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

commit 353f7f3a9dd5fd2833b6462bac89ec1654c9c3aa 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: Lee Jones <lee.jones@linaro.org>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
Cc: Nathan Chancellor <nathan@kernel.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/gpu/drm/amd/display/dc/gpio/gpio_service.c b/drivers/gpu/drm/amd/display/dc/gpio/gpio_service.c
index d03165e71dc651764e37ff1dcfbef441bda33670..0be817f8cae6bb53ebe3b279d117ee224778af95 100644 (file)
--- a/drivers/gpu/drm/amd/display/dc/gpio/gpio_service.c
+++ b/drivers/gpu/drm/amd/display/dc/gpio/gpio_service.c
@@ -53,8 +53,8 @@
  */
 
 struct gpio_service *dal_gpio_service_create(
-       enum dce_version dce_version_major,
-       enum dce_version dce_version_minor,
+       enum dce_version dce_version,
+       enum dce_environment dce_environment,
        struct dc_context *ctx)
 {
        struct gpio_service *service;
@@ -67,14 +67,14 @@ struct gpio_service *dal_gpio_service_create(
                return NULL;
        }
 
-       if (!dal_hw_translate_init(&service->translate, dce_version_major,
-                       dce_version_minor)) {
+       if (!dal_hw_translate_init(&service->translate, dce_version,
+                       dce_environment)) {
                BREAK_TO_DEBUGGER();
                goto failure_1;
        }
 
-       if (!dal_hw_factory_init(&service->factory, dce_version_major,
-                       dce_version_minor)) {
+       if (!dal_hw_factory_init(&service->factory, dce_version,
+                       dce_environment)) {
                BREAK_TO_DEBUGGER();
                goto failure_1;
        }

diff --git a/drivers/gpu/drm/amd/display/include/gpio_service_interface.h b/drivers/gpu/drm/amd/display/include/gpio_service_interface.h
index 9c55d247227ea5fb5098679da77a74f55a041e05..7e3240e73c1fcd4e636433b6b419775b3349bf61 100644 (file)
--- a/drivers/gpu/drm/amd/display/include/gpio_service_interface.h
+++ b/drivers/gpu/drm/amd/display/include/gpio_service_interface.h
@@ -42,8 +42,8 @@ void dal_gpio_destroy(
        struct gpio **ptr);
 
 struct gpio_service *dal_gpio_service_create(
-       enum dce_version dce_version_major,
-       enum dce_version dce_version_minor,
+       enum dce_version dce_version,
+       enum dce_environment dce_environment,
        struct dc_context *ctx);
 
 struct gpio *dal_gpio_service_create_irq(