RE: [PATCH] drm/amd/display: Fix unused variable warning

[Lin, Wayne]

[AMD Official Use Only - Internal Distribution Only]

Thanks Arnd.

Reviewed-by: Wayne Lin <Wayne.Lin@xxxxxxx>

-----Original Message-----
From: Arnd Bergmann <arnd@xxxxxxxxxx>
Sent: Sunday, January 3, 2021 10:03 PM
To: Wentland, Harry <Harry.Wentland@xxxxxxx>; Li, Sun peng (Leo) <Sunpeng.Li@xxxxxxx>; Deucher, Alexander <Alexander.Deucher@xxxxxxx>; Koenig, Christian <Christian.Koenig@xxxxxxx>; David Airlie <airlied@xxxxxxxx>; Daniel Vetter <daniel@xxxxxxxx>; R, Bindu <Bindu.R@xxxxxxx>; Lin, Wayne <Wayne.Lin@xxxxxxx>
Cc: Arnd Bergmann <arnd@xxxxxxxx>; Kazlauskas, Nicholas <Nicholas.Kazlauskas@xxxxxxx>; Siqueira, Rodrigo <Rodrigo.Siqueira@xxxxxxx>; Pillai, Aurabindo <Aurabindo.Pillai@xxxxxxx>; Wang, Chao-kai (Stylon) <Stylon.Wang@xxxxxxx>; Simon Ser <contact@xxxxxxxxxxx>; Brol, Eryk <Eryk.Brol@xxxxxxx>; Bas Nieuwenhuizen <bas@xxxxxxxxxxxxxxxxxxx>; Lakha, Bhawanpreet <Bhawanpreet.Lakha@xxxxxxx>; dri-devel@xxxxxxxxxxxxxxxxxxxxx; linux-kernel@xxxxxxxxxxxxxxx
Subject: [PATCH] drm/amd/display: Fix unused variable warning

From: Arnd Bergmann <arnd@xxxxxxxx>

Some of the newly added code is hidden inside of #ifdef blocks, but one variable is unused when debugfs is disabled:

drivers/gpu/drm/amd/amdgpu/../display/amdgpu_dm/amdgpu_dm.c:8370:8: error: unused variable 'configure_crc' [-Werror,-Wunused-variable]

Change the #ifdef to an if(IS_ENABLED()) check to fix the warning and avoid adding more #ifdefs.

Fixes: c920888c604d ("drm/amd/display: Expose new CRC window property")
Signed-off-by: Arnd Bergmann <arnd@xxxxxxxx>
---
 drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c     | 4 +---
 drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_crc.h | 2 +-
 2 files changed, 2 insertions(+), 4 deletions(-)

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 42b0fdb72e7b..5071b55ad0f6 100644
--- a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c
+++ b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c
@@ -8379,8 +8379,7 @@ static void amdgpu_dm_atomic_commit_tail(struct drm_atomic_state *state)
 acrtc->dm_irq_params.stream = dm_new_crtc_state->stream;
 manage_dm_interrupts(adev, acrtc, true);
 }
-#ifdef CONFIG_DEBUG_FS
-if (new_crtc_state->active &&
+if (IS_ENABLED(CONFIG_DEBUG_FS) && new_crtc_state->active &&
 amdgpu_dm_is_valid_crc_source(dm_new_crtc_state->crc_src)) {
 /**
  * Frontend may have changed so reapply the CRC capture @@ -8401,7 +8400,6 @@ static void amdgpu_dm_atomic_commit_tail(struct drm_atomic_state *state)
 amdgpu_dm_crtc_configure_crc_source(
 crtc, dm_new_crtc_state, dm_new_crtc_state->crc_src);
 }
-#endif
 }

 for_each_new_crtc_in_state(state, crtc, new_crtc_state, j) diff --git a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_crc.h b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_crc.h
index 0235bfb246e5..eba2f1d35d07 100644
--- a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_crc.h
+++ b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_crc.h
@@ -46,13 +46,13 @@ static inline bool amdgpu_dm_is_valid_crc_source(enum amdgpu_dm_pipe_crc_source  }

 /* amdgpu_dm_crc.c */
-#ifdef CONFIG_DEBUG_FS
 bool amdgpu_dm_crc_window_is_default(struct dm_crtc_state *dm_crtc_state);  bool amdgpu_dm_crc_window_changed(struct dm_crtc_state *dm_new_crtc_state,
 struct dm_crtc_state *dm_old_crtc_state);  int amdgpu_dm_crtc_configure_crc_source(struct drm_crtc *crtc,
 struct dm_crtc_state *dm_crtc_state,
 enum amdgpu_dm_pipe_crc_source source);
+#ifdef CONFIG_DEBUG_FS
 int amdgpu_dm_crtc_set_crc_source(struct drm_crtc *crtc, const char *src_name);  int amdgpu_dm_crtc_verify_crc_source(struct drm_crtc *crtc,
      const char *src_name,
--
2.29.2