[PATCH] drm: cleanup modesetting ioctls, one param per line

[Daniel Vetter]

On Wed, Aug 19, 2015 at 08:34:45PM -0400, Alex Deucher wrote:
> On Wed, Aug 19, 2015 at 7:21 PM, Rob Clark <robdclark at gmail.com> wrote:
> > Since this already confused me once when adding addfb2.1, let's clean up
> > the header to split params one per line.
> >
> > Signed-off-by: Rob Clark <robdclark at gmail.com>
> 
> Reviewed-by: Alex Deucher <alexander.deucher at amd.com>

Applied to drm-misc.
-Daniel

> 
> > ---
> >  include/uapi/drm/drm_mode.h | 42 ++++++++++++++++++++++++++++++------------
> >  1 file changed, 30 insertions(+), 12 deletions(-)
> >
> > diff --git a/include/uapi/drm/drm_mode.h b/include/uapi/drm/drm_mode.h
> > index 359107a..6c11ca4 100644
> > --- a/include/uapi/drm/drm_mode.h
> > +++ b/include/uapi/drm/drm_mode.h
> > @@ -105,8 +105,16 @@
> >
> >  struct drm_mode_modeinfo {
> >         __u32 clock;
> > -       __u16 hdisplay, hsync_start, hsync_end, htotal, hskew;
> > -       __u16 vdisplay, vsync_start, vsync_end, vtotal, vscan;
> > +       __u16 hdisplay;
> > +       __u16 hsync_start;
> > +       __u16 hsync_end;
> > +       __u16 htotal;
> > +       __u16 hskew;
> > +       __u16 vdisplay;
> > +       __u16 vsync_start;
> > +       __u16 vsync_end;
> > +       __u16 vtotal;
> > +       __u16 vscan;
> >
> >         __u32 vrefresh;
> >
> > @@ -124,8 +132,10 @@ struct drm_mode_card_res {
> >         __u32 count_crtcs;
> >         __u32 count_connectors;
> >         __u32 count_encoders;
> > -       __u32 min_width, max_width;
> > -       __u32 min_height, max_height;
> > +       __u32 min_width;
> > +       __u32 max_width;
> > +       __u32 min_height;
> > +       __u32 max_height;
> >  };
> >
> >  struct drm_mode_crtc {
> > @@ -135,7 +145,8 @@ struct drm_mode_crtc {
> >         __u32 crtc_id; /**< Id */
> >         __u32 fb_id; /**< Id of framebuffer */
> >
> > -       __u32 x, y; /**< Position on the frameuffer */
> > +       __u32 x; /**< x Position on the framebuffer */
> > +       __u32 y; /**< y Position on the framebuffer */
> >
> >         __u32 gamma_size;
> >         __u32 mode_valid;
> > @@ -153,12 +164,16 @@ struct drm_mode_set_plane {
> >         __u32 flags; /* see above flags */
> >
> >         /* Signed dest location allows it to be partially off screen */
> > -       __s32 crtc_x, crtc_y;
> > -       __u32 crtc_w, crtc_h;
> > +       __s32 crtc_x;
> > +       __s32 crtc_y;
> > +       __u32 crtc_w;
> > +       __u32 crtc_h;
> >
> >         /* Source values are 16.16 fixed point */
> > -       __u32 src_x, src_y;
> > -       __u32 src_h, src_w;
> > +       __u32 src_x;
> > +       __u32 src_y;
> > +       __u32 src_h;
> > +       __u32 src_w;
> >  };
> >
> >  struct drm_mode_get_plane {
> > @@ -244,7 +259,8 @@ struct drm_mode_get_connector {
> >         __u32 connector_type_id;
> >
> >         __u32 connection;
> > -       __u32 mm_width, mm_height; /**< HxW in millimeters */
> > +       __u32 mm_width;  /**< width in millimeters */
> > +       __u32 mm_height; /**< height in millimeters */
> >         __u32 subpixel;
> >
> >         __u32 pad;
> > @@ -327,7 +343,8 @@ struct drm_mode_get_blob {
> >
> >  struct drm_mode_fb_cmd {
> >         __u32 fb_id;
> > -       __u32 width, height;
> > +       __u32 width;
> > +       __u32 height;
> >         __u32 pitch;
> >         __u32 bpp;
> >         __u32 depth;
> > @@ -340,7 +357,8 @@ struct drm_mode_fb_cmd {
> >
> >  struct drm_mode_fb_cmd2 {
> >         __u32 fb_id;
> > -       __u32 width, height;
> > +       __u32 width;
> > +       __u32 height;
> >         __u32 pixel_format; /* fourcc code from drm_fourcc.h */
> >         __u32 flags; /* see above flags */
> >
> > --
> > 2.4.3
> >
> > _______________________________________________
> > dri-devel mailing list
> > dri-devel at lists.freedesktop.org
> > http://lists.freedesktop.org/mailman/listinfo/dri-devel
> _______________________________________________
> dri-devel mailing list
> dri-devel at lists.freedesktop.org
> http://lists.freedesktop.org/mailman/listinfo/dri-devel

-- 
Daniel Vetter
Software Engineer, Intel Corporation
http://blog.ffwll.ch