lkml.org 
[lkml]   [2022]   [Apr]   [5]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 5.15 177/913] drm/nouveau/backlight: Just set all backlight types as RAW
    Date
    From: Lyude Paul <lyude@redhat.com>

    commit b21a142fd2055d8276169efcc95b624ff908a341 upstream.

    Currently we can get a warning on systems with eDP backlights like so:

    nv_backlight: invalid backlight type
    WARNING: CPU: 4 PID: 454 at drivers/video/backlight/backlight.c:420
    backlight_device_register+0x226/0x250

    This happens as a result of us not filling out props.type for the eDP
    backlight, even though we do it for all other backlight types.

    Since nothing in our driver uses anything but BACKLIGHT_RAW, let's take the
    props\.type assignments out of the codepaths for individual backlight types
    and just set it unconditionally to prevent this from happening again.

    Signed-off-by: Lyude Paul <lyude@redhat.com>
    Fixes: 6eca310e8924 ("drm/nouveau/kms/nv50-: Add basic DPCD backlight support for nouveau")
    Cc: <stable@vger.kernel.org> # v5.15+
    Reviewed-by: Karol Herbst <kherbst@redhat.com>
    Link: https://patchwork.freedesktop.org/patch/msgid/20220204193319.451119-1-lyude@redhat.com
    Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
    ---
    drivers/gpu/drm/nouveau/nouveau_backlight.c | 3 +--
    1 file changed, 1 insertion(+), 2 deletions(-)

    --- a/drivers/gpu/drm/nouveau/nouveau_backlight.c
    +++ b/drivers/gpu/drm/nouveau/nouveau_backlight.c
    @@ -101,7 +101,6 @@ nv40_backlight_init(struct nouveau_encod
    if (!(nvif_rd32(device, NV40_PMC_BACKLIGHT) & NV40_PMC_BACKLIGHT_MASK))
    return -ENODEV;

    - props->type = BACKLIGHT_RAW;
    props->max_brightness = 31;
    *ops = &nv40_bl_ops;
    return 0;
    @@ -340,7 +339,6 @@ nv50_backlight_init(struct nouveau_backl
    else
    *ops = &nva3_bl_ops;

    - props->type = BACKLIGHT_RAW;
    props->max_brightness = 100;

    return 0;
    @@ -408,6 +406,7 @@ nouveau_backlight_init(struct drm_connec
    goto fail_alloc;
    }

    + props.type = BACKLIGHT_RAW;
    bl->dev = backlight_device_register(backlight_name, connector->kdev,
    nv_encoder, ops, &props);
    if (IS_ERR(bl->dev)) {

    \
     
     \ /
      Last update: 2022-04-05 21:57    [W:4.025 / U:0.868 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site