diff --git a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c index 49f1a22f2888..4ee677f5b8b7 100644 --- a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c +++ b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c @@ -6337,6 +6337,19 @@ static int dm_update_plane_state(struct dc *dc, if (ret) goto out; + /* + * Recreating the plane re-derives its DC color pipeline from the + * colorop states in this commit. Pull the plane's colorops in so + * the derivation sees the current pipeline; otherwise every stage + * silently defaults to bypass (dropping YUV->RGB, shaper, 3D LUT + * and regamma) when userspace didn't touch color in this commit. + */ + if (new_plane_state->color_pipeline) { + ret = drm_atomic_add_affected_colorops(state, plane); + if (ret) + goto out; + } + WARN_ON(dm_new_plane_state->dc_state); dc_new_plane_state = dc_create_plane_state(dc);