--- /dev/null
+From 6ed51ba95e27221ce87979bd2ad5926033b9e1b9 Mon Sep 17 00:00:00 2001
+From: Val Packett <val@packett.cool>
+Date: Mon, 24 Jun 2024 17:40:49 -0300
+Subject: drm/rockchip: vop: enable VOP_FEATURE_INTERNAL_RGB on RK3066
+
+From: Val Packett <val@packett.cool>
+
+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 <val@packett.cool>
+Signed-off-by: Heiko Stuebner <heiko@sntech.de>
+Link: https://patchwork.freedesktop.org/patch/msgid/20240624204054.5524-3-val@packett.cool
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+---
+ 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 },
+ };
+
--- /dev/null
+From ee06c09ded3c2f722be4e240ed06287e23596bda Mon Sep 17 00:00:00 2001
+From: Matthew Auld <matthew.auld@intel.com>
+Date: Mon, 16 Sep 2024 09:49:12 +0100
+Subject: drm/xe/vram: fix ccs offset calculation
+
+From: Matthew Auld <matthew.auld@intel.com>
+
+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 <matthew.auld@intel.com>
+Cc: Himal Prasad Ghimiray <himal.prasad.ghimiray@intel.com>
+Cc: Akshata Jahagirdar <akshata.jahagirdar@intel.com>
+Cc: Lucas De Marchi <lucas.demarchi@intel.com>
+Cc: Shuicheng Lin <shuicheng.lin@intel.com>
+Cc: Matt Roper <matthew.d.roper@intel.com>
+Cc: stable@vger.kernel.org # v6.10+
+Reviewed-by: Himal Prasad Ghimiray <himal.prasad.ghimiray@intel.com>
+Tested-by: Shuicheng Lin <shuicheng.lin@intel.com>
+Reviewed-by: Lucas De Marchi <lucas.demarchi@intel.com>
+Link: https://patchwork.freedesktop.org/patch/msgid/20240916084911.13119-2-matthew.auld@intel.com
+Signed-off-by: Lucas De Marchi <lucas.demarchi@intel.com>
+(cherry picked from commit 37173392741c425191b959acb3adf70c9a4610c0)
+Signed-off-by: Lucas De Marchi <lucas.demarchi@intel.com>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+---
+ 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),
--- /dev/null
+From stable+bounces-81209-greg=kroah.com@vger.kernel.org Mon Oct 7 05:59:33 2024
+From: Jonathan Gray <jsg@jsg.id.au>
+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 <jsg@jsg.id.au>
+
+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 <jsg@jsg.id.au>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+---
+ 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
+ */
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
projects / thirdparty / kernel / stable-queue.git / commitdiff
