Message ID | 1368020454-5131-1-git-send-email-ville.syrjala@linux.intel.com (mailing list archive) |
---|---|
State | New, archived |
Headers | show |
On Wednesday 08 May 2013 16:40:54 ville.syrjala@linux.intel.com wrote: > From: Ville Syrjälä <ville.syrjala@linux.intel.com> > > There's a bunch of unused members inside drm_plane, bloating the size of > the structure needlessly. Eliminate them. > > v2: Remove all of it from kernel-doc too > > Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com> Reviewed-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com> > --- > drivers/gpu/drm/drm_crtc.c | 2 +- > include/drm/drm_crtc.h | 11 ----------- > 2 files changed, 1 insertion(+), 12 deletions(-) > > diff --git a/drivers/gpu/drm/drm_crtc.c b/drivers/gpu/drm/drm_crtc.c > index d7c449f..e591914 100644 > --- a/drivers/gpu/drm/drm_crtc.c > +++ b/drivers/gpu/drm/drm_crtc.c > @@ -1739,7 +1739,7 @@ int drm_mode_getplane(struct drm_device *dev, void > *data, > > plane_resp->plane_id = plane->base.id; > plane_resp->possible_crtcs = plane->possible_crtcs; > - plane_resp->gamma_size = plane->gamma_size; > + plane_resp->gamma_size = 0; > > /* > * This ioctl is called twice, once to determine how much space is > diff --git a/include/drm/drm_crtc.h b/include/drm/drm_crtc.h > index adb3f9b..e11c6bc 100644 > --- a/include/drm/drm_crtc.h > +++ b/include/drm/drm_crtc.h > @@ -654,11 +654,7 @@ struct drm_plane_funcs { > * @format_count: number of formats supported > * @crtc: currently bound CRTC > * @fb: currently bound fb > - * @gamma_size: size of gamma table > - * @gamma_store: gamma correction table > - * @enabled: enabled flag > * @funcs: helper functions > - * @helper_private: storage for drver layer > * @properties: property tracking for this plane > */ > struct drm_plane { > @@ -674,14 +670,7 @@ struct drm_plane { > struct drm_crtc *crtc; > struct drm_framebuffer *fb; > > - /* CRTC gamma size for reporting to userspace */ > - uint32_t gamma_size; > - uint16_t *gamma_store; > - > - bool enabled; > - > const struct drm_plane_funcs *funcs; > - void *helper_private; > > struct drm_object_properties properties; > };
Hello, On Wednesday 08 May 2013 15:52:10 Laurent Pinchart wrote: > On Wednesday 08 May 2013 16:40:54 ville.syrjala@linux.intel.com wrote: > > From: Ville Syrjälä <ville.syrjala@linux.intel.com> > > > > There's a bunch of unused members inside drm_plane, bloating the size of > > the structure needlessly. Eliminate them. > > > > v2: Remove all of it from kernel-doc too > > > > Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com> > > Reviewed-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com> Wow, I've managed to review the patch and miss that it broke compilation of the shmob-drm driver :-( I'll send a patch to fix it. > > --- > > > > drivers/gpu/drm/drm_crtc.c | 2 +- > > include/drm/drm_crtc.h | 11 ----------- > > 2 files changed, 1 insertion(+), 12 deletions(-) > > > > diff --git a/drivers/gpu/drm/drm_crtc.c b/drivers/gpu/drm/drm_crtc.c > > index d7c449f..e591914 100644 > > --- a/drivers/gpu/drm/drm_crtc.c > > +++ b/drivers/gpu/drm/drm_crtc.c > > @@ -1739,7 +1739,7 @@ int drm_mode_getplane(struct drm_device *dev, void > > *data, > > > > plane_resp->plane_id = plane->base.id; > > plane_resp->possible_crtcs = plane->possible_crtcs; > > > > - plane_resp->gamma_size = plane->gamma_size; > > + plane_resp->gamma_size = 0; > > > > /* > > > > * This ioctl is called twice, once to determine how much space is > > > > diff --git a/include/drm/drm_crtc.h b/include/drm/drm_crtc.h > > index adb3f9b..e11c6bc 100644 > > --- a/include/drm/drm_crtc.h > > +++ b/include/drm/drm_crtc.h > > @@ -654,11 +654,7 @@ struct drm_plane_funcs { > > * @format_count: number of formats supported > > * @crtc: currently bound CRTC > > * @fb: currently bound fb > > - * @gamma_size: size of gamma table > > - * @gamma_store: gamma correction table > > - * @enabled: enabled flag > > * @funcs: helper functions > > - * @helper_private: storage for drver layer > > * @properties: property tracking for this plane > > */ > > > > struct drm_plane { > > @@ -674,14 +670,7 @@ struct drm_plane { > > struct drm_crtc *crtc; > > struct drm_framebuffer *fb; > > > > - /* CRTC gamma size for reporting to userspace */ > > - uint32_t gamma_size; > > - uint16_t *gamma_store; > > - > > - bool enabled; > > - > > const struct drm_plane_funcs *funcs; > > - void *helper_private; > > > > struct drm_object_properties properties; > > };
diff --git a/drivers/gpu/drm/drm_crtc.c b/drivers/gpu/drm/drm_crtc.c index d7c449f..e591914 100644 --- a/drivers/gpu/drm/drm_crtc.c +++ b/drivers/gpu/drm/drm_crtc.c @@ -1739,7 +1739,7 @@ int drm_mode_getplane(struct drm_device *dev, void *data, plane_resp->plane_id = plane->base.id; plane_resp->possible_crtcs = plane->possible_crtcs; - plane_resp->gamma_size = plane->gamma_size; + plane_resp->gamma_size = 0; /* * This ioctl is called twice, once to determine how much space is diff --git a/include/drm/drm_crtc.h b/include/drm/drm_crtc.h index adb3f9b..e11c6bc 100644 --- a/include/drm/drm_crtc.h +++ b/include/drm/drm_crtc.h @@ -654,11 +654,7 @@ struct drm_plane_funcs { * @format_count: number of formats supported * @crtc: currently bound CRTC * @fb: currently bound fb - * @gamma_size: size of gamma table - * @gamma_store: gamma correction table - * @enabled: enabled flag * @funcs: helper functions - * @helper_private: storage for drver layer * @properties: property tracking for this plane */ struct drm_plane { @@ -674,14 +670,7 @@ struct drm_plane { struct drm_crtc *crtc; struct drm_framebuffer *fb; - /* CRTC gamma size for reporting to userspace */ - uint32_t gamma_size; - uint16_t *gamma_store; - - bool enabled; - const struct drm_plane_funcs *funcs; - void *helper_private; struct drm_object_properties properties; };