From: Greg Kroah-Hartman Date: Tue, 8 Oct 2024 09:43:58 +0000 (+0200) Subject: 6.10-stable patches X-Git-Tag: v6.6.55~37 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=329fa71406ef548685860eeb3be4ef1885f005e8;p=thirdparty%2Fkernel%2Fstable-queue.git 6.10-stable patches added patches: drm-rockchip-vop-enable-vop_feature_internal_rgb-on-rk3066.patch revert-drm-amd-display-skip-recompute-dsc-params-if-no-stream-on-link.patch --- diff --git a/queue-6.10/drm-rockchip-vop-enable-vop_feature_internal_rgb-on-rk3066.patch b/queue-6.10/drm-rockchip-vop-enable-vop_feature_internal_rgb-on-rk3066.patch new file mode 100644 index 00000000000..99dfa28d76a --- /dev/null +++ b/queue-6.10/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.10/revert-drm-amd-display-skip-recompute-dsc-params-if-no-stream-on-link.patch b/queue-6.10/revert-drm-amd-display-skip-recompute-dsc-params-if-no-stream-on-link.patch new file mode 100644 index 00000000000..bc8a680f387 --- /dev/null +++ b/queue-6.10/revert-drm-amd-display-skip-recompute-dsc-params-if-no-stream-on-link.patch @@ -0,0 +1,34 @@ +From stable+bounces-81208-greg=kroah.com@vger.kernel.org Mon Oct 7 05:58:33 2024 +From: Jonathan Gray +Date: Mon, 7 Oct 2024 14:58:19 +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: <20241007035819.12246-1-jsg@jsg.id.au> + +From: Jonathan Gray + +This reverts commit 6f9c39e8169384d2a5ca9bf323a0c1b81b3d0f3a. + +duplicated a change made in 6.10.5 +70275bb960c71d313254473d38c14e7101cee5ad + +Cc: stable@vger.kernel.org # 6.10 +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 +@@ -1267,9 +1267,6 @@ static bool is_dsc_need_re_compute( + if (new_stream_on_link_num == 0) + return false; + +- 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.10/series b/queue-6.10/series index ec8310c260b..0ad41f665fc 100644 --- a/queue-6.10/series +++ b/queue-6.10/series @@ -470,3 +470,5 @@ r8169-fix-spelling-mistake-tx_underun-tx_underrun.patch r8169-add-tally-counter-fields-added-with-rtl8125.patch acpi-battery-simplify-battery-hook-locking.patch acpi-battery-fix-possible-crash-when-unregistering-a.patch +drm-rockchip-vop-enable-vop_feature_internal_rgb-on-rk3066.patch +revert-drm-amd-display-skip-recompute-dsc-params-if-no-stream-on-link.patch