* [PATCH] drm/amdgpu/display/mst: fix an unused-variable warning
@ 2023-01-26 16:35 Arnd Bergmann
2023-01-26 21:07 ` Hamza Mahfooz
0 siblings, 1 reply; 3+ messages in thread
From: Arnd Bergmann @ 2023-01-26 16:35 UTC (permalink / raw)
To: Harry Wentland, Leo Li, Rodrigo Siqueira
Cc: Arnd Bergmann, Alex Deucher, Christian König, Pan, Xinhui,
David Airlie, Daniel Vetter, Roman Li, Wayne Lin,
Aurabindo Pillai, Stylon Wang, hersen wu, Lyude Paul, amd-gfx,
dri-devel, linux-kernel
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>
---
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;
--
2.39.0
^ permalink raw reply [flat|nested] 3+ messages in thread* Re: [PATCH] drm/amdgpu/display/mst: fix an unused-variable warning
2023-01-26 16:35 [PATCH] drm/amdgpu/display/mst: fix an unused-variable warning Arnd Bergmann
@ 2023-01-26 21:07 ` Hamza Mahfooz
2023-01-27 3:55 ` Dave Airlie
0 siblings, 1 reply; 3+ messages in thread
From: Hamza Mahfooz @ 2023-01-26 21:07 UTC (permalink / raw)
To: Arnd Bergmann, Harry Wentland, Leo Li, Rodrigo Siqueira
Cc: Stylon Wang, Arnd Bergmann, Pan, Xinhui, Roman Li, amd-gfx,
linux-kernel, Aurabindo Pillai, hersen wu, dri-devel,
Daniel Vetter, Wayne Lin, Alex Deucher, David Airlie,
Christian König
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;
--
Hamza
^ permalink raw reply [flat|nested] 3+ messages in thread* Re: [PATCH] drm/amdgpu/display/mst: fix an unused-variable warning
2023-01-26 21:07 ` Hamza Mahfooz
@ 2023-01-27 3:55 ` Dave Airlie
0 siblings, 0 replies; 3+ messages in thread
From: Dave Airlie @ 2023-01-27 3:55 UTC (permalink / raw)
To: Hamza Mahfooz
Cc: Arnd Bergmann, Harry Wentland, Leo Li, Rodrigo Siqueira,
Stylon Wang, Arnd Bergmann, Pan, Xinhui, Roman Li, amd-gfx,
linux-kernel, Aurabindo Pillai, hersen wu, dri-devel,
Daniel Vetter, Wayne Lin, Alex Deucher, Christian König
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.
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2023-01-27 3:55 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2023-01-26 16:35 [PATCH] drm/amdgpu/display/mst: fix an unused-variable warning Arnd Bergmann
2023-01-26 21:07 ` Hamza Mahfooz
2023-01-27 3:55 ` Dave Airlie
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
Powered by JetHome