drm/amdgpu: mark gfx_v9_4_3_disable_gpa_mode() static
Subsystems (3)
PATCH 1/3 drm/amdgpu: mark gfx_v9_4_3_disable_gpa_mode() static
From: Arnd Bergmann <[email protected]>
This was left global by accident, the corresponding functions for other hardware types are already static:
drivers/gpu/drm/amd/amdgpu/gfx_v9_4_3.c:1072:6: error: no previous prototype for function 'gfx_v9_4_3_disable_gpa_mode' [-Werror,-Wmissing-prototypes]
--- drivers/gpu/drm/amd/amdgpu/gfx_v9_4_3.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/gpu/drm/amd/amdgpu/gfx_v9_4_3.c +1 -1
@@ -1069,7 +1069,7 @@ static void gfx_v9_4_3_init_pg(struct amdgpu_device *adev, int xcc_id) } } -void gfx_v9_4_3_disable_gpa_mode (struct amdgpu_device *adev,int xcc_id) +static void gfx_v9_4_3_disable_gpa_mode (struct amdgpu_device *adev,int xcc_id) {uint32_t data;
Signature · 1 line
2.39.2
PATCH 2/3 drm/amd/display: dumb_abm_lcd: avoid missing-prototype warnings
From: Arnd Bergmann <[email protected]>
The dmub_abm_set_ambient_level() function has no caller and can just be removed, the other ones have a declaration in the header file and just need to see the prototype:
drivers/gpu/drm/amd/amdgpu/../display/dc/dce/dmub_abm_lcd.c:122:14: error: no previous prototype for function 'dmub_abm_get_current_backlight' [-Werror,-Wmissing-prototypes] drivers/gpu/drm/amd/amdgpu/../display/dc/dce/dmub_abm_lcd.c:133:14: error: no previous prototype for function 'dmub_abm_get_target_backlight' [-Werror,-Wmissing-prototypes] drivers/gpu/drm/amd/amdgpu/../display/dc/dce/dmub_abm_lcd.c:144:6: error: no previous prototype for function 'dmub_abm_set_level' [-Werror,-Wmissing-prototypes] drivers/gpu/drm/amd/amdgpu/../display/dc/dce/dmub_abm_lcd.c:163:6: error: no previous prototype for function 'dmub_abm_set_ambient_level' [-Werror,-Wmissing-prototypes] drivers/gpu/drm/amd/amdgpu/../display/dc/dce/dmub_abm_lcd.c:183:6: error: no previous prototype for function 'dmub_abm_init_config' [-Werror,-Wmissing-prototypes] drivers/gpu/drm/amd/amdgpu/../display/dc/dce/dmub_abm_lcd.c:213:6: error: no previous prototype for function 'dmub_abm_set_pause' [-Werror,-Wmissing-prototypes] drivers/gpu/drm/amd/amdgpu/../display/dc/dce/dmub_abm_lcd.c:231:6: error: no previous prototype for function 'dmub_abm_set_pipe' [-Werror,-Wmissing-prototypes] drivers/gpu/drm/amd/amdgpu/../display/dc/dce/dmub_abm_lcd.c:251:6: error: no previous prototype for function 'dmub_abm_set_backlight_level' [-Werror,-Wmissing-prototypes]
--- .../gpu/drm/amd/display/dc/dce/dmub_abm_lcd.c | 22 +------------------ 1 file changed, 1 insertion(+), 21 deletions(-)
drivers/gpu/drm/amd/display/dc/dce/dmub_abm_lcd.c +1 -21
@@ -24,6 +24,7 @@*/ #include "dmub_abm.h" +#include "dmub_abm_lcd.h" #include "dce_abm.h" #include "dc.h" #include "dc_dmub_srv.h"
@@ -159,27 +160,6 @@ bool dmub_abm_set_level(struct abm *abm, uint32_t level, uint8_t panel_mask)return true; } -#ifndef TRIM_AMBIENT_GAMMA -void dmub_abm_set_ambient_level (struct abm *abm,unsigned int ambient_lux,uint8_t panel_mask) -{ -union dmub_rb_cmd cmd; -struct dc_context *dc = abm->ctx; - -if (ambient_lux >0xFFFF ) - ambient_lux =0xFFFF ; - -memset (&cmd,0 ,sizeof (cmd)); - cmd.abm_set_ambient_level.header.type =DMUB_CMD__ABM ; - cmd.abm_set_ambient_level.header.sub_type =DMUB_CMD__ABM_SET_AMBIENT_LEVEL ; - cmd.abm_set_ambient_level.abm_set_ambient_level_data.ambient_lux = ambient_lux; - cmd.abm_set_ambient_level.abm_set_ambient_level_data.version =DMUB_CMD_ABM_CONTROL_VERSION_1 ; - cmd.abm_set_ambient_level.abm_set_ambient_level_data.panel_mask = panel_mask; - cmd.abm_set_ambient_level.header.payload_bytes =sizeof (struct dmub_cmd_abm_set_ambient_level_data ); - -dm_execute_dmub_cmd (dc, &cmd,DM_DMUB_WAIT_TYPE_WAIT ); -} -#endif - void dmub_abm_init_config(struct abm *abm, const char *src, unsigned int bytes,
Signature · 1 line
2.39.2
Hamza Mahfooz
AppliedRe: [PATCH 2/3] drm/amd/display: dumb_abm_lcd: avoid missing-prototype warnings
Quoted 15 lines · Arnd Bergmann
From: Arnd Bergmann <[email protected]>
The
dmub_abm_set_ambient_level()function has no caller and can just be removed, the other ones have a declaration in the header file and just need to see the prototype:
drivers/gpu/drm/amd/amdgpu/../display/dc/dce/dmub_abm_lcd.c:122:14: error: no previous prototype for function 'dmub_abm_get_current_backlight' [-Werror,-Wmissing-prototypes]drivers/gpu/drm/amd/amdgpu/../display/dc/dce/dmub_abm_lcd.c:133:14: error: no previous prototype for function 'dmub_abm_get_target_backlight' [-Werror,-Wmissing-prototypes]drivers/gpu/drm/amd/amdgpu/../display/dc/dce/dmub_abm_lcd.c:144:6: error: no previous prototype for function 'dmub_abm_set_level' [-Werror,-Wmissing-prototypes]drivers/gpu/drm/amd/amdgpu/../display/dc/dce/dmub_abm_lcd.c:163:6: error: no previous prototype for function 'dmub_abm_set_ambient_level' [-Werror,-Wmissing-prototypes]drivers/gpu/drm/amd/amdgpu/../display/dc/dce/dmub_abm_lcd.c:183:6: error: no previous prototype for function 'dmub_abm_init_config' [-Werror,-Wmissing-prototypes]drivers/gpu/drm/amd/amdgpu/../display/dc/dce/dmub_abm_lcd.c:213:6: error: no previous prototype for function 'dmub_abm_set_pause' [-Werror,-Wmissing-prototypes]drivers/gpu/drm/amd/amdgpu/../display/dc/dce/dmub_abm_lcd.c:231:6: error: no previous prototype for function 'dmub_abm_set_pipe' [-Werror,-Wmissing-prototypes]drivers/gpu/drm/amd/amdgpu/../display/dc/dce/dmub_abm_lcd.c:251:6: error: no previous prototype for function 'dmub_abm_set_backlight_level' [-Werror,-Wmissing-prototypes]
Quoted 2 lines
Fixes b8fe56375f78 ("drm/amd/display: Refactor ABM feature")Signed-off-by Arnd Bergmann <[email protected]>
Applied, thanks!
Quoted 44 lines
--- .../gpu/drm/amd/display/dc/dce/dmub_abm_lcd.c | 22 +------------------ 1 file changed, 1 insertion(+), 21 deletions(-)drivers/gpu/drm/amd/display/dc/dce/dmub_abm_lcd.c +1
-21@@ -24,6 +24,7 @@*/ #include "dmub_abm.h" +#include "dmub_abm_lcd.h" #include "dce_abm.h" #include "dc.h" #include "dc_dmub_srv.h" @@ -159,27 +160,6 @@ bool dmub_abm_set_level(struct abm *abm, uint32_t level, uint8_t panel_mask)return true; } -#ifndef TRIM_AMBIENT_GAMMA -void dmub_abm_set_ambient_level (struct abm *abm,unsigned int ambient_lux,uint8_t panel_mask) -{ -union dmub_rb_cmd cmd; -struct dc_context *dc = abm->ctx; - -if (ambient_lux >0xFFFF ) - ambient_lux =0xFFFF ; - -memset (&cmd,0 ,sizeof (cmd)); - cmd.abm_set_ambient_level.header.type =DMUB_CMD__ABM ; - cmd.abm_set_ambient_level.header.sub_type =DMUB_CMD__ABM_SET_AMBIENT_LEVEL ; - cmd.abm_set_ambient_level.abm_set_ambient_level_data.ambient_lux = ambient_lux; - cmd.abm_set_ambient_level.abm_set_ambient_level_data.version =DMUB_CMD_ABM_CONTROL_VERSION_1 ; - cmd.abm_set_ambient_level.abm_set_ambient_level_data.panel_mask = panel_mask; - cmd.abm_set_ambient_level.header.payload_bytes =sizeof (struct dmub_cmd_abm_set_ambient_level_data ); - -dm_execute_dmub_cmd (dc, &cmd,DM_DMUB_WAIT_TYPE_WAIT ); -} -#endif - void dmub_abm_init_config(struct abm *abm, const char *src, unsigned int bytes,
Signature · 1 line
Hamza
PATCH 3/3 drm/amd/display: remove unused variables in dcn21_set_backlight_level
In reply to Arnd BergmannFrom: Arnd Bergmann <[email protected]>
The only references to these variables were removed, so they now cause warnings and have to be removed as well:
drivers/gpu/drm/amd/amdgpu/../display/dc/dcn21/dcn21_hwseq.c:226:20: error: unused variable 'cmd' [-Werror,-Wunused-variable] drivers/gpu/drm/amd/amdgpu/../display/dc/dcn21/dcn21_hwseq.c:229:11: error: unused variable 'otg_inst' [-Werror,-Wunused-variable]
--- drivers/gpu/drm/amd/display/dc/dcn21/dcn21_hwseq.c | 2 -- 1 file changed, 2 deletions(-)
drivers/gpu/drm/amd/display/dc/dcn21/dcn21_hwseq.c +0 -2
@@ -223,10 +223,8 @@ bool dcn21_set_backlight_level(struct pipe_ctx *pipe_ctx, uint32_t backlight_pwm_u16_16, uint32_t frame_ramp) { -union dmub_rb_cmd cmd;struct dc_context *dc = pipe_ctx->stream->ctx;struct abm *abm = pipe_ctx->stream_res.abm; -uint32_t otg_inst = pipe_ctx->stream_res.tg->inst;struct panel_cntl *panel_cntl = pipe_ctx->stream->link->panel_cntl;if (dc->dc->res_pool->dmcu) {
Signature · 1 line
2.39.2
Re: [PATCH 3/3] drm/amd/display: remove unused variables in dcn21_set_backlight_level
Quoted 10 lines · Arnd Bergmann
From: Arnd Bergmann <[email protected]>
The only references to these variables were removed, so they now cause warnings and have to be removed as well:
drivers/gpu/drm/amd/amdgpu/../display/dc/dcn21/dcn21_hwseq.c:226:20: error: unused variable 'cmd' [-Werror,-Wunused-variable]drivers/gpu/drm/amd/amdgpu/../display/dc/dcn21/dcn21_hwseq.c:229:11: error: unused variable 'otg_inst' [-Werror,-Wunused-variable]Fixes 6f0ef80a00ad ("drm/amd/display: Fix ABM pipe/backlight issues when change backlight")Signed-off-by Arnd Bergmann <[email protected]>
This has already been fixed, as of commit 1adb4dd5bd4b ("drm/amd/display: Remove unused variables in dcn21_hwseq.c") in amd-staging-drm-next.
Quoted 19 lines
--- drivers/gpu/drm/amd/display/dc/dcn21/dcn21_hwseq.c | 2 -- 1 file changed, 2 deletions(-)drivers/gpu/drm/amd/display/dc/dcn21/dcn21_hwseq.c +0
-2@@ -223,10 +223,8 @@ bool dcn21_set_backlight_level(struct pipe_ctx *pipe_ctx, uint32_t backlight_pwm_u16_16, uint32_t frame_ramp) { -union dmub_rb_cmd cmd;struct dc_context *dc = pipe_ctx->stream->ctx;struct abm *abm = pipe_ctx->stream_res.abm; -uint32_t otg_inst = pipe_ctx->stream_res.tg->inst;struct panel_cntl *panel_cntl = pipe_ctx->stream->link->panel_cntl;if (dc->dc->res_pool->dmcu) {
Signature · 1 line
Hamza