Commit a4ead6e3 authored by Arnd Bergmann's avatar Arnd Bergmann Committed by Danilo Krummrich
Browse files

drm/nouveau/kms/nv50: hide unused variables 



After a recent change, two variables are only used in an #ifdef:

drivers/gpu/drm/nouveau/dispnv50/disp.c: In function 'nv50_sor_atomic_disable':
drivers/gpu/drm/nouveau/dispnv50/disp.c:1569:13: error: unused variable 'ret' [-Werror=unused-variable]
 1569 |         int ret;
      |             ^~~
drivers/gpu/drm/nouveau/dispnv50/disp.c:1568:28: error: unused variable 'aux' [-Werror=unused-variable]
 1568 |         struct drm_dp_aux *aux = &nv_connector->aux;
      |                            ^~~

Move them into the same conditional block, along with the nv_connector variable
that becomes unused during that fix.

Fixes: 75703380 ("drm/nouveau/kms/nv50-: fixup sink D3 before tearing down link")
Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
Reviewed-by: default avatarDanilo Krummrich <dakr@redhat.com>
Signed-off-by: default avatarDanilo Krummrich <dakr@redhat.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20230925155930.677620-1-arnd@kernel.org
parent 24c614c3

drivers/gpu/drm/nouveau/dispnv50/disp.c

+1 −3
Original line number Diff line number Diff line
@@ -1560,15 +1560,13 @@ nv50_sor_atomic_disable(struct drm_encoder *encoder, struct drm_atomic_state *st 
{

	struct nouveau_encoder *nv_encoder = nouveau_encoder(encoder);

	struct nv50_head *head = nv50_head(nv_encoder->crtc);

	struct nouveau_connector *nv_connector = nv50_outp_get_old_connector(state, nv_encoder);

#ifdef CONFIG_DRM_NOUVEAU_BACKLIGHT

	struct nouveau_connector *nv_connector = nv50_outp_get_old_connector(state, nv_encoder);

	struct nouveau_drm *drm = nouveau_drm(nv_encoder->base.base.dev);

	struct nouveau_backlight *backlight = nv_connector->backlight;

#endif

	struct drm_dp_aux *aux = &nv_connector->aux;

	int ret;



#ifdef CONFIG_DRM_NOUVEAU_BACKLIGHT

	if (backlight && backlight->uses_dpcd) {

		ret = drm_edp_backlight_disable(aux, &backlight->edp_info);

		if (ret < 0)