From: Alex Deucher <alexdeucher@gmail.com>
To: Sasha Levin <sashal@kernel.org>
Cc: linux-kernel@vger.kernel.org, stable@vger.kernel.org,
stylon.wang@amd.com, sunpeng.li@amd.com, Xinhui.Pan@amd.com,
Rodrigo.Siqueira@amd.com, roman.li@amd.com,
amd-gfx@lists.freedesktop.org, Jerry.Zuo@amd.com,
aurabindo.pillai@amd.com, dri-devel@lists.freedesktop.org,
alexander.deucher@amd.com, Dave Airlie <airlied@redhat.com>,
christian.koenig@amd.com
Subject: Re: [PATCH AUTOSEL 5.15 12/12] amdgpu: fix build on non-DCN platforms.
Date: Tue, 31 Jan 2023 15:29:04 -0500 [thread overview]
Message-ID: <CADnq5_M=WvEf6N9my2cjX1=aQdweKfrshyU+Q8Ohuo5=DBtf+w@mail.gmail.com> (raw)
In-Reply-To: <20230131150030.1250104-12-sashal@kernel.org>
On Tue, Jan 31, 2023 at 10:01 AM Sasha Levin <sashal@kernel.org> wrote:
>
> 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 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 ee238a16572e..0f0dd9b0d84a 100644
> --- a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c
> +++ b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c
> @@ -10769,6 +10769,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;
> #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 20:29 UTC|newest]
Thread overview: 14+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-01-31 15:00 [PATCH AUTOSEL 5.15 01/12] i2c: designware-pci: Add new PCI IDs for AMD NAVI GPU Sasha Levin
2023-01-31 15:00 ` [PATCH AUTOSEL 5.15 02/12] i2c: mxs: suppress probe-deferral error message Sasha Levin
2023-01-31 15:00 ` [PATCH AUTOSEL 5.15 03/12] scsi: target: core: Fix warning on RT kernels Sasha Levin
2023-01-31 15:00 ` [PATCH AUTOSEL 5.15 04/12] perf/x86/intel: Add Emerald Rapids Sasha Levin
2023-01-31 15:00 ` [PATCH AUTOSEL 5.15 05/12] scsi: iscsi_tcp: Fix UAF during logout when accessing the shost ipaddress Sasha Levin
2023-01-31 15:00 ` [PATCH AUTOSEL 5.15 06/12] scsi: iscsi_tcp: Fix UAF during login " Sasha Levin
2023-01-31 15:00 ` [PATCH AUTOSEL 5.15 07/12] i2c: rk3x: fix a bunch of kernel-doc warnings Sasha Levin
2023-01-31 15:00 ` [PATCH AUTOSEL 5.15 08/12] platform/x86: dell-wmi: Add a keymap for KEY_MUTE in type 0x0010 table Sasha Levin
2023-01-31 15:00 ` [PATCH AUTOSEL 5.15 09/12] platform/x86: gigabyte-wmi: add support for B450M DS3H WIFI-CF Sasha Levin
2023-01-31 15:00 ` [PATCH AUTOSEL 5.15 10/12] net/x25: Fix to not accept on connected socket Sasha Levin
2023-01-31 15:00 ` [PATCH AUTOSEL 5.15 11/12] drm/amd/display: Fix timing not changning when freesync video is enabled Sasha Levin
2023-01-31 15:00 ` [PATCH AUTOSEL 5.15 12/12] amdgpu: fix build on non-DCN platforms Sasha Levin
2023-01-31 20:29 ` Alex Deucher [this message]
2023-02-05 14:17 ` Sasha Levin
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='CADnq5_M=WvEf6N9my2cjX1=aQdweKfrshyU+Q8Ohuo5=DBtf+w@mail.gmail.com' \
--to=alexdeucher@gmail.com \
--cc=Jerry.Zuo@amd.com \
--cc=Rodrigo.Siqueira@amd.com \
--cc=Xinhui.Pan@amd.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=dri-devel@lists.freedesktop.org \
--cc=linux-kernel@vger.kernel.org \
--cc=roman.li@amd.com \
--cc=sashal@kernel.org \
--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;
as well as URLs for NNTP newsgroup(s).