| Message ID | 20230126163605.3524630-1-arnd@kernel.org (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | drm/amdgpu/display/mst: fix an unused-variable warning | expand |
On 1/26/23 11:35, Arnd Bergmann wrote: > From: Arnd Bergmann <arnd@arndb.de> > > 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; > | ^~~ > > Fixes: c689e1e362ea ("drm/amdgpu/display/mst: Fix mst_state->pbn_div and slot count assignments") > Signed-off-by: Arnd Bergmann <arnd@arndb.de> Applied, thanks! > --- > 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 be1232356f9e..c966bb05f6c7 100644 > --- a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c > +++ b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c > @@ -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;
On Fri, 27 Jan 2023 at 07:06, Hamza Mahfooz <hamza.mahfooz@amd.com> wrote: > > On 1/26/23 11:35, Arnd Bergmann wrote: > > From: Arnd Bergmann <arnd@arndb.de> > > > > 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; > > | ^~~ > > > > Fixes: c689e1e362ea ("drm/amdgpu/display/mst: Fix mst_state->pbn_div and slot count assignments") > > Signed-off-by: Arnd Bergmann <arnd@arndb.de> > > Applied, thanks! > > > --- > > 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 be1232356f9e..c966bb05f6c7 100644 > > --- a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c > > +++ b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c > > @@ -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.
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 be1232356f9e..c966bb05f6c7 100644 --- a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c +++ b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c @@ -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;