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

Message ID 20210526084726.552052-15-lee.jones@linaro.org
State Accepted
Commit 353f7f3a9dd5fd2833b6462bac89ec1654c9c3aa
Headers show
Series
  • Rid W=1 warnings from GPU
Related show

Commit Message

Lee Jones May 26, 2021, 8:47 a.m.
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>

---
 drivers/gpu/drm/amd/display/dc/gpio/gpio_service.c   | 12 ++++++------
 .../drm/amd/display/include/gpio_service_interface.h |  4 ++--
 2 files changed, 8 insertions(+), 8 deletions(-)

-- 
2.31.1

Comments

Alex Deucher May 27, 2021, 4:06 a.m. | #1
Applied.  Thanks!

On Wed, May 26, 2021 at 4:48 AM Lee Jones <lee.jones@linaro.org> wrote:
>

> 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>

> ---

>  drivers/gpu/drm/amd/display/dc/gpio/gpio_service.c   | 12 ++++++------

>  .../drm/amd/display/include/gpio_service_interface.h |  4 ++--

>  2 files changed, 8 insertions(+), 8 deletions(-)

>

> 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 92280cc05e2db..dae8e489c8cf4 100644

> --- 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 9c55d247227ea..7e3240e73c1fc 100644

> --- 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(

> --

> 2.31.1

>

Patch

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 92280cc05e2db..dae8e489c8cf4 100644
--- 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 9c55d247227ea..7e3240e73c1fc 100644
--- 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(