* [PATCH 0/2] drm: fix and cleanup legacy gamma support @ 2020-12-03 11:48 Tomi Valkeinen 2020-12-03 11:48 ` [PATCH 1/2] drm: add legacy support for using degamma for gamma Tomi Valkeinen 2020-12-03 11:48 ` [PATCH 2/2] drm: automatic legacy gamma support Tomi Valkeinen 0 siblings, 2 replies; 8+ messages in thread From: Tomi Valkeinen @ 2020-12-03 11:48 UTC (permalink / raw) To: dri-devel, Daniel Vetter Cc: Yannick Fertre, Philippe Cornu, David Airlie, Russell King, Sandy Huang, Paul Cercueil, Tomi Valkeinen, Laurent Pinchart, Thomas Zimmermann, Matthias Brugger, Vincent Abriou, Maxime Coquelin, Alexandre Torgue Hi, The first patch fix legacy gamma table for HW which have a degamma lut block before CTM block, but no gamma lut after the CTM. The second one cleans up the legacy gamma support a bit by handling legacy gamma for modern drivers in the drm core. Tomi Tomi Valkeinen (2): drm: add legacy support for using degamma for gamma drm: automatic legacy gamma support .../gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c | 1 - .../gpu/drm/arm/display/komeda/komeda_crtc.c | 1 - drivers/gpu/drm/arm/malidp_crtc.c | 1 - drivers/gpu/drm/armada/armada_crtc.c | 1 - drivers/gpu/drm/ast/ast_mode.c | 1 - .../gpu/drm/atmel-hlcdc/atmel_hlcdc_crtc.c | 1 - drivers/gpu/drm/drm_atomic_helper.c | 70 ----------- drivers/gpu/drm/drm_color_mgmt.c | 117 +++++++++++++++++- drivers/gpu/drm/drm_fb_helper.c | 12 +- drivers/gpu/drm/ingenic/ingenic-drm-drv.c | 2 - drivers/gpu/drm/mediatek/mtk_drm_crtc.c | 1 - drivers/gpu/drm/nouveau/dispnv50/head.c | 2 - drivers/gpu/drm/omapdrm/omap_crtc.c | 1 - drivers/gpu/drm/rcar-du/rcar_du_crtc.c | 1 - drivers/gpu/drm/rockchip/rockchip_drm_vop.c | 1 - drivers/gpu/drm/stm/ltdc.c | 1 - drivers/gpu/drm/vc4/vc4_crtc.c | 1 - drivers/gpu/drm/vc4/vc4_txp.c | 1 - include/drm/drm_atomic_helper.h | 4 - include/drm/drm_color_mgmt.h | 7 ++ include/drm/drm_crtc.h | 3 + 21 files changed, 130 insertions(+), 100 deletions(-) -- Texas Instruments Finland Oy, Porkkalankatu 22, 00180 Helsinki. Y-tunnus/Business ID: 0615521-4. Kotipaikka/Domicile: Helsinki _______________________________________________ dri-devel mailing list dri-devel@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/dri-devel ^ permalink raw reply [flat|nested] 8+ messages in thread
* [PATCH 1/2] drm: add legacy support for using degamma for gamma 2020-12-03 11:48 [PATCH 0/2] drm: fix and cleanup legacy gamma support Tomi Valkeinen @ 2020-12-03 11:48 ` Tomi Valkeinen 2020-12-04 22:35 ` Laurent Pinchart 2020-12-03 11:48 ` [PATCH 2/2] drm: automatic legacy gamma support Tomi Valkeinen 1 sibling, 1 reply; 8+ messages in thread From: Tomi Valkeinen @ 2020-12-03 11:48 UTC (permalink / raw) To: dri-devel, Daniel Vetter Cc: Yannick Fertre, Philippe Cornu, David Airlie, Russell King, Sandy Huang, Paul Cercueil, Tomi Valkeinen, Laurent Pinchart, Thomas Zimmermann, Matthias Brugger, Vincent Abriou, Maxime Coquelin, Alexandre Torgue We currently have drm_atomic_helper_legacy_gamma_set() helper which can be used to handle legacy gamma-set ioctl. drm_atomic_helper_legacy_gamma_set() sets GAMMA_LUT, and clears CTM and DEGAMMA_LUT. This works fine on HW where we have either: degamma -> ctm -> gamma -> out or ctm -> gamma -> out However, if the HW has gamma table before ctm, the atomic property should be DEGAMMA_LUT, and thus we have: degamma -> ctm -> out This is fine for userspace which sets gamma table using the properties, as the userspace can check for the existence of gamma & degamma, but the legacy gamma-set ioctl does not work. This patch fixes the issue by changing drm_atomic_helper_legacy_gamma_set() so that GAMMA_LUT will be used if it exists, and DEGAMMA_LUT will be used as a fallback. Signed-off-by: Tomi Valkeinen <tomi.valkeinen@ti.com> --- drivers/gpu/drm/drm_atomic_helper.c | 18 +++++++++++++++--- drivers/gpu/drm/drm_color_mgmt.c | 4 ++++ include/drm/drm_crtc.h | 3 +++ 3 files changed, 22 insertions(+), 3 deletions(-) diff --git a/drivers/gpu/drm/drm_atomic_helper.c b/drivers/gpu/drm/drm_atomic_helper.c index ba1507036f26..fe59c8ea42a9 100644 --- a/drivers/gpu/drm/drm_atomic_helper.c +++ b/drivers/gpu/drm/drm_atomic_helper.c @@ -3512,6 +3512,10 @@ EXPORT_SYMBOL(drm_atomic_helper_page_flip_target); * that support color management through the DEGAMMA_LUT/GAMMA_LUT * properties. See drm_crtc_enable_color_mgmt() and the containing chapter for * how the atomic color management and gamma tables work. + * + * This function uses the GAMMA_LUT or DEGAMMA_LUT property for the gamma table. + * GAMMA_LUT property is used if it exists, and DEGAMMA_LUT property is used as + * a fallback. */ int drm_atomic_helper_legacy_gamma_set(struct drm_crtc *crtc, u16 *red, u16 *green, u16 *blue, @@ -3525,6 +3529,12 @@ int drm_atomic_helper_legacy_gamma_set(struct drm_crtc *crtc, struct drm_color_lut *blob_data; int i, ret = 0; bool replaced; + bool use_degamma; + + if (!crtc->has_gamma_prop && !crtc->has_degamma_prop) + return -ENODEV; + + use_degamma = !crtc->has_gamma_prop; state = drm_atomic_state_alloc(crtc->dev); if (!state) @@ -3554,10 +3564,12 @@ int drm_atomic_helper_legacy_gamma_set(struct drm_crtc *crtc, goto fail; } - /* Reset DEGAMMA_LUT and CTM properties. */ - replaced = drm_property_replace_blob(&crtc_state->degamma_lut, NULL); + /* Set GAMMA/DEGAMMA_LUT and reset DEGAMMA/GAMMA_LUT and CTM */ + replaced = drm_property_replace_blob(&crtc_state->degamma_lut, + use_degamma ? blob : NULL); replaced |= drm_property_replace_blob(&crtc_state->ctm, NULL); - replaced |= drm_property_replace_blob(&crtc_state->gamma_lut, blob); + replaced |= drm_property_replace_blob(&crtc_state->gamma_lut, + use_degamma ? NULL : blob); crtc_state->color_mgmt_changed |= replaced; ret = drm_atomic_commit(state); diff --git a/drivers/gpu/drm/drm_color_mgmt.c b/drivers/gpu/drm/drm_color_mgmt.c index 3bcabc2f6e0e..956e59d5f6a7 100644 --- a/drivers/gpu/drm/drm_color_mgmt.c +++ b/drivers/gpu/drm/drm_color_mgmt.c @@ -176,6 +176,8 @@ void drm_crtc_enable_color_mgmt(struct drm_crtc *crtc, degamma_lut_size); } + crtc->has_degamma_prop = !!degamma_lut_size; + if (has_ctm) drm_object_attach_property(&crtc->base, config->ctm_property, 0); @@ -187,6 +189,8 @@ void drm_crtc_enable_color_mgmt(struct drm_crtc *crtc, config->gamma_lut_size_property, gamma_lut_size); } + + crtc->has_gamma_prop = !!gamma_lut_size; } EXPORT_SYMBOL(drm_crtc_enable_color_mgmt); diff --git a/include/drm/drm_crtc.h b/include/drm/drm_crtc.h index ba839e5e357d..9e1f06047e3d 100644 --- a/include/drm/drm_crtc.h +++ b/include/drm/drm_crtc.h @@ -1084,6 +1084,9 @@ struct drm_crtc { */ uint16_t *gamma_store; + bool has_gamma_prop; + bool has_degamma_prop; + /** @helper_private: mid-layer private data */ const struct drm_crtc_helper_funcs *helper_private; -- Texas Instruments Finland Oy, Porkkalankatu 22, 00180 Helsinki. Y-tunnus/Business ID: 0615521-4. Kotipaikka/Domicile: Helsinki _______________________________________________ dri-devel mailing list dri-devel@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/dri-devel ^ permalink raw reply related [flat|nested] 8+ messages in thread
* Re: [PATCH 1/2] drm: add legacy support for using degamma for gamma 2020-12-03 11:48 ` [PATCH 1/2] drm: add legacy support for using degamma for gamma Tomi Valkeinen @ 2020-12-04 22:35 ` Laurent Pinchart 2020-12-07 15:31 ` Ville Syrjälä 0 siblings, 1 reply; 8+ messages in thread From: Laurent Pinchart @ 2020-12-04 22:35 UTC (permalink / raw) To: Tomi Valkeinen Cc: Yannick Fertre, Thomas Zimmermann, Philippe Cornu, David Airlie, Russell King, Sandy Huang, Paul Cercueil, Alexandre Torgue, dri-devel, Matthias Brugger, Vincent Abriou, Maxime Coquelin Hi Tomi, Thank you for the patch. On Thu, Dec 03, 2020 at 01:48:44PM +0200, Tomi Valkeinen wrote: > We currently have drm_atomic_helper_legacy_gamma_set() helper which can > be used to handle legacy gamma-set ioctl. > drm_atomic_helper_legacy_gamma_set() sets GAMMA_LUT, and clears > CTM and DEGAMMA_LUT. This works fine on HW where we have either: > > degamma -> ctm -> gamma -> out > > or > > ctm -> gamma -> out > > However, if the HW has gamma table before ctm, the atomic property > should be DEGAMMA_LUT, and thus we have: > > degamma -> ctm -> out > > This is fine for userspace which sets gamma table using the properties, > as the userspace can check for the existence of gamma & degamma, but the > legacy gamma-set ioctl does not work. > > This patch fixes the issue by changing > drm_atomic_helper_legacy_gamma_set() so that GAMMA_LUT will be used if > it exists, and DEGAMMA_LUT will be used as a fallback. > > Signed-off-by: Tomi Valkeinen <tomi.valkeinen@ti.com> > --- > drivers/gpu/drm/drm_atomic_helper.c | 18 +++++++++++++++--- > drivers/gpu/drm/drm_color_mgmt.c | 4 ++++ > include/drm/drm_crtc.h | 3 +++ > 3 files changed, 22 insertions(+), 3 deletions(-) > > diff --git a/drivers/gpu/drm/drm_atomic_helper.c b/drivers/gpu/drm/drm_atomic_helper.c > index ba1507036f26..fe59c8ea42a9 100644 > --- a/drivers/gpu/drm/drm_atomic_helper.c > +++ b/drivers/gpu/drm/drm_atomic_helper.c > @@ -3512,6 +3512,10 @@ EXPORT_SYMBOL(drm_atomic_helper_page_flip_target); > * that support color management through the DEGAMMA_LUT/GAMMA_LUT > * properties. See drm_crtc_enable_color_mgmt() and the containing chapter for > * how the atomic color management and gamma tables work. > + * > + * This function uses the GAMMA_LUT or DEGAMMA_LUT property for the gamma table. > + * GAMMA_LUT property is used if it exists, and DEGAMMA_LUT property is used as > + * a fallback. > */ > int drm_atomic_helper_legacy_gamma_set(struct drm_crtc *crtc, > u16 *red, u16 *green, u16 *blue, > @@ -3525,6 +3529,12 @@ int drm_atomic_helper_legacy_gamma_set(struct drm_crtc *crtc, > struct drm_color_lut *blob_data; > int i, ret = 0; > bool replaced; > + bool use_degamma; > + > + if (!crtc->has_gamma_prop && !crtc->has_degamma_prop) > + return -ENODEV; > + > + use_degamma = !crtc->has_gamma_prop; > > state = drm_atomic_state_alloc(crtc->dev); > if (!state) > @@ -3554,10 +3564,12 @@ int drm_atomic_helper_legacy_gamma_set(struct drm_crtc *crtc, > goto fail; > } > > - /* Reset DEGAMMA_LUT and CTM properties. */ > - replaced = drm_property_replace_blob(&crtc_state->degamma_lut, NULL); > + /* Set GAMMA/DEGAMMA_LUT and reset DEGAMMA/GAMMA_LUT and CTM */ > + replaced = drm_property_replace_blob(&crtc_state->degamma_lut, > + use_degamma ? blob : NULL); > replaced |= drm_property_replace_blob(&crtc_state->ctm, NULL); > - replaced |= drm_property_replace_blob(&crtc_state->gamma_lut, blob); > + replaced |= drm_property_replace_blob(&crtc_state->gamma_lut, > + use_degamma ? NULL : blob); > crtc_state->color_mgmt_changed |= replaced; > > ret = drm_atomic_commit(state); > diff --git a/drivers/gpu/drm/drm_color_mgmt.c b/drivers/gpu/drm/drm_color_mgmt.c > index 3bcabc2f6e0e..956e59d5f6a7 100644 > --- a/drivers/gpu/drm/drm_color_mgmt.c > +++ b/drivers/gpu/drm/drm_color_mgmt.c > @@ -176,6 +176,8 @@ void drm_crtc_enable_color_mgmt(struct drm_crtc *crtc, > degamma_lut_size); > } > > + crtc->has_degamma_prop = !!degamma_lut_size; > + > if (has_ctm) > drm_object_attach_property(&crtc->base, > config->ctm_property, 0); > @@ -187,6 +189,8 @@ void drm_crtc_enable_color_mgmt(struct drm_crtc *crtc, > config->gamma_lut_size_property, > gamma_lut_size); > } > + > + crtc->has_gamma_prop = !!gamma_lut_size; > } > EXPORT_SYMBOL(drm_crtc_enable_color_mgmt); > > diff --git a/include/drm/drm_crtc.h b/include/drm/drm_crtc.h > index ba839e5e357d..9e1f06047e3d 100644 > --- a/include/drm/drm_crtc.h > +++ b/include/drm/drm_crtc.h > @@ -1084,6 +1084,9 @@ struct drm_crtc { > */ > uint16_t *gamma_store; > > + bool has_gamma_prop; > + bool has_degamma_prop; We could use a bitfield to save a bit of memory. Apart from that, the patch looks good to me. Reviewed-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com> > + > /** @helper_private: mid-layer private data */ > const struct drm_crtc_helper_funcs *helper_private; > -- Regards, Laurent Pinchart _______________________________________________ dri-devel mailing list dri-devel@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/dri-devel ^ permalink raw reply [flat|nested] 8+ messages in thread
* Re: [PATCH 1/2] drm: add legacy support for using degamma for gamma 2020-12-04 22:35 ` Laurent Pinchart @ 2020-12-07 15:31 ` Ville Syrjälä 2020-12-07 15:45 ` Tomi Valkeinen 0 siblings, 1 reply; 8+ messages in thread From: Ville Syrjälä @ 2020-12-07 15:31 UTC (permalink / raw) To: Laurent Pinchart Cc: Paul Cercueil, Alexandre Torgue, Sandy Huang, David Airlie, Philippe Cornu, dri-devel, Russell King, Yannick Fertre, Tomi Valkeinen, Thomas Zimmermann, Matthias Brugger, Vincent Abriou, Maxime Coquelin On Sat, Dec 05, 2020 at 12:35:25AM +0200, Laurent Pinchart wrote: > Hi Tomi, > > Thank you for the patch. > > On Thu, Dec 03, 2020 at 01:48:44PM +0200, Tomi Valkeinen wrote: > > We currently have drm_atomic_helper_legacy_gamma_set() helper which can > > be used to handle legacy gamma-set ioctl. > > drm_atomic_helper_legacy_gamma_set() sets GAMMA_LUT, and clears > > CTM and DEGAMMA_LUT. This works fine on HW where we have either: > > > > degamma -> ctm -> gamma -> out > > > > or > > > > ctm -> gamma -> out > > > > However, if the HW has gamma table before ctm, the atomic property > > should be DEGAMMA_LUT, and thus we have: > > > > degamma -> ctm -> out > > > > This is fine for userspace which sets gamma table using the properties, > > as the userspace can check for the existence of gamma & degamma, but the > > legacy gamma-set ioctl does not work. > > > > This patch fixes the issue by changing > > drm_atomic_helper_legacy_gamma_set() so that GAMMA_LUT will be used if > > it exists, and DEGAMMA_LUT will be used as a fallback. > > > > Signed-off-by: Tomi Valkeinen <tomi.valkeinen@ti.com> > > --- > > drivers/gpu/drm/drm_atomic_helper.c | 18 +++++++++++++++--- > > drivers/gpu/drm/drm_color_mgmt.c | 4 ++++ > > include/drm/drm_crtc.h | 3 +++ > > 3 files changed, 22 insertions(+), 3 deletions(-) > > > > diff --git a/drivers/gpu/drm/drm_atomic_helper.c b/drivers/gpu/drm/drm_atomic_helper.c > > index ba1507036f26..fe59c8ea42a9 100644 > > --- a/drivers/gpu/drm/drm_atomic_helper.c > > +++ b/drivers/gpu/drm/drm_atomic_helper.c > > @@ -3512,6 +3512,10 @@ EXPORT_SYMBOL(drm_atomic_helper_page_flip_target); > > * that support color management through the DEGAMMA_LUT/GAMMA_LUT > > * properties. See drm_crtc_enable_color_mgmt() and the containing chapter for > > * how the atomic color management and gamma tables work. > > + * > > + * This function uses the GAMMA_LUT or DEGAMMA_LUT property for the gamma table. > > + * GAMMA_LUT property is used if it exists, and DEGAMMA_LUT property is used as > > + * a fallback. > > */ > > int drm_atomic_helper_legacy_gamma_set(struct drm_crtc *crtc, > > u16 *red, u16 *green, u16 *blue, > > @@ -3525,6 +3529,12 @@ int drm_atomic_helper_legacy_gamma_set(struct drm_crtc *crtc, > > struct drm_color_lut *blob_data; > > int i, ret = 0; > > bool replaced; > > + bool use_degamma; > > + > > + if (!crtc->has_gamma_prop && !crtc->has_degamma_prop) > > + return -ENODEV; > > + > > + use_degamma = !crtc->has_gamma_prop; > > > > state = drm_atomic_state_alloc(crtc->dev); > > if (!state) > > @@ -3554,10 +3564,12 @@ int drm_atomic_helper_legacy_gamma_set(struct drm_crtc *crtc, > > goto fail; > > } > > > > - /* Reset DEGAMMA_LUT and CTM properties. */ > > - replaced = drm_property_replace_blob(&crtc_state->degamma_lut, NULL); > > + /* Set GAMMA/DEGAMMA_LUT and reset DEGAMMA/GAMMA_LUT and CTM */ > > + replaced = drm_property_replace_blob(&crtc_state->degamma_lut, > > + use_degamma ? blob : NULL); > > replaced |= drm_property_replace_blob(&crtc_state->ctm, NULL); > > - replaced |= drm_property_replace_blob(&crtc_state->gamma_lut, blob); > > + replaced |= drm_property_replace_blob(&crtc_state->gamma_lut, > > + use_degamma ? NULL : blob); > > crtc_state->color_mgmt_changed |= replaced; > > > > ret = drm_atomic_commit(state); > > diff --git a/drivers/gpu/drm/drm_color_mgmt.c b/drivers/gpu/drm/drm_color_mgmt.c > > index 3bcabc2f6e0e..956e59d5f6a7 100644 > > --- a/drivers/gpu/drm/drm_color_mgmt.c > > +++ b/drivers/gpu/drm/drm_color_mgmt.c > > @@ -176,6 +176,8 @@ void drm_crtc_enable_color_mgmt(struct drm_crtc *crtc, > > degamma_lut_size); > > } > > > > + crtc->has_degamma_prop = !!degamma_lut_size; > > + > > if (has_ctm) > > drm_object_attach_property(&crtc->base, > > config->ctm_property, 0); > > @@ -187,6 +189,8 @@ void drm_crtc_enable_color_mgmt(struct drm_crtc *crtc, > > config->gamma_lut_size_property, > > gamma_lut_size); > > } > > + > > + crtc->has_gamma_prop = !!gamma_lut_size; > > } > > EXPORT_SYMBOL(drm_crtc_enable_color_mgmt); > > > > diff --git a/include/drm/drm_crtc.h b/include/drm/drm_crtc.h > > index ba839e5e357d..9e1f06047e3d 100644 > > --- a/include/drm/drm_crtc.h > > +++ b/include/drm/drm_crtc.h > > @@ -1084,6 +1084,9 @@ struct drm_crtc { > > */ > > uint16_t *gamma_store; > > > > + bool has_gamma_prop; > > + bool has_degamma_prop; > > We could use a bitfield to save a bit of memory. Apart from that, the > patch looks good to me. Or we could just check if the crtc has the relevant prop or not. > > Reviewed-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com> > > > + > > /** @helper_private: mid-layer private data */ > > const struct drm_crtc_helper_funcs *helper_private; > > > > -- > Regards, > > Laurent Pinchart > _______________________________________________ > dri-devel mailing list > dri-devel@lists.freedesktop.org > https://lists.freedesktop.org/mailman/listinfo/dri-devel -- Ville Syrjälä Intel _______________________________________________ dri-devel mailing list dri-devel@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/dri-devel ^ permalink raw reply [flat|nested] 8+ messages in thread
* Re: [PATCH 1/2] drm: add legacy support for using degamma for gamma 2020-12-07 15:31 ` Ville Syrjälä @ 2020-12-07 15:45 ` Tomi Valkeinen 2020-12-09 0:05 ` Daniel Vetter 0 siblings, 1 reply; 8+ messages in thread From: Tomi Valkeinen @ 2020-12-07 15:45 UTC (permalink / raw) To: Ville Syrjälä, Laurent Pinchart Cc: Paul Cercueil, Alexandre Torgue, David Airlie, Sandy Huang, dri-devel, Philippe Cornu, Yannick Fertre, Thomas Zimmermann, Matthias Brugger, Russell King, Vincent Abriou, Maxime Coquelin On 07/12/2020 17:31, Ville Syrjälä wrote: > On Sat, Dec 05, 2020 at 12:35:25AM +0200, Laurent Pinchart wrote: >> Hi Tomi, >> >> Thank you for the patch. >> >> On Thu, Dec 03, 2020 at 01:48:44PM +0200, Tomi Valkeinen wrote: >>> We currently have drm_atomic_helper_legacy_gamma_set() helper which can >>> be used to handle legacy gamma-set ioctl. >>> drm_atomic_helper_legacy_gamma_set() sets GAMMA_LUT, and clears >>> CTM and DEGAMMA_LUT. This works fine on HW where we have either: >>> >>> degamma -> ctm -> gamma -> out >>> >>> or >>> >>> ctm -> gamma -> out >>> >>> However, if the HW has gamma table before ctm, the atomic property >>> should be DEGAMMA_LUT, and thus we have: >>> >>> degamma -> ctm -> out >>> >>> This is fine for userspace which sets gamma table using the properties, >>> as the userspace can check for the existence of gamma & degamma, but the >>> legacy gamma-set ioctl does not work. >>> >>> This patch fixes the issue by changing >>> drm_atomic_helper_legacy_gamma_set() so that GAMMA_LUT will be used if >>> it exists, and DEGAMMA_LUT will be used as a fallback. >>> >>> Signed-off-by: Tomi Valkeinen <tomi.valkeinen@ti.com> >>> --- >>> drivers/gpu/drm/drm_atomic_helper.c | 18 +++++++++++++++--- >>> drivers/gpu/drm/drm_color_mgmt.c | 4 ++++ >>> include/drm/drm_crtc.h | 3 +++ >>> 3 files changed, 22 insertions(+), 3 deletions(-) >>> >>> diff --git a/drivers/gpu/drm/drm_atomic_helper.c b/drivers/gpu/drm/drm_atomic_helper.c >>> index ba1507036f26..fe59c8ea42a9 100644 >>> --- a/drivers/gpu/drm/drm_atomic_helper.c >>> +++ b/drivers/gpu/drm/drm_atomic_helper.c >>> @@ -3512,6 +3512,10 @@ EXPORT_SYMBOL(drm_atomic_helper_page_flip_target); >>> * that support color management through the DEGAMMA_LUT/GAMMA_LUT >>> * properties. See drm_crtc_enable_color_mgmt() and the containing chapter for >>> * how the atomic color management and gamma tables work. >>> + * >>> + * This function uses the GAMMA_LUT or DEGAMMA_LUT property for the gamma table. >>> + * GAMMA_LUT property is used if it exists, and DEGAMMA_LUT property is used as >>> + * a fallback. >>> */ >>> int drm_atomic_helper_legacy_gamma_set(struct drm_crtc *crtc, >>> u16 *red, u16 *green, u16 *blue, >>> @@ -3525,6 +3529,12 @@ int drm_atomic_helper_legacy_gamma_set(struct drm_crtc *crtc, >>> struct drm_color_lut *blob_data; >>> int i, ret = 0; >>> bool replaced; >>> + bool use_degamma; >>> + >>> + if (!crtc->has_gamma_prop && !crtc->has_degamma_prop) >>> + return -ENODEV; >>> + >>> + use_degamma = !crtc->has_gamma_prop; >>> >>> state = drm_atomic_state_alloc(crtc->dev); >>> if (!state) >>> @@ -3554,10 +3564,12 @@ int drm_atomic_helper_legacy_gamma_set(struct drm_crtc *crtc, >>> goto fail; >>> } >>> >>> - /* Reset DEGAMMA_LUT and CTM properties. */ >>> - replaced = drm_property_replace_blob(&crtc_state->degamma_lut, NULL); >>> + /* Set GAMMA/DEGAMMA_LUT and reset DEGAMMA/GAMMA_LUT and CTM */ >>> + replaced = drm_property_replace_blob(&crtc_state->degamma_lut, >>> + use_degamma ? blob : NULL); >>> replaced |= drm_property_replace_blob(&crtc_state->ctm, NULL); >>> - replaced |= drm_property_replace_blob(&crtc_state->gamma_lut, blob); >>> + replaced |= drm_property_replace_blob(&crtc_state->gamma_lut, >>> + use_degamma ? NULL : blob); >>> crtc_state->color_mgmt_changed |= replaced; >>> >>> ret = drm_atomic_commit(state); >>> diff --git a/drivers/gpu/drm/drm_color_mgmt.c b/drivers/gpu/drm/drm_color_mgmt.c >>> index 3bcabc2f6e0e..956e59d5f6a7 100644 >>> --- a/drivers/gpu/drm/drm_color_mgmt.c >>> +++ b/drivers/gpu/drm/drm_color_mgmt.c >>> @@ -176,6 +176,8 @@ void drm_crtc_enable_color_mgmt(struct drm_crtc *crtc, >>> degamma_lut_size); >>> } >>> >>> + crtc->has_degamma_prop = !!degamma_lut_size; >>> + >>> if (has_ctm) >>> drm_object_attach_property(&crtc->base, >>> config->ctm_property, 0); >>> @@ -187,6 +189,8 @@ void drm_crtc_enable_color_mgmt(struct drm_crtc *crtc, >>> config->gamma_lut_size_property, >>> gamma_lut_size); >>> } >>> + >>> + crtc->has_gamma_prop = !!gamma_lut_size; >>> } >>> EXPORT_SYMBOL(drm_crtc_enable_color_mgmt); >>> >>> diff --git a/include/drm/drm_crtc.h b/include/drm/drm_crtc.h >>> index ba839e5e357d..9e1f06047e3d 100644 >>> --- a/include/drm/drm_crtc.h >>> +++ b/include/drm/drm_crtc.h >>> @@ -1084,6 +1084,9 @@ struct drm_crtc { >>> */ >>> uint16_t *gamma_store; >>> >>> + bool has_gamma_prop; >>> + bool has_degamma_prop; >> >> We could use a bitfield to save a bit of memory. Apart from that, the >> patch looks good to me. > > Or we could just check if the crtc has the relevant prop or not. That's what I did at first, but it requires iterating over the props (unless I missed a simple way to just check it). Probably not noticeable (in performance) but just felt a bit ugly. Tomi -- Texas Instruments Finland Oy, Porkkalankatu 22, 00180 Helsinki. Y-tunnus/Business ID: 0615521-4. Kotipaikka/Domicile: Helsinki _______________________________________________ dri-devel mailing list dri-devel@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/dri-devel ^ permalink raw reply [flat|nested] 8+ messages in thread
* Re: [PATCH 1/2] drm: add legacy support for using degamma for gamma 2020-12-07 15:45 ` Tomi Valkeinen @ 2020-12-09 0:05 ` Daniel Vetter 0 siblings, 0 replies; 8+ messages in thread From: Daniel Vetter @ 2020-12-09 0:05 UTC (permalink / raw) To: Tomi Valkeinen Cc: Yannick Fertre, Alexandre Torgue, David Airlie, Maxime Coquelin, Sandy Huang, dri-devel, Philippe Cornu, Paul Cercueil, Laurent Pinchart, Thomas Zimmermann, Matthias Brugger, Russell King, Vincent Abriou On Mon, Dec 07, 2020 at 05:45:02PM +0200, Tomi Valkeinen wrote: > On 07/12/2020 17:31, Ville Syrjälä wrote: > > On Sat, Dec 05, 2020 at 12:35:25AM +0200, Laurent Pinchart wrote: > >> Hi Tomi, > >> > >> Thank you for the patch. > >> > >> On Thu, Dec 03, 2020 at 01:48:44PM +0200, Tomi Valkeinen wrote: > >>> We currently have drm_atomic_helper_legacy_gamma_set() helper which can > >>> be used to handle legacy gamma-set ioctl. > >>> drm_atomic_helper_legacy_gamma_set() sets GAMMA_LUT, and clears > >>> CTM and DEGAMMA_LUT. This works fine on HW where we have either: > >>> > >>> degamma -> ctm -> gamma -> out > >>> > >>> or > >>> > >>> ctm -> gamma -> out > >>> > >>> However, if the HW has gamma table before ctm, the atomic property > >>> should be DEGAMMA_LUT, and thus we have: > >>> > >>> degamma -> ctm -> out > >>> > >>> This is fine for userspace which sets gamma table using the properties, > >>> as the userspace can check for the existence of gamma & degamma, but the > >>> legacy gamma-set ioctl does not work. > >>> > >>> This patch fixes the issue by changing > >>> drm_atomic_helper_legacy_gamma_set() so that GAMMA_LUT will be used if > >>> it exists, and DEGAMMA_LUT will be used as a fallback. > >>> > >>> Signed-off-by: Tomi Valkeinen <tomi.valkeinen@ti.com> > >>> --- > >>> drivers/gpu/drm/drm_atomic_helper.c | 18 +++++++++++++++--- > >>> drivers/gpu/drm/drm_color_mgmt.c | 4 ++++ > >>> include/drm/drm_crtc.h | 3 +++ > >>> 3 files changed, 22 insertions(+), 3 deletions(-) > >>> > >>> diff --git a/drivers/gpu/drm/drm_atomic_helper.c b/drivers/gpu/drm/drm_atomic_helper.c > >>> index ba1507036f26..fe59c8ea42a9 100644 > >>> --- a/drivers/gpu/drm/drm_atomic_helper.c > >>> +++ b/drivers/gpu/drm/drm_atomic_helper.c > >>> @@ -3512,6 +3512,10 @@ EXPORT_SYMBOL(drm_atomic_helper_page_flip_target); > >>> * that support color management through the DEGAMMA_LUT/GAMMA_LUT > >>> * properties. See drm_crtc_enable_color_mgmt() and the containing chapter for > >>> * how the atomic color management and gamma tables work. > >>> + * > >>> + * This function uses the GAMMA_LUT or DEGAMMA_LUT property for the gamma table. > >>> + * GAMMA_LUT property is used if it exists, and DEGAMMA_LUT property is used as > >>> + * a fallback. > >>> */ > >>> int drm_atomic_helper_legacy_gamma_set(struct drm_crtc *crtc, > >>> u16 *red, u16 *green, u16 *blue, > >>> @@ -3525,6 +3529,12 @@ int drm_atomic_helper_legacy_gamma_set(struct drm_crtc *crtc, > >>> struct drm_color_lut *blob_data; > >>> int i, ret = 0; > >>> bool replaced; > >>> + bool use_degamma; > >>> + > >>> + if (!crtc->has_gamma_prop && !crtc->has_degamma_prop) > >>> + return -ENODEV; > >>> + > >>> + use_degamma = !crtc->has_gamma_prop; > >>> > >>> state = drm_atomic_state_alloc(crtc->dev); > >>> if (!state) > >>> @@ -3554,10 +3564,12 @@ int drm_atomic_helper_legacy_gamma_set(struct drm_crtc *crtc, > >>> goto fail; > >>> } > >>> > >>> - /* Reset DEGAMMA_LUT and CTM properties. */ > >>> - replaced = drm_property_replace_blob(&crtc_state->degamma_lut, NULL); > >>> + /* Set GAMMA/DEGAMMA_LUT and reset DEGAMMA/GAMMA_LUT and CTM */ > >>> + replaced = drm_property_replace_blob(&crtc_state->degamma_lut, > >>> + use_degamma ? blob : NULL); > >>> replaced |= drm_property_replace_blob(&crtc_state->ctm, NULL); > >>> - replaced |= drm_property_replace_blob(&crtc_state->gamma_lut, blob); > >>> + replaced |= drm_property_replace_blob(&crtc_state->gamma_lut, > >>> + use_degamma ? NULL : blob); > >>> crtc_state->color_mgmt_changed |= replaced; > >>> > >>> ret = drm_atomic_commit(state); > >>> diff --git a/drivers/gpu/drm/drm_color_mgmt.c b/drivers/gpu/drm/drm_color_mgmt.c > >>> index 3bcabc2f6e0e..956e59d5f6a7 100644 > >>> --- a/drivers/gpu/drm/drm_color_mgmt.c > >>> +++ b/drivers/gpu/drm/drm_color_mgmt.c > >>> @@ -176,6 +176,8 @@ void drm_crtc_enable_color_mgmt(struct drm_crtc *crtc, > >>> degamma_lut_size); > >>> } > >>> > >>> + crtc->has_degamma_prop = !!degamma_lut_size; > >>> + > >>> if (has_ctm) > >>> drm_object_attach_property(&crtc->base, > >>> config->ctm_property, 0); > >>> @@ -187,6 +189,8 @@ void drm_crtc_enable_color_mgmt(struct drm_crtc *crtc, > >>> config->gamma_lut_size_property, > >>> gamma_lut_size); > >>> } > >>> + > >>> + crtc->has_gamma_prop = !!gamma_lut_size; > >>> } > >>> EXPORT_SYMBOL(drm_crtc_enable_color_mgmt); > >>> > >>> diff --git a/include/drm/drm_crtc.h b/include/drm/drm_crtc.h > >>> index ba839e5e357d..9e1f06047e3d 100644 > >>> --- a/include/drm/drm_crtc.h > >>> +++ b/include/drm/drm_crtc.h > >>> @@ -1084,6 +1084,9 @@ struct drm_crtc { > >>> */ > >>> uint16_t *gamma_store; > >>> > >>> + bool has_gamma_prop; > >>> + bool has_degamma_prop; > >> > >> We could use a bitfield to save a bit of memory. Apart from that, the > >> patch looks good to me. > > > > Or we could just check if the crtc has the relevant prop or not. > > That's what I did at first, but it requires iterating over the props (unless I missed a simple way > to just check it). Probably not noticeable (in performance) but just felt a bit ugly. Every atomic prop set iterates over that array somewhere for checking. See drm_mode_obj_find_prop_id(). If that's too much, then we need a hashtable or something like that just to make atomic commits acceptable. I'd use that, instead of duplicating information, if at all possible. You really don't have to worry about that loop, as long as you use that function which atomic uses already. -Daniel -- Daniel Vetter Software Engineer, Intel Corporation http://blog.ffwll.ch _______________________________________________ dri-devel mailing list dri-devel@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/dri-devel ^ permalink raw reply [flat|nested] 8+ messages in thread
* [PATCH 2/2] drm: automatic legacy gamma support 2020-12-03 11:48 [PATCH 0/2] drm: fix and cleanup legacy gamma support Tomi Valkeinen 2020-12-03 11:48 ` [PATCH 1/2] drm: add legacy support for using degamma for gamma Tomi Valkeinen @ 2020-12-03 11:48 ` Tomi Valkeinen 2020-12-04 22:40 ` Laurent Pinchart 1 sibling, 1 reply; 8+ messages in thread From: Tomi Valkeinen @ 2020-12-03 11:48 UTC (permalink / raw) To: dri-devel, Daniel Vetter Cc: Yannick Fertre, Philippe Cornu, David Airlie, Russell King, Sandy Huang, Paul Cercueil, Tomi Valkeinen, Laurent Pinchart, Thomas Zimmermann, Matthias Brugger, Vincent Abriou, Maxime Coquelin, Alexandre Torgue To support legacy gamma ioctls the drivers need to set drm_crtc_funcs.gamma_set either to a custom implementation or to drm_atomic_helper_legacy_gamma_set. Most of the atomic drivers do the latter. We can simplify this by making the core handle it automatically. Add two functions: drm_crtc_supports_legacy_gamma() which tells if the legacy gamma table can be set, and drm_crtc_legacy_gamma_set() which does the work by either calling the drm_crtc_funcs.gamma_set or using GAMMA_LUT or DEGAMMA_LUT. We can then drop drm_atomic_helper_legacy_gamma_set() and remove all its uses. Signed-off-by: Tomi Valkeinen <tomi.valkeinen@ti.com> --- .../gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c | 1 - .../gpu/drm/arm/display/komeda/komeda_crtc.c | 1 - drivers/gpu/drm/arm/malidp_crtc.c | 1 - drivers/gpu/drm/armada/armada_crtc.c | 1 - drivers/gpu/drm/ast/ast_mode.c | 1 - .../gpu/drm/atmel-hlcdc/atmel_hlcdc_crtc.c | 1 - drivers/gpu/drm/drm_atomic_helper.c | 82 ------------- drivers/gpu/drm/drm_color_mgmt.c | 113 +++++++++++++++++- drivers/gpu/drm/drm_fb_helper.c | 12 +- drivers/gpu/drm/ingenic/ingenic-drm-drv.c | 2 - drivers/gpu/drm/mediatek/mtk_drm_crtc.c | 1 - drivers/gpu/drm/nouveau/dispnv50/head.c | 2 - drivers/gpu/drm/omapdrm/omap_crtc.c | 1 - drivers/gpu/drm/rcar-du/rcar_du_crtc.c | 1 - drivers/gpu/drm/rockchip/rockchip_drm_vop.c | 1 - drivers/gpu/drm/stm/ltdc.c | 1 - drivers/gpu/drm/vc4/vc4_crtc.c | 1 - drivers/gpu/drm/vc4/vc4_txp.c | 1 - include/drm/drm_atomic_helper.h | 4 - include/drm/drm_color_mgmt.h | 7 ++ 20 files changed, 123 insertions(+), 112 deletions(-) diff --git a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c index 2855bb918535..848b06c51b0e 100644 --- a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c +++ b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c @@ -5396,7 +5396,6 @@ static void dm_disable_vblank(struct drm_crtc *crtc) static const struct drm_crtc_funcs amdgpu_dm_crtc_funcs = { .reset = dm_crtc_reset_state, .destroy = amdgpu_dm_crtc_destroy, - .gamma_set = drm_atomic_helper_legacy_gamma_set, .set_config = drm_atomic_helper_set_config, .page_flip = drm_atomic_helper_page_flip, .atomic_duplicate_state = dm_crtc_duplicate_state, diff --git a/drivers/gpu/drm/arm/display/komeda/komeda_crtc.c b/drivers/gpu/drm/arm/display/komeda/komeda_crtc.c index 4b485eb512e2..59172acb9738 100644 --- a/drivers/gpu/drm/arm/display/komeda/komeda_crtc.c +++ b/drivers/gpu/drm/arm/display/komeda/komeda_crtc.c @@ -550,7 +550,6 @@ static void komeda_crtc_vblank_disable(struct drm_crtc *crtc) } static const struct drm_crtc_funcs komeda_crtc_funcs = { - .gamma_set = drm_atomic_helper_legacy_gamma_set, .destroy = drm_crtc_cleanup, .set_config = drm_atomic_helper_set_config, .page_flip = drm_atomic_helper_page_flip, diff --git a/drivers/gpu/drm/arm/malidp_crtc.c b/drivers/gpu/drm/arm/malidp_crtc.c index 108e7a31bd26..494075ddbef6 100644 --- a/drivers/gpu/drm/arm/malidp_crtc.c +++ b/drivers/gpu/drm/arm/malidp_crtc.c @@ -510,7 +510,6 @@ static void malidp_crtc_disable_vblank(struct drm_crtc *crtc) } static const struct drm_crtc_funcs malidp_crtc_funcs = { - .gamma_set = drm_atomic_helper_legacy_gamma_set, .destroy = drm_crtc_cleanup, .set_config = drm_atomic_helper_set_config, .page_flip = drm_atomic_helper_page_flip, diff --git a/drivers/gpu/drm/armada/armada_crtc.c b/drivers/gpu/drm/armada/armada_crtc.c index 3ebcf5a52c8b..b7bb90ae787f 100644 --- a/drivers/gpu/drm/armada/armada_crtc.c +++ b/drivers/gpu/drm/armada/armada_crtc.c @@ -820,7 +820,6 @@ static const struct drm_crtc_funcs armada_crtc_funcs = { .cursor_set = armada_drm_crtc_cursor_set, .cursor_move = armada_drm_crtc_cursor_move, .destroy = armada_drm_crtc_destroy, - .gamma_set = drm_atomic_helper_legacy_gamma_set, .set_config = drm_atomic_helper_set_config, .page_flip = drm_atomic_helper_page_flip, .atomic_duplicate_state = drm_atomic_helper_crtc_duplicate_state, diff --git a/drivers/gpu/drm/ast/ast_mode.c b/drivers/gpu/drm/ast/ast_mode.c index 9db371f4054f..5b0ec785c516 100644 --- a/drivers/gpu/drm/ast/ast_mode.c +++ b/drivers/gpu/drm/ast/ast_mode.c @@ -903,7 +903,6 @@ static void ast_crtc_atomic_destroy_state(struct drm_crtc *crtc, static const struct drm_crtc_funcs ast_crtc_funcs = { .reset = ast_crtc_reset, - .gamma_set = drm_atomic_helper_legacy_gamma_set, .destroy = drm_crtc_cleanup, .set_config = drm_atomic_helper_set_config, .page_flip = drm_atomic_helper_page_flip, diff --git a/drivers/gpu/drm/atmel-hlcdc/atmel_hlcdc_crtc.c b/drivers/gpu/drm/atmel-hlcdc/atmel_hlcdc_crtc.c index c58fa00b4848..05ad75d155e8 100644 --- a/drivers/gpu/drm/atmel-hlcdc/atmel_hlcdc_crtc.c +++ b/drivers/gpu/drm/atmel-hlcdc/atmel_hlcdc_crtc.c @@ -473,7 +473,6 @@ static const struct drm_crtc_funcs atmel_hlcdc_crtc_funcs = { .atomic_destroy_state = atmel_hlcdc_crtc_destroy_state, .enable_vblank = atmel_hlcdc_crtc_enable_vblank, .disable_vblank = atmel_hlcdc_crtc_disable_vblank, - .gamma_set = drm_atomic_helper_legacy_gamma_set, }; int atmel_hlcdc_crtc_create(struct drm_device *dev) diff --git a/drivers/gpu/drm/drm_atomic_helper.c b/drivers/gpu/drm/drm_atomic_helper.c index fe59c8ea42a9..b114658100b3 100644 --- a/drivers/gpu/drm/drm_atomic_helper.c +++ b/drivers/gpu/drm/drm_atomic_helper.c @@ -3499,88 +3499,6 @@ int drm_atomic_helper_page_flip_target(struct drm_crtc *crtc, } EXPORT_SYMBOL(drm_atomic_helper_page_flip_target); -/** - * drm_atomic_helper_legacy_gamma_set - set the legacy gamma correction table - * @crtc: CRTC object - * @red: red correction table - * @green: green correction table - * @blue: green correction table - * @size: size of the tables - * @ctx: lock acquire context - * - * Implements support for legacy gamma correction table for drivers - * that support color management through the DEGAMMA_LUT/GAMMA_LUT - * properties. See drm_crtc_enable_color_mgmt() and the containing chapter for - * how the atomic color management and gamma tables work. - * - * This function uses the GAMMA_LUT or DEGAMMA_LUT property for the gamma table. - * GAMMA_LUT property is used if it exists, and DEGAMMA_LUT property is used as - * a fallback. - */ -int drm_atomic_helper_legacy_gamma_set(struct drm_crtc *crtc, - u16 *red, u16 *green, u16 *blue, - uint32_t size, - struct drm_modeset_acquire_ctx *ctx) -{ - struct drm_device *dev = crtc->dev; - struct drm_atomic_state *state; - struct drm_crtc_state *crtc_state; - struct drm_property_blob *blob = NULL; - struct drm_color_lut *blob_data; - int i, ret = 0; - bool replaced; - bool use_degamma; - - if (!crtc->has_gamma_prop && !crtc->has_degamma_prop) - return -ENODEV; - - use_degamma = !crtc->has_gamma_prop; - - state = drm_atomic_state_alloc(crtc->dev); - if (!state) - return -ENOMEM; - - blob = drm_property_create_blob(dev, - sizeof(struct drm_color_lut) * size, - NULL); - if (IS_ERR(blob)) { - ret = PTR_ERR(blob); - blob = NULL; - goto fail; - } - - /* Prepare GAMMA_LUT with the legacy values. */ - blob_data = blob->data; - for (i = 0; i < size; i++) { - blob_data[i].red = red[i]; - blob_data[i].green = green[i]; - blob_data[i].blue = blue[i]; - } - - state->acquire_ctx = ctx; - crtc_state = drm_atomic_get_crtc_state(state, crtc); - if (IS_ERR(crtc_state)) { - ret = PTR_ERR(crtc_state); - goto fail; - } - - /* Set GAMMA/DEGAMMA_LUT and reset DEGAMMA/GAMMA_LUT and CTM */ - replaced = drm_property_replace_blob(&crtc_state->degamma_lut, - use_degamma ? blob : NULL); - replaced |= drm_property_replace_blob(&crtc_state->ctm, NULL); - replaced |= drm_property_replace_blob(&crtc_state->gamma_lut, - use_degamma ? NULL : blob); - crtc_state->color_mgmt_changed |= replaced; - - ret = drm_atomic_commit(state); - -fail: - drm_atomic_state_put(state); - drm_property_blob_put(blob); - return ret; -} -EXPORT_SYMBOL(drm_atomic_helper_legacy_gamma_set); - /** * drm_atomic_helper_bridge_propagate_bus_fmt() - Propagate output format to * the input end of a bridge diff --git a/drivers/gpu/drm/drm_color_mgmt.c b/drivers/gpu/drm/drm_color_mgmt.c index 956e59d5f6a7..21f667ad9c79 100644 --- a/drivers/gpu/drm/drm_color_mgmt.c +++ b/drivers/gpu/drm/drm_color_mgmt.c @@ -22,6 +22,7 @@ #include <linux/uaccess.h> +#include <drm/drm_atomic.h> #include <drm/drm_color_mgmt.h> #include <drm/drm_crtc.h> #include <drm/drm_device.h> @@ -235,6 +236,112 @@ int drm_mode_crtc_set_gamma_size(struct drm_crtc *crtc, } EXPORT_SYMBOL(drm_mode_crtc_set_gamma_size); +/** + * drm_crtc_supports_legacy_gamma - does the crtc support legacy gamma correction table + * @crtc: CRTC object + * + * Returns true/false if the given crtc supports setting the legacy gamma + * correction table. + */ +bool drm_crtc_supports_legacy_gamma(struct drm_crtc *crtc) +{ + if (!crtc->gamma_size) + return false; + + if (crtc->funcs->gamma_set) + return true; + + return crtc->has_gamma_prop || crtc->has_degamma_prop; +} +EXPORT_SYMBOL(drm_crtc_supports_legacy_gamma); + +/** + * drm_crtc_legacy_gamma_set - set the legacy gamma correction table + * @crtc: CRTC object + * @red: red correction table + * @green: green correction table + * @blue: green correction table + * @size: size of the tables + * @ctx: lock acquire context + * + * Implements support for legacy gamma correction table for drivers + * that have set drm_crtc_funcs.gamma_set or that support color management + * through the DEGAMMA_LUT/GAMMA_LUT properties. See + * drm_crtc_enable_color_mgmt() and the containing chapter for + * how the atomic color management and gamma tables work. + * + * This function sets the gamma using the first one available: + * - drm_crtc_funcs.gamma_set() + * - GAMMA_LUT + * - DEGAMMA_LUT + */ +int drm_crtc_legacy_gamma_set(struct drm_crtc *crtc, + u16 *red, u16 *green, u16 *blue, + uint32_t size, + struct drm_modeset_acquire_ctx *ctx) +{ + struct drm_device *dev = crtc->dev; + struct drm_atomic_state *state; + struct drm_crtc_state *crtc_state; + struct drm_property_blob *blob = NULL; + struct drm_color_lut *blob_data; + int i, ret = 0; + bool replaced; + bool use_degamma; + + if (crtc->funcs->gamma_set) + return crtc->funcs->gamma_set(crtc, red, green, blue, size, ctx); + + if (!crtc->has_gamma_prop && !crtc->has_degamma_prop) + return -ENODEV; + + use_degamma = !crtc->has_gamma_prop; + + state = drm_atomic_state_alloc(crtc->dev); + if (!state) + return -ENOMEM; + + blob = drm_property_create_blob(dev, + sizeof(struct drm_color_lut) * size, + NULL); + if (IS_ERR(blob)) { + ret = PTR_ERR(blob); + blob = NULL; + goto fail; + } + + /* Prepare GAMMA_LUT with the legacy values. */ + blob_data = blob->data; + for (i = 0; i < size; i++) { + blob_data[i].red = red[i]; + blob_data[i].green = green[i]; + blob_data[i].blue = blue[i]; + } + + state->acquire_ctx = ctx; + crtc_state = drm_atomic_get_crtc_state(state, crtc); + if (IS_ERR(crtc_state)) { + ret = PTR_ERR(crtc_state); + goto fail; + } + + /* Set GAMMA/DEGAMMA_LUT and reset DEGAMMA/GAMMA_LUT and CTM */ + replaced = drm_property_replace_blob(&crtc_state->degamma_lut, + use_degamma ? blob : NULL); + replaced |= drm_property_replace_blob(&crtc_state->ctm, NULL); + replaced |= drm_property_replace_blob(&crtc_state->gamma_lut, + use_degamma ? NULL : blob); + crtc_state->color_mgmt_changed |= replaced; + + ret = drm_atomic_commit(state); + +fail: + drm_atomic_state_put(state); + drm_property_blob_put(blob); + return ret; +} +EXPORT_SYMBOL(drm_crtc_legacy_gamma_set); + /** * drm_mode_gamma_set_ioctl - set the gamma table * @dev: DRM device @@ -266,7 +373,7 @@ int drm_mode_gamma_set_ioctl(struct drm_device *dev, if (!crtc) return -ENOENT; - if (crtc->funcs->gamma_set == NULL) + if (!drm_crtc_supports_legacy_gamma(crtc)) return -ENOSYS; /* memcpy into gamma store */ @@ -294,8 +401,8 @@ int drm_mode_gamma_set_ioctl(struct drm_device *dev, goto out; } - ret = crtc->funcs->gamma_set(crtc, r_base, g_base, b_base, - crtc->gamma_size, &ctx); + ret = drm_crtc_legacy_gamma_set(crtc, r_base, g_base, b_base, + crtc->gamma_size, &ctx); out: DRM_MODESET_LOCK_ALL_END(dev, ctx, ret); diff --git a/drivers/gpu/drm/drm_fb_helper.c b/drivers/gpu/drm/drm_fb_helper.c index 25edf670867c..446e321779e6 100644 --- a/drivers/gpu/drm/drm_fb_helper.c +++ b/drivers/gpu/drm/drm_fb_helper.c @@ -136,15 +136,15 @@ static void drm_fb_helper_restore_lut_atomic(struct drm_crtc *crtc) { uint16_t *r_base, *g_base, *b_base; - if (crtc->funcs->gamma_set == NULL) + if (!drm_crtc_supports_legacy_gamma(crtc)) return; r_base = crtc->gamma_store; g_base = r_base + crtc->gamma_size; b_base = g_base + crtc->gamma_size; - crtc->funcs->gamma_set(crtc, r_base, g_base, b_base, - crtc->gamma_size, NULL); + drm_crtc_legacy_gamma_set(crtc, r_base, g_base, b_base, + crtc->gamma_size, NULL); } /** @@ -907,7 +907,7 @@ static int setcmap_legacy(struct fb_cmap *cmap, struct fb_info *info) drm_modeset_lock_all(fb_helper->dev); drm_client_for_each_modeset(modeset, &fb_helper->client) { crtc = modeset->crtc; - if (!crtc->funcs->gamma_set || !crtc->gamma_size) + if (!drm_crtc_supports_legacy_gamma(crtc)) return -EINVAL; if (cmap->start + cmap->len > crtc->gamma_size) @@ -921,8 +921,8 @@ static int setcmap_legacy(struct fb_cmap *cmap, struct fb_info *info) memcpy(g + cmap->start, cmap->green, cmap->len * sizeof(*g)); memcpy(b + cmap->start, cmap->blue, cmap->len * sizeof(*b)); - ret = crtc->funcs->gamma_set(crtc, r, g, b, - crtc->gamma_size, NULL); + ret = drm_crtc_legacy_gamma_set(crtc, r, g, b, crtc->gamma_size, + NULL); if (ret) return ret; } diff --git a/drivers/gpu/drm/ingenic/ingenic-drm-drv.c b/drivers/gpu/drm/ingenic/ingenic-drm-drv.c index 368bfef8b340..75f948d41b0a 100644 --- a/drivers/gpu/drm/ingenic/ingenic-drm-drv.c +++ b/drivers/gpu/drm/ingenic/ingenic-drm-drv.c @@ -755,8 +755,6 @@ static const struct drm_crtc_funcs ingenic_drm_crtc_funcs = { .enable_vblank = ingenic_drm_enable_vblank, .disable_vblank = ingenic_drm_disable_vblank, - - .gamma_set = drm_atomic_helper_legacy_gamma_set, }; static const struct drm_plane_helper_funcs ingenic_drm_plane_helper_funcs = { diff --git a/drivers/gpu/drm/mediatek/mtk_drm_crtc.c b/drivers/gpu/drm/mediatek/mtk_drm_crtc.c index bfe994230543..b665bd498a4a 100644 --- a/drivers/gpu/drm/mediatek/mtk_drm_crtc.c +++ b/drivers/gpu/drm/mediatek/mtk_drm_crtc.c @@ -619,7 +619,6 @@ static const struct drm_crtc_funcs mtk_crtc_funcs = { .reset = mtk_drm_crtc_reset, .atomic_duplicate_state = mtk_drm_crtc_duplicate_state, .atomic_destroy_state = mtk_drm_crtc_destroy_state, - .gamma_set = drm_atomic_helper_legacy_gamma_set, .enable_vblank = mtk_drm_crtc_enable_vblank, .disable_vblank = mtk_drm_crtc_disable_vblank, }; diff --git a/drivers/gpu/drm/nouveau/dispnv50/head.c b/drivers/gpu/drm/nouveau/dispnv50/head.c index 537c1ef2e464..ec361d17e900 100644 --- a/drivers/gpu/drm/nouveau/dispnv50/head.c +++ b/drivers/gpu/drm/nouveau/dispnv50/head.c @@ -503,7 +503,6 @@ nv50_head_destroy(struct drm_crtc *crtc) static const struct drm_crtc_funcs nv50_head_func = { .reset = nv50_head_reset, - .gamma_set = drm_atomic_helper_legacy_gamma_set, .destroy = nv50_head_destroy, .set_config = drm_atomic_helper_set_config, .page_flip = drm_atomic_helper_page_flip, @@ -518,7 +517,6 @@ nv50_head_func = { static const struct drm_crtc_funcs nvd9_head_func = { .reset = nv50_head_reset, - .gamma_set = drm_atomic_helper_legacy_gamma_set, .destroy = nv50_head_destroy, .set_config = drm_atomic_helper_set_config, .page_flip = drm_atomic_helper_page_flip, diff --git a/drivers/gpu/drm/omapdrm/omap_crtc.c b/drivers/gpu/drm/omapdrm/omap_crtc.c index 7d66269ad998..b97f21cf4a91 100644 --- a/drivers/gpu/drm/omapdrm/omap_crtc.c +++ b/drivers/gpu/drm/omapdrm/omap_crtc.c @@ -741,7 +741,6 @@ static const struct drm_crtc_funcs omap_crtc_funcs = { .set_config = drm_atomic_helper_set_config, .destroy = omap_crtc_destroy, .page_flip = drm_atomic_helper_page_flip, - .gamma_set = drm_atomic_helper_legacy_gamma_set, .atomic_duplicate_state = omap_crtc_duplicate_state, .atomic_destroy_state = drm_atomic_helper_crtc_destroy_state, .atomic_set_property = omap_crtc_atomic_set_property, diff --git a/drivers/gpu/drm/rcar-du/rcar_du_crtc.c b/drivers/gpu/drm/rcar-du/rcar_du_crtc.c index b5fb941e0f53..f93e0750431d 100644 --- a/drivers/gpu/drm/rcar-du/rcar_du_crtc.c +++ b/drivers/gpu/drm/rcar-du/rcar_du_crtc.c @@ -1144,7 +1144,6 @@ static const struct drm_crtc_funcs crtc_funcs_gen3 = { .set_crc_source = rcar_du_crtc_set_crc_source, .verify_crc_source = rcar_du_crtc_verify_crc_source, .get_crc_sources = rcar_du_crtc_get_crc_sources, - .gamma_set = drm_atomic_helper_legacy_gamma_set, }; /* ----------------------------------------------------------------------------- diff --git a/drivers/gpu/drm/rockchip/rockchip_drm_vop.c b/drivers/gpu/drm/rockchip/rockchip_drm_vop.c index d1e05482641b..8d15cabdcb02 100644 --- a/drivers/gpu/drm/rockchip/rockchip_drm_vop.c +++ b/drivers/gpu/drm/rockchip/rockchip_drm_vop.c @@ -1643,7 +1643,6 @@ static const struct drm_crtc_funcs vop_crtc_funcs = { .disable_vblank = vop_crtc_disable_vblank, .set_crc_source = vop_crtc_set_crc_source, .verify_crc_source = vop_crtc_verify_crc_source, - .gamma_set = drm_atomic_helper_legacy_gamma_set, }; static void vop_fb_unref_worker(struct drm_flip_work *work, void *val) diff --git a/drivers/gpu/drm/stm/ltdc.c b/drivers/gpu/drm/stm/ltdc.c index 3980677435cb..7812094f93d6 100644 --- a/drivers/gpu/drm/stm/ltdc.c +++ b/drivers/gpu/drm/stm/ltdc.c @@ -713,7 +713,6 @@ static const struct drm_crtc_funcs ltdc_crtc_funcs = { .enable_vblank = ltdc_crtc_enable_vblank, .disable_vblank = ltdc_crtc_disable_vblank, .get_vblank_timestamp = drm_crtc_vblank_helper_get_vblank_timestamp, - .gamma_set = drm_atomic_helper_legacy_gamma_set, }; /* diff --git a/drivers/gpu/drm/vc4/vc4_crtc.c b/drivers/gpu/drm/vc4/vc4_crtc.c index ea710beb8e00..7495d70d6a32 100644 --- a/drivers/gpu/drm/vc4/vc4_crtc.c +++ b/drivers/gpu/drm/vc4/vc4_crtc.c @@ -884,7 +884,6 @@ static const struct drm_crtc_funcs vc4_crtc_funcs = { .reset = vc4_crtc_reset, .atomic_duplicate_state = vc4_crtc_duplicate_state, .atomic_destroy_state = vc4_crtc_destroy_state, - .gamma_set = drm_atomic_helper_legacy_gamma_set, .enable_vblank = vc4_enable_vblank, .disable_vblank = vc4_disable_vblank, .get_vblank_timestamp = drm_crtc_vblank_helper_get_vblank_timestamp, diff --git a/drivers/gpu/drm/vc4/vc4_txp.c b/drivers/gpu/drm/vc4/vc4_txp.c index 8aa5220885f4..e4b782e42f69 100644 --- a/drivers/gpu/drm/vc4/vc4_txp.c +++ b/drivers/gpu/drm/vc4/vc4_txp.c @@ -382,7 +382,6 @@ static const struct drm_crtc_funcs vc4_txp_crtc_funcs = { .reset = vc4_crtc_reset, .atomic_duplicate_state = vc4_crtc_duplicate_state, .atomic_destroy_state = vc4_crtc_destroy_state, - .gamma_set = drm_atomic_helper_legacy_gamma_set, .enable_vblank = vc4_txp_enable_vblank, .disable_vblank = vc4_txp_disable_vblank, }; diff --git a/include/drm/drm_atomic_helper.h b/include/drm/drm_atomic_helper.h index 5f47720440fa..4045e2507e11 100644 --- a/include/drm/drm_atomic_helper.h +++ b/include/drm/drm_atomic_helper.h @@ -147,10 +147,6 @@ int drm_atomic_helper_page_flip_target( uint32_t flags, uint32_t target, struct drm_modeset_acquire_ctx *ctx); -int drm_atomic_helper_legacy_gamma_set(struct drm_crtc *crtc, - u16 *red, u16 *green, u16 *blue, - uint32_t size, - struct drm_modeset_acquire_ctx *ctx); /** * drm_atomic_crtc_for_each_plane - iterate over planes currently attached to CRTC diff --git a/include/drm/drm_color_mgmt.h b/include/drm/drm_color_mgmt.h index 81c298488b0c..a899be9404a0 100644 --- a/include/drm/drm_color_mgmt.h +++ b/include/drm/drm_color_mgmt.h @@ -28,6 +28,7 @@ struct drm_crtc; struct drm_plane; +struct drm_modeset_acquire_ctx; /** * drm_color_lut_extract - clamp and round LUT entries @@ -62,6 +63,12 @@ void drm_crtc_enable_color_mgmt(struct drm_crtc *crtc, int drm_mode_crtc_set_gamma_size(struct drm_crtc *crtc, int gamma_size); +bool drm_crtc_supports_legacy_gamma(struct drm_crtc *crtc); +int drm_crtc_legacy_gamma_set(struct drm_crtc *crtc, + u16 *red, u16 *green, u16 *blue, + uint32_t size, + struct drm_modeset_acquire_ctx *ctx); + /** * drm_color_lut_size - calculate the number of entries in the LUT * @blob: blob containing the LUT -- Texas Instruments Finland Oy, Porkkalankatu 22, 00180 Helsinki. Y-tunnus/Business ID: 0615521-4. Kotipaikka/Domicile: Helsinki _______________________________________________ dri-devel mailing list dri-devel@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/dri-devel ^ permalink raw reply related [flat|nested] 8+ messages in thread
* Re: [PATCH 2/2] drm: automatic legacy gamma support 2020-12-03 11:48 ` [PATCH 2/2] drm: automatic legacy gamma support Tomi Valkeinen @ 2020-12-04 22:40 ` Laurent Pinchart 0 siblings, 0 replies; 8+ messages in thread From: Laurent Pinchart @ 2020-12-04 22:40 UTC (permalink / raw) To: Tomi Valkeinen Cc: Yannick Fertre, Thomas Zimmermann, Philippe Cornu, David Airlie, Russell King, Sandy Huang, Paul Cercueil, Alexandre Torgue, dri-devel, Matthias Brugger, Vincent Abriou, Maxime Coquelin Hi Tomi, Thank you for the patch. On Thu, Dec 03, 2020 at 01:48:45PM +0200, Tomi Valkeinen wrote: > To support legacy gamma ioctls the drivers need to set > drm_crtc_funcs.gamma_set either to a custom implementation or to > drm_atomic_helper_legacy_gamma_set. Most of the atomic drivers do the > latter. > > We can simplify this by making the core handle it automatically. > > Add two functions: drm_crtc_supports_legacy_gamma() which tells if the > legacy gamma table can be set, and drm_crtc_legacy_gamma_set() which > does the work by either calling the drm_crtc_funcs.gamma_set or using > GAMMA_LUT or DEGAMMA_LUT. > > We can then drop drm_atomic_helper_legacy_gamma_set() and remove all its > uses. > > Signed-off-by: Tomi Valkeinen <tomi.valkeinen@ti.com> > --- > .../gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c | 1 - > .../gpu/drm/arm/display/komeda/komeda_crtc.c | 1 - > drivers/gpu/drm/arm/malidp_crtc.c | 1 - > drivers/gpu/drm/armada/armada_crtc.c | 1 - > drivers/gpu/drm/ast/ast_mode.c | 1 - > .../gpu/drm/atmel-hlcdc/atmel_hlcdc_crtc.c | 1 - > drivers/gpu/drm/drm_atomic_helper.c | 82 ------------- > drivers/gpu/drm/drm_color_mgmt.c | 113 +++++++++++++++++- > drivers/gpu/drm/drm_fb_helper.c | 12 +- > drivers/gpu/drm/ingenic/ingenic-drm-drv.c | 2 - > drivers/gpu/drm/mediatek/mtk_drm_crtc.c | 1 - > drivers/gpu/drm/nouveau/dispnv50/head.c | 2 - > drivers/gpu/drm/omapdrm/omap_crtc.c | 1 - > drivers/gpu/drm/rcar-du/rcar_du_crtc.c | 1 - > drivers/gpu/drm/rockchip/rockchip_drm_vop.c | 1 - > drivers/gpu/drm/stm/ltdc.c | 1 - > drivers/gpu/drm/vc4/vc4_crtc.c | 1 - > drivers/gpu/drm/vc4/vc4_txp.c | 1 - > include/drm/drm_atomic_helper.h | 4 - > include/drm/drm_color_mgmt.h | 7 ++ > 20 files changed, 123 insertions(+), 112 deletions(-) > > diff --git a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c > index 2855bb918535..848b06c51b0e 100644 > --- a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c > +++ b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c > @@ -5396,7 +5396,6 @@ static void dm_disable_vblank(struct drm_crtc *crtc) > static const struct drm_crtc_funcs amdgpu_dm_crtc_funcs = { > .reset = dm_crtc_reset_state, > .destroy = amdgpu_dm_crtc_destroy, > - .gamma_set = drm_atomic_helper_legacy_gamma_set, > .set_config = drm_atomic_helper_set_config, > .page_flip = drm_atomic_helper_page_flip, > .atomic_duplicate_state = dm_crtc_duplicate_state, > diff --git a/drivers/gpu/drm/arm/display/komeda/komeda_crtc.c b/drivers/gpu/drm/arm/display/komeda/komeda_crtc.c > index 4b485eb512e2..59172acb9738 100644 > --- a/drivers/gpu/drm/arm/display/komeda/komeda_crtc.c > +++ b/drivers/gpu/drm/arm/display/komeda/komeda_crtc.c > @@ -550,7 +550,6 @@ static void komeda_crtc_vblank_disable(struct drm_crtc *crtc) > } > > static const struct drm_crtc_funcs komeda_crtc_funcs = { > - .gamma_set = drm_atomic_helper_legacy_gamma_set, > .destroy = drm_crtc_cleanup, > .set_config = drm_atomic_helper_set_config, > .page_flip = drm_atomic_helper_page_flip, > diff --git a/drivers/gpu/drm/arm/malidp_crtc.c b/drivers/gpu/drm/arm/malidp_crtc.c > index 108e7a31bd26..494075ddbef6 100644 > --- a/drivers/gpu/drm/arm/malidp_crtc.c > +++ b/drivers/gpu/drm/arm/malidp_crtc.c > @@ -510,7 +510,6 @@ static void malidp_crtc_disable_vblank(struct drm_crtc *crtc) > } > > static const struct drm_crtc_funcs malidp_crtc_funcs = { > - .gamma_set = drm_atomic_helper_legacy_gamma_set, > .destroy = drm_crtc_cleanup, > .set_config = drm_atomic_helper_set_config, > .page_flip = drm_atomic_helper_page_flip, > diff --git a/drivers/gpu/drm/armada/armada_crtc.c b/drivers/gpu/drm/armada/armada_crtc.c > index 3ebcf5a52c8b..b7bb90ae787f 100644 > --- a/drivers/gpu/drm/armada/armada_crtc.c > +++ b/drivers/gpu/drm/armada/armada_crtc.c > @@ -820,7 +820,6 @@ static const struct drm_crtc_funcs armada_crtc_funcs = { > .cursor_set = armada_drm_crtc_cursor_set, > .cursor_move = armada_drm_crtc_cursor_move, > .destroy = armada_drm_crtc_destroy, > - .gamma_set = drm_atomic_helper_legacy_gamma_set, > .set_config = drm_atomic_helper_set_config, > .page_flip = drm_atomic_helper_page_flip, > .atomic_duplicate_state = drm_atomic_helper_crtc_duplicate_state, > diff --git a/drivers/gpu/drm/ast/ast_mode.c b/drivers/gpu/drm/ast/ast_mode.c > index 9db371f4054f..5b0ec785c516 100644 > --- a/drivers/gpu/drm/ast/ast_mode.c > +++ b/drivers/gpu/drm/ast/ast_mode.c > @@ -903,7 +903,6 @@ static void ast_crtc_atomic_destroy_state(struct drm_crtc *crtc, > > static const struct drm_crtc_funcs ast_crtc_funcs = { > .reset = ast_crtc_reset, > - .gamma_set = drm_atomic_helper_legacy_gamma_set, > .destroy = drm_crtc_cleanup, > .set_config = drm_atomic_helper_set_config, > .page_flip = drm_atomic_helper_page_flip, > diff --git a/drivers/gpu/drm/atmel-hlcdc/atmel_hlcdc_crtc.c b/drivers/gpu/drm/atmel-hlcdc/atmel_hlcdc_crtc.c > index c58fa00b4848..05ad75d155e8 100644 > --- a/drivers/gpu/drm/atmel-hlcdc/atmel_hlcdc_crtc.c > +++ b/drivers/gpu/drm/atmel-hlcdc/atmel_hlcdc_crtc.c > @@ -473,7 +473,6 @@ static const struct drm_crtc_funcs atmel_hlcdc_crtc_funcs = { > .atomic_destroy_state = atmel_hlcdc_crtc_destroy_state, > .enable_vblank = atmel_hlcdc_crtc_enable_vblank, > .disable_vblank = atmel_hlcdc_crtc_disable_vblank, > - .gamma_set = drm_atomic_helper_legacy_gamma_set, > }; > > int atmel_hlcdc_crtc_create(struct drm_device *dev) > diff --git a/drivers/gpu/drm/drm_atomic_helper.c b/drivers/gpu/drm/drm_atomic_helper.c > index fe59c8ea42a9..b114658100b3 100644 > --- a/drivers/gpu/drm/drm_atomic_helper.c > +++ b/drivers/gpu/drm/drm_atomic_helper.c > @@ -3499,88 +3499,6 @@ int drm_atomic_helper_page_flip_target(struct drm_crtc *crtc, > } > EXPORT_SYMBOL(drm_atomic_helper_page_flip_target); > > -/** > - * drm_atomic_helper_legacy_gamma_set - set the legacy gamma correction table > - * @crtc: CRTC object > - * @red: red correction table > - * @green: green correction table > - * @blue: green correction table > - * @size: size of the tables > - * @ctx: lock acquire context > - * > - * Implements support for legacy gamma correction table for drivers > - * that support color management through the DEGAMMA_LUT/GAMMA_LUT > - * properties. See drm_crtc_enable_color_mgmt() and the containing chapter for > - * how the atomic color management and gamma tables work. > - * > - * This function uses the GAMMA_LUT or DEGAMMA_LUT property for the gamma table. > - * GAMMA_LUT property is used if it exists, and DEGAMMA_LUT property is used as > - * a fallback. > - */ > -int drm_atomic_helper_legacy_gamma_set(struct drm_crtc *crtc, > - u16 *red, u16 *green, u16 *blue, > - uint32_t size, > - struct drm_modeset_acquire_ctx *ctx) > -{ > - struct drm_device *dev = crtc->dev; > - struct drm_atomic_state *state; > - struct drm_crtc_state *crtc_state; > - struct drm_property_blob *blob = NULL; > - struct drm_color_lut *blob_data; > - int i, ret = 0; > - bool replaced; > - bool use_degamma; > - > - if (!crtc->has_gamma_prop && !crtc->has_degamma_prop) > - return -ENODEV; > - > - use_degamma = !crtc->has_gamma_prop; > - > - state = drm_atomic_state_alloc(crtc->dev); > - if (!state) > - return -ENOMEM; > - > - blob = drm_property_create_blob(dev, > - sizeof(struct drm_color_lut) * size, > - NULL); > - if (IS_ERR(blob)) { > - ret = PTR_ERR(blob); > - blob = NULL; > - goto fail; > - } > - > - /* Prepare GAMMA_LUT with the legacy values. */ > - blob_data = blob->data; > - for (i = 0; i < size; i++) { > - blob_data[i].red = red[i]; > - blob_data[i].green = green[i]; > - blob_data[i].blue = blue[i]; > - } > - > - state->acquire_ctx = ctx; > - crtc_state = drm_atomic_get_crtc_state(state, crtc); > - if (IS_ERR(crtc_state)) { > - ret = PTR_ERR(crtc_state); > - goto fail; > - } > - > - /* Set GAMMA/DEGAMMA_LUT and reset DEGAMMA/GAMMA_LUT and CTM */ > - replaced = drm_property_replace_blob(&crtc_state->degamma_lut, > - use_degamma ? blob : NULL); > - replaced |= drm_property_replace_blob(&crtc_state->ctm, NULL); > - replaced |= drm_property_replace_blob(&crtc_state->gamma_lut, > - use_degamma ? NULL : blob); > - crtc_state->color_mgmt_changed |= replaced; > - > - ret = drm_atomic_commit(state); > - > -fail: > - drm_atomic_state_put(state); > - drm_property_blob_put(blob); > - return ret; > -} > -EXPORT_SYMBOL(drm_atomic_helper_legacy_gamma_set); > - > /** > * drm_atomic_helper_bridge_propagate_bus_fmt() - Propagate output format to > * the input end of a bridge > diff --git a/drivers/gpu/drm/drm_color_mgmt.c b/drivers/gpu/drm/drm_color_mgmt.c > index 956e59d5f6a7..21f667ad9c79 100644 > --- a/drivers/gpu/drm/drm_color_mgmt.c > +++ b/drivers/gpu/drm/drm_color_mgmt.c > @@ -22,6 +22,7 @@ > > #include <linux/uaccess.h> > > +#include <drm/drm_atomic.h> > #include <drm/drm_color_mgmt.h> > #include <drm/drm_crtc.h> > #include <drm/drm_device.h> > @@ -235,6 +236,112 @@ int drm_mode_crtc_set_gamma_size(struct drm_crtc *crtc, > } > EXPORT_SYMBOL(drm_mode_crtc_set_gamma_size); > > +/** > + * drm_crtc_supports_legacy_gamma - does the crtc support legacy gamma correction table > + * @crtc: CRTC object > + * > + * Returns true/false if the given crtc supports setting the legacy gamma > + * correction table. > + */ > +bool drm_crtc_supports_legacy_gamma(struct drm_crtc *crtc) > +{ > + if (!crtc->gamma_size) > + return false; > + > + if (crtc->funcs->gamma_set) > + return true; > + > + return crtc->has_gamma_prop || crtc->has_degamma_prop; > +} > +EXPORT_SYMBOL(drm_crtc_supports_legacy_gamma); > + > +/** > + * drm_crtc_legacy_gamma_set - set the legacy gamma correction table > + * @crtc: CRTC object > + * @red: red correction table > + * @green: green correction table > + * @blue: green correction table > + * @size: size of the tables > + * @ctx: lock acquire context > + * > + * Implements support for legacy gamma correction table for drivers > + * that have set drm_crtc_funcs.gamma_set or that support color management > + * through the DEGAMMA_LUT/GAMMA_LUT properties. See > + * drm_crtc_enable_color_mgmt() and the containing chapter for > + * how the atomic color management and gamma tables work. > + * > + * This function sets the gamma using the first one available: > + * - drm_crtc_funcs.gamma_set() > + * - GAMMA_LUT > + * - DEGAMMA_LUT > + */ > +int drm_crtc_legacy_gamma_set(struct drm_crtc *crtc, > + u16 *red, u16 *green, u16 *blue, > + uint32_t size, > + struct drm_modeset_acquire_ctx *ctx) > +{ > + struct drm_device *dev = crtc->dev; > + struct drm_atomic_state *state; > + struct drm_crtc_state *crtc_state; > + struct drm_property_blob *blob = NULL; > + struct drm_color_lut *blob_data; > + int i, ret = 0; > + bool replaced; > + bool use_degamma; > + > + if (crtc->funcs->gamma_set) > + return crtc->funcs->gamma_set(crtc, red, green, blue, size, ctx); > + > + if (!crtc->has_gamma_prop && !crtc->has_degamma_prop) > + return -ENODEV; > + > + use_degamma = !crtc->has_gamma_prop; > + > + state = drm_atomic_state_alloc(crtc->dev); > + if (!state) > + return -ENOMEM; > + > + blob = drm_property_create_blob(dev, > + sizeof(struct drm_color_lut) * size, > + NULL); > + if (IS_ERR(blob)) { > + ret = PTR_ERR(blob); > + blob = NULL; > + goto fail; > + } > + > + /* Prepare GAMMA_LUT with the legacy values. */ > + blob_data = blob->data; > + for (i = 0; i < size; i++) { > + blob_data[i].red = red[i]; > + blob_data[i].green = green[i]; > + blob_data[i].blue = blue[i]; > + } > + > + state->acquire_ctx = ctx; > + crtc_state = drm_atomic_get_crtc_state(state, crtc); > + if (IS_ERR(crtc_state)) { > + ret = PTR_ERR(crtc_state); > + goto fail; > + } > + > + /* Set GAMMA/DEGAMMA_LUT and reset DEGAMMA/GAMMA_LUT and CTM */ > + replaced = drm_property_replace_blob(&crtc_state->degamma_lut, > + use_degamma ? blob : NULL); > + replaced |= drm_property_replace_blob(&crtc_state->ctm, NULL); > + replaced |= drm_property_replace_blob(&crtc_state->gamma_lut, > + use_degamma ? NULL : blob); > + crtc_state->color_mgmt_changed |= replaced; > + > + ret = drm_atomic_commit(state); > + > +fail: > + drm_atomic_state_put(state); > + drm_property_blob_put(blob); > + return ret; > +} > +EXPORT_SYMBOL(drm_crtc_legacy_gamma_set); > + > /** > * drm_mode_gamma_set_ioctl - set the gamma table > * @dev: DRM device > @@ -266,7 +373,7 @@ int drm_mode_gamma_set_ioctl(struct drm_device *dev, > if (!crtc) > return -ENOENT; > > - if (crtc->funcs->gamma_set == NULL) > + if (!drm_crtc_supports_legacy_gamma(crtc)) > return -ENOSYS; > > /* memcpy into gamma store */ > @@ -294,8 +401,8 @@ int drm_mode_gamma_set_ioctl(struct drm_device *dev, > goto out; > } > > - ret = crtc->funcs->gamma_set(crtc, r_base, g_base, b_base, > - crtc->gamma_size, &ctx); > + ret = drm_crtc_legacy_gamma_set(crtc, r_base, g_base, b_base, > + crtc->gamma_size, &ctx); > > out: > DRM_MODESET_LOCK_ALL_END(dev, ctx, ret); > diff --git a/drivers/gpu/drm/drm_fb_helper.c b/drivers/gpu/drm/drm_fb_helper.c > index 25edf670867c..446e321779e6 100644 > --- a/drivers/gpu/drm/drm_fb_helper.c > +++ b/drivers/gpu/drm/drm_fb_helper.c > @@ -136,15 +136,15 @@ static void drm_fb_helper_restore_lut_atomic(struct drm_crtc *crtc) > { > uint16_t *r_base, *g_base, *b_base; > > - if (crtc->funcs->gamma_set == NULL) > + if (!drm_crtc_supports_legacy_gamma(crtc)) > return; > > r_base = crtc->gamma_store; > g_base = r_base + crtc->gamma_size; > b_base = g_base + crtc->gamma_size; > > - crtc->funcs->gamma_set(crtc, r_base, g_base, b_base, > - crtc->gamma_size, NULL); > + drm_crtc_legacy_gamma_set(crtc, r_base, g_base, b_base, > + crtc->gamma_size, NULL); > } > > /** > @@ -907,7 +907,7 @@ static int setcmap_legacy(struct fb_cmap *cmap, struct fb_info *info) > drm_modeset_lock_all(fb_helper->dev); > drm_client_for_each_modeset(modeset, &fb_helper->client) { > crtc = modeset->crtc; > - if (!crtc->funcs->gamma_set || !crtc->gamma_size) > + if (!drm_crtc_supports_legacy_gamma(crtc)) > return -EINVAL; > > if (cmap->start + cmap->len > crtc->gamma_size) > @@ -921,8 +921,8 @@ static int setcmap_legacy(struct fb_cmap *cmap, struct fb_info *info) > memcpy(g + cmap->start, cmap->green, cmap->len * sizeof(*g)); > memcpy(b + cmap->start, cmap->blue, cmap->len * sizeof(*b)); > > - ret = crtc->funcs->gamma_set(crtc, r, g, b, > - crtc->gamma_size, NULL); > + ret = drm_crtc_legacy_gamma_set(crtc, r, g, b, crtc->gamma_size, > + NULL); > if (ret) > return ret; > } > diff --git a/drivers/gpu/drm/ingenic/ingenic-drm-drv.c b/drivers/gpu/drm/ingenic/ingenic-drm-drv.c > index 368bfef8b340..75f948d41b0a 100644 > --- a/drivers/gpu/drm/ingenic/ingenic-drm-drv.c > +++ b/drivers/gpu/drm/ingenic/ingenic-drm-drv.c > @@ -755,8 +755,6 @@ static const struct drm_crtc_funcs ingenic_drm_crtc_funcs = { > > .enable_vblank = ingenic_drm_enable_vblank, > .disable_vblank = ingenic_drm_disable_vblank, > - > - .gamma_set = drm_atomic_helper_legacy_gamma_set, > }; > > static const struct drm_plane_helper_funcs ingenic_drm_plane_helper_funcs = { > diff --git a/drivers/gpu/drm/mediatek/mtk_drm_crtc.c b/drivers/gpu/drm/mediatek/mtk_drm_crtc.c > index bfe994230543..b665bd498a4a 100644 > --- a/drivers/gpu/drm/mediatek/mtk_drm_crtc.c > +++ b/drivers/gpu/drm/mediatek/mtk_drm_crtc.c > @@ -619,7 +619,6 @@ static const struct drm_crtc_funcs mtk_crtc_funcs = { > .reset = mtk_drm_crtc_reset, > .atomic_duplicate_state = mtk_drm_crtc_duplicate_state, > .atomic_destroy_state = mtk_drm_crtc_destroy_state, > - .gamma_set = drm_atomic_helper_legacy_gamma_set, > .enable_vblank = mtk_drm_crtc_enable_vblank, > .disable_vblank = mtk_drm_crtc_disable_vblank, > }; > diff --git a/drivers/gpu/drm/nouveau/dispnv50/head.c b/drivers/gpu/drm/nouveau/dispnv50/head.c > index 537c1ef2e464..ec361d17e900 100644 > --- a/drivers/gpu/drm/nouveau/dispnv50/head.c > +++ b/drivers/gpu/drm/nouveau/dispnv50/head.c > @@ -503,7 +503,6 @@ nv50_head_destroy(struct drm_crtc *crtc) > static const struct drm_crtc_funcs > nv50_head_func = { > .reset = nv50_head_reset, > - .gamma_set = drm_atomic_helper_legacy_gamma_set, > .destroy = nv50_head_destroy, > .set_config = drm_atomic_helper_set_config, > .page_flip = drm_atomic_helper_page_flip, > @@ -518,7 +517,6 @@ nv50_head_func = { > static const struct drm_crtc_funcs > nvd9_head_func = { > .reset = nv50_head_reset, > - .gamma_set = drm_atomic_helper_legacy_gamma_set, > .destroy = nv50_head_destroy, > .set_config = drm_atomic_helper_set_config, > .page_flip = drm_atomic_helper_page_flip, > diff --git a/drivers/gpu/drm/omapdrm/omap_crtc.c b/drivers/gpu/drm/omapdrm/omap_crtc.c > index 7d66269ad998..b97f21cf4a91 100644 > --- a/drivers/gpu/drm/omapdrm/omap_crtc.c > +++ b/drivers/gpu/drm/omapdrm/omap_crtc.c > @@ -741,7 +741,6 @@ static const struct drm_crtc_funcs omap_crtc_funcs = { > .set_config = drm_atomic_helper_set_config, > .destroy = omap_crtc_destroy, > .page_flip = drm_atomic_helper_page_flip, > - .gamma_set = drm_atomic_helper_legacy_gamma_set, > .atomic_duplicate_state = omap_crtc_duplicate_state, > .atomic_destroy_state = drm_atomic_helper_crtc_destroy_state, > .atomic_set_property = omap_crtc_atomic_set_property, > diff --git a/drivers/gpu/drm/rcar-du/rcar_du_crtc.c b/drivers/gpu/drm/rcar-du/rcar_du_crtc.c > index b5fb941e0f53..f93e0750431d 100644 > --- a/drivers/gpu/drm/rcar-du/rcar_du_crtc.c > +++ b/drivers/gpu/drm/rcar-du/rcar_du_crtc.c > @@ -1144,7 +1144,6 @@ static const struct drm_crtc_funcs crtc_funcs_gen3 = { > .set_crc_source = rcar_du_crtc_set_crc_source, > .verify_crc_source = rcar_du_crtc_verify_crc_source, > .get_crc_sources = rcar_du_crtc_get_crc_sources, > - .gamma_set = drm_atomic_helper_legacy_gamma_set, > }; > > /* ----------------------------------------------------------------------------- > diff --git a/drivers/gpu/drm/rockchip/rockchip_drm_vop.c b/drivers/gpu/drm/rockchip/rockchip_drm_vop.c > index d1e05482641b..8d15cabdcb02 100644 > --- a/drivers/gpu/drm/rockchip/rockchip_drm_vop.c > +++ b/drivers/gpu/drm/rockchip/rockchip_drm_vop.c > @@ -1643,7 +1643,6 @@ static const struct drm_crtc_funcs vop_crtc_funcs = { > .disable_vblank = vop_crtc_disable_vblank, > .set_crc_source = vop_crtc_set_crc_source, > .verify_crc_source = vop_crtc_verify_crc_source, > - .gamma_set = drm_atomic_helper_legacy_gamma_set, > }; > > static void vop_fb_unref_worker(struct drm_flip_work *work, void *val) > diff --git a/drivers/gpu/drm/stm/ltdc.c b/drivers/gpu/drm/stm/ltdc.c > index 3980677435cb..7812094f93d6 100644 > --- a/drivers/gpu/drm/stm/ltdc.c > +++ b/drivers/gpu/drm/stm/ltdc.c > @@ -713,7 +713,6 @@ static const struct drm_crtc_funcs ltdc_crtc_funcs = { > .enable_vblank = ltdc_crtc_enable_vblank, > .disable_vblank = ltdc_crtc_disable_vblank, > .get_vblank_timestamp = drm_crtc_vblank_helper_get_vblank_timestamp, > - .gamma_set = drm_atomic_helper_legacy_gamma_set, > }; > > /* > diff --git a/drivers/gpu/drm/vc4/vc4_crtc.c b/drivers/gpu/drm/vc4/vc4_crtc.c > index ea710beb8e00..7495d70d6a32 100644 > --- a/drivers/gpu/drm/vc4/vc4_crtc.c > +++ b/drivers/gpu/drm/vc4/vc4_crtc.c > @@ -884,7 +884,6 @@ static const struct drm_crtc_funcs vc4_crtc_funcs = { > .reset = vc4_crtc_reset, > .atomic_duplicate_state = vc4_crtc_duplicate_state, > .atomic_destroy_state = vc4_crtc_destroy_state, > - .gamma_set = drm_atomic_helper_legacy_gamma_set, > .enable_vblank = vc4_enable_vblank, > .disable_vblank = vc4_disable_vblank, > .get_vblank_timestamp = drm_crtc_vblank_helper_get_vblank_timestamp, > diff --git a/drivers/gpu/drm/vc4/vc4_txp.c b/drivers/gpu/drm/vc4/vc4_txp.c > index 8aa5220885f4..e4b782e42f69 100644 > --- a/drivers/gpu/drm/vc4/vc4_txp.c > +++ b/drivers/gpu/drm/vc4/vc4_txp.c > @@ -382,7 +382,6 @@ static const struct drm_crtc_funcs vc4_txp_crtc_funcs = { > .reset = vc4_crtc_reset, > .atomic_duplicate_state = vc4_crtc_duplicate_state, > .atomic_destroy_state = vc4_crtc_destroy_state, > - .gamma_set = drm_atomic_helper_legacy_gamma_set, > .enable_vblank = vc4_txp_enable_vblank, > .disable_vblank = vc4_txp_disable_vblank, > }; > diff --git a/include/drm/drm_atomic_helper.h b/include/drm/drm_atomic_helper.h > index 5f47720440fa..4045e2507e11 100644 > --- a/include/drm/drm_atomic_helper.h > +++ b/include/drm/drm_atomic_helper.h > @@ -147,10 +147,6 @@ int drm_atomic_helper_page_flip_target( > uint32_t flags, > uint32_t target, > struct drm_modeset_acquire_ctx *ctx); > -int drm_atomic_helper_legacy_gamma_set(struct drm_crtc *crtc, > - u16 *red, u16 *green, u16 *blue, > - uint32_t size, > - struct drm_modeset_acquire_ctx *ctx); > > /** > * drm_atomic_crtc_for_each_plane - iterate over planes currently attached to CRTC > diff --git a/include/drm/drm_color_mgmt.h b/include/drm/drm_color_mgmt.h > index 81c298488b0c..a899be9404a0 100644 > --- a/include/drm/drm_color_mgmt.h > +++ b/include/drm/drm_color_mgmt.h > @@ -28,6 +28,7 @@ > > struct drm_crtc; > struct drm_plane; > +struct drm_modeset_acquire_ctx; > > /** > * drm_color_lut_extract - clamp and round LUT entries > @@ -62,6 +63,12 @@ void drm_crtc_enable_color_mgmt(struct drm_crtc *crtc, > int drm_mode_crtc_set_gamma_size(struct drm_crtc *crtc, > int gamma_size); > > +bool drm_crtc_supports_legacy_gamma(struct drm_crtc *crtc); > +int drm_crtc_legacy_gamma_set(struct drm_crtc *crtc, > + u16 *red, u16 *green, u16 *blue, > + uint32_t size, > + struct drm_modeset_acquire_ctx *ctx); > + As those two functions are not meant to be called by drivers, I wonder if they shouldn't go to drm_internal.h. Reviewed-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com> > /** > * drm_color_lut_size - calculate the number of entries in the LUT > * @blob: blob containing the LUT -- Regards, Laurent Pinchart _______________________________________________ dri-devel mailing list dri-devel@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/dri-devel ^ permalink raw reply [flat|nested] 8+ messages in thread
end of thread, other threads:[~2020-12-09 0:06 UTC | newest] Thread overview: 8+ messages (download: mbox.gz follow: Atom feed -- links below jump to the message on this page -- 2020-12-03 11:48 [PATCH 0/2] drm: fix and cleanup legacy gamma support Tomi Valkeinen 2020-12-03 11:48 ` [PATCH 1/2] drm: add legacy support for using degamma for gamma Tomi Valkeinen 2020-12-04 22:35 ` Laurent Pinchart 2020-12-07 15:31 ` Ville Syrjälä 2020-12-07 15:45 ` Tomi Valkeinen 2020-12-09 0:05 ` Daniel Vetter 2020-12-03 11:48 ` [PATCH 2/2] drm: automatic legacy gamma support Tomi Valkeinen 2020-12-04 22:40 ` Laurent Pinchart
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.