drm/atomic: track colorop changes of a given plane
Subsystems (5)
v3 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.
v1: https://lore.kernel.org/dri-devel/[email protected]/
Changes:
- include linux types for function's bool return type (kernel bot on MSM driver)
- add Harry's r-b tags
v2: https://lore.kernel.org/dri-devel/[email protected]/
Changes:
- [NEW] two patches to only consider colorop updates from active color pipelines (Chaitanya)
- [NEW] make lut interpolation properties mutable + Alex H patch for kernel docs
- track lut(1/3)d_interpolation updates (Chaitanya)
- rebase changes according to new patches
Let me know your thoughts!
[1] https://github.com/ValveSoftware/gamescope/pull/2113
Melissa Wen
Alex Hung (1):
drm/colorop: Remove read-only comments from interpolation fields
Melissa Wen (5):
drm/atomic: only add colorop state from active color pipeline drm/atomic: don't set colorop properties of inactive color pipelines drm/colorop: make lut(1/3)d_interpolation mutable 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.c | 43 +++++---- drivers/gpu/drm/drm_atomic_helper.c | 9 +- drivers/gpu/drm/drm_atomic_uapi.c | 93 +++++++++++++++---- drivers/gpu/drm/drm_colorop.c | 16 +++- include/drm/drm_atomic.h | 2 +- include/drm/drm_atomic_uapi.h | 4 +- include/drm/drm_colorop.h | 34 ++++--- 8 files changed, 136 insertions(+), 71 deletions(-)
Signature · 1 line
2.53.0
PATCH v3 1/6 drm/atomic: only add colorop state from active color pipeline
Instead of adding colorop state of all colorops of a given plane, only get those from an active color pipeline of this plane.
--- drivers/gpu/drm/drm_atomic.c | 39 ++++++++++++++--------------- drivers/gpu/drm/drm_atomic_helper.c | 9 +++---- include/drm/drm_atomic.h | 2 +- 3 files changed, 23 insertions(+), 27 deletions(-)
drivers/gpu/drm/drm_atomic.c +19 -20
@@ -1591,26 +1591,25 @@ drm_atomic_add_affected_planes(struct drm_atomic_state *state,if (IS_ERR (plane_state))return PTR_ERR (plane_state); -if (plane_state->color_pipeline) { - ret =drm_atomic_add_affected_colorops (state, plane); -if (ret) -return ret; - } + ret =drm_atomic_add_affected_colorops (plane_state, plane); +if (ret) +return ret; }return 0 ; }EXPORT_SYMBOL (drm_atomic_add_affected_planes);/** -* drm_atomic_add_affected_colorops - add colorops for plane -* @state: atomic state +* drm_atomic_add_affected_colorops - add active colorops for plane +* @state: DRM plane state * @plane: DRM plane * * This function walks the current configuration and adds all colorops -* currently used by @plane to the atomic configuration @state. This is useful -* when an atomic commit also needs to check all currently enabled colorop on -* @plane, e.g. when changing the mode. It's also useful when re-enabling a plane -* to avoid special code to force-enable all colorops. +* currently used by an active color pipeline set for a @plane to the atomic +* configuration @state. This is useful when an atomic commit also needs to +* check all currently enabled colorop on @plane, e.g. when changing the mode. +* It's also useful when re-enabling a plane to avoid special code to +* force-enable all colorops. * * Since acquiring a colorop state will always also acquire the w/w mutex of the * current plane for that colorop (if there is any) adding all the colorop states for
@@ -1622,23 +1621,23 @@ EXPORT_SYMBOL(drm_atomic_add_affected_planes);* sequence must be restarted. All other errors are fatal. */ int -drm_atomic_add_affected_colorops (struct drm_atomic_state *state, +drm_atomic_add_affected_colorops (struct drm_plane_state *plane_state,struct drm_plane *plane) {struct drm_colorop *colorop;struct drm_colorop_state *colorop_state; -WARN_ON (!drm_atomic_get_new_plane_state (state, plane)); +if (!plane_state || !plane_state->color_pipeline) +return 0 ;drm_dbg_atomic (plane->dev, -"Adding all current colorops for [PLANE:%d:%s] to %p\n" , - plane->base.id, plane->name, state); +"Adding all current active colorops for [PLANE:%d:%s] to %p\n" , + plane->base.id, plane->name, plane_state->state); -drm_for_each_colorop (colorop, plane->dev) { -if (colorop->plane != plane) -continue ; - - colorop_state =drm_atomic_get_colorop_state (state, colorop); +for (colorop = plane_state->color_pipeline; + colorop; + colorop = colorop->next) { + colorop_state =drm_atomic_get_colorop_state (plane_state->state, colorop);if (IS_ERR (colorop_state))return PTR_ERR (colorop_state); }
drivers/gpu/drm/drm_atomic_helper.c +3 -6
@@ -3752,12 +3752,9 @@ drm_atomic_helper_duplicate_state(struct drm_device *dev, goto free; } -if (plane_state->color_pipeline) { - err =drm_atomic_add_affected_colorops (state, plane); -if (err) - goto free; - } - + err =drm_atomic_add_affected_colorops (plane_state, plane); +if (err) + goto free; }drm_connector_list_iter_begin (dev, &conn_iter);
include/drm/drm_atomic.h +1 -1
@@ -919,7 +919,7 @@ int __must_check drm_atomic_add_affected_planes(struct drm_atomic_state *state, struct drm_crtc *crtc);int __must_check -drm_atomic_add_affected_colorops (struct drm_atomic_state *state, +drm_atomic_add_affected_colorops (struct drm_plane_state *state,struct drm_plane *plane);int __must_check drm_atomic_check_only (struct drm_atomic_state *state);
Signature · 1 line
2.53.0
PATCH v3 2/6 drm/atomic: don't set colorop properties of inactive color pipelines
In reply to Melissa WenReject attempts to change property values of a colorop that is not part of an active plane color pipeline.
--- drivers/gpu/drm/drm_atomic_uapi.c | 34 ++++++++++++++++++++++++++----- 1 file changed, 29 insertions(+), 5 deletions(-)
drivers/gpu/drm/drm_atomic_uapi.c +29 -5
@@ -1275,15 +1275,38 @@ int drm_atomic_set_property(struct drm_atomic_state *state,break ; }case DRM_MODE_OBJECT_COLOROP : { -struct drm_colorop *colorop =obj_to_colorop (obj); -struct drm_colorop_state *colorop_state; +struct drm_colorop *active_colorop, *colorop =obj_to_colorop (obj); +struct drm_colorop_state *colorop_state =NULL ; +struct drm_plane_state *plane_state; - colorop_state =drm_atomic_get_colorop_state (state, colorop); -if (IS_ERR (colorop_state)) { - ret =PTR_ERR (colorop_state); + plane_state =drm_atomic_get_plane_state (state, colorop->plane); +if (IS_ERR (plane_state)) { + ret =PTR_ERR (plane_state);break ; } +/* Check if the colorop obj is part of an active color pipeline */ +for (active_colorop = plane_state->color_pipeline; + active_colorop; + active_colorop = active_colorop->next) { +if (active_colorop == colorop) { + colorop_state =drm_atomic_get_colorop_state (state, colorop); +if (IS_ERR (colorop_state)) { + ret =PTR_ERR (colorop_state); + goto err; + } +break ; + } + } + +if (!colorop_state) { +drm_dbg_atomic (prop->dev, +"[COLOROP:%d:%d] not part of the active pipeline\n" , + obj->id, colorop->type); + ret = -EINVAL ; + goto err; + } + ret =drm_atomic_colorop_set_property (colorop, colorop_state, file_priv, prop, prop_value);break ;
@@ -1294,6 +1317,7 @@ int drm_atomic_set_property(struct drm_atomic_state *state,break ; } +err:drm_property_change_valid_put (prop, ref);return ret; }
Signature · 1 line
2.53.0
PATCH v3 3/6 drm/colorop: Remove read-only comments from interpolation fields
In reply to Melissa WenFrom: Alex Hung <[email protected]>
The lut1d_interpolation and lut3d_interpolation fields and their associated properties were marked as read-only, but userspace can set them via drm_atomic_colorop_set_property().
--- include/drm/drm_colorop.h | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-)
include/drm/drm_colorop.h +2 -4
@@ -309,7 +309,6 @@ struct drm_colorop {/** * @lut1d_interpolation: * -* Read-only * Interpolation for DRM_COLOROP_1D_LUT */ enum drm_colorop_lut1d_interpolation_type lut1d_interpolation;
@@ -317,7 +316,6 @@ struct drm_colorop {/** * @lut3d_interpolation: * -* Read-only * Interpolation for DRM_COLOROP_3D_LUT */ enum drm_colorop_lut3d_interpolation_type lut3d_interpolation;
@@ -325,7 +323,7 @@ struct drm_colorop {/** * @lut1d_interpolation_property: * -* Read-only property for DRM_COLOROP_1D_LUT interpolation +* Property for DRM_COLOROP_1D_LUT interpolation */ struct drm_property *lut1d_interpolation_property;
@@ -353,7 +351,7 @@ struct drm_colorop {/** * @lut3d_interpolation_property: * -* Read-only property for DRM_COLOROP_3D_LUT interpolation +* Property for DRM_COLOROP_3D_LUT interpolation */ struct drm_property *lut3d_interpolation_property;
Signature · 1 line
2.53.0
PATCH v3 4/6 drm/colorop: make lut(1/3)d_interpolation mutable
In reply to Melissa WenAs it's not immutable anymore, any changes should be handled by drm_colorop_state. Move their enum and make it correctly behaves as mutable.
--- drivers/gpu/drm/drm_atomic.c | 4 ++-- drivers/gpu/drm/drm_atomic_uapi.c | 8 ++++---- drivers/gpu/drm/drm_colorop.c | 16 ++++++++++++++-- include/drm/drm_colorop.h | 28 ++++++++++++++-------------- 4 files changed, 34 insertions(+), 22 deletions(-)
drivers/gpu/drm/drm_atomic.c +2 -2
@@ -830,7 +830,7 @@ static void drm_atomic_colorop_print_state(struct drm_printer *p,case DRM_COLOROP_1D_LUT :drm_printf (p,"\tsize=%d\n" , colorop->size);drm_printf (p,"\tinterpolation=%s\n" , -drm_get_colorop_lut1d_interpolation_name (colorop->lut1d_interpolation)); +drm_get_colorop_lut1d_interpolation_name (state->lut1d_interpolation));drm_printf (p,"\tdata blob id=%d\n" , state->data ? state->data->base.id :0 );break ;case DRM_COLOROP_CTM_3X4 :
@@ -842,7 +842,7 @@ static void drm_atomic_colorop_print_state(struct drm_printer *p,case DRM_COLOROP_3D_LUT :drm_printf (p,"\tsize=%d\n" , colorop->size);drm_printf (p,"\tinterpolation=%s\n" , -drm_get_colorop_lut3d_interpolation_name (colorop->lut3d_interpolation)); +drm_get_colorop_lut3d_interpolation_name (state->lut3d_interpolation));drm_printf (p,"\tdata blob id=%d\n" , state->data ? state->data->base.id :0 );break ;default :
drivers/gpu/drm/drm_atomic_uapi.c +4 -4
@@ -751,13 +751,13 @@ static int drm_atomic_colorop_set_property(struct drm_colorop *colorop,if (property == colorop->bypass_property) { state->bypass = val; }else if (property == colorop->lut1d_interpolation_property) { - colorop->lut1d_interpolation = val; + state->lut1d_interpolation = val; }else if (property == colorop->curve_1d_type_property) { state->curve_1d_type = val; }else if (property == colorop->multiplier_property) { state->multiplier = val; }else if (property == colorop->lut3d_interpolation_property) { - colorop->lut3d_interpolation = val; + state->lut3d_interpolation = val; }else if (property == colorop->data_property) {return drm_atomic_color_set_data_property (colorop, state, property, val);
@@ -782,7 +782,7 @@ drm_atomic_colorop_get_property(struct drm_colorop *colorop,else if (property == colorop->bypass_property) *val = state->bypass;else if (property == colorop->lut1d_interpolation_property) - *val = colorop->lut1d_interpolation; + *val = state->lut1d_interpolation;else if (property == colorop->curve_1d_type_property) *val = state->curve_1d_type;else if (property == colorop->multiplier_property)
@@ -790,7 +790,7 @@ drm_atomic_colorop_get_property(struct drm_colorop *colorop,else if (property == colorop->size_property) *val = colorop->size;else if (property == colorop->lut3d_interpolation_property) - *val = colorop->lut3d_interpolation; + *val = state->lut3d_interpolation;else if (property == colorop->data_property) *val = (state->data) ? state->data->base.id :0 ;else
drivers/gpu/drm/drm_colorop.c +14 -2
@@ -342,7 +342,6 @@ int drm_plane_colorop_curve_1d_lut_init(struct drm_device *dev, struct drm_color colorop->lut1d_interpolation_property = prop;drm_object_attach_property (&colorop->base, prop, interpolation); - colorop->lut1d_interpolation = interpolation;/* data */ ret =drm_colorop_create_data_prop (dev, colorop);
@@ -442,7 +441,6 @@ int drm_plane_colorop_3dlut_init(struct drm_device *dev, struct drm_colorop *col colorop->lut3d_interpolation_property = prop;drm_object_attach_property (&colorop->base, prop, interpolation); - colorop->lut3d_interpolation = interpolation;/* data */ ret =drm_colorop_create_data_prop (dev, colorop);
@@ -521,6 +519,20 @@ static void __drm_colorop_state_reset(struct drm_colorop_state *colorop_state, &val); colorop_state->curve_1d_type = val; } + +if (colorop->lut1d_interpolation_property) { +drm_object_property_get_default_value (&colorop->base, + colorop->lut1d_interpolation_property, + &val); + colorop_state->lut1d_interpolation = val; + } + +if (colorop->lut3d_interpolation_property) { +drm_object_property_get_default_value (&colorop->base, + colorop->lut3d_interpolation_property, + &val); + colorop_state->lut3d_interpolation = val; + } }/**
include/drm/drm_colorop.h +14 -14
@@ -183,6 +183,20 @@ struct drm_colorop_state {*/ struct drm_property_blob *data; +/** +* @lut1d_interpolation: +* +* Interpolation for DRM_COLOROP_1D_LUT +*/ +enum drm_colorop_lut1d_interpolation_type lut1d_interpolation; + +/** +* @lut3d_interpolation: +* +* Interpolation for DRM_COLOROP_3D_LUT +*/ +enum drm_colorop_lut3d_interpolation_type lut3d_interpolation; +/** @state: backpointer to global drm_atomic_state */ struct drm_atomic_state *state; };
@@ -306,20 +320,6 @@ struct drm_colorop {*/ uint32_t size; -/** -* @lut1d_interpolation: -* -* Interpolation for DRM_COLOROP_1D_LUT -*/ -enum drm_colorop_lut1d_interpolation_type lut1d_interpolation; - -/** -* @lut3d_interpolation: -* -* Interpolation for DRM_COLOROP_3D_LUT -*/ -enum drm_colorop_lut3d_interpolation_type lut3d_interpolation; -/** * @lut1d_interpolation_property: *
Signature · 1 line
2.53.0
PATCH v3 5/6 drm/atomic: track individual colorop updates
In reply to Melissa WenAs 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.
--
v2: add linux types to provide bool for MSM driver (kernel bot) v3:
- track lut1d/3d_interpolation changes (Chaitanya)
--- drivers/gpu/drm/drm_atomic_uapi.c | 55 +++++++++++++++++++++++-------- include/drm/drm_atomic_uapi.h | 4 ++- 2 files changed, 45 insertions(+), 14 deletions(-)
drivers/gpu/drm/drm_atomic_uapi.c +42 -13
@@ -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);
@@ -604,7 +612,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,
@@ -713,11 +721,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 :
@@ -739,28 +747,45 @@ 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) { - state->lut1d_interpolation = val; +if (state->lut1d_interpolation != val) { + state->lut1d_interpolation = val; + *replaced = true; + } }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) { - state->lut3d_interpolation = val; +if (state->lut3d_interpolation != val) { + state->lut3d_interpolation = val; + *replaced = true; + } }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",
@@ -1278,6 +1303,7 @@ int drm_atomic_set_property(struct drm_atomic_state *state,struct drm_colorop *active_colorop, *colorop =obj_to_colorop (obj);struct drm_colorop_state *colorop_state =NULL ;struct drm_plane_state *plane_state; +bool replaced = false; plane_state =drm_atomic_get_plane_state (state, colorop->plane);if (IS_ERR (plane_state)) {
@@ -1308,7 +1334,10 @@ 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) + plane_state->color_mgmt_changed = true;break ; }default :
include/drm/drm_atomic_uapi.h +3 -1
@@ -29,6 +29,8 @@#ifndef DRM_ATOMIC_UAPI_H_ #define DRM_ATOMIC_UAPI_H_ +#include <linux/types.h> +struct drm_crtc_state ;struct drm_display_mode ;struct drm_property_blob ;
@@ -50,7 +52,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.53.0
PATCH v3 6/6 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
@@ -10077,7 +10077,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;
@@ -11818,6 +11818,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.53.0