Skip to contentSkip to conversation

drm/amd/display: fix dp_retrieve_lttpr_cap return code

PATCH Superseded Arnd Bergmann 3 participants 3 messages Dec 15, 2022 – Dec 16, 2022

Subsystems (3)

v1 of 2 Superseded Latest is v2 →

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 drm/amd/display: fix dp_retrieve_lttpr_cap return code

From: Arnd Bergmann <[email protected]>

The dp_retrieve_lttpr_cap() return type changed from 'bool' to 'enum dc_status', so now the early 'return' uses the wrong type:

drivers/gpu/drm/amd/amdgpu/../display/dc/core/dc_link_dp.c: In function 'dp_retrieve_lttpr_cap':
drivers/gpu/drm/amd/amdgpu/../display/dc/core/dc_link_dp.c:5075:24: error: implicit conversion from 'enum <anonymous>' to 'enum dc_status' [-Werror=enum-conversion]
5075 | return false;
| ^~~~~

Convert it to return 'DC_OK', which is the same value as 'false'.

Fixes b473bd5fc333 ("drm/amd/display: refine wake up aux in retrieve link caps")

---
No idea if DC_OK is the intended return code, but it leaves the behavior unchanged and fixes the warning.

---
 drivers/gpu/drm/amd/display/dc/core/dc_link_dp.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/gpu/drm/amd/display/dc/core/dc_link_dp.c +1 -1
index af9411ee3c74..95dbfa4e996a 100644
@@ -5095,7 +5095,7 @@ enum dc_status dp_retrieve_lttpr_cap(struct dc_link *link)
 	bool vbios_lttpr_interop = link->dc->caps.vbios_lttpr_aware;
 
 	if (!vbios_lttpr_interop || !link->dc->caps.extended_aux_timeout_support)
-		return false;
+		return DC_OK;
 
 	/* By reading LTTPR capability, RX assumes that we will enable
 	 * LTTPR extended aux timeout if LTTPR is present.
Signature · 1 line
2.35.1
#1 lore raw
Quoted 27 lines · Arnd Bergmann

From: Arnd Bergmann <[email protected]>

The dp_retrieve_lttpr_cap() return type changed from 'bool' to 'enum dc_status', so now the early 'return' uses the wrong type:

drivers/gpu/drm/amd/amdgpu/../display/dc/core/dc_link_dp.c: In function 'dp_retrieve_lttpr_cap':
drivers/gpu/drm/amd/amdgpu/../display/dc/core/dc_link_dp.c:5075:24: error: implicit conversion from 'enum <anonymous>' to 'enum dc_status' [-Werror=enum-conversion]
5075 | return false;
| ^~~~~

Convert it to return 'DC_OK', which is the same value as 'false'.

Fixes b473bd5fc333 ("drm/amd/display: refine wake up aux in retrieve link caps")

---
No idea if DC_OK is the intended return code, but it leaves the behavior unchanged and fixes the warning.

---
 drivers/gpu/drm/amd/display/dc/core/dc_link_dp.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/gpu/drm/amd/display/dc/core/dc_link_dp.c +0 -0
index af9411ee3c74..95dbfa4e996a 100644

drivers/gpu/drm/amd/display/dc/core/dc_link_dp.c enum dc_status dp_retrieve_lttpr_cap(struct dc_link *link) · line 5098

Quoted 5 lines
drivers/gpu/drm/amd/display/dc/core/dc_link_dp.c +1 -1
@@ -5095,7 +5095,7 @@ enum dc_status dp_retrieve_lttpr_cap(struct dc_link *link)
 	bool vbios_lttpr_interop = link->dc->caps.vbios_lttpr_aware;
 
 	if (!vbios_lttpr_interop || !link->dc->caps.extended_aux_timeout_support)
-		return false;
+		return DC_OK;
		return status;

seems more appropriate. (Otherwise the status = DC_ERROR_UNEXPECTED initialization has no effect)

Signature · 2 lines
Earthling Michel Dänzer            |                  https://redhat.com
Libre software enthusiast          |         Mesa and Xwayland developer
#2 lore raw
Quoted 1 line · Michel Dänzer

On 12/15/22 17:37, Arnd Bergmann wrote:

/amd/display/dc/core/dc_link_dp.c

Quoted 6 lines
Quoted 6 lines

index af9411ee3c74..95dbfa4e996a 100644

drivers/gpu/drm/amd/display/dc/core/dc_link_dp.c +0 -0
@@ -5095,7 +5095,7 @@ enum dc_status dp_retrieve_lttpr_cap(struct dc_link *link)
 	bool vbios_lttpr_interop = link->dc->caps.vbios_lttpr_aware;
 
Quoted 8 lines

drivers/gpu/drm/amd/display/dc/core/dc_link_dp.c enum dc_status dp_retrieve_lttpr_cap(struct dc_link *link) · line 5098

Quoted 3 lines
drivers/gpu/drm/amd/display/dc/core/dc_link_dp.c +1 -1
 	if (!vbios_lttpr_interop || !link->dc->caps.extended_aux_timeout_support)
-		return false;
+		return DC_OK;
		return status;

seems more appropriate. (Otherwise the status = DC_ERROR_UNEXPECTED initialization has no effect)

Ok, makes sense. I'd also remove the unused initialization in that case though:

enum dc_status dp_retrieve_lttpr_cap(struct dc_link *link)

 {
        uint8_t lttpr_dpcd_data[8];
-       enum dc_status status = DC_ERROR_UNEXPECTED;
-       bool is_lttpr_present = false;
+       enum dc_status status;
+       bool is_lttpr_present;
        /* Logic to determine LTTPR support*/
        bool vbios_lttpr_interop = link->dc->caps.vbios_lttpr_aware;
 
        if (!vbios_lttpr_interop || !link->dc->caps.extended_aux_timeout_support)

- return false;
+ return DC_ERROR_UNEXPECTED;

/* By reading LTTPR capability, RX assumes that we will enable
* LTTPR extended aux timeout if LTTPR is present.

I'll send that as a v2 once that passes my build test and nobody has further suggestions.

Arnd