[RFC PATCH 05/40] drm/amd/display: add shaper LUT driver-private props
CRTC shaper LUT shapes the content after blending, i.e., de-linearizes or normalizes space before applying a 3D LUT color correction. In the next patch, we add CRTC 3D LUT property to DRM color management after this shaper LUT and before the current CRTC gamma LUT. Signed-off-by: Melissa Wen --- drivers/gpu/drm/amd/amdgpu/amdgpu_display.c | 28 drivers/gpu/drm/amd/amdgpu/amdgpu_mode.h | 14 ++ .../gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.h | 17 +++ .../amd/display/amdgpu_dm/amdgpu_dm_crtc.c| 122 +- 4 files changed, 179 insertions(+), 2 deletions(-) diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_display.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_display.c index 8632ab695a6c..44c22cb87dde 100644 --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_display.c +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_display.c @@ -1247,6 +1247,30 @@ amdgpu_display_user_framebuffer_create(struct drm_device *dev, return &amdgpu_fb->base; } +#ifdef CONFIG_STEAM_DECK +static int +amdgpu_display_create_color_properties(struct amdgpu_device *adev) +{ + struct drm_property *prop; + + prop = drm_property_create(adev_to_drm(adev), + DRM_MODE_PROP_BLOB, + "AMD_SHAPER_LUT", 0); + if (!prop) + return -ENOMEM; + adev->mode_info.shaper_lut_property = prop; + + prop = drm_property_create_range(adev_to_drm(adev), +DRM_MODE_PROP_IMMUTABLE, +"AMD_SHAPER_LUT_SIZE", 0, UINT_MAX); + if (!prop) + return -ENOMEM; + adev->mode_info.shaper_lut_size_property = prop; + + return 0; +} +#endif + const struct drm_mode_config_funcs amdgpu_mode_funcs = { .fb_create = amdgpu_display_user_framebuffer_create, }; @@ -1323,6 +1347,10 @@ int amdgpu_display_modeset_create_props(struct amdgpu_device *adev) return -ENOMEM; } +#ifdef CONFIG_STEAM_DECK + if (amdgpu_display_create_color_properties(adev)) + return -ENOMEM; +#endif return 0; } diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_mode.h b/drivers/gpu/drm/amd/amdgpu/amdgpu_mode.h index b8633df418d4..1fd3497af3b5 100644 --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_mode.h +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_mode.h @@ -344,6 +344,20 @@ struct amdgpu_mode_info { int disp_priority; const struct amdgpu_display_funcs *funcs; const enum drm_plane_type *plane_type; + + /* Driver-private color mgmt props */ +#ifdef CONFIG_STEAM_DECK + /** +* @shaper_lut_property: CRTC property to set post-blending shaper LUT +* that converts content before 3D LUT gamma correction. +*/ + struct drm_property *shaper_lut_property; + /** +* @shaper_lut_size_property: CRTC property for the size of +* post-blending shaper LUT as supported by the driver (read-only). +*/ + struct drm_property *shaper_lut_size_property; +#endif }; #define AMDGPU_MAX_BL_LEVEL 0xFF diff --git a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.h b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.h index 2e2413fd73a4..de63455896cc 100644 --- a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.h +++ b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.h @@ -726,6 +726,23 @@ struct dm_crtc_state { struct dc_info_packet vrr_infopacket; int abm_level; + +#ifdef CONFIG_STEAM_DECK + /* AMD driver-private color mgmt pipeline +* +* DRM provides CRTC degamma/ctm/gamma color mgmt features, but AMD HW +* has a larger set of post-blending color calibration features, as +* below: +*/ + /** +* @shaper_lut: +* +* Lookup table used to de-linearize pixel data for gamma correction. +* See drm_crtc_enable_color_mgmt(). The blob (if not NULL) is an array +* of &struct drm_color_lut. +*/ + struct drm_property_blob *shaper_lut; +#endif }; #define to_dm_crtc_state(x) container_of(x, struct dm_crtc_state, base) diff --git a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_crtc.c b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_crtc.c index e3762e806617..503433e5cb38 100644 --- a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_crtc.c +++ b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_crtc.c @@ -229,7 +229,9 @@ static void dm_crtc_destroy_state(struct drm_crtc *crtc, if (cur->stream) dc_stream_release(cur->stream); - +#ifdef CONFIG_STEAM_DECK + drm_property_blob_put(cur->shaper_lut); +#endif __drm_atomic_helper_crtc_destroy_state(state); @@ -266,7 +268,12 @@ static struct drm_crtc_state *dm_crtc_duplicate_state(struct drm_crtc *crtc) state->crc_skip_count = cur->crc_skip_count; state->mpo_requested = cur->mpo_requested; /* TODO Duplicate dc_stream after o
Re: [RFC PATCH 05/40] drm/amd/display: add shaper LUT driver-private props
On 4/23/23 10:10, Melissa Wen wrote: > CRTC shaper LUT shapes the content after blending, i.e., de-linearizes > or normalizes space before applying a 3D LUT color correction. In the > next patch, we add CRTC 3D LUT property to DRM color management after > this shaper LUT and before the current CRTC gamma LUT. > It might be good to describe the motivation behind the "de-linearization" of pixels. Since a 3DLUT has a limited number of entries in each dimension we want to use them in an optimal fashion. This means using the 3DLUT in a colorspace that is optimized for human vision, such as sRGB, PQ, or another non-linear space. > Signed-off-by: Melissa Wen > --- > drivers/gpu/drm/amd/amdgpu/amdgpu_display.c | 28 > drivers/gpu/drm/amd/amdgpu/amdgpu_mode.h | 14 ++ > .../gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.h | 17 +++ > .../amd/display/amdgpu_dm/amdgpu_dm_crtc.c| 122 +- > 4 files changed, 179 insertions(+), 2 deletions(-) > > diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_display.c > b/drivers/gpu/drm/amd/amdgpu/amdgpu_display.c > index 8632ab695a6c..44c22cb87dde 100644 > --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_display.c > +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_display.c > @@ -1247,6 +1247,30 @@ amdgpu_display_user_framebuffer_create(struct > drm_device *dev, > return &amdgpu_fb->base; > } > > +#ifdef CONFIG_STEAM_DECK Something like AMD_PRIVATE_COLOR would be better. It might also be enough to guard only the bits that make the uAPI appear, such as drm_property_create, etc. Harry > +static int > +amdgpu_display_create_color_properties(struct amdgpu_device *adev) > +{ > + struct drm_property *prop; > + > + prop = drm_property_create(adev_to_drm(adev), > +DRM_MODE_PROP_BLOB, > +"AMD_SHAPER_LUT", 0); > + if (!prop) > + return -ENOMEM; > + adev->mode_info.shaper_lut_property = prop; > + > + prop = drm_property_create_range(adev_to_drm(adev), > + DRM_MODE_PROP_IMMUTABLE, > + "AMD_SHAPER_LUT_SIZE", 0, UINT_MAX); > + if (!prop) > + return -ENOMEM; > + adev->mode_info.shaper_lut_size_property = prop; > + > + return 0; > +} > +#endif > + > const struct drm_mode_config_funcs amdgpu_mode_funcs = { > .fb_create = amdgpu_display_user_framebuffer_create, > }; > @@ -1323,6 +1347,10 @@ int amdgpu_display_modeset_create_props(struct > amdgpu_device *adev) > return -ENOMEM; > } > > +#ifdef CONFIG_STEAM_DECK > + if (amdgpu_display_create_color_properties(adev)) > + return -ENOMEM; > +#endif > return 0; > } > > diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_mode.h > b/drivers/gpu/drm/amd/amdgpu/amdgpu_mode.h > index b8633df418d4..1fd3497af3b5 100644 > --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_mode.h > +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_mode.h > @@ -344,6 +344,20 @@ struct amdgpu_mode_info { > int disp_priority; > const struct amdgpu_display_funcs *funcs; > const enum drm_plane_type *plane_type; > + > + /* Driver-private color mgmt props */ > +#ifdef CONFIG_STEAM_DECK > + /** > + * @shaper_lut_property: CRTC property to set post-blending shaper LUT > + * that converts content before 3D LUT gamma correction. > + */ > + struct drm_property *shaper_lut_property; > + /** > + * @shaper_lut_size_property: CRTC property for the size of > + * post-blending shaper LUT as supported by the driver (read-only). > + */ > + struct drm_property *shaper_lut_size_property; > +#endif > }; > > #define AMDGPU_MAX_BL_LEVEL 0xFF > diff --git a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.h > b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.h > index 2e2413fd73a4..de63455896cc 100644 > --- a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.h > +++ b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.h > @@ -726,6 +726,23 @@ struct dm_crtc_state { > struct dc_info_packet vrr_infopacket; > > int abm_level; > + > +#ifdef CONFIG_STEAM_DECK > + /* AMD driver-private color mgmt pipeline > + * > + * DRM provides CRTC degamma/ctm/gamma color mgmt features, but AMD HW > + * has a larger set of post-blending color calibration features, as > + * below: > + */ > + /** > + * @shaper_lut: > + * > + * Lookup table used to de-linearize pixel data for gamma correction. > + * See drm_crtc_enable_color_mgmt(). The blob (if not NULL) is an array > + * of &struct drm_color_lut. > + */ > + struct drm_property_blob *shaper_lut; > +#endif > }; > > #define to_dm_crtc_state(x) container_of(x, struct dm_crtc_state, base) > diff --git a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_crtc.c > b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_crtc.c > index e3762e806617..503433e5cb38 1006
Re: [RFC PATCH 05/40] drm/amd/display: add shaper LUT driver-private props
On 05/08, Harry Wentland wrote: > > > On 4/23/23 10:10, Melissa Wen wrote: > > CRTC shaper LUT shapes the content after blending, i.e., de-linearizes > > or normalizes space before applying a 3D LUT color correction. In the > > next patch, we add CRTC 3D LUT property to DRM color management after > > this shaper LUT and before the current CRTC gamma LUT. > > > > It might be good to describe the motivation behind the "de-linearization" > of pixels. Since a 3DLUT has a limited number of entries in each dimension > we want to use them in an optimal fashion. This means using the 3DLUT in > a colorspace that is optimized for human vision, such as sRGB, PQ, or > another non-linear space. ack. > > > Signed-off-by: Melissa Wen > > --- > > drivers/gpu/drm/amd/amdgpu/amdgpu_display.c | 28 > > drivers/gpu/drm/amd/amdgpu/amdgpu_mode.h | 14 ++ > > .../gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.h | 17 +++ > > .../amd/display/amdgpu_dm/amdgpu_dm_crtc.c| 122 +- > > 4 files changed, 179 insertions(+), 2 deletions(-) > > > > diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_display.c > > b/drivers/gpu/drm/amd/amdgpu/amdgpu_display.c > > index 8632ab695a6c..44c22cb87dde 100644 > > --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_display.c > > +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_display.c > > @@ -1247,6 +1247,30 @@ amdgpu_display_user_framebuffer_create(struct > > drm_device *dev, > > return &amdgpu_fb->base; > > } > > > > +#ifdef CONFIG_STEAM_DECK > > Something like AMD_PRIVATE_COLOR would be better. Oh, I see your suggestion for my previous question here, so nvm. > > It might also be enough to guard only the bits that make the uAPI > appear, such as drm_property_create, etc. Makes sense. Joshie also suggested me this path. Thanks! > > Harry > > > +static int > > +amdgpu_display_create_color_properties(struct amdgpu_device *adev) > > +{ > > + struct drm_property *prop; > > + > > + prop = drm_property_create(adev_to_drm(adev), > > + DRM_MODE_PROP_BLOB, > > + "AMD_SHAPER_LUT", 0); > > + if (!prop) > > + return -ENOMEM; > > + adev->mode_info.shaper_lut_property = prop; > > + > > + prop = drm_property_create_range(adev_to_drm(adev), > > +DRM_MODE_PROP_IMMUTABLE, > > +"AMD_SHAPER_LUT_SIZE", 0, UINT_MAX); > > + if (!prop) > > + return -ENOMEM; > > + adev->mode_info.shaper_lut_size_property = prop; > > + > > + return 0; > > +} > > +#endif > > + > > const struct drm_mode_config_funcs amdgpu_mode_funcs = { > > .fb_create = amdgpu_display_user_framebuffer_create, > > }; > > @@ -1323,6 +1347,10 @@ int amdgpu_display_modeset_create_props(struct > > amdgpu_device *adev) > > return -ENOMEM; > > } > > > > +#ifdef CONFIG_STEAM_DECK > > + if (amdgpu_display_create_color_properties(adev)) > > + return -ENOMEM; > > +#endif > > return 0; > > } > > > > diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_mode.h > > b/drivers/gpu/drm/amd/amdgpu/amdgpu_mode.h > > index b8633df418d4..1fd3497af3b5 100644 > > --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_mode.h > > +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_mode.h > > @@ -344,6 +344,20 @@ struct amdgpu_mode_info { > > int disp_priority; > > const struct amdgpu_display_funcs *funcs; > > const enum drm_plane_type *plane_type; > > + > > + /* Driver-private color mgmt props */ > > +#ifdef CONFIG_STEAM_DECK > > + /** > > +* @shaper_lut_property: CRTC property to set post-blending shaper LUT > > +* that converts content before 3D LUT gamma correction. > > +*/ > > + struct drm_property *shaper_lut_property; > > + /** > > +* @shaper_lut_size_property: CRTC property for the size of > > +* post-blending shaper LUT as supported by the driver (read-only). > > +*/ > > + struct drm_property *shaper_lut_size_property; > > +#endif > > }; > > > > #define AMDGPU_MAX_BL_LEVEL 0xFF > > diff --git a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.h > > b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.h > > index 2e2413fd73a4..de63455896cc 100644 > > --- a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.h > > +++ b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.h > > @@ -726,6 +726,23 @@ struct dm_crtc_state { > > struct dc_info_packet vrr_infopacket; > > > > int abm_level; > > + > > +#ifdef CONFIG_STEAM_DECK > > + /* AMD driver-private color mgmt pipeline > > +* > > +* DRM provides CRTC degamma/ctm/gamma color mgmt features, but AMD HW > > +* has a larger set of post-blending color calibration features, as > > +* below: > > +*/ > > + /** > > +* @shaper_lut: > > +* > > +* Lookup table used to de-linearize pixel data for gamma correction. > > +* See drm_crtc_enable_color_mgmt(). The blob (if not NULL) is an array > > +* of &struct drm_color_lu