MIME-Version: 1.0
References: <20230131150030.1250104-1-sashal@kernel.org> <20230131150030.1250104-12-sashal@kernel.org>
In-Reply-To: <20230131150030.1250104-12-sashal@kernel.org>
From:   Alex Deucher <alexdeucher@gmail.com>
Date:   Tue, 31 Jan 2023 15:29:04 -0500
Message-ID: <CADnq5_M=WvEf6N9my2cjX1=aQdweKfrshyU+Q8Ohuo5=DBtf+w@mail.gmail.com>
Subject: Re: [PATCH AUTOSEL 5.15 12/12] amdgpu: fix build on non-DCN platforms.
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
Content-Type: text/plain; charset="UTF-8"
Precedence: bulk

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
>