[2/5] drm/amdgpu: fix incorrect enum type

Message ID 20201026210039.3884312-2-arnd@kernel.org
State New
Headers show
Series
  • [1/5] drm/amdgpu: fix enum mismatches
Related show

Commit Message

Arnd Bergmann Oct. 26, 2020, 9 p.m.
From: Arnd Bergmann <arnd@arndb.de>


core_link_write_dpcd() returns enum dc_status, not ddc_result:

display/dc/core/dc_link_dp.c: In function 'dp_set_panel_mode':
display/dc/core/dc_link_dp.c:4237:11: warning: implicit conversion from 'enum dc_status' to 'enum ddc_result'
[-Wenum-conversion]

Avoid the warning by using the correct enum in the caller.

Fixes: 0b226322434c ("drm/amd/display: Synchronous DisplayPort Link Training")
Signed-off-by: Arnd Bergmann <arnd@arndb.de>

---
 drivers/gpu/drm/amd/display/dc/core/dc_link_dp.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

-- 
2.27.0

_______________________________________________
dri-devel mailing list
dri-devel@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/dri-devel

Comments

Alex Deucher Oct. 30, 2020, 3:44 a.m. | #1
Applied.  Thanks!

Alex

On Mon, Oct 26, 2020 at 5:01 PM Arnd Bergmann <arnd@kernel.org> wrote:
>

> From: Arnd Bergmann <arnd@arndb.de>

>

> core_link_write_dpcd() returns enum dc_status, not ddc_result:

>

> display/dc/core/dc_link_dp.c: In function 'dp_set_panel_mode':

> display/dc/core/dc_link_dp.c:4237:11: warning: implicit conversion from 'enum dc_status' to 'enum ddc_result'

> [-Wenum-conversion]

>

> Avoid the warning by using the correct enum in the caller.

>

> Fixes: 0b226322434c ("drm/amd/display: Synchronous DisplayPort Link Training")

> Signed-off-by: Arnd Bergmann <arnd@arndb.de>

> ---

>  drivers/gpu/drm/amd/display/dc/core/dc_link_dp.c | 4 ++--

>  1 file changed, 2 insertions(+), 2 deletions(-)

>

> diff --git a/drivers/gpu/drm/amd/display/dc/core/dc_link_dp.c b/drivers/gpu/drm/amd/display/dc/core/dc_link_dp.c

> index ff1e9963ec7a..98464886341f 100644

> --- a/drivers/gpu/drm/amd/display/dc/core/dc_link_dp.c

> +++ b/drivers/gpu/drm/amd/display/dc/core/dc_link_dp.c

> @@ -4230,7 +4230,7 @@ void dp_set_panel_mode(struct dc_link *link, enum dp_panel_mode panel_mode)

>

>                 if (edp_config_set.bits.PANEL_MODE_EDP

>                         != panel_mode_edp) {

> -                       enum ddc_result result = DDC_RESULT_UNKNOWN;

> +                       enum dc_status result = DC_ERROR_UNEXPECTED;

>

>                         edp_config_set.bits.PANEL_MODE_EDP =

>                         panel_mode_edp;

> @@ -4240,7 +4240,7 @@ void dp_set_panel_mode(struct dc_link *link, enum dp_panel_mode panel_mode)

>                                 &edp_config_set.raw,

>                                 sizeof(edp_config_set.raw));

>

> -                       ASSERT(result == DDC_RESULT_SUCESSFULL);

> +                       ASSERT(result == DC_OK);

>                 }

>         }

>         DC_LOG_DETECTION_DP_CAPS("Link: %d eDP panel mode supported: %d "

> --

> 2.27.0

>

> _______________________________________________

> dri-devel mailing list

> dri-devel@lists.freedesktop.org

> https://lists.freedesktop.org/mailman/listinfo/dri-devel

_______________________________________________
dri-devel mailing list
dri-devel@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/dri-devel

Patch

diff --git a/drivers/gpu/drm/amd/display/dc/core/dc_link_dp.c b/drivers/gpu/drm/amd/display/dc/core/dc_link_dp.c
index ff1e9963ec7a..98464886341f 100644
--- a/drivers/gpu/drm/amd/display/dc/core/dc_link_dp.c
+++ b/drivers/gpu/drm/amd/display/dc/core/dc_link_dp.c
@@ -4230,7 +4230,7 @@  void dp_set_panel_mode(struct dc_link *link, enum dp_panel_mode panel_mode)
 
 		if (edp_config_set.bits.PANEL_MODE_EDP
 			!= panel_mode_edp) {
-			enum ddc_result result = DDC_RESULT_UNKNOWN;
+			enum dc_status result = DC_ERROR_UNEXPECTED;
 
 			edp_config_set.bits.PANEL_MODE_EDP =
 			panel_mode_edp;
@@ -4240,7 +4240,7 @@  void dp_set_panel_mode(struct dc_link *link, enum dp_panel_mode panel_mode)
 				&edp_config_set.raw,
 				sizeof(edp_config_set.raw));
 
-			ASSERT(result == DDC_RESULT_SUCESSFULL);
+			ASSERT(result == DC_OK);
 		}
 	}
 	DC_LOG_DETECTION_DP_CAPS("Link: %d eDP panel mode supported: %d "