Skip to contentSkip to conversation

drm/amd/display: return status of abm_feature_support

PATCH In review Tom Rix 2 participants 2 messages Apr 20, 2023 – Apr 24, 2023

Subsystems (3)
lore
Share & tools
lore

Tom Rix

author
#0 lore raw

PATCH 1/1 drm/amd/display: return status of abm_feature_support

gcc with W=1 reports drivers/gpu/drm/amd/amdgpu/../display/dc/dce/dmub_abm.c:
In function ‘dmub_abm_set_event_ex’:
drivers/gpu/drm/amd/amdgpu/../display/dc/dce/dmub_abm.c:138:22: error: variable
‘feature_support’ set but not used [-Werror=unused-but-set-variable]

  138 |         unsigned int feature_support;
      |                      ^~~~~~~~~~~~~~~

This variable is not used so remove it.
The status of amb_feature_support should have been returned, so set ret and return it.

Fixes b8fe56375f78 ("drm/amd/display: Refactor ABM feature")
---
 drivers/gpu/drm/amd/display/dc/dce/dmub_abm.c | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)
drivers/gpu/drm/amd/display/dc/dce/dmub_abm.c +2 -3
index a66f83a61402..8f285c3be4c6 100644
@@ -134,10 +134,9 @@ static bool dmub_abm_set_pipe_ex(struct abm *abm, uint32_t otg_inst, uint32_t op
 static bool dmub_abm_set_event_ex(struct abm *abm, unsigned int full_screen, unsigned int video_mode,
 		unsigned int hdr_mode, unsigned int panel_inst)
 {
-	bool ret = false;
-	unsigned int feature_support;
+	bool ret;
 
-	feature_support = abm_feature_support(abm, panel_inst);
+	ret = abm_feature_support(abm, panel_inst);
 
 	return ret;
 }
Signature · 1 line
2.27.0
#1 lore raw
Quoted 8 lines · Tom Rix

gcc with W=1 reports drivers/gpu/drm/amd/amdgpu/../display/dc/dce/dmub_abm.c:
In function ‘dmub_abm_set_event_ex’:
drivers/gpu/drm/amd/amdgpu/../display/dc/dce/dmub_abm.c:138:22: error: variable
‘feature_support’ set but not used [-Werror=unused-but-set-variable]

   138 |         unsigned int feature_support;
       |                      ^~~~~~~~~~~~~~~
Quoted 6 lines

This variable is not used so remove it.
The status of amb_feature_support should have been returned, so set ret and return it.

Fixes b8fe56375f78 ("drm/amd/display: Refactor ABM feature")

Since set_abm_event() is never used. I would prefer if it was dropped entirely.

Quoted 21 lines
---
  drivers/gpu/drm/amd/display/dc/dce/dmub_abm.c | 5 ++---
  1 file changed, 2 insertions(+), 3 deletions(-)
drivers/gpu/drm/amd/display/dc/dce/dmub_abm.c +2 -3
index a66f83a61402..8f285c3be4c6 100644
@@ -134,10 +134,9 @@ static bool dmub_abm_set_pipe_ex(struct abm *abm, uint32_t otg_inst, uint32_t op
  static bool dmub_abm_set_event_ex(struct abm *abm, unsigned int full_screen, unsigned int video_mode,
  		unsigned int hdr_mode, unsigned int panel_inst)
  {
-	bool ret = false;
-	unsigned int feature_support;
+	bool ret;
 
-	feature_support = abm_feature_support(abm, panel_inst);
+	ret = abm_feature_support(abm, panel_inst);
 
  	return ret;
  }
Signature · 1 line
Hamza