Skip to contentSkip to conversation

drm/amd/display: return status of dmub_srv_get_fw_boot_status

PATCH Applied Tom Rix 2 participants 4 messages Apr 20, 2023 – Apr 26, 2023

Subsystems (3)
lore
Share & tools
lore

Tom Rix

author
#0 lore raw

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.

Fixes 499e4b1c722e ("drm/amd/display: add mechanism to skip DCN init")
---
 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
index d15ec32243e2..36d936ab4300 100644
@@ -182,14 +182,23 @@ bool dc_dmub_srv_cmd_run_list(struct dc_dmub_srv *dc_dmub_srv, unsigned int coun
 bool 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
#1 lore raw
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 | struct dmub_srv *dmub;
| ^~~~

Quoted 4 lines

The return status is never set.
It looks like a call to dmub_srv_get_fw_boot_status is 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
---
  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
index d15ec32243e2..36d936ab4300 100644
@@ -182,14 +182,23 @@ bool dc_dmub_srv_cmd_run_list(struct dc_dmub_srv *dc_dmub_srv, unsigned int coun
  bool 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
author
#2 lore raw
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 |         struct dmub_srv *dmub;
       |                          ^~~~

Quoted 7 lines
Quoted 4 lines

The return status is never set.
It looks like a call to dmub_srv_get_fw_boot_status is 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

---
  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
index d15ec32243e2..36d936ab4300 100644
@@ -182,14 +182,23 @@ bool dc_dmub_srv_cmd_run_list(struct 

dc_dmub_srv *dc_dmub_srv, unsigned int coun
  bool 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,

#3 lore raw
In reply to Tom Rix
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 | struct dmub_srv *dmub;
| ^~~~

Quoted 5 lines

The return status is never set.
It looks like a call to dmub_srv_get_fw_boot_status is missing.

Fixes 499e4b1c722e ("drm/amd/display: add mechanism to skip DCN init")

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
index d15ec32243e2..36d936ab4300 100644
@@ -182,14 +182,23 @@ bool dc_dmub_srv_cmd_run_list(struct dc_dmub_srv *dc_dmub_srv, unsigned int coun
  bool 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