From: Greg Kroah-Hartman Date: Mon, 30 Jan 2023 18:14:00 +0000 (+0100) Subject: 6.1-stable patches X-Git-Tag: v5.10.166~2 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=396261313e9cefde51114b6ae382cb4ebec1d285;p=thirdparty%2Fkernel%2Fstable-queue.git 6.1-stable patches added patches: amdgpu-fix-build-on-non-dcn-platforms.patch --- diff --git a/queue-6.1/amdgpu-fix-build-on-non-dcn-platforms.patch b/queue-6.1/amdgpu-fix-build-on-non-dcn-platforms.patch new file mode 100644 index 00000000000..e63c104a5b9 --- /dev/null +++ b/queue-6.1/amdgpu-fix-build-on-non-dcn-platforms.patch @@ -0,0 +1,37 @@ +From f439a959dcfb6b39d6fd4b85ca1110a1d1de1587 Mon Sep 17 00:00:00 2001 +From: Dave Airlie +Date: Fri, 27 Jan 2023 12:15:13 +1000 +Subject: amdgpu: fix build on non-DCN platforms. + +From: Dave Airlie + +commit f439a959dcfb6b39d6fd4b85ca1110a1d1de1587 upstream. + +This fixes the build here locally on my 32-bit arm build. + +Signed-off-by: Dave Airlie +Signed-off-by: Greg Kroah-Hartman +--- + drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +--- a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c ++++ b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c +@@ -9393,8 +9393,6 @@ static int amdgpu_dm_atomic_check(struct + struct drm_connector_state *old_con_state, *new_con_state; + struct drm_crtc *crtc; + struct drm_crtc_state *old_crtc_state, *new_crtc_state; +- struct drm_dp_mst_topology_mgr *mgr; +- struct drm_dp_mst_topology_state *mst_state; + struct drm_plane *plane; + struct drm_plane_state *old_plane_state, *new_plane_state; + enum dc_status status; +@@ -9402,6 +9400,8 @@ static int amdgpu_dm_atomic_check(struct + bool lock_and_validation_needed = false; + struct dm_crtc_state *dm_old_crtc_state, *dm_new_crtc_state; + #if defined(CONFIG_DRM_AMD_DC_DCN) ++ struct drm_dp_mst_topology_mgr *mgr; ++ struct drm_dp_mst_topology_state *mst_state; + struct dsc_mst_fairness_vars vars[MAX_PIPES]; + #endif + diff --git a/queue-6.1/series b/queue-6.1/series index d48ac6169da..a166f6a30b0 100644 --- a/queue-6.1/series +++ b/queue-6.1/series @@ -310,3 +310,4 @@ x86-i8259-mark-legacy-pic-interrupts-with-irq_level.patch dt-bindings-i2c-renesas-rzv2m-fix-soc-specific-string.patch netfilter-conntrack-unify-established-states-for-sctp-paths.patch perf-x86-amd-fix-potential-integer-overflow-on-shift-of-a-int.patch +amdgpu-fix-build-on-non-dcn-platforms.patch