| Message ID | 1370265102-14208-2-git-send-email-ville.syrjala@linux.intel.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
On Mon, Jun 03, 2013 at 04:11:42PM +0300, 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 > > Reviewed-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com> > Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com> Yeah, makes sense to ditch this. We can think about this again when atomic modeset and plane properties pop up again. For both patches: Reviewed-by: Daniel Vetter <daniel.vetter@ffwll.ch> > --- > 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 865ebfe..f00ba75 100644 > --- a/drivers/gpu/drm/drm_crtc.c > +++ b/drivers/gpu/drm/drm_crtc.c > @@ -1749,7 +1749,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 db7a885..3c14b46 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; > }; > -- > 1.8.1.5 > > _______________________________________________ > Intel-gfx mailing list > Intel-gfx@lists.freedesktop.org > http://lists.freedesktop.org/mailman/listinfo/intel-gfx
diff --git a/drivers/gpu/drm/drm_crtc.c b/drivers/gpu/drm/drm_crtc.c index 865ebfe..f00ba75 100644 --- a/drivers/gpu/drm/drm_crtc.c +++ b/drivers/gpu/drm/drm_crtc.c @@ -1749,7 +1749,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 db7a885..3c14b46 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; };