amdgpu: fix build on non-DCN platforms.
authorjsg <jsg@openbsd.org>
Thu, 2 Feb 2023 04:24:59 +0000 (04:24 +0000)
committerjsg <jsg@openbsd.org>
Thu, 2 Feb 2023 04:24:59 +0000 (04:24 +0000)
From Dave Airlie
432ddb5765c45e12339f2980463c89b21c96b504 in linux-6.1.y/6.1.9
f439a959dcfb6b39d6fd4b85ca1110a1d1de1587 in mainline linux

sys/dev/pci/drm/amd/display/amdgpu_dm/amdgpu_dm.c

index c33fc7a..ad33dc8 100644 (file)
@@ -9397,8 +9397,6 @@ static int amdgpu_dm_atomic_check(struct drm_device *dev,
        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;
@@ -9406,6 +9404,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