History

drm: cleanup modesetting ioctls, one param per line

Since this already confused me once when adding addfb2.1, let's clean up the header to split params one per line.

Rob Clark committed 11 years ago

Commit bbda9c11 parent fafecc01 file · +30 −12Browse files

Showing the changes to include/uapi (1 of 1 file). Show all

Unified · Split

include/uapi/drm/drm_mode.h+30−12
@@ -105,8 +105,16 @@ · 104 unmodified lines
105105
106106 struct drm_mode_modeinfo {
107107 __u32 clock;
108− __u16 hdisplay, hsync_start, hsync_end, htotal, hskew;
109− __u16 vdisplay, vsync_start, vsync_end, vtotal, vscan;
108+ __u16 hdisplay;
109+ __u16 hsync_start;
110+ __u16 hsync_end;
111+ __u16 htotal;
112+ __u16 hskew;
113+ __u16 vdisplay;
114+ __u16 vsync_start;
115+ __u16 vsync_end;
116+ __u16 vtotal;
117+ __u16 vscan;
110118
111119 __u32 vrefresh;
112120
@@ -124,8 +132,10 @@ struct drm_mode_card_res { · 11 unmodified lines
124132 __u32 count_crtcs;
125133 __u32 count_connectors;
126134 __u32 count_encoders;
127− __u32 min_width, max_width;
128− __u32 min_height, max_height;
135+ __u32 min_width;
136+ __u32 max_width;
137+ __u32 min_height;
138+ __u32 max_height;
129139 };
130140
131141 struct drm_mode_crtc {
@@ -135,7 +145,8 @@ struct drm_mode_crtc { · 3 unmodified lines
135145 __u32 crtc_id; /**< Id */
136146 __u32 fb_id; /**< Id of framebuffer */
137147
138− __u32 x, y; /**< Position on the frameuffer */
148+ __u32 x; /**< x Position on the framebuffer */
149+ __u32 y; /**< y Position on the framebuffer */
139150
140151 __u32 gamma_size;
141152 __u32 mode_valid;
@@ -153,12 +164,16 @@ struct drm_mode_set_plane { · 11 unmodified lines
153164 __u32 flags; /* see above flags */
154165
155166 /* Signed dest location allows it to be partially off screen */
156− __s32 crtc_x, crtc_y;
157− __u32 crtc_w, crtc_h;
167+ __s32 crtc_x;
168+ __s32 crtc_y;
169+ __u32 crtc_w;
170+ __u32 crtc_h;
158171
159172 /* Source values are 16.16 fixed point */
160− __u32 src_x, src_y;
161− __u32 src_h, src_w;
173+ __u32 src_x;
174+ __u32 src_y;
175+ __u32 src_h;
176+ __u32 src_w;
162177 };
163178
164179 struct drm_mode_get_plane {
@@ -244,7 +259,8 @@ struct drm_mode_get_connector { · 79 unmodified lines
244259 __u32 connector_type_id;
245260
246261 __u32 connection;
247− __u32 mm_width, mm_height; /**< HxW in millimeters */
262+ __u32 mm_width; /**< width in millimeters */
263+ __u32 mm_height; /**< height in millimeters */
248264 __u32 subpixel;
249265
250266 __u32 pad;
@@ -327,7 +343,8 @@ struct drm_mode_get_blob { · 76 unmodified lines
327343
328344 struct drm_mode_fb_cmd {
329345 __u32 fb_id;
330− __u32 width, height;
346+ __u32 width;
347+ __u32 height;
331348 __u32 pitch;
332349 __u32 bpp;
333350 __u32 depth;
@@ -340,7 +357,8 @@ struct drm_mode_fb_cmd { · 6 unmodified lines
340357
341358 struct drm_mode_fb_cmd2 {
342359 __u32 fb_id;
343− __u32 width, height;
360+ __u32 width;
361+ __u32 height;
344362 __u32 pixel_format; /* fourcc code from drm_fourcc.h */
345363 __u32 flags; /* see above flags */
346364

Keyboard shortcuts

General

Show keyboard shortcuts
?
Focus the current search
/

Issues and pull requests

Open filters
f

Issues, pull requests and Inbox

Select next item
j↓
Select previous item
k↑
Open selected item
Enter
Dismiss filters or clear selection
Esc

Repository code

Go to file
t