From: Greg Kroah-Hartman Date: Mon, 12 Aug 2024 14:08:58 +0000 (+0200) Subject: 6.1-stable patches X-Git-Tag: v6.1.105~48 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=84e473a8daa3b50882ff1939fd3a947abd54f204;p=thirdparty%2Fkernel%2Fstable-queue.git 6.1-stable patches added patches: revert-drm-amd-display-add-null-check-for-afb-before-dereferencing-in-amdgpu_dm_plane_handle_cursor_update.patch --- diff --git a/queue-6.1/revert-drm-amd-display-add-null-check-for-afb-before-dereferencing-in-amdgpu_dm_plane_handle_cursor_update.patch b/queue-6.1/revert-drm-amd-display-add-null-check-for-afb-before-dereferencing-in-amdgpu_dm_plane_handle_cursor_update.patch new file mode 100644 index 00000000000..be75fcdaff1 --- /dev/null +++ b/queue-6.1/revert-drm-amd-display-add-null-check-for-afb-before-dereferencing-in-amdgpu_dm_plane_handle_cursor_update.patch @@ -0,0 +1,53 @@ +From 778e3979c5dc9cbdb5d1b92afed427de6bc483b4 Mon Sep 17 00:00:00 2001 +From: Ivan Lipski +Date: Fri, 7 Jun 2024 12:33:59 -0400 +Subject: Revert "drm/amd/display: Add NULL check for 'afb' before dereferencing in amdgpu_dm_plane_handle_cursor_update" + +From: Ivan Lipski + +commit 778e3979c5dc9cbdb5d1b92afed427de6bc483b4 upstream. + +[WHY] +This patch is a dupplicate implementation of 14bcf29b, which we +are reverting due to a regression with kms_plane_cursor IGT tests. + +This reverts commit 38e6f715b02b572f74677eb2f29d3b4bc6f1ddff. + +Reviewed-by: Srinivasan Shanmugam +Tested-by: George Zhang +Signed-off-by: Ivan Lipski +Signed-off-by: Alex Deucher +Signed-off-by: Greg Kroah-Hartman +--- + drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_plane.c | 16 ++++------------ + 1 file changed, 4 insertions(+), 12 deletions(-) + +--- a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_plane.c ++++ b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_plane.c +@@ -1225,22 +1225,14 @@ void handle_cursor_update(struct drm_pla + { + struct amdgpu_device *adev = drm_to_adev(plane->dev); + struct amdgpu_framebuffer *afb = to_amdgpu_framebuffer(plane->state->fb); +- struct drm_crtc *crtc; +- struct dm_crtc_state *crtc_state; +- struct amdgpu_crtc *amdgpu_crtc; +- u64 address; ++ struct drm_crtc *crtc = afb ? plane->state->crtc : old_plane_state->crtc; ++ struct dm_crtc_state *crtc_state = crtc ? to_dm_crtc_state(crtc->state) : NULL; ++ struct amdgpu_crtc *amdgpu_crtc = to_amdgpu_crtc(crtc); ++ uint64_t address = afb ? afb->address : 0; + struct dc_cursor_position position = {0}; + struct dc_cursor_attributes attributes; + int ret; + +- if (!afb) +- return; +- +- crtc = plane->state->crtc ? plane->state->crtc : old_plane_state->crtc; +- crtc_state = crtc ? to_dm_crtc_state(crtc->state) : NULL; +- amdgpu_crtc = to_amdgpu_crtc(crtc); +- address = afb->address; +- + if (!plane->state->fb && !old_plane_state->fb) + return; + diff --git a/queue-6.1/series b/queue-6.1/series index 7d6a1a4e035..ed3293d7975 100644 --- a/queue-6.1/series +++ b/queue-6.1/series @@ -133,3 +133,4 @@ selftests-mptcp-join-validate-backup-in-mpj.patch selftests-mptcp-join-check-backup-support-in-signal-endp.patch mptcp-pm-deny-endp-with-signal-subflow-port.patch block-use-the-right-type-for-stub-rq_integrity_vec.patch +revert-drm-amd-display-add-null-check-for-afb-before-dereferencing-in-amdgpu_dm_plane_handle_cursor_update.patch