UbiquitousOS
/
OpenCloudOS-Kernel
mirror of https://gitee.com/OpenCloudOS/OpenCloudOS-Kernel.git
11
0
Fork 0
Code Issues Projects Releases Wiki Activity

drm/amd/display/dc/gpio/gpio_service: Pass around correct dce_{version, environment} types 

Fixes the following W=1 kernel build warning(s):

 drivers/gpu/drm/amd/amdgpu/../display/dc/gpio/gpio_service.c: In function ‘dal_gpio_service_create’:
 drivers/gpu/drm/amd/amdgpu/../display/dc/gpio/gpio_service.c:71:4: warning: implicit conversion from ‘enum dce_version’ to ‘enum dce_environment’ [-Wenum-conversion]
 drivers/gpu/drm/amd/amdgpu/../display/dc/gpio/gpio_service.c:77:4: warning: implicit conversion from ‘enum dce_version’ to ‘enum dce_environment’ [-Wenum-conversion]

Cc: Harry Wentland <harry.wentland@amd.com>
Cc: Leo Li <sunpeng.li@amd.com>
Cc: Alex Deucher <alexander.deucher@amd.com>
Cc: "Christian König" <christian.koenig@amd.com>
Cc: David Airlie <airlied@linux.ie>
Cc: Daniel Vetter <daniel@ffwll.ch>
Cc: amd-gfx@lists.freedesktop.org
Cc: dri-devel@lists.freedesktop.org
Signed-off-by: Lee Jones <lee.jones@linaro.org>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
This commit is contained in:
Lee Jones 2021-05-26 09:47:06 +01:00 committed by Alex Deucher
parent 5ac1dd89df
commit 353f7f3a9d
2 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
drivers/gpu/drm/amd/display/dc/gpio/gpio_service.c
View File

@ -53,8 +53,8 @@
*/ */
struct gpio_service *dal_gpio_service_create( struct gpio_service *dal_gpio_service_create(
enum dce_version dce_version_major, enum dce_version dce_version,
enum dce_version dce_version_minor, enum dce_environment dce_environment,
struct dc_context *ctx) struct dc_context *ctx)
{ {
struct gpio_service *service; struct gpio_service *service;
@ -67,14 +67,14 @@ struct gpio_service *dal_gpio_service_create(
return NULL; return NULL;
} }
if (!dal_hw_translate_init(&service->translate, dce_version_major, if (!dal_hw_translate_init(&service->translate, dce_version,
dce_version_minor)) { dce_environment)) {
BREAK_TO_DEBUGGER(); BREAK_TO_DEBUGGER();
goto failure_1; goto failure_1;
} }
if (!dal_hw_factory_init(&service->factory, dce_version_major, if (!dal_hw_factory_init(&service->factory, dce_version,
dce_version_minor)) { dce_environment)) {
BREAK_TO_DEBUGGER(); BREAK_TO_DEBUGGER();
goto failure_1; goto failure_1;
} }

4
drivers/gpu/drm/amd/display/include/gpio_service_interface.h
View File

@ -42,8 +42,8 @@ void dal_gpio_destroy(
struct gpio **ptr); struct gpio **ptr);
struct gpio_service *dal_gpio_service_create( struct gpio_service *dal_gpio_service_create(
enum dce_version dce_version_major, enum dce_version dce_version,
enum dce_version dce_version_minor, enum dce_environment dce_environment,
struct dc_context *ctx); struct dc_context *ctx);
struct gpio *dal_gpio_service_create_irq( struct gpio *dal_gpio_service_create_irq(