drm/amdgpu/display/mst: fix an unused-variable warning
Subsystems (3)
PATCH 1/1 drm/amdgpu/display/mst: fix an unused-variable warning
From: Arnd Bergmann <[email protected]>
The newly added code is in an #ifdef, so the variables that are only used in there cause a warning if CONFIG_DRM_AMD_DC_DCN is disabled:
drivers/gpu/drm/amd/amdgpu/../display/amdgpu_dm/amdgpu_dm.c: In function 'amdgpu_dm_atomic_check':drivers/gpu/drm/amd/amdgpu/../display/amdgpu_dm/amdgpu_dm.c:9698:43: error: unused variable 'mst_state' [-Werror=unused-variable]
9698 | struct drm_dp_mst_topology_state *mst_state;
| ^~~~~~~~~drivers/gpu/drm/amd/amdgpu/../display/amdgpu_dm/amdgpu_dm.c:9697:41: error: unused variable 'mgr' [-Werror=unused-variable]
9697 | struct drm_dp_mst_topology_mgr *mgr;
| ^~~
--- drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c | 2 ++ 1 file changed, 2 insertions(+)
drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c +2 -0
@@ -9694,8 +9694,10 @@ 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; +#if defined(CONFIG_DRM_AMD_DC_DCN )struct drm_dp_mst_topology_mgr *mgr;struct drm_dp_mst_topology_state *mst_state; +#endif struct drm_plane *plane;struct drm_plane_state *old_plane_state, *new_plane_state;enum dc_status status;
Signature · 1 line
2.39.0
Hamza Mahfooz
AppliedQuoted 14 lines · Arnd Bergmann
From: Arnd Bergmann <[email protected]>
The newly added code is in an #ifdef, so the variables that are only used in there cause a warning if
CONFIG_DRM_AMD_DC_DCNis disabled:
drivers/gpu/drm/amd/amdgpu/../display/amdgpu_dm/amdgpu_dm.c: In function 'amdgpu_dm_atomic_check':drivers/gpu/drm/amd/amdgpu/../display/amdgpu_dm/amdgpu_dm.c:9698:43: error: unused variable 'mst_state' [-Werror=unused-variable]
9698 | structdrm_dp_mst_topology_state*mst_state;
| ^~~~~~~~~drivers/gpu/drm/amd/amdgpu/../display/amdgpu_dm/amdgpu_dm.c:9697:41: error: unused variable 'mgr' [-Werror=unused-variable]
9697 | structdrm_dp_mst_topology_mgr*mgr;
| ^~~
Quoted 2 lines
Fixes c689e1e362ea ("drm/amdgpu/display/mst: Fix mst_state->pbn_div and slot count assignments")Signed-off-by Arnd Bergmann <[email protected]>
Applied, thanks!
Quoted 19 lines
--- drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c | 2 ++ 1 file changed, 2 insertions(+)drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c +2
-0@@ -9694,8 +9694,10 @@ 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; +#if defined(CONFIG_DRM_AMD_DC_DCN )struct drm_dp_mst_topology_mgr *mgr;struct drm_dp_mst_topology_state *mst_state; +#endif struct drm_plane *plane;struct drm_plane_state *old_plane_state, *new_plane_state;enum dc_status status;
Signature · 1 line
Hamza
Dave Airlie
maintainerQuoted 25 lines · Hamza Mahfooz
Quoted 14 lines · Arnd Bergmann
From: Arnd Bergmann <[email protected]>
The newly added code is in an #ifdef, so the variables that are only used in there cause a warning if
CONFIG_DRM_AMD_DC_DCNis disabled:
drivers/gpu/drm/amd/amdgpu/../display/amdgpu_dm/amdgpu_dm.c: In function 'amdgpu_dm_atomic_check':drivers/gpu/drm/amd/amdgpu/../display/amdgpu_dm/amdgpu_dm.c:9698:43: error: unused variable 'mst_state' [-Werror=unused-variable]
9698 | structdrm_dp_mst_topology_state*mst_state;
| ^~~~~~~~~drivers/gpu/drm/amd/amdgpu/../display/amdgpu_dm/amdgpu_dm.c:9697:41: error: unused variable 'mgr' [-Werror=unused-variable]
9697 | structdrm_dp_mst_topology_mgr*mgr;
| ^~~Quoted 2 lines
Fixes c689e1e362ea ("drm/amdgpu/display/mst: Fix mst_state->pbn_div and slot count assignments")Signed-off-by Arnd Bergmann <[email protected]>Applied, thanks!
Quoted 4 lines
--- drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c | 2 ++ 1 file changed, 2 insertions(+)
Quoted 16 lines
Quoted 5 lines
drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c +0
-0drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c static int amdgpu_dm_atomic_check(struct drm_device *dev, · line 9703
Quoted 10 lines
drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c +2
-0@@ -9694,8 +9694,10 @@ 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; +#if defined(CONFIG_DRM_AMD_DC_DCN )struct drm_dp_mst_topology_mgr *mgr;struct drm_dp_mst_topology_state *mst_state; +#endif struct drm_plane *plane;struct drm_plane_state *old_plane_state, *new_plane_state;enum dc_status status;
I've pushed an alternate fix to drm-fixes as I pulled in a tree this morning and it failed to build on arm here.
Dave.