drm/amd/display: return status of dmub_srv_get_fw_boot_status
Subsystems (3)
PATCH 1/1 drm/amd/display: return status of dmub_srv_get_fw_boot_status
gcc with W=1 reports drivers/gpu/drm/amd/amdgpu/../display/dc/dc_dmub_srv.c:
In function ‘dc_dmub_srv_optimized_init_done’:drivers/gpu/drm/amd/amdgpu/../display/dc/dc_dmub_srv.c:184:26:
error: variable ‘dmub’ set but not used [-Werror=unused-but-set-variable]
184 | struct dmub_srv *dmub;
| ^~~~
The return status is never set.
It looks like a call to dmub_srv_get_fw_boot_status is missing.
--- drivers/gpu/drm/amd/display/dc/dc_dmub_srv.c | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-)
drivers/gpu/drm/amd/display/dc/dc_dmub_srv.c +11 -2
@@ -182,14 +182,23 @@ bool dc_dmub_srv_cmd_run_list(struct dc_dmub_srv *dc_dmub_srv, unsigned int counbool dc_dmub_srv_optimized_init_done (struct dc_dmub_srv *dc_dmub_srv) {struct dmub_srv *dmub; -union dmub_fw_boot_status status; +struct dc_context *dc_ctx; +union dmub_fw_boot_status boot_status; +enum dmub_status status;if (!dc_dmub_srv || !dc_dmub_srv->dmub)return false; dmub = dc_dmub_srv->dmub; + dc_ctx = dc_dmub_srv->ctx; + + status =dmub_srv_get_fw_boot_status (dmub, &boot_status); +if (status !=DMUB_STATUS_OK ) { +DC_ERROR ("Error querying DMUB boot status: error=%d\n" , status); +return false; + } -return status.bits.optimized_init_done; +return boot_status.bits.optimized_init_done; } bool dc_dmub_srv_notify_stream_mask(struct dc_dmub_srv *dc_dmub_srv,
Signature · 1 line
2.27.0
Quoted 8 lines · Tom Rix
gcc with W=1 reports
drivers/gpu/drm/amd/amdgpu/../display/dc/dc_dmub_srv.c:
In function ‘dc_dmub_srv_optimized_init_done’:drivers/gpu/drm/amd/amdgpu/../display/dc/dc_dmub_srv.c:184:26:
error: variable ‘dmub’ set but not used [-Werror=unused-but-set-variable]
184 | structdmub_srv*dmub;
| ^~~~
Quoted 4 lines
The return status is never set.
It looks like a call todmub_srv_get_fw_boot_statusis missing.Fixes 499e4b1c722e ("drm/amd/display: add mechanism to skip DCN init")
What tree is this based on? I am unable to find that exact commit on amd-staging-drm-next.
Quoted 35 lines
Signed-off-by Tom Rix <[email protected]>--- drivers/gpu/drm/amd/display/dc/dc_dmub_srv.c | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-)drivers/gpu/drm/amd/display/dc/dc_dmub_srv.c +11
-2@@ -182,14 +182,23 @@ bool dc_dmub_srv_cmd_run_list(struct dc_dmub_srv *dc_dmub_srv, unsigned int counbool dc_dmub_srv_optimized_init_done (struct dc_dmub_srv *dc_dmub_srv) {struct dmub_srv *dmub; -union dmub_fw_boot_status status; +struct dc_context *dc_ctx; +union dmub_fw_boot_status boot_status; +enum dmub_status status;if (!dc_dmub_srv || !dc_dmub_srv->dmub)return false; dmub = dc_dmub_srv->dmub; + dc_ctx = dc_dmub_srv->ctx; + + status =dmub_srv_get_fw_boot_status (dmub, &boot_status); +if (status !=DMUB_STATUS_OK ) { +DC_ERROR ("Error querying DMUB boot status: error=%d\n" , status); +return false; + } -return status.bits.optimized_init_done; +return boot_status.bits.optimized_init_done; } bool dc_dmub_srv_notify_stream_mask(struct dc_dmub_srv *dc_dmub_srv,
Signature · 1 line
Hamza
Quoted 10 lines · Hamza Mahfooz
Quoted 8 lines · Tom Rix
gcc with W=1 reports
drivers/gpu/drm/amd/amdgpu/../display/dc/dc_dmub_srv.c:
In function ‘dc_dmub_srv_optimized_init_done’:drivers/gpu/drm/amd/amdgpu/../display/dc/dc_dmub_srv.c:184:26:
error: variable ‘dmub’ set but not used [-Werror=unused-but-set-variable] 184 | structdmub_srv*dmub;
| ^~~~
Quoted 7 lines
Quoted 4 lines
The return status is never set.
It looks like a call todmub_srv_get_fw_boot_statusis missing.Fixes 499e4b1c722e ("drm/amd/display: add mechanism to skip DCN init")What tree is this based on? I am unable to find that exact commit on amd-staging-drm-next.
linux-next
Tom
Quoted 34 lines
Quoted 34 lines
Signed-off-by Tom Rix <[email protected]>---
drivers/gpu/drm/amd/display/dc/dc_dmub_srv.c| 13 +++++++++++--1 file changed, 11 insertions(+), 2 deletions(-)drivers/gpu/drm/amd/display/dc/dc_dmub_srv.c +0
-0@@ -182,14 +182,23 @@ bool dc_dmub_srv_cmd_run_list(struct
dc_dmub_srv*dc_dmub_srv, unsigned int coun
booldc_dmub_srv_optimized_init_done(struct dc_dmub_srv *dc_dmub_srv){
structdmub_srv*dmub;
- uniondmub_fw_boot_statusstatus;
+ structdc_context*dc_ctx;
+ uniondmub_fw_boot_statusboot_status;
+ enumdmub_statusstatus;
if (!dc_dmub_srv || !dc_dmub_srv->dmub)
return false;
dmub =dc_dmub_srv->dmub;
+dc_ctx=dc_dmub_srv->ctx;
+
+ status =dmub_srv_get_fw_boot_status(dmub, &boot_status); + if (status !=DMUB_STATUS_OK) {
+DC_ERROR("Error querying DMUB boot status: error=%d\n", status);
+ return false;
+ }
- return status.bits.optimized_init_done;
+ return boot_status.bits.optimized_init_done;
}
bool dc_dmub_srv_notify_stream_mask(structdc_dmub_srv*dc_dmub_srv,
Hamza Mahfooz
AppliedQuoted 8 lines · Tom Rix
gcc with W=1 reports
drivers/gpu/drm/amd/amdgpu/../display/dc/dc_dmub_srv.c:
In function ‘dc_dmub_srv_optimized_init_done’:drivers/gpu/drm/amd/amdgpu/../display/dc/dc_dmub_srv.c:184:26:
error: variable ‘dmub’ set but not used [-Werror=unused-but-set-variable]
184 | structdmub_srv*dmub;
| ^~~~
Quoted 5 lines
The return status is never set.
It looks like a call todmub_srv_get_fw_boot_statusis missing.Fixes 499e4b1c722e ("drm/amd/display: add mechanism to skip DCN init")Signed-off-by Tom Rix <[email protected]>
Applied, thanks!
Quoted 34 lines
--- drivers/gpu/drm/amd/display/dc/dc_dmub_srv.c | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-)drivers/gpu/drm/amd/display/dc/dc_dmub_srv.c +11
-2@@ -182,14 +182,23 @@ bool dc_dmub_srv_cmd_run_list(struct dc_dmub_srv *dc_dmub_srv, unsigned int counbool dc_dmub_srv_optimized_init_done (struct dc_dmub_srv *dc_dmub_srv) {struct dmub_srv *dmub; -union dmub_fw_boot_status status; +struct dc_context *dc_ctx; +union dmub_fw_boot_status boot_status; +enum dmub_status status;if (!dc_dmub_srv || !dc_dmub_srv->dmub)return false; dmub = dc_dmub_srv->dmub; + dc_ctx = dc_dmub_srv->ctx; + + status =dmub_srv_get_fw_boot_status (dmub, &boot_status); +if (status !=DMUB_STATUS_OK ) { +DC_ERROR ("Error querying DMUB boot status: error=%d\n" , status); +return false; + } -return status.bits.optimized_init_done; +return boot_status.bits.optimized_init_done; } bool dc_dmub_srv_notify_stream_mask(struct dc_dmub_srv *dc_dmub_srv,
Signature · 1 line
Hamza