| Message ID | 2c88b9666a38e9344d31317a3b75b7846122a91c.1464207811.git.jsarha@ti.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
On Wed, May 25, 2016 at 11:43:30PM +0300, Jyri Sarha wrote: > Remove obsolete drm_helper_crtc_enable_color_mgmt(). The function is > replaced by drm_crtc_enable_color_mgmt(). > > Signed-off-by: Jyri Sarha <jsarha@ti.com> Ah, here it is. Tbh this is patch splitting too far, since when you move a function it's much better to have the removal and addition in the same patch. If you split it like this then it's much harder to review. So please merge this with the addition patch + the patch to update i915. We can handle the resulting conflicts (if there are any) and cross-maintainer depencies. -Daniel > --- > drivers/gpu/drm/drm_crtc_helper.c | 33 --------------------------------- > include/drm/drm_crtc_helper.h | 3 --- > 2 files changed, 36 deletions(-) > > diff --git a/drivers/gpu/drm/drm_crtc_helper.c b/drivers/gpu/drm/drm_crtc_helper.c > index a6e4243..bf10d70 100644 > --- a/drivers/gpu/drm/drm_crtc_helper.c > +++ b/drivers/gpu/drm/drm_crtc_helper.c > @@ -1121,36 +1121,3 @@ int drm_helper_crtc_mode_set_base(struct drm_crtc *crtc, int x, int y, > return drm_plane_helper_commit(plane, plane_state, old_fb); > } > EXPORT_SYMBOL(drm_helper_crtc_mode_set_base); > - > -/** > - * drm_helper_crtc_enable_color_mgmt - enable color management properties > - * @crtc: DRM CRTC > - * @degamma_lut_size: the size of the degamma lut (before CSC) > - * @gamma_lut_size: the size of the gamma lut (after CSC) > - * > - * This function lets the driver enable the color correction properties on a > - * CRTC. This includes 3 degamma, csc and gamma properties that userspace can > - * set and 2 size properties to inform the userspace of the lut sizes. > - */ > -void drm_helper_crtc_enable_color_mgmt(struct drm_crtc *crtc, > - int degamma_lut_size, > - int gamma_lut_size) > -{ > - struct drm_device *dev = crtc->dev; > - struct drm_mode_config *config = &dev->mode_config; > - > - drm_object_attach_property(&crtc->base, > - config->degamma_lut_property, 0); > - drm_object_attach_property(&crtc->base, > - config->ctm_property, 0); > - drm_object_attach_property(&crtc->base, > - config->gamma_lut_property, 0); > - > - drm_object_attach_property(&crtc->base, > - config->degamma_lut_size_property, > - degamma_lut_size); > - drm_object_attach_property(&crtc->base, > - config->gamma_lut_size_property, > - gamma_lut_size); > -} > -EXPORT_SYMBOL(drm_helper_crtc_enable_color_mgmt); > diff --git a/include/drm/drm_crtc_helper.h b/include/drm/drm_crtc_helper.h > index 97fa894..4b37afa 100644 > --- a/include/drm/drm_crtc_helper.h > +++ b/include/drm/drm_crtc_helper.h > @@ -48,9 +48,6 @@ extern bool drm_crtc_helper_set_mode(struct drm_crtc *crtc, > struct drm_display_mode *mode, > int x, int y, > struct drm_framebuffer *old_fb); > -extern void drm_helper_crtc_enable_color_mgmt(struct drm_crtc *crtc, > - int degamma_lut_size, > - int gamma_lut_size); > extern bool drm_helper_crtc_in_use(struct drm_crtc *crtc); > extern bool drm_helper_encoder_in_use(struct drm_encoder *encoder); > > -- > 1.9.1 >
On 05/26/16 11:08, Daniel Vetter wrote: > On Wed, May 25, 2016 at 11:43:30PM +0300, Jyri Sarha wrote: >> Remove obsolete drm_helper_crtc_enable_color_mgmt(). The function is >> replaced by drm_crtc_enable_color_mgmt(). >> >> Signed-off-by: Jyri Sarha <jsarha@ti.com> > > Ah, here it is. Tbh this is patch splitting too far, since when you move a > function it's much better to have the removal and addition in the same > patch. If you split it like this then it's much harder to review. > > So please merge this with the addition patch + the patch to update i915. > We can handle the resulting conflicts (if there are any) and > cross-maintainer depencies. > -Daniel Ok, I'll do that and move the omapdrm patches after the color_mgmt-patch, and squash omapdrm-patch #5 to patch #3. BR, Jyri > >> --- >> drivers/gpu/drm/drm_crtc_helper.c | 33 --------------------------------- >> include/drm/drm_crtc_helper.h | 3 --- >> 2 files changed, 36 deletions(-) >> >> diff --git a/drivers/gpu/drm/drm_crtc_helper.c b/drivers/gpu/drm/drm_crtc_helper.c >> index a6e4243..bf10d70 100644 >> --- a/drivers/gpu/drm/drm_crtc_helper.c >> +++ b/drivers/gpu/drm/drm_crtc_helper.c >> @@ -1121,36 +1121,3 @@ int drm_helper_crtc_mode_set_base(struct drm_crtc *crtc, int x, int y, >> return drm_plane_helper_commit(plane, plane_state, old_fb); >> } >> EXPORT_SYMBOL(drm_helper_crtc_mode_set_base); >> - >> -/** >> - * drm_helper_crtc_enable_color_mgmt - enable color management properties >> - * @crtc: DRM CRTC >> - * @degamma_lut_size: the size of the degamma lut (before CSC) >> - * @gamma_lut_size: the size of the gamma lut (after CSC) >> - * >> - * This function lets the driver enable the color correction properties on a >> - * CRTC. This includes 3 degamma, csc and gamma properties that userspace can >> - * set and 2 size properties to inform the userspace of the lut sizes. >> - */ >> -void drm_helper_crtc_enable_color_mgmt(struct drm_crtc *crtc, >> - int degamma_lut_size, >> - int gamma_lut_size) >> -{ >> - struct drm_device *dev = crtc->dev; >> - struct drm_mode_config *config = &dev->mode_config; >> - >> - drm_object_attach_property(&crtc->base, >> - config->degamma_lut_property, 0); >> - drm_object_attach_property(&crtc->base, >> - config->ctm_property, 0); >> - drm_object_attach_property(&crtc->base, >> - config->gamma_lut_property, 0); >> - >> - drm_object_attach_property(&crtc->base, >> - config->degamma_lut_size_property, >> - degamma_lut_size); >> - drm_object_attach_property(&crtc->base, >> - config->gamma_lut_size_property, >> - gamma_lut_size); >> -} >> -EXPORT_SYMBOL(drm_helper_crtc_enable_color_mgmt); >> diff --git a/include/drm/drm_crtc_helper.h b/include/drm/drm_crtc_helper.h >> index 97fa894..4b37afa 100644 >> --- a/include/drm/drm_crtc_helper.h >> +++ b/include/drm/drm_crtc_helper.h >> @@ -48,9 +48,6 @@ extern bool drm_crtc_helper_set_mode(struct drm_crtc *crtc, >> struct drm_display_mode *mode, >> int x, int y, >> struct drm_framebuffer *old_fb); >> -extern void drm_helper_crtc_enable_color_mgmt(struct drm_crtc *crtc, >> - int degamma_lut_size, >> - int gamma_lut_size); >> extern bool drm_helper_crtc_in_use(struct drm_crtc *crtc); >> extern bool drm_helper_encoder_in_use(struct drm_encoder *encoder); >> >> -- >> 1.9.1 >> >
diff --git a/drivers/gpu/drm/drm_crtc_helper.c b/drivers/gpu/drm/drm_crtc_helper.c index a6e4243..bf10d70 100644 --- a/drivers/gpu/drm/drm_crtc_helper.c +++ b/drivers/gpu/drm/drm_crtc_helper.c @@ -1121,36 +1121,3 @@ int drm_helper_crtc_mode_set_base(struct drm_crtc *crtc, int x, int y, return drm_plane_helper_commit(plane, plane_state, old_fb); } EXPORT_SYMBOL(drm_helper_crtc_mode_set_base); - -/** - * drm_helper_crtc_enable_color_mgmt - enable color management properties - * @crtc: DRM CRTC - * @degamma_lut_size: the size of the degamma lut (before CSC) - * @gamma_lut_size: the size of the gamma lut (after CSC) - * - * This function lets the driver enable the color correction properties on a - * CRTC. This includes 3 degamma, csc and gamma properties that userspace can - * set and 2 size properties to inform the userspace of the lut sizes. - */ -void drm_helper_crtc_enable_color_mgmt(struct drm_crtc *crtc, - int degamma_lut_size, - int gamma_lut_size) -{ - struct drm_device *dev = crtc->dev; - struct drm_mode_config *config = &dev->mode_config; - - drm_object_attach_property(&crtc->base, - config->degamma_lut_property, 0); - drm_object_attach_property(&crtc->base, - config->ctm_property, 0); - drm_object_attach_property(&crtc->base, - config->gamma_lut_property, 0); - - drm_object_attach_property(&crtc->base, - config->degamma_lut_size_property, - degamma_lut_size); - drm_object_attach_property(&crtc->base, - config->gamma_lut_size_property, - gamma_lut_size); -} -EXPORT_SYMBOL(drm_helper_crtc_enable_color_mgmt); diff --git a/include/drm/drm_crtc_helper.h b/include/drm/drm_crtc_helper.h index 97fa894..4b37afa 100644 --- a/include/drm/drm_crtc_helper.h +++ b/include/drm/drm_crtc_helper.h @@ -48,9 +48,6 @@ extern bool drm_crtc_helper_set_mode(struct drm_crtc *crtc, struct drm_display_mode *mode, int x, int y, struct drm_framebuffer *old_fb); -extern void drm_helper_crtc_enable_color_mgmt(struct drm_crtc *crtc, - int degamma_lut_size, - int gamma_lut_size); extern bool drm_helper_crtc_in_use(struct drm_crtc *crtc); extern bool drm_helper_encoder_in_use(struct drm_encoder *encoder);
Remove obsolete drm_helper_crtc_enable_color_mgmt(). The function is replaced by drm_crtc_enable_color_mgmt(). Signed-off-by: Jyri Sarha <jsarha@ti.com> --- drivers/gpu/drm/drm_crtc_helper.c | 33 --------------------------------- include/drm/drm_crtc_helper.h | 3 --- 2 files changed, 36 deletions(-)