git.ipfire.org Git - thirdparty/kernel/stable-queue.git/blob

   1 From 353f7f3a9dd5fd2833b6462bac89ec1654c9c3aa Mon Sep 17 00:00:00 2001
   2 From: Lee Jones <lee.jones@linaro.org>
   3 Date: Wed, 26 May 2021 09:47:06 +0100
   4 Subject: drm/amd/display/dc/gpio/gpio_service: Pass around correct dce_{version, environment} types
   5 MIME-Version: 1.0
   6 Content-Type: text/plain; charset=UTF-8
   7 Content-Transfer-Encoding: 8bit
   8
   9 From: Lee Jones <lee.jones@linaro.org>
  10
  11 commit 353f7f3a9dd5fd2833b6462bac89ec1654c9c3aa upstream.
  12
  13 Fixes the following W=1 kernel build warning(s):
  14
  15  drivers/gpu/drm/amd/amdgpu/../display/dc/gpio/gpio_service.c: In function ‘dal_gpio_service_create’:
  16  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]
  17  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]
  18
  19 Cc: Harry Wentland <harry.wentland@amd.com>
  20 Cc: Leo Li <sunpeng.li@amd.com>
  21 Cc: Alex Deucher <alexander.deucher@amd.com>
  22 Cc: "Christian König" <christian.koenig@amd.com>
  23 Cc: David Airlie <airlied@linux.ie>
  24 Cc: Daniel Vetter <daniel@ffwll.ch>
  25 Cc: amd-gfx@lists.freedesktop.org
  26 Cc: dri-devel@lists.freedesktop.org
  27 Signed-off-by: Lee Jones <lee.jones@linaro.org>
  28 Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
  29 Cc: Nathan Chancellor <nathan@kernel.org>
  30 Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
  31 ---
  32  drivers/gpu/drm/amd/display/dc/gpio/gpio_service.c           |   12 +++++------
  33  drivers/gpu/drm/amd/display/include/gpio_service_interface.h |    4 +--
  34  2 files changed, 8 insertions(+), 8 deletions(-)
  35
  36 --- a/drivers/gpu/drm/amd/display/dc/gpio/gpio_service.c
  37 +++ b/drivers/gpu/drm/amd/display/dc/gpio/gpio_service.c
  38 @@ -53,8 +53,8 @@
  39   */
  40
  41  struct gpio_service *dal_gpio_service_create(
  42 -       enum dce_version dce_version_major,
  43 -       enum dce_version dce_version_minor,
  44 +       enum dce_version dce_version,
  45 +       enum dce_environment dce_environment,
  46         struct dc_context *ctx)
  47  {
  48         struct gpio_service *service;
  49 @@ -67,14 +67,14 @@ struct gpio_service *dal_gpio_service_cr
  50                 return NULL;
  51         }
  52
  53 -       if (!dal_hw_translate_init(&service->translate, dce_version_major,
  54 -                       dce_version_minor)) {
  55 +       if (!dal_hw_translate_init(&service->translate, dce_version,
  56 +                       dce_environment)) {
  57                 BREAK_TO_DEBUGGER();
  58                 goto failure_1;
  59         }
  60
  61 -       if (!dal_hw_factory_init(&service->factory, dce_version_major,
  62 -                       dce_version_minor)) {
  63 +       if (!dal_hw_factory_init(&service->factory, dce_version,
  64 +                       dce_environment)) {
  65                 BREAK_TO_DEBUGGER();
  66                 goto failure_1;
  67         }
  68 --- a/drivers/gpu/drm/amd/display/include/gpio_service_interface.h
  69 +++ b/drivers/gpu/drm/amd/display/include/gpio_service_interface.h
  70 @@ -42,8 +42,8 @@ void dal_gpio_destroy(
  71         struct gpio **ptr);
  72
  73  struct gpio_service *dal_gpio_service_create(
  74 -       enum dce_version dce_version_major,
  75 -       enum dce_version dce_version_minor,
  76 +       enum dce_version dce_version,
  77 +       enum dce_environment dce_environment,
  78         struct dc_context *ctx);
  79
  80  struct gpio *dal_gpio_service_create_irq(