[AMD Official Use Only - General]
-----Original Message----- From: Sasha Levin sashal@kernel.org Sent: Tuesday, January 31, 2023 10:00 AM To: linux-kernel@vger.kernel.org; stable@vger.kernel.org Cc: Dave Airlie airlied@redhat.com; Sasha Levin sashal@kernel.org; Wentland, Harry Harry.Wentland@amd.com; Li, Sun peng (Leo) Sunpeng.Li@amd.com; Siqueira, Rodrigo Rodrigo.Siqueira@amd.com; Deucher, Alexander Alexander.Deucher@amd.com; Koenig, Christian Christian.Koenig@amd.com; Pan, Xinhui Xinhui.Pan@amd.com; airlied@gmail.com; daniel@ffwll.ch; Li, Roman Roman.Li@amd.com; Wang, Chao-kai (Stylon) Stylon.Wang@amd.com; Pillai, Aurabindo Aurabindo.Pillai@amd.com; Zuo, Jerry Jerry.Zuo@amd.com; amd- gfx@lists.freedesktop.org; dri-devel@lists.freedesktop.org Subject: [PATCH AUTOSEL 6.1 20/20] amdgpu: fix build on non-DCN platforms.
From: Dave Airlie airlied@redhat.com
[ Upstream commit f439a959dcfb6b39d6fd4b85ca1110a1d1de1587 ]
This fixes the build here locally on my 32-bit arm build.
Signed-off-by: Dave Airlie airlied@redhat.com Signed-off-by: Sasha Levin sashal@kernel.org
This patch is only applicable to kernel 6.1.x and newer.
Alex
drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c | 2 ++ 1 file changed, 2 insertions(+)
diff --git a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c index 15b408e3a705..d756a606b5e2 100644 --- a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c +++ b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c @@ -9411,6 +9411,8 @@ static int amdgpu_dm_atomic_check(struct drm_device *dev, 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
-- 2.39.0