| From b3a84160ae97bb9d7d8e1e4e3a4d5f6902daf042 Mon Sep 17 00:00:00 2001 |
| From: Sasha Levin <sashal@kernel.org> |
| Date: Fri, 23 Jan 2026 14:47:01 +0800 |
| Subject: drm/amd/display: Avoid updating surface with the same surface under |
| MPO |
| |
| From: Wayne Lin <Wayne.Lin@amd.com> |
| |
| [ Upstream commit 1a38ded4bc8ac09fd029ec656b1e2c98cc0d238c ] |
| |
| [Why & How] |
| Although it's dummy updates of surface update for committing stream |
| updates, we should not have dummy_updates[j].surface all indicating |
| to the same surface under multiple surfaces case. Otherwise, |
| copy_surface_update_to_plane() in update_planes_and_stream_state() |
| will update to the same surface only. |
| |
| Reviewed-by: Harry Wentland <harry.wentland@amd.com> |
| Signed-off-by: Wayne Lin <Wayne.Lin@amd.com> |
| Signed-off-by: Tom Chung <chiahsuan.chung@amd.com> |
| Tested-by: Daniel Wheeler <daniel.wheeler@amd.com> |
| Signed-off-by: Alex Deucher <alexander.deucher@amd.com> |
| Signed-off-by: Sasha Levin <sashal@kernel.org> |
| --- |
| drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c | 2 +- |
| 1 file changed, 1 insertion(+), 1 deletion(-) |
| |
| 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 0aa681939b7e7..c22783b882067 100644 |
| --- a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c |
| +++ b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c |
| @@ -7958,7 +7958,7 @@ static void amdgpu_dm_atomic_commit_tail(struct drm_atomic_state *state) |
| * To fix this, DC should permit updating only stream properties. |
| */ |
| for (j = 0; j < status->plane_count; j++) |
| - dummy_updates[j].surface = status->plane_states[0]; |
| + dummy_updates[j].surface = status->plane_states[j]; |
| |
| |
| mutex_lock(&dm->dc_lock); |
| -- |
| 2.51.0 |
| |
