lkml.org 
[lkml]   [2022]   [May]   [13]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 4.19 03/15] drm/amd/display/dc/gpio/gpio_service: Pass around correct dce_{version, environment} types
    Date
    From: Lee Jones <lee.jones@linaro.org>

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

    --- a/drivers/gpu/drm/amd/display/dc/gpio/gpio_service.c
    +++ b/drivers/gpu/drm/amd/display/dc/gpio/gpio_service.c
    @@ -51,8 +51,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;
    @@ -66,14 +66,14 @@ struct gpio_service *dal_gpio_service_cr
    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;
    }
    --- 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(

    \
     
     \ /
      Last update: 2022-05-13 16:29    [W:6.386 / U:1.064 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site