drm/atomic: track colorop changes of a given plane
Subsystems (4)
cover drm/atomic: track colorop changes of a given plane
Similar to what is done for tracking CRTC color mgmt property changes with CRTC color_mgmt_changed flag, track colorop updates of a given plane color pipeline by setting plane color_mgmt_changed flag. Also true if setting a different color pipeline to a given plane. That way, the driver can react accordingly and update their color blocks.
This small series fix shaper/3D LUT updates when changing night mode settings on gamescope with a custom branch that supports COLOR_PIPELINE[1].
This series doesn't cover 1D/3D LUT interpolation, since it's documented as read-only properties.
Let me know your thoughts!
[1] https://github.com/ValveSoftware/gamescope/pull/2113
Melissa Wen
Melissa Wen (2):
drm/atomic: track individual colorop updates drm/amd/display: use plane color_mgmt_changed to track colorop changes
.../gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c | 6 ++- drivers/gpu/drm/drm_atomic_uapi.c | 53 +++++++++++++++---- include/drm/drm_atomic_uapi.h | 2 +- 3 files changed, 48 insertions(+), 13 deletions(-)
Signature · 1 line
2.51.0
PATCH 1/2 drm/atomic: track individual colorop updates
As we do for CRTC color mgmt properties, use color_mgmt_changed flag to track any value changes in the color pipeline of a given plane, so that drivers can update color blocks as soon as plane color pipeline or individual colorop values change.
--- drivers/gpu/drm/drm_atomic_uapi.c | 53 ++++++++++++++++++++++++------- include/drm/drm_atomic_uapi.h | 2 +- 2 files changed, 43 insertions(+), 12 deletions(-)
drivers/gpu/drm/drm_atomic_uapi.c +42 -11
@@ -265,13 +265,19 @@ EXPORT_SYMBOL(drm_atomic_set_fb_for_plane);* * Helper function to select the color pipeline on a plane by setting * it to the first drm_colorop element of the pipeline. +* +* Return: true if plane color pipeline value changed, false otherwise. */ -void +bool drm_atomic_set_colorop_for_plane (struct drm_plane_state *plane_state,struct drm_colorop *colorop) {struct drm_plane *plane = plane_state->plane; +/* Color pipeline didn't change */ +if (plane_state->color_pipeline == colorop) +return false; +if (colorop) drm_dbg_atomic(plane->dev, "Set [COLOROP:%d] for [PLANE:%d:%s] state %p\n",
@@ -283,6 +289,8 @@ drm_atomic_set_colorop_for_plane(struct drm_plane_state *plane_state, plane->base.id, plane->name, plane_state); plane_state->color_pipeline = colorop; + +return true; }EXPORT_SYMBOL (drm_atomic_set_colorop_for_plane);
@@ -600,7 +608,7 @@ static int drm_atomic_plane_set_property(struct drm_plane *plane,if (val && !colorop)return -EACCES ; -drm_atomic_set_colorop_for_plane (state, colorop); + state->color_mgmt_changed |=drm_atomic_set_colorop_for_plane (state, colorop); }else if (property == config->prop_fb_damage_clips) { ret = drm_property_replace_blob_from_id(dev, &state->fb_damage_clips,
@@ -709,11 +717,11 @@ drm_atomic_plane_get_property(struct drm_plane *plane,static int drm_atomic_color_set_data_property (struct drm_colorop *colorop,struct drm_colorop_state *state,struct drm_property *property, -uint64_t val) +uint64_t val, +bool *replaced) {ssize_t elem_size =-1 ;ssize_t size =-1 ; -bool replaced = false;switch (colorop->type) {case DRM_COLOROP_1D_LUT :
@@ -735,28 +743,39 @@ static int drm_atomic_color_set_data_property(struct drm_colorop *colorop, &state->data, val,-1 , size, elem_size, - &replaced); + replaced); }static int drm_atomic_colorop_set_property (struct drm_colorop *colorop,struct drm_colorop_state *state,struct drm_file *file_priv,struct drm_property *property, -uint64_t val) +uint64_t val, +bool *replaced) {if (property == colorop->bypass_property) { - state->bypass = val; +if (state->bypass != val) { + state->bypass = val; + *replaced = true; + } }else if (property == colorop->lut1d_interpolation_property) { colorop->lut1d_interpolation = val; }else if (property == colorop->curve_1d_type_property) { - state->curve_1d_type = val; +if (state->curve_1d_type != val) { + state->curve_1d_type = val; + *replaced = true; + } }else if (property == colorop->multiplier_property) { - state->multiplier = val; +if (state->multiplier != val) { + state->multiplier = val; + *replaced = true; + } }else if (property == colorop->lut3d_interpolation_property) { colorop->lut3d_interpolation = val; }else if (property == colorop->data_property) {return drm_atomic_color_set_data_property (colorop, state, - property, val); + property, val, + replaced); }else { drm_dbg_atomic(colorop->dev, "[COLOROP:%d:%d] unknown property [PROP:%d:%s]\n",
@@ -1273,6 +1292,8 @@ int drm_atomic_set_property(struct drm_atomic_state *state,case DRM_MODE_OBJECT_COLOROP : {struct drm_colorop *colorop =obj_to_colorop (obj);struct drm_colorop_state *colorop_state; +struct drm_plane_state *plane_state; +bool replaced = false; colorop_state =drm_atomic_get_colorop_state (state, colorop);if (IS_ERR (colorop_state)) {
@@ -1281,7 +1302,17 @@ int drm_atomic_set_property(struct drm_atomic_state *state, } ret =drm_atomic_colorop_set_property (colorop, colorop_state, - file_priv, prop, prop_value); + file_priv, prop, prop_value, + &replaced); +if (ret || !replaced) +break ; + + plane_state =drm_atomic_get_plane_state (state, colorop->plane); +if (IS_ERR (plane_state)) { + ret =PTR_ERR (plane_state); +break ; + } + plane_state->color_mgmt_changed = true;break ; }default :
include/drm/drm_atomic_uapi.h +1 -1
@@ -50,7 +50,7 @@ drm_atomic_set_crtc_for_plane(struct drm_plane_state *plane_state, struct drm_crtc *crtc);void drm_atomic_set_fb_for_plane (struct drm_plane_state *plane_state,struct drm_framebuffer *fb); -void drm_atomic_set_colorop_for_plane (struct drm_plane_state *plane_state, +bool drm_atomic_set_colorop_for_plane (struct drm_plane_state *plane_state,struct drm_colorop *colorop); int __must_check drm_atomic_set_crtc_for_connector(struct drm_connector_state *conn_state,
Signature · 1 line
2.51.0
Re: [PATCH 1/2] drm/atomic: track individual colorop updates
Quoted 6 lines · Melissa Wen
As we do for CRTC color mgmt properties, use
color_mgmt_changedflag to track any value changes in the color pipeline of a given plane, so that drivers can update color blocks as soon as plane color pipeline or individual colorop values change.Signed-off-by Melissa Wen <[email protected]>
Harry
Quoted 149 lines
--- drivers/gpu/drm/drm_atomic_uapi.c | 53 ++++++++++++++++++++++++------- include/drm/drm_atomic_uapi.h | 2 +- 2 files changed, 43 insertions(+), 12 deletions(-)drivers/gpu/drm/drm_atomic_uapi.c +42
-11@@ -265,13 +265,19 @@ EXPORT_SYMBOL(drm_atomic_set_fb_for_plane);* * Helper function to select the color pipeline on a plane by setting * it to the first drm_colorop element of the pipeline. +* +* Return: true if plane color pipeline value changed, false otherwise. */ -void +bool drm_atomic_set_colorop_for_plane (struct drm_plane_state *plane_state,struct drm_colorop *colorop) {struct drm_plane *plane = plane_state->plane; +/* Color pipeline didn't change */ +if (plane_state->color_pipeline == colorop) +return false; +if (colorop) drm_dbg_atomic(plane->dev, "Set [COLOROP:%d] for [PLANE:%d:%s] state %p\n",@@ -283,6 +289,8 @@ drm_atomic_set_colorop_for_plane(struct drm_plane_state *plane_state, plane->base.id, plane->name, plane_state); plane_state->color_pipeline = colorop; + +return true; }EXPORT_SYMBOL (drm_atomic_set_colorop_for_plane);@@ -600,7 +608,7 @@ static int drm_atomic_plane_set_property(struct drm_plane *plane,if (val && !colorop)return -EACCES ; -drm_atomic_set_colorop_for_plane (state, colorop); + state->color_mgmt_changed |=drm_atomic_set_colorop_for_plane (state, colorop); }else if (property == config->prop_fb_damage_clips) { ret = drm_property_replace_blob_from_id(dev, &state->fb_damage_clips,@@ -709,11 +717,11 @@ drm_atomic_plane_get_property(struct drm_plane *plane,static int drm_atomic_color_set_data_property (struct drm_colorop *colorop,struct drm_colorop_state *state,struct drm_property *property, -uint64_t val) +uint64_t val, +bool *replaced) {ssize_t elem_size =-1 ;ssize_t size =-1 ; -bool replaced = false;switch (colorop->type) {case DRM_COLOROP_1D_LUT :@@ -735,28 +743,39 @@ static int drm_atomic_color_set_data_property(struct drm_colorop *colorop, &state->data, val,-1 , size, elem_size, - &replaced); + replaced); }static int drm_atomic_colorop_set_property (struct drm_colorop *colorop,struct drm_colorop_state *state,struct drm_file *file_priv,struct drm_property *property, -uint64_t val) +uint64_t val, +bool *replaced) {if (property == colorop->bypass_property) { - state->bypass = val; +if (state->bypass != val) { + state->bypass = val; + *replaced = true; + } }else if (property == colorop->lut1d_interpolation_property) { colorop->lut1d_interpolation = val; }else if (property == colorop->curve_1d_type_property) { - state->curve_1d_type = val; +if (state->curve_1d_type != val) { + state->curve_1d_type = val; + *replaced = true; + } }else if (property == colorop->multiplier_property) { - state->multiplier = val; +if (state->multiplier != val) { + state->multiplier = val; + *replaced = true; + } }else if (property == colorop->lut3d_interpolation_property) { colorop->lut3d_interpolation = val; }else if (property == colorop->data_property) {return drm_atomic_color_set_data_property (colorop, state, - property, val); + property, val, + replaced); }else { drm_dbg_atomic(colorop->dev, "[COLOROP:%d:%d] unknown property [PROP:%d:%s]\n",@@ -1273,6 +1292,8 @@ int drm_atomic_set_property(struct drm_atomic_state *state,case DRM_MODE_OBJECT_COLOROP : {struct drm_colorop *colorop =obj_to_colorop (obj);struct drm_colorop_state *colorop_state; +struct drm_plane_state *plane_state; +bool replaced = false; colorop_state =drm_atomic_get_colorop_state (state, colorop);if (IS_ERR (colorop_state)) {@@ -1281,7 +1302,17 @@ int drm_atomic_set_property(struct drm_atomic_state *state, } ret =drm_atomic_colorop_set_property (colorop, colorop_state, - file_priv, prop, prop_value); + file_priv, prop, prop_value, + &replaced); +if (ret || !replaced) +break ; + + plane_state =drm_atomic_get_plane_state (state, colorop->plane); +if (IS_ERR (plane_state)) { + ret =PTR_ERR (plane_state); +break ; + } + plane_state->color_mgmt_changed = true;break ; }default :include/drm/drm_atomic_uapi.h +1
-1@@ -50,7 +50,7 @@ drm_atomic_set_crtc_for_plane(struct drm_plane_state *plane_state, struct drm_crtc *crtc);void drm_atomic_set_fb_for_plane (struct drm_plane_state *plane_state,struct drm_framebuffer *fb); -void drm_atomic_set_colorop_for_plane (struct drm_plane_state *plane_state, +bool drm_atomic_set_colorop_for_plane (struct drm_plane_state *plane_state,struct drm_colorop *colorop); int __must_check drm_atomic_set_crtc_for_connector(struct drm_connector_state *conn_state,
kernel test robot
build botRe: [PATCH 1/2] drm/atomic: track individual colorop updates
In reply to Melissa Wenkernel test robot noticed the following build errors:
Hi Melissa,
kernel test robot noticed the following build errors:
[auto build test ERROR on drm-misc/drm-misc-next]
[also build test ERROR on linus/master v7.0-rc4 next-20260318] [If your patch is applied to the wrong git tree, kindly drop us a note. And when submitting patch, we suggest to use '--base' as documented in
https://git-scm.com/docs/git-format-patch#_base_tree_information]
url: https://github.com/intel-lab-lkp/linux/commits/Melissa-Wen/drm-atomic-track-individual-colorop-updates/20260319-023607 base: https://gitlab.freedesktop.org/drm/misc/kernel.git drm-misc-next patch link: https://lore.kernel.org/r/20260318162348.299807-2-mwen%40igalia.com patch subject: [PATCH 1/2] drm/atomic: track individual colorop updates config: arc-randconfig-002-20260319 (https://download.01.org/0day-ci/archive/20260319/[email protected]/config) compiler: arc-linux-gcc (GCC) 13.4.0 reproduce (this is a W=1 build): (https://download.01.org/0day-ci/archive/20260319/[email protected]/reproduce)
If you fix the issue in a separate patch/commit (i.e. not just a new version of the same patch/commit), kindly add following tags
| Reported-by: kernel test robot <[email protected]>
| Closes: https://lore.kernel.org/oe-kbuild-all/[email protected]/
All errors (new ones prefixed by >>):
In file included from drivers/gpu/drm/msm/msm_atomic.c:7:
>> include/drm/drm_atomic_uapi.h:53:1: error: unknown type name 'bool'
53 | bool drm_atomic_set_colorop_for_plane(struct drm_plane_state *plane_state,
| ^~~~
include/drm/drm_atomic_uapi.h:1:1: note: 'bool' is defined in header '<stdbool.h>'; did you forget to '#include <stdbool.h>'?
+++ |+#include <stdbool.h>
1 | /*vim +/bool +53 include/drm/drm_atomic_uapi.h
41
42 int __must_check
43 drm_atomic_set_mode_for_crtc(struct drm_crtc_state *state,
44 const struct drm_display_mode *mode);
45 int __must_check
46 drm_atomic_set_mode_prop_for_crtc(struct drm_crtc_state *state,
47 struct drm_property_blob *blob);
48 int __must_check
49 drm_atomic_set_crtc_for_plane(struct drm_plane_state *plane_state,
50 struct drm_crtc *crtc);
51 void drm_atomic_set_fb_for_plane(struct drm_plane_state *plane_state,
52 struct drm_framebuffer *fb);
> 53 bool drm_atomic_set_colorop_for_plane(struct drm_plane_state *plane_state,
54 struct drm_colorop *colorop);
55 int __must_check
56 drm_atomic_set_crtc_for_connector(struct drm_connector_state *conn_state,
57 struct drm_crtc *crtc);
58 Signature · 2 lines
0-DAY CI Kernel Test Service https://github.com/intel/lkp-tests/wiki
PATCH 2/2 drm/amd/display: use plane color_mgmt_changed to track colorop changes
In reply to Melissa WenEnsure the driver tracks changes in any colorop property of a plane color pipeline by using the same mechanism of CRTC color management and update plane color blocks when any colorop property changes. It fixes an issue observed on gamescope settings for night mode which is done via shaper/3D-LUT updates.
--- drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-)
drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c +5 -1
@@ -9955,7 +9955,7 @@ static void amdgpu_dm_commit_planes(struct drm_atomic_state *state,continue ; bundle->surface_updates[planes_count].surface = dc_plane; -if (new_pcrtc_state->color_mgmt_changed) { +if (new_pcrtc_state->color_mgmt_changed || new_plane_state->color_mgmt_changed) { bundle->surface_updates[planes_count].gamma = &dc_plane->gamma_correction; bundle->surface_updates[planes_count].in_transfer_func = &dc_plane->in_transfer_func; bundle->surface_updates[planes_count].gamut_remap_matrix = &dc_plane->gamut_remap_matrix;
@@ -11695,6 +11695,10 @@ static bool should_reset_plane(struct drm_atomic_state *state,if (new_crtc_state->color_mgmt_changed)return true; +/* Plane color pipeline or its colorop changes. */ +if (new_plane_state->color_mgmt_changed) +return true; +/* * On zpos change, planes need to be reordered by removing and re-adding * them one by one to the dc state, in order of descending zpos.
Signature · 1 line
2.51.0
Re: [PATCH 2/2] drm/amd/display: use plane color_mgmt_changed to track colorop changes
Quoted 7 lines · Melissa Wen
Ensure the driver tracks changes in any colorop property of a plane color pipeline by using the same mechanism of CRTC color management and update plane color blocks when any colorop property changes. It fixes an issue observed on gamescope settings for night mode which is done via shaper/3D-LUT updates.
Signed-off-by Melissa Wen <[email protected]>
Harry
Quoted 28 lines
--- drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-)drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c +5
-1@@ -9955,7 +9955,7 @@ static void amdgpu_dm_commit_planes(struct drm_atomic_state *state,continue ; bundle->surface_updates[planes_count].surface = dc_plane; -if (new_pcrtc_state->color_mgmt_changed) { +if (new_pcrtc_state->color_mgmt_changed || new_plane_state->color_mgmt_changed) { bundle->surface_updates[planes_count].gamma = &dc_plane->gamma_correction; bundle->surface_updates[planes_count].in_transfer_func = &dc_plane->in_transfer_func; bundle->surface_updates[planes_count].gamut_remap_matrix = &dc_plane->gamut_remap_matrix;@@ -11695,6 +11695,10 @@ static bool should_reset_plane(struct drm_atomic_state *state,if (new_crtc_state->color_mgmt_changed)return true; +/* Plane color pipeline or its colorop changes. */ +if (new_plane_state->color_mgmt_changed) +return true; +/* * On zpos change, planes need to be reordered by removing and re-adding * them one by one to the dc state, in order of descending zpos.