From: Greg Kroah-Hartman Date: Tue, 8 Oct 2024 09:44:16 +0000 (+0200) Subject: 6.11-stable patches X-Git-Tag: v6.6.55~36 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=328b8878bf5095d675f5ecd8830282fb7d81255a;p=thirdparty%2Fkernel%2Fstable-queue.git 6.11-stable patches added patches: drm-rockchip-vop-enable-vop_feature_internal_rgb-on-rk3066.patch drm-xe-vram-fix-ccs-offset-calculation.patch revert-drm-amd-display-skip-recompute-dsc-params-if-no-stream-on-link.patch --- diff --git a/queue-6.11/drm-rockchip-vop-enable-vop_feature_internal_rgb-on-rk3066.patch b/queue-6.11/drm-rockchip-vop-enable-vop_feature_internal_rgb-on-rk3066.patch new file mode 100644 index 00000000000..99dfa28d76a --- /dev/null +++ b/queue-6.11/drm-rockchip-vop-enable-vop_feature_internal_rgb-on-rk3066.patch @@ -0,0 +1,31 @@ +From 6ed51ba95e27221ce87979bd2ad5926033b9e1b9 Mon Sep 17 00:00:00 2001 +From: Val Packett +Date: Mon, 24 Jun 2024 17:40:49 -0300 +Subject: drm/rockchip: vop: enable VOP_FEATURE_INTERNAL_RGB on RK3066 + +From: Val Packett + +commit 6ed51ba95e27221ce87979bd2ad5926033b9e1b9 upstream. + +The RK3066 does have RGB display output, so it should be marked as such. + +Fixes: f4a6de855eae ("drm: rockchip: vop: add rk3066 vop definitions") +Cc: stable@vger.kernel.org +Signed-off-by: Val Packett +Signed-off-by: Heiko Stuebner +Link: https://patchwork.freedesktop.org/patch/msgid/20240624204054.5524-3-val@packett.cool +Signed-off-by: Greg Kroah-Hartman +--- + drivers/gpu/drm/rockchip/rockchip_vop_reg.c | 1 + + 1 file changed, 1 insertion(+) + +--- a/drivers/gpu/drm/rockchip/rockchip_vop_reg.c ++++ b/drivers/gpu/drm/rockchip/rockchip_vop_reg.c +@@ -515,6 +515,7 @@ static const struct vop_data rk3066_vop + .output = &rk3066_output, + .win = rk3066_vop_win_data, + .win_size = ARRAY_SIZE(rk3066_vop_win_data), ++ .feature = VOP_FEATURE_INTERNAL_RGB, + .max_output = { 1920, 1080 }, + }; + diff --git a/queue-6.11/drm-xe-vram-fix-ccs-offset-calculation.patch b/queue-6.11/drm-xe-vram-fix-ccs-offset-calculation.patch new file mode 100644 index 00000000000..ae0747211d0 --- /dev/null +++ b/queue-6.11/drm-xe-vram-fix-ccs-offset-calculation.patch @@ -0,0 +1,49 @@ +From ee06c09ded3c2f722be4e240ed06287e23596bda Mon Sep 17 00:00:00 2001 +From: Matthew Auld +Date: Mon, 16 Sep 2024 09:49:12 +0100 +Subject: drm/xe/vram: fix ccs offset calculation + +From: Matthew Auld + +commit ee06c09ded3c2f722be4e240ed06287e23596bda upstream. + +Spec says SW is expected to round up to the nearest 128K, if not already +aligned for the CC unit view of CCS. We are seeing the assert sometimes +pop on BMG to tell us that there is a hole between GSM and CCS, as well +as popping other asserts with having a vram size with strange alignment, +which is likely caused by misaligned offset here. + +v2 (Shuicheng): + - Do the round_up() on final SW address. + +BSpec: 68023 +Fixes: b5c2ca0372dc ("drm/xe/xe2hpg: Determine flat ccs offset for vram") +Signed-off-by: Matthew Auld +Cc: Himal Prasad Ghimiray +Cc: Akshata Jahagirdar +Cc: Lucas De Marchi +Cc: Shuicheng Lin +Cc: Matt Roper +Cc: stable@vger.kernel.org # v6.10+ +Reviewed-by: Himal Prasad Ghimiray +Tested-by: Shuicheng Lin +Reviewed-by: Lucas De Marchi +Link: https://patchwork.freedesktop.org/patch/msgid/20240916084911.13119-2-matthew.auld@intel.com +Signed-off-by: Lucas De Marchi +(cherry picked from commit 37173392741c425191b959acb3adf70c9a4610c0) +Signed-off-by: Lucas De Marchi +Signed-off-by: Greg Kroah-Hartman +--- + drivers/gpu/drm/xe/xe_vram.c | 1 + + 1 file changed, 1 insertion(+) + +--- a/drivers/gpu/drm/xe/xe_vram.c ++++ b/drivers/gpu/drm/xe/xe_vram.c +@@ -182,6 +182,7 @@ static inline u64 get_flat_ccs_offset(st + offset = offset_hi << 32; /* HW view bits 39:32 */ + offset |= offset_lo << 6; /* HW view bits 31:6 */ + offset *= num_enabled; /* convert to SW view */ ++ offset = round_up(offset, SZ_128K); /* SW must round up to nearest 128K */ + + /* We don't expect any holes */ + xe_assert_msg(xe, offset == (xe_mmio_read64_2x32(gt, GSMBASE) - ccs_size), diff --git a/queue-6.11/revert-drm-amd-display-skip-recompute-dsc-params-if-no-stream-on-link.patch b/queue-6.11/revert-drm-amd-display-skip-recompute-dsc-params-if-no-stream-on-link.patch new file mode 100644 index 00000000000..6655edfa1f0 --- /dev/null +++ b/queue-6.11/revert-drm-amd-display-skip-recompute-dsc-params-if-no-stream-on-link.patch @@ -0,0 +1,34 @@ +From stable+bounces-81209-greg=kroah.com@vger.kernel.org Mon Oct 7 05:59:33 2024 +From: Jonathan Gray +Date: Mon, 7 Oct 2024 14:59:22 +1100 +Subject: Revert "drm/amd/display: Skip Recompute DSC Params if no Stream on Link" +To: gregkh@linuxfoundation.org +Cc: stable@vger.kernel.org +Message-ID: <20241007035922.55322-1-jsg@jsg.id.au> + +From: Jonathan Gray + +This reverts commit d45c64d933586d409d3f1e0ecaca4da494b1d9c6. + +duplicated a change made in 6.11-rc3 +50e376f1fe3bf571d0645ddf48ad37eb58323919 + +Cc: stable@vger.kernel.org # 6.11 +Signed-off-by: Jonathan Gray +Signed-off-by: Greg Kroah-Hartman +--- + drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_mst_types.c | 3 --- + 1 file changed, 3 deletions(-) + +--- a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_mst_types.c ++++ b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_mst_types.c +@@ -1353,9 +1353,6 @@ static bool is_dsc_need_re_compute( + DRM_DEBUG_DRIVER("%s: MST_DSC check on %d streams in current dc_state\n", + __func__, dc->current_state->stream_count); + +- if (new_stream_on_link_num == 0) +- return false; +- + /* check current_state if there stream on link but it is not in + * new request state + */ diff --git a/queue-6.11/series b/queue-6.11/series index 7ddf070729e..6c6b5bdbbfc 100644 --- a/queue-6.11/series +++ b/queue-6.11/series @@ -545,3 +545,6 @@ acpi-battery-simplify-battery-hook-locking.patch acpi-battery-fix-possible-crash-when-unregistering-a.patch drm-xe-clean-up-vm-exec-queue-file-lock-usage.patch drm-xe-vm-move-xa_alloc-to-prevent-uaf.patch +drm-rockchip-vop-enable-vop_feature_internal_rgb-on-rk3066.patch +drm-xe-vram-fix-ccs-offset-calculation.patch +revert-drm-amd-display-skip-recompute-dsc-params-if-no-stream-on-link.patch