From: Sasha Levin <sashal@kernel.org>
To: linux-kernel@vger.kernel.org, stable@vger.kernel.org
Cc: Dave Airlie <airlied@redhat.com>, Sasha Levin <sashal@kernel.org>,
harry.wentland@amd.com, sunpeng.li@amd.com,
Rodrigo.Siqueira@amd.com, alexander.deucher@amd.com,
christian.koenig@amd.com, Xinhui.Pan@amd.com, airlied@gmail.com,
daniel@ffwll.ch, roman.li@amd.com, stylon.wang@amd.com,
aurabindo.pillai@amd.com, 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.
Date: Tue, 31 Jan 2023 09:59:46 -0500 [thread overview]
Message-ID: <20230131145946.1249850-20-sashal@kernel.org> (raw)
In-Reply-To: <20230131145946.1249850-1-sashal@kernel.org>
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>
---
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
next prev parent reply other threads:[~2023-01-31 15:02 UTC|newest]
Thread overview: 21+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-01-31 14:59 [PATCH AUTOSEL 6.1 01/20] i2c: designware-pci: Add new PCI IDs for AMD NAVI GPU Sasha Levin
2023-01-31 14:59 ` [PATCH AUTOSEL 6.1 02/20] i2c: mxs: suppress probe-deferral error message Sasha Levin
2023-01-31 14:59 ` [PATCH AUTOSEL 6.1 03/20] scsi: target: core: Fix warning on RT kernels Sasha Levin
2023-01-31 14:59 ` [PATCH AUTOSEL 6.1 04/20] x86/aperfmperf: Erase stale arch_freq_scale values when disabling frequency invariance readings Sasha Levin
2023-01-31 14:59 ` [PATCH AUTOSEL 6.1 05/20] perf/x86/intel: Add Emerald Rapids Sasha Levin
2023-01-31 14:59 ` [PATCH AUTOSEL 6.1 06/20] perf/x86/intel/cstate: " Sasha Levin
2023-01-31 14:59 ` [PATCH AUTOSEL 6.1 07/20] scsi: iscsi_tcp: Fix UAF during logout when accessing the shost ipaddress Sasha Levin
2023-01-31 14:59 ` [PATCH AUTOSEL 6.1 08/20] scsi: iscsi_tcp: Fix UAF during login " Sasha Levin
2023-01-31 14:59 ` [PATCH AUTOSEL 6.1 09/20] i2c: rk3x: fix a bunch of kernel-doc warnings Sasha Levin
2023-01-31 14:59 ` [PATCH AUTOSEL 6.1 10/20] Revert "gfs2: stop using generic_writepages in gfs2_ail1_start_one" Sasha Levin
2023-01-31 14:59 ` [PATCH AUTOSEL 6.1 11/20] x86/build: Move '-mindirect-branch-cs-prefix' out of GCC-only block Sasha Levin
2023-01-31 14:59 ` [PATCH AUTOSEL 6.1 12/20] ACPI: video: Add backlight=native DMI quirk for HP Pavilion g6-1d80nr Sasha Levin
2023-01-31 14:59 ` [PATCH AUTOSEL 6.1 13/20] platform/x86: dell-wmi: Add a keymap for KEY_MUTE in type 0x0010 table Sasha Levin
2023-01-31 14:59 ` [PATCH AUTOSEL 6.1 14/20] platform/x86: hp-wmi: Handle Omen Key event Sasha Levin
2023-01-31 14:59 ` [PATCH AUTOSEL 6.1 15/20] platform/x86: gigabyte-wmi: add support for B450M DS3H WIFI-CF Sasha Levin
2023-01-31 14:59 ` [PATCH AUTOSEL 6.1 16/20] platform/x86/amd: pmc: Disable IRQ1 wakeup for RN/CZN Sasha Levin
2023-01-31 14:59 ` [PATCH AUTOSEL 6.1 17/20] net/x25: Fix to not accept on connected socket Sasha Levin
2023-01-31 14:59 ` [PATCH AUTOSEL 6.1 18/20] drm/amd/display: Fix timing not changning when freesync video is enabled Sasha Levin
2023-01-31 14:59 ` [PATCH AUTOSEL 6.1 19/20] bcache: Silence memcpy() run-time false positive warnings Sasha Levin
2023-01-31 14:59 ` Sasha Levin [this message]
2023-01-31 15:27 ` [PATCH AUTOSEL 6.1 20/20] amdgpu: fix build on non-DCN platforms Deucher, Alexander
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20230131145946.1249850-20-sashal@kernel.org \
--to=sashal@kernel.org \
--cc=Jerry.Zuo@amd.com \
--cc=Rodrigo.Siqueira@amd.com \
--cc=Xinhui.Pan@amd.com \
--cc=airlied@gmail.com \
--cc=airlied@redhat.com \
--cc=alexander.deucher@amd.com \
--cc=amd-gfx@lists.freedesktop.org \
--cc=aurabindo.pillai@amd.com \
--cc=christian.koenig@amd.com \
--cc=daniel@ffwll.ch \
--cc=dri-devel@lists.freedesktop.org \
--cc=harry.wentland@amd.com \
--cc=linux-kernel@vger.kernel.org \
--cc=roman.li@amd.com \
--cc=stable@vger.kernel.org \
--cc=stylon.wang@amd.com \
--cc=sunpeng.li@amd.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox