提交 0c55a666 编写于 作者: L Lee Jones 提交者: Zheng Zengkai

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

stable inclusion
from stable-v5.10.116
commit f89f76f4b0e7ae7d7f5316fe0584c4cb79fa2507
category: bugfix
bugzilla: https://gitee.com/openeuler/kernel/issues/I5L64K

Reference: https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?id=f89f76f4b0e7ae7d7f5316fe0584c4cb79fa2507

--------------------------------

commit 353f7f3a upstream.

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: NLee Jones <lee.jones@linaro.org>
Signed-off-by: NAlex Deucher <alexander.deucher@amd.com>
Cc: Nathan Chancellor <nathan@kernel.org>
Signed-off-by: NGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Signed-off-by: NZheng Zengkai <zhengzengkai@huawei.com>
Reviewed-by: NWei Li <liwei391@huawei.com>
上级 f26b3dc7
...@@ -53,8 +53,8 @@ ...@@ -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( ...@@ -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;
} }
......
...@@ -42,8 +42,8 @@ void dal_gpio_destroy( ...@@ -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(
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册