drm/atomic: track individual colorop updates
Subsystems (5)
v6 cover drm/atomic: track individual colorop updates
This series aims to track updates for each individual color operation, allowing the driver to react accordingly.
- Patches 1 and 2 make colorop update process more consistent and optimized by only keeping colorop states from active color pipelines. Due to ordering dependency, attempts to update inactive colorops are not rejected at property setting time, but only later during atomic check.
- Patches 3 and 4 make lut1d_interpolation and lut3d_interpolation colorops correctly behave as mutable, handling their changes via drm_colorop_state.
- Finally, patches 5 and 6 track colorop updates of a given plane color pipeline by setting plane color_mgmt_changed flag, similar to what is done for tracking CRTC color mgmt property changes with CRTC color_mgmt_changed flag. The flag also tracks when a different color pipeline is set to a given plane. That way, the driver can react accordingly and update their color blocks.
It also fixes shaper/3D LUT updates when changing night mode settings on gamescope with a custom branch that supports COLOR_PIPELINE:
- https://github.com/ValveSoftware/gamescope/pull/2113
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
v3: https://lore.kernel.org/dri-devel/[email protected]/
Changes: rebase on drm-misc-next
v4: https://lore.kernel.org/dri-devel/[email protected]/
Changes: fix kernel doc (kernel bot)
v5: https://lore.kernel.org/dri-devel/[email protected]/
Changes:
- rebase on drm-misc-next
- fix kernel-doc and correctly reword (atomic) state to plane_state (Chaitanya)
- reject inactive colorop updates in atomic check time, instead of during property's setup, to avoid ordering dependency as pointed out by Chaitanya
- use |= replaced for consistency (Chaitanya)
- add Chaitanya's r-b tags to patches 1,3-5
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: reject colorop update from inactive color pipeline 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 | 82 ++++++++++++++----- drivers/gpu/drm/drm_atomic_helper.c | 9 +- drivers/gpu/drm/drm_atomic_uapi.c | 68 +++++++++++---- 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, 155 insertions(+), 66 deletions(-)
Signature · 1 line
2.53.0
PATCH v6 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.
---
v5: fix kernel-doc for plane_state (kernel bot)
v6: correctly reword state to plane_state (Chaitanya)
--- drivers/gpu/drm/drm_atomic.c | 40 ++++++++++++++--------------- drivers/gpu/drm/drm_atomic_helper.c | 9 +++---- include/drm/drm_atomic.h | 2 +- 3 files changed, 24 insertions(+), 27 deletions(-)
drivers/gpu/drm/drm_atomic.c +20 -20
@@ -1591,26 +1591,26 @@ drm_atomic_add_affected_planes(struct drm_atomic_commit *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 +* @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 a @plane to the atomic plane configuration @plane_state. +* It only adds colorops that belong to an active color pipeline, i.e., +* colorops that are in the chain set to the plane's color_pipeline property. +* This function is useful when an atomic commit needs to check all currently +* enabled colorop on @plane, e.g. when changing the mode; and 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 +1622,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_commit *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_commit *state, struct drm_crtc *crtc);int __must_check -drm_atomic_add_affected_colorops (struct drm_atomic_commit *state, +drm_atomic_add_affected_colorops (struct drm_plane_state *plane_state,struct drm_plane *plane);int __must_check drm_atomic_check_only (struct drm_atomic_commit *state);
Signature · 1 line
2.53.0
PATCH v6 2/6 drm/atomic: reject colorop update from inactive color pipeline
In reply to Melissa WenOnly allow updates on colorops that are part of an active pipeline. Check if a colorop in a new state belongs to a color pipeline which was set as a plane color_pipeline property and therefore is an active color pipeline. If not, reject the atomic state. Performing this check later in drm_atomic_check_only() to remove the ordering dependency that would exist if done at the time of colorop property setting.
--- drivers/gpu/drm/drm_atomic.c | 38 ++++++++++++++++++++++++++++++++++++ 1 file changed, 38 insertions(+)
drivers/gpu/drm/drm_atomic.c +38 -0
@@ -812,6 +812,33 @@ static int drm_atomic_plane_check(const struct drm_plane_state *old_plane_state,return 0 ; } +/** +* drm_atomic_colorop_check - check new colorop state +* @new_colorop_state: new colorop state to check +* +* Ensure that the colorop in @new_colorop_state belongs to an active color +* pipeline, i.e. it's in the chain of colorops set to the color_pipeline +* property of a plane state. +* +* Returns: 0 on success, -EINVAL otherwise. +*/ +static int drm_atomic_colorop_check (const struct drm_colorop_state *new_colorop_state) +{ +struct drm_colorop *colorop, *color_pipeline; +struct drm_plane_state *new_plane_state; + + new_plane_state =drm_atomic_get_new_plane_state (new_colorop_state->state, + new_colorop_state->colorop->plane); + color_pipeline = new_plane_state ? new_plane_state->color_pipeline : + new_colorop_state->colorop->plane->state->color_pipeline; + +for (colorop = color_pipeline; colorop; colorop = colorop->next) +if (colorop == new_colorop_state->colorop) +return 0 ; + +return -EINVAL ; +} +static void drm_atomic_colorop_print_state (struct drm_printer *p,const struct drm_colorop_state *state) {
@@ -1665,6 +1692,8 @@ int drm_atomic_check_only(struct drm_atomic_commit *state)struct drm_plane *plane;struct drm_plane_state *old_plane_state;struct drm_plane_state *new_plane_state; +struct drm_colorop *colorop; +struct drm_colorop_state *new_colorop_state;struct drm_crtc *crtc;struct drm_crtc_state *old_crtc_state;struct drm_crtc_state *new_crtc_state;
@@ -1681,6 +1710,15 @@ int drm_atomic_check_only(struct drm_atomic_commit *state) requested_crtc |=drm_crtc_mask (crtc); } +for_each_new_colorop_in_state (state, colorop, new_colorop_state, i) { + ret =drm_atomic_colorop_check (new_colorop_state); +if (ret) { +drm_dbg_atomic (dev,"[COLOROP:%d:%d] is not part of an active color pipeline.\n" , + colorop->base.id, colorop->type); +return ret; + } + } +for_each_oldnew_plane_in_state (state, plane, old_plane_state, new_plane_state, i) { ret =drm_atomic_plane_check (old_plane_state, new_plane_state);if (ret) {
Signature · 1 line
2.53.0
Re: [PATCH v6 2/6] drm/atomic: reject colorop update from inactive color pipeline
Quoted 38 lines · Melissa Wen
Only allow updates on colorops that are part of an active pipeline. Check if a colorop in a new state belongs to a color pipeline which was set as a plane
color_pipelineproperty and therefore is an active color pipeline. If not, reject the atomic state. Performing this check later indrm_atomic_check_only()to remove the ordering dependency that would exist if done at the time of colorop property setting.Suggested-by Chaitanya Kumar Borah <[email protected]>Signed-off-by Melissa Wen <[email protected]>--- drivers/gpu/drm/drm_atomic.c | 38 ++++++++++++++++++++++++++++++++++++ 1 file changed, 38 insertions(+)drivers/gpu/drm/drm_atomic.c +17
-0@@ -812,6 +812,33 @@ static int drm_atomic_plane_check(const struct drm_plane_state *old_plane_state,return 0 ; } +/** +* drm_atomic_colorop_check - check new colorop state +* @new_colorop_state: new colorop state to check +* +* Ensure that the colorop in @new_colorop_state belongs to an active color +* pipeline, i.e. it's in the chain of colorops set to the color_pipeline +* property of a plane state. +* +* Returns: 0 on success, -EINVAL otherwise. +*/ +static int drm_atomic_colorop_check (const struct drm_colorop_state *new_colorop_state) +{ +struct drm_colorop *colorop, *color_pipeline; +struct drm_plane_state *new_plane_state; + + new_plane_state =drm_atomic_get_new_plane_state (new_colorop_state->state, + new_colorop_state->colorop->plane);
drivers/gpu/drm/drm_atomic.c static int drm_atomic_plane_check(const struct drm_plane_state *old_plane_state, · line 841
Quoted 10 lines
drivers/gpu/drm/drm_atomic.c +10
-0+ color_pipeline = new_plane_state ? new_plane_state->color_pipeline : + new_colorop_state->colorop->plane->state->color_pipeline; + +for (colorop = color_pipeline; colorop; colorop = colorop->next) +if (colorop == new_colorop_state->colorop) +return 0 ; + +return -EINVAL ; +} +
This causes regression in our CI[1].
I looked into it and looks like the following sequence in igt@kms_color_pipeline causes the error
set_color_pipeline_bypass(plane);
reset_colorops(colorops);
igt_plane_set_fb(plane, NULL);
igt_display_commit_atomic(&data->display, 0, NULL);So this change restricts bypassing/disabling both the pipeline and a colorop within it in a single commit.
Also Sashiko had the following to say
"Furthermore, does this unnecessarily restrict UAPI by preventing userspace from configuring inactive pipelines before enabling them, or from resetting properties on a pipeline in the same commit that switches away from it?"
So this will also fail a commit which tries to change a pipeline and disable the colorops in an old pipeline.
That got me thinking whether the first patch[3] in the series is also correct, since it is quite similar to the change[4] I added, where colorops are only added to the state when a pipeline is active. In both cases, we could end up ignoring colorops that are not part of the currently selected pipeline.
[1] https://intel-gfx-ci.01.org/tree/intel-xe/xe-pw-166922v1/shard-lnl-5/igt@kms_color_pipeline@[email protected]
[2] https://sashiko.dev/#/patchset/20260520073827.3395745-3-chaitanya.kumar.borah%40intel.com
[3] https://lore.kernel.org/dri-devel/[email protected]/
[4] https://lore.kernel.org/dri-devel/[email protected]/
P.S. Can you please send the next version to intel-gfx and intel-xe too?
==
Chaitanya
Quoted 28 lines
drivers/gpu/drm/drm_atomic.c +11
-0static void drm_atomic_colorop_print_state (struct drm_printer *p,const struct drm_colorop_state *state) {@@ -1665,6 +1692,8 @@ int drm_atomic_check_only(struct drm_atomic_commit *state)struct drm_plane *plane;struct drm_plane_state *old_plane_state;struct drm_plane_state *new_plane_state; +struct drm_colorop *colorop; +struct drm_colorop_state *new_colorop_state;struct drm_crtc *crtc;struct drm_crtc_state *old_crtc_state;struct drm_crtc_state *new_crtc_state;@@ -1681,6 +1710,15 @@ int drm_atomic_check_only(struct drm_atomic_commit *state) requested_crtc |=drm_crtc_mask (crtc); } +for_each_new_colorop_in_state (state, colorop, new_colorop_state, i) { + ret =drm_atomic_colorop_check (new_colorop_state); +if (ret) { +drm_dbg_atomic (dev,"[COLOROP:%d:%d] is not part of an active color pipeline.\n" , + colorop->base.id, colorop->type); +return ret; + } + } +for_each_oldnew_plane_in_state (state, plane, old_plane_state, new_plane_state, i) { ret =drm_atomic_plane_check (old_plane_state, new_plane_state);if (ret) {
Re: [PATCH v6 2/6] drm/atomic: reject colorop update from inactive color pipeline
Quoted 68 lines · Chaitanya Kumar
Quoted 45 lines · Melissa Wen
Only allow updates on colorops that are part of an active pipeline. Check if a colorop in a new state belongs to a color pipeline which was set as a plane
color_pipelineproperty and therefore is an active color pipeline. If not, reject the atomic state. Performing this check later indrm_atomic_check_only()to remove the ordering dependency that would exist if done at the time of colorop property setting.Suggested-by Chaitanya Kumar Borah <[email protected]>Signed-off-by Melissa Wen <[email protected]>---
drivers/gpu/drm/drm_atomic.c| 38 ++++++++++++++++++++++++++++++++++++1 file changed, 38 insertions(+)drivers/gpu/drm/drm_atomic.c +0
-0@@ -812,6 +812,33 @@ static int drm_atomic_plane_check(const struct drm_plane_state *old_plane_state, return 0; }+/**
+ *drm_atomic_colorop_check- check new colorop state
+ * @new_colorop_state: new colorop state to check
+ *
+ * Ensure that the colorop in @new_colorop_state belongs to an active color
+ * pipeline, i.e. it's in the chain of colorops set to thecolor_pipeline
+ * property of a plane state.
+ *
+ * Returns: 0 on success,-EINVALotherwise.
+ */
+static intdrm_atomic_colorop_check(const struct drm_colorop_state *new_colorop_state)drivers/gpu/drm/drm_atomic.c +5
-0+{ + struct drm_colorop *colorop, *color_pipeline; + struct drm_plane_state *new_plane_state; + + new_plane_state =drm_atomic_get_new_plane_state(new_colorop_state->state,
+new_colorop_state->colorop->plane);
+color_pipeline=new_plane_state?new_plane_state->color_pipeline:
+new_colorop_state->colorop->plane->state->color_pipeline;drivers/gpu/drm/drm_atomic.c static int drm_atomic_plane_check(const struct drm_plane_state *old_plane_state, · line 841
Quoted 8 lines
drivers/gpu/drm/drm_atomic.c +8
-0+ + for (colorop = color_pipeline; colorop; colorop = colorop->next) + if (colorop == new_colorop_state->colorop) + return 0; + + return -EINVAL; +} +This causes regression in our CI[1].
I looked into it and looks like the following sequence in igt@kms_color_pipeline causes the error
set_color_pipeline_bypass(plane);reset_colorops(colorops);igt_plane_set_fb(plane, NULL);igt_display_commit_atomic(&data->display, 0, NULL);So this change restricts bypassing/disabling both the pipeline and a colorop within it in a single commit.
Quoted 7 lines
Also Sashiko had the following to say
"Furthermore, does this unnecessarily restrict UAPI by preventing userspace from configuring inactive pipelines before enabling them, or from resetting properties on a pipeline in the same commit that switches away from it?"
So this will also fail a commit which tries to change a pipeline and disable the colorops in an old pipeline.
I wonder if userspace resetting colorops to disable a pipeline or configuring colorops before enabling the color pipeline is an expected behavior.
For resetting properties, I think I can solve it by taking into account old and new state to collect the active colorops, not only the new state.
But if configuring colorops before activate a color pipeline is expected, there is no need to have patches 1 and 2, since setting an inactive colorop have to be allowed. In that case, the solution is just drop both patches from the series.
Melissa
Quoted 43 lines
That got me thinking whether the first patch[3] in the series is also correct, since it is quite similar to the change[4] I added, where colorops are only added to the state when a pipeline is active. In both cases, we could end up ignoring colorops that are not part of the currently selected pipeline.
[1] https://intel-gfx-ci.01.org/tree/intel-xe/xe-pw-166922v1/shard-lnl-5/igt@kms_color_pipeline@[email protected]
[2] https://sashiko.dev/#/patchset/20260520073827.3395745-3-chaitanya.kumar.borah%40intel.com
[3] https://lore.kernel.org/dri-devel/[email protected]/
[4] https://lore.kernel.org/dri-devel/[email protected]/
P.S. Can you please send the next version to intel-gfx and intel-xe too?==
ChaitanyaQuoted 30 lines
static void
drm_atomic_colorop_print_state(struct drm_printer *p, const struct drm_colorop_state *state){drivers/gpu/drm/drm_atomic.c +2
-0@@ -1665,6 +1692,8 @@ int drm_atomic_check_only(struct drm_atomic_commit *state) struct drm_plane *plane; struct drm_plane_state *old_plane_state; struct drm_plane_state *new_plane_state; + struct drm_colorop *colorop; + struct drm_colorop_state *new_colorop_state; struct drm_crtc *crtc; struct drm_crtc_state *old_crtc_state;struct
drm_crtc_state*new_crtc_state;drivers/gpu/drm/drm_atomic.c +8
-0@@ -1681,6 +1710,15 @@ int drm_atomic_check_only(struct drm_atomic_commit *state) requested_crtc |= drm_crtc_mask(crtc); } + for_each_new_colorop_in_state(state, colorop, new_colorop_state, i) { + ret = drm_atomic_colorop_check(new_colorop_state); + if (ret) { + drm_dbg_atomic(dev, "[COLOROP:%d:%d] is not part of an active color pipeline.\n", + colorop->base.id, colorop->type); + return ret; + } + } + for_each_oldnew_plane_in_state(state, plane, old_plane_state, new_plane_state, i) {ret =
drm_atomic_plane_check(old_plane_state, new_plane_state); if (ret) {
Re: [PATCH v6 2/6] drm/atomic: reject colorop update from inactive color pipeline
In reply to Borah, Chaitanya KumarQuoted 59 lines · Chaitanya Kumar
Quoted 45 lines · Melissa Wen
Only allow updates on colorops that are part of an active pipeline. Check if a colorop in a new state belongs to a color pipeline which was set as a plane
color_pipelineproperty and therefore is an active color pipeline. If not, reject the atomic state. Performing this check later indrm_atomic_check_only()to remove the ordering dependency that would exist if done at the time of colorop property setting.Suggested-by Chaitanya Kumar Borah <[email protected]>Signed-off-by Melissa Wen <[email protected]>---
drivers/gpu/drm/drm_atomic.c| 38 ++++++++++++++++++++++++++++++++++++1 file changed, 38 insertions(+)drivers/gpu/drm/drm_atomic.c +0
-0@@ -812,6 +812,33 @@ static int drm_atomic_plane_check(const struct drm_plane_state *old_plane_state, return 0; }+/**
+ *drm_atomic_colorop_check- check new colorop state
+ * @new_colorop_state: new colorop state to check
+ *
+ * Ensure that the colorop in @new_colorop_state belongs to an active color
+ * pipeline, i.e. it's in the chain of colorops set to thecolor_pipeline
+ * property of a plane state.
+ *
+ * Returns: 0 on success,-EINVALotherwise.
+ */
+static intdrm_atomic_colorop_check(const struct drm_colorop_state *new_colorop_state)drivers/gpu/drm/drm_atomic.c +5
-0+{ + struct drm_colorop *colorop, *color_pipeline; + struct drm_plane_state *new_plane_state; + + new_plane_state =drm_atomic_get_new_plane_state(new_colorop_state->state,
+new_colorop_state->colorop->plane);
+color_pipeline=new_plane_state?new_plane_state->color_pipeline:
+new_colorop_state->colorop->plane->state->color_pipeline;drivers/gpu/drm/drm_atomic.c static int drm_atomic_plane_check(const struct drm_plane_state *old_plane_state, · line 841
Quoted 8 lines
drivers/gpu/drm/drm_atomic.c +8
-0+ + for (colorop = color_pipeline; colorop; colorop = colorop->next) + if (colorop == new_colorop_state->colorop) + return 0; + + return -EINVAL; +} +This causes regression in our CI[1].
Quoted 8 lines
I looked into it and looks like the following sequence in igt@kms_color_pipeline causes the error
set_color_pipeline_bypass(plane);reset_colorops(colorops);igt_plane_set_fb(plane, NULL);igt_display_commit_atomic(&data->display, 0, NULL);So this change restricts bypassing/disabling both the pipeline and a colorop within it in a single commit.
Oops, cc'ing everyone.
"
I wonder if userspace resetting colorops to disable a pipeline or configuring colorops before enabling the color pipeline is an expected behavior.
For resetting properties, I think I can solve it by taking into account old and new state to collect the active colorops, not only the new state.
But if configuring colorops before activate a color pipeline is expected, there is no need to have patches 1 and 2, since setting an inactive colorop have to be allowed. In that case, the solution is just drop both patches from the series. "
Melissa
Quoted 51 lines
Also Sashiko had the following to say
"Furthermore, does this unnecessarily restrict UAPI by preventing userspace from configuring inactive pipelines before enabling them, or from resetting properties on a pipeline in the same commit that switches away from it?"
So this will also fail a commit which tries to change a pipeline and disable the colorops in an old pipeline.
That got me thinking whether the first patch[3] in the series is also correct, since it is quite similar to the change[4] I added, where colorops are only added to the state when a pipeline is active. In both cases, we could end up ignoring colorops that are not part of the currently selected pipeline.
[1] https://intel-gfx-ci.01.org/tree/intel-xe/xe-pw-166922v1/shard-lnl-5/igt@kms_color_pipeline@[email protected]
[2] https://sashiko.dev/#/patchset/20260520073827.3395745-3-chaitanya.kumar.borah%40intel.com
[3] https://lore.kernel.org/dri-devel/[email protected]/
[4] https://lore.kernel.org/dri-devel/[email protected]/
P.S. Can you please send the next version to intel-gfx and intel-xe too?==
ChaitanyaQuoted 30 lines
static void
drm_atomic_colorop_print_state(struct drm_printer *p, const struct drm_colorop_state *state){drivers/gpu/drm/drm_atomic.c +2
-0@@ -1665,6 +1692,8 @@ int drm_atomic_check_only(struct drm_atomic_commit *state) struct drm_plane *plane; struct drm_plane_state *old_plane_state; struct drm_plane_state *new_plane_state; + struct drm_colorop *colorop; + struct drm_colorop_state *new_colorop_state; struct drm_crtc *crtc; struct drm_crtc_state *old_crtc_state;struct
drm_crtc_state*new_crtc_state;drivers/gpu/drm/drm_atomic.c +8
-0@@ -1681,6 +1710,15 @@ int drm_atomic_check_only(struct drm_atomic_commit *state) requested_crtc |= drm_crtc_mask(crtc); } + for_each_new_colorop_in_state(state, colorop, new_colorop_state, i) { + ret = drm_atomic_colorop_check(new_colorop_state); + if (ret) { + drm_dbg_atomic(dev, "[COLOROP:%d:%d] is not part of an active color pipeline.\n", + colorop->base.id, colorop->type); + return ret; + } + } + for_each_oldnew_plane_in_state(state, plane, old_plane_state, new_plane_state, i) {ret =
drm_atomic_plane_check(old_plane_state, new_plane_state); if (ret) {
PATCH v6 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 v6 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.
---
v6:
- check drm_object_property_get_default_value() before set interp props
--- 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
@@ -857,7 +857,7 @@ static void drm_atomic_colorop_print_state(struct drm_printer *p,case DRM_COLOROP_1D_LUT :drm_printf_indent (p,1 ,"size=%d\n" , colorop->size);drm_printf_indent (p,1 ,"interpolation=%s\n" , -drm_get_colorop_lut1d_interpolation_name (colorop->lut1d_interpolation)); +drm_get_colorop_lut1d_interpolation_name (state->lut1d_interpolation));drm_printf_indent (p,1 ,"data blob id=%d\n" , state->data ? state->data->base.id :0 );break ;case DRM_COLOROP_CTM_3X4 :
@@ -869,7 +869,7 @@ static void drm_atomic_colorop_print_state(struct drm_printer *p,case DRM_COLOROP_3D_LUT :drm_printf_indent (p,1 ,"size=%d\n" , colorop->size);drm_printf_indent (p,1 ,"interpolation=%s\n" , -drm_get_colorop_lut3d_interpolation_name (colorop->lut3d_interpolation)); +drm_get_colorop_lut3d_interpolation_name (state->lut3d_interpolation));drm_printf_indent (p,1 ,"data 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) { +if (!drm_object_property_get_default_value (&colorop->base, + colorop->lut1d_interpolation_property, + &val)); + colorop_state->lut1d_interpolation = val; + } + +if (colorop->lut3d_interpolation_property) { +if (!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_commit */ struct drm_atomic_commit *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
Re: [PATCH v6 4/6] drm/colorop: make lut(1/3)d_interpolation mutable
Quoted 106 lines · Melissa Wen
As it's not immutable anymore, any changes should be handled by
drm_colorop_state. Move their enum and make it correctly behaves as mutable.Reviewed-by Chaitanya Kumar Borah <[email protected]>Signed-off-by Melissa Wen <[email protected]>---
v6:
- checkdrm_object_property_get_default_value()before set interp props--- 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@@ -857,7 +857,7 @@ static void drm_atomic_colorop_print_state(struct drm_printer *p,case DRM_COLOROP_1D_LUT :drm_printf_indent (p,1 ,"size=%d\n" , colorop->size);drm_printf_indent (p,1 ,"interpolation=%s\n" , -drm_get_colorop_lut1d_interpolation_name (colorop->lut1d_interpolation)); +drm_get_colorop_lut1d_interpolation_name (state->lut1d_interpolation));drm_printf_indent (p,1 ,"data blob id=%d\n" , state->data ? state->data->base.id :0 );break ;case DRM_COLOROP_CTM_3X4 :@@ -869,7 +869,7 @@ static void drm_atomic_colorop_print_state(struct drm_printer *p,case DRM_COLOROP_3D_LUT :drm_printf_indent (p,1 ,"size=%d\n" , colorop->size);drm_printf_indent (p,1 ,"interpolation=%s\n" , -drm_get_colorop_lut3d_interpolation_name (colorop->lut3d_interpolation)); +drm_get_colorop_lut3d_interpolation_name (state->lut3d_interpolation));drm_printf_indent (p,1 ,"data 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 +4
-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) { + if(!drm_object_property_get_default_value(&colorop->base, + colorop->lut1d_interpolation_property,
drivers/gpu/drm/drm_colorop.c static void __drm_colorop_state_reset(struct drm_colorop_state *colorop_state, · line 535
Quoted 10 lines
drivers/gpu/drm/drm_colorop.c +10
-0+ &val)); + colorop_state->lut1d_interpolation = val; + } + +if (colorop->lut3d_interpolation_property) { +if (!drm_object_property_get_default_value (&colorop->base, + colorop->lut3d_interpolation_property, + &val); + colorop_state->lut3d_interpolation = val; + }
I see you fixed the ; in the next patch, better to fix it within this patch. Also needs space between if and (.
Quoted 49 lines
drivers/gpu/drm/drm_colorop.c +0
-0}/** 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_commit */ struct drm_atomic_commit *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: *
Re: [PATCH v6 4/6] drm/colorop: make lut(1/3)d_interpolation mutable
Quoted 119 lines · Chaitanya Kumar
Quoted 116 lines · Melissa Wen
As it's not immutable anymore, any changes should be handled by
drm_colorop_state. Move their enum and make it correctly behaves as mutable.Reviewed-by Chaitanya Kumar Borah <[email protected]>Signed-off-by Melissa Wen <[email protected]>---
v6:
- checkdrm_object_property_get_default_value()before set interp props
---
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 +0
-0@@ -857,7 +857,7 @@ static void drm_atomic_colorop_print_state(struct drm_printer *p,case
DRM_COLOROP_1D_LUT:
drm_printf_indent(p, 1, "size=%d\n", colorop->size); drm_printf_indent(p, 1, "interpolation=%s\n",
-drm_get_colorop_lut1d_interpolation_name(colorop->lut1d_interpolation));
+drm_get_colorop_lut1d_interpolation_name(state->lut1d_interpolation));drm_printf_indent(p, 1, "data blob id=%d\n", state->data ? state->data->base.id : 0); break;
caseDRM_COLOROP_CTM_3X4:drivers/gpu/drm/drm_atomic.c +0
-0@@ -869,7 +869,7 @@ static void drm_atomic_colorop_print_state(struct drm_printer *p,case
DRM_COLOROP_3D_LUT:
drm_printf_indent(p, 1, "size=%d\n", colorop->size); drm_printf_indent(p, 1, "interpolation=%s\n",
-drm_get_colorop_lut3d_interpolation_name(colorop->lut3d_interpolation));
+drm_get_colorop_lut3d_interpolation_name(state->lut3d_interpolation));drm_printf_indent(p, 1, "data blob id=%d\n", state->data ? state->data->base.id : 0); break;
default:drivers/gpu/drm/drm_atomic_uapi.c +2
-2@@ -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);
drivers/gpu/drm/drm_atomic_uapi.c +1
-1@@ -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)drivers/gpu/drm/drm_atomic_uapi.c +1
-1@@ -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 +0
-0@@ -342,7 +342,6 @@ int drm_plane_colorop_curve_1d_lut_init(struct
drm_device*dev, structdrm_colorcolorop->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);drivers/gpu/drm/drm_colorop.c +0
-0@@ -442,7 +441,6 @@ int drm_plane_colorop_3dlut_init(struct
drm_device*dev, structdrm_colorop*colcolorop->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);drivers/gpu/drm/drm_colorop.c +8
-0@@ -521,6 +519,20 @@ static void __drm_colorop_state_reset(structdrm_colorop_state *colorop_state, &val)) colorop_state->curve_1d_type = val; } + + if (colorop->lut1d_interpolation_property) { +if (!drm_object_property_get_default_value (&colorop->base, + colorop->lut1d_interpolation_property, + &val)); + colorop_state->lut1d_interpolation = val; + } +
Quoted 8 lines
drivers/gpu/drm/drm_colorop.c static void __drm_colorop_state_reset(struct drm_colorop_state *colorop_state, · line 535
Quoted 6 lines
drivers/gpu/drm/drm_colorop.c +6
-0+ if (colorop->lut3d_interpolation_property) { + if(!drm_object_property_get_default_value(&colorop->base, + colorop->lut3d_interpolation_property, + &val); + colorop_state->lut3d_interpolation = val; + }I see you fixed the ; in the next patch, better to fix it within this patch. Also needs space between if and (.
Ouch, thanks for pointing it out.
Quoted 48 lines
Quoted 47 lines
drivers/gpu/drm/drm_colorop.c +0
-0} /**include/drm/drm_colorop.h +0
-0@@ -183,6 +183,20 @@ struct drm_colorop_state {*/ struct drm_property_blob *data;+ /**
+ * @lut1d_interpolation:
+ *
+ * Interpolation forDRM_COLOROP_1D_LUT
+ */
+ enumdrm_colorop_lut1d_interpolation_typelut1d_interpolation;include/drm/drm_colorop.h +8
-0+ + /** + * @lut3d_interpolation: + * + * Interpolation for DRM_COLOROP_3D_LUT + */ + enum drm_colorop_lut3d_interpolation_type lut3d_interpolation; +/** @state: backpointer to global
drm_atomic_commit*/ structdrm_atomic_commit*state;
};include/drm/drm_colorop.h +0
-0@@ -306,20 +320,6 @@ struct drm_colorop {*/ uint32_t size;- /**
- * @lut1d_interpolation:
- *
- * Interpolation forDRM_COLOROP_1D_LUT
- */
- enumdrm_colorop_lut1d_interpolation_typelut1d_interpolation;include/drm/drm_colorop.h +0
-8- - /** - * @lut3d_interpolation: - * - * Interpolation for DRM_COLOROP_3D_LUT - */ - enum drm_colorop_lut3d_interpolation_type lut3d_interpolation; -/**
* @lut1d_interpolation_property:
*
PATCH v6 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)
v6: use |= replaced for consistency (Chaitanya)
--- drivers/gpu/drm/drm_atomic_uapi.c | 64 ++++++++++++++++++++++++------- drivers/gpu/drm/drm_colorop.c | 4 +- include/drm/drm_atomic_uapi.h | 4 +- 3 files changed, 56 insertions(+), 16 deletions(-)
drivers/gpu/drm/drm_atomic_uapi.c +51 -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",
@@ -1275,8 +1300,10 @@ int drm_atomic_set_property(struct drm_atomic_commit *state,break ; }case DRM_MODE_OBJECT_COLOROP : { +struct drm_plane_state *plane_state;struct drm_colorop *colorop =obj_to_colorop (obj);struct drm_colorop_state *colorop_state; +bool replaced = false; colorop_state =drm_atomic_get_colorop_state (state, colorop);if (IS_ERR (colorop_state)) {
@@ -1285,7 +1312,18 @@ int drm_atomic_set_property(struct drm_atomic_commit *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 |= replaced; +break ; }default :
drivers/gpu/drm/drm_colorop.c +2 -2
@@ -523,14 +523,14 @@ static void __drm_colorop_state_reset(struct drm_colorop_state *colorop_state,if (colorop->lut1d_interpolation_property) {if (!drm_object_property_get_default_value (&colorop->base, colorop->lut1d_interpolation_property, - &val)); + &val)) colorop_state->lut1d_interpolation = val; }if (colorop->lut3d_interpolation_property) {if (!drm_object_property_get_default_value (&colorop->base, colorop->lut3d_interpolation_property, - &val); + &val)) colorop_state->lut3d_interpolation = val; } }
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 v6 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
@@ -10198,7 +10198,7 @@ static void amdgpu_dm_commit_planes(struct drm_atomic_commit *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;
@@ -12024,6 +12024,10 @@ static bool should_reset_plane(struct drm_atomic_commit *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