Message ID | Y117XNaSP6/8bH+3@moc6.cz |
---|---|
State | New |
Headers |
Return-Path: <linux-kernel-owner@vger.kernel.org> Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:6687:0:0:0:0:0 with SMTP id l7csp1495597wru; Sat, 29 Oct 2022 13:26:46 -0700 (PDT) X-Google-Smtp-Source: AMsMyM4EiVeLUf5gSr6ZmnGMy+KJhcRZehKBDf8NpA3Z4UHzzlxJRlHOa2sBJMiss7SEqLSFY7zB X-Received: by 2002:a17:906:7313:b0:78e:c2a:a3fa with SMTP id di19-20020a170906731300b0078e0c2aa3famr4996800ejc.581.1667075206755; Sat, 29 Oct 2022 13:26:46 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1667075206; cv=none; d=google.com; s=arc-20160816; b=zeHZXrbsp59+GjEyMwcB0J7NaLaNYgQ5BHjXv4c5jNorv56ligQUls0AD+U8pNuknT gP8TwMfosm2uXo2AfpApAi/6AZZ/qeSvaGGjcIaNz0ZLIx9Rc1wgWd8tMzBlkfBc7LdE IgEdrXHBN4GmNlL05bmD4Ms0MBMbJ7T/Wy9cu44Tp0H+dDTZKCLE5goF7bDmH9UpxbT2 +pc5v+zHdkB933qt3JQA3hxaAiZPscZu7f+ICFku5Hf0DBdCPfqUx1PQ0/tPRJs6GTpx GOjycywHpz2vDJfN3G4hdNt4zbrPnlMNhFRWomdFANy+qq6WuF3hKvUjyvVmPFiweAfS Okkg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-disposition:mime-version:message-id :subject:cc:to:from:date:dkim-signature; bh=/KZ42D3HakbTGEBmYLFXIwAxUy17kAfEEriya9xR94A=; b=YHZWsSls+IOvUynbdU+FMhyS8UVWPW1M34t/3/vlTxrm6t9Ij+T/DHqAbyBiY0pkK/ 6PLUGzziQuDlamBgW9l2e2MinhKihw4Ogmg7sNrbItq9c7a2f18ZsYEkb1yQSueW5brK 4nREG7YHybaGo7zf3xAgeyul9+g+Jt/+jeB3k3ETTMmIUwLAWHe1DUv5Lk+kuRbJdnOu fIwnXK/W3ER3hyIkOceMV2ahlC/3vcz/R3U07ObvMjyw1rhXorI9BwOylIdTqGi7RCby 2csCr1cPw/EMnNrwzSnayTRUSg95xm1ZE66TjHvJmnhIF5WzvxxS+GzaWhmhkjELvTFS xBVw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@moc6.cz header.s=mail20201116 header.b=PI3A0ss1; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=moc6.cz Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id sh6-20020a1709076e8600b0078e16203457si3054643ejc.5.2022.10.29.13.26.05; Sat, 29 Oct 2022 13:26:46 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@moc6.cz header.s=mail20201116 header.b=PI3A0ss1; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=moc6.cz Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229667AbiJ2TaD (ORCPT <rfc822;ezelljr.billy@gmail.com> + 99 others); Sat, 29 Oct 2022 15:30:03 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:33336 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229635AbiJ2TaC (ORCPT <rfc822;linux-kernel@vger.kernel.org>); Sat, 29 Oct 2022 15:30:02 -0400 X-Greylist: delayed 976 seconds by postgrey-1.37 at lindbergh.monkeyblade.net; Sat, 29 Oct 2022 12:29:58 PDT Received: from moc6.cz (hosting.moc6.cz [IPv6:2a02:c60:c70:8900::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 0BDEE140CE for <linux-kernel@vger.kernel.org>; Sat, 29 Oct 2022 12:29:56 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=moc6.cz; s=mail20201116; h=Message-ID:Subject:Cc:To:From:Date:Reply-To:In-Reply-To; bh=/KZ42D3HakbTGEBmYLFXIwAxUy17kAfEEriya9xR94A=; b=PI3A0ss1I9FqpoZTYN1cM8Pqlm gyf8SayurTBFU91SklIzKzQDvMU/BubynTVmXOqvH3HvWB5XrD3to50VSlCzfhy7skuIQMc7geuvu Bg1WoWqA7i9sXYpDj3239B+0qQwSC2RpObTCjmUtyfbGFmn3DB6pBvnmZtEc1CQSw8u3+xp7fKHmW xzrk2m/zwuDQ6wuw+/Ocu091I7BCTsb9WIHieLucVGZG5s/waUOBnzymCL7p2/m5kUj+49Cfmb/pk IbfKx+LlnS6G4DhglkJ8lx9t0MNSr3jnzkkouyiTL00dcaGXKbYqMKYeib17XZ8oYovwqW0wfhKux 2f+DF/D5Rk7FT0DzxLX0zWUCa2wVC1YW+58/aF5EJ8fUzUeB4kdqdGGasRfVlJEmtvrQpZVaRv10d MLB2IjGkQb7aXZkOzCAD9K00HwUdlUtC5ozBqCa2P5deRjm7RtRknRX112aBbgXAkLFNdRDq+H6vk qJQzcIs7iCao17FP288ypEopfQCg4TA9QDlCz1ucFGsVaXDkcYv4uft5PBKMwnmKjxumFILsH+Xhc 4Zw/nSVSYRcQVX7e28YdcDQBebcjfU1WA9rHo3OjmAI/3PuuxScdWvwmzZ9OAYq1woGB55yTQekd5 UZKFq3qAZwgQxc64kt0GyFWueAXvF6BI57eNlok9Y=; Received: from Debian-exim by moc6.cz with local (Exim 4.94.2) (envelope-from <Debian-exim@moc6.cz>) authenticated: Debian-exim id 1oorGu-000siT-5T; Sat, 29 Oct 2022 21:13:32 +0200 Date: Sat, 29 Oct 2022 21:13:32 +0200 From: Filip Moc <dev@moc6.cz> To: Harry Wentland <harry.wentland@amd.com>, Leo Li <sunpeng.li@amd.com>, Rodrigo Siqueira <Rodrigo.Siqueira@amd.com> Cc: Alex Deucher <alexander.deucher@amd.com>, Christian =?iso-8859-1?q?K=F6n?= =?iso-8859-1?q?ig?= <christian.koenig@amd.com>, "Pan, Xinhui" <Xinhui.Pan@amd.com>, David Airlie <airlied@linux.ie>, Daniel Vetter <daniel@ffwll.ch>, amd-gfx@lists.freedesktop.org, dri-devel@lists.freedesktop.org, linux-kernel@vger.kernel.org Subject: [PATCH] drm/amd/display: add parameter backlight_min Message-ID: <Y117XNaSP6/8bH+3@moc6.cz> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,SPF_HELO_PASS,SPF_PASS autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: <linux-kernel.vger.kernel.org> X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1748055052129955011?= X-GMAIL-MSGID: =?utf-8?q?1748055052129955011?= |
Series |
drm/amd/display: add parameter backlight_min
|
|
Commit Message
Filip Moc
Oct. 29, 2022, 7:13 p.m. UTC
There are some devices on which amdgpu won't allow user to set brightness
to sufficiently low values even though the hardware would support it just
fine.
This usually happens in two cases when either configuration of brightness
levels via ACPI/ATIF is not available and amdgpu falls back to defaults
(currently 12 for minimum level) which may be too high for some devices or
even the configuration via ATIF is available but the minimum brightness
level provided by the manufacturer is set to unreasonably high value.
In either case user can use this new module parameter to adjust the
minimum allowed backlight brightness level.
Link: https://bugzilla.kernel.org/show_bug.cgi?id=203439
Signed-off-by: Filip Moc <dev@moc6.cz>
---
drivers/gpu/drm/amd/amdgpu/amdgpu.h | 3 +++
drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c | 15 +++++++++++++++
drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c | 15 +++++++++++++++
3 files changed, 33 insertions(+)
base-commit: d8c03bfe146fd5e081a252cd34f3f12ca0255357
Comments
On 2022-10-29 15:13, Filip Moc wrote: > There are some devices on which amdgpu won't allow user to set brightness > to sufficiently low values even though the hardware would support it just > fine. > > This usually happens in two cases when either configuration of brightness > levels via ACPI/ATIF is not available and amdgpu falls back to defaults > (currently 12 for minimum level) which may be too high for some devices or > even the configuration via ATIF is available but the minimum brightness > level provided by the manufacturer is set to unreasonably high value. > > In either case user can use this new module parameter to adjust the > minimum allowed backlight brightness level. > Thanks for this patch and covering all the bases. It might be useful to have an example in the commit description on how to set the array property. I assume it looks like this if I wanted to set the first device to a minimum of 2 and leave the default for the 2nd one: amdgpu.backlight_min=2:-1 Either way, this patch is Reviewed-by: Harry Wentland <harry.wentland@amd.com> Harry > Link: https://bugzilla.kernel.org/show_bug.cgi?id=203439>> > Signed-off-by: Filip Moc <dev@moc6.cz> > --- > drivers/gpu/drm/amd/amdgpu/amdgpu.h | 3 +++ > drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c | 15 +++++++++++++++ > drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c | 15 +++++++++++++++ > 3 files changed, 33 insertions(+) > > diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu.h b/drivers/gpu/drm/amd/amdgpu/amdgpu.h > index 0e6ddf05c23c..c5445402c49d 100644 > --- a/drivers/gpu/drm/amd/amdgpu/amdgpu.h > +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu.h > @@ -200,6 +200,9 @@ extern uint amdgpu_dc_debug_mask; > extern uint amdgpu_dc_visual_confirm; > extern uint amdgpu_dm_abm_level; > extern int amdgpu_backlight; > +#ifdef CONFIG_DRM_AMD_DC > +extern int amdgpu_backlight_override_min[]; > +#endif > extern struct amdgpu_mgpu_info mgpu_info; > extern int amdgpu_ras_enable; > extern uint amdgpu_ras_mask; > diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c > index 16f6a313335e..f2fb549ac52f 100644 > --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c > +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c > @@ -43,6 +43,7 @@ > #include "amdgpu_irq.h" > #include "amdgpu_dma_buf.h" > #include "amdgpu_sched.h" > +#include "amdgpu_dm.h" > #include "amdgpu_fdinfo.h" > #include "amdgpu_amdkfd.h" > > @@ -853,6 +854,20 @@ int amdgpu_backlight = -1; > MODULE_PARM_DESC(backlight, "Backlight control (0 = pwm, 1 = aux, -1 auto (default))"); > module_param_named(backlight, amdgpu_backlight, bint, 0444); > > +/** > + * DOC: backlight_min (array of int) > + * Override minimum allowed backlight brightness signal (per display). > + * Must be less than the maximum brightness signal. > + * Negative value means no override. > + * > + * Defaults to all -1 (no override on any display). > + */ > +#ifdef CONFIG_DRM_AMD_DC > +int amdgpu_backlight_override_min[AMDGPU_DM_MAX_NUM_EDP] = {[0 ... (AMDGPU_DM_MAX_NUM_EDP-1)] = -1}; > +MODULE_PARM_DESC(backlight_min, "Override minimum backlight brightness signal (0..max-1, -1 = no override (default))"); > +module_param_array_named(backlight_min, amdgpu_backlight_override_min, int, NULL, 0444); > +#endif > + > /** > * DOC: tmz (int) > * Trusted Memory Zone (TMZ) is a method to protect data being written > diff --git a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c > index eb4ce7216104..e2c36ba93d05 100644 > --- a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c > +++ b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c > @@ -3911,6 +3911,21 @@ static void amdgpu_dm_update_backlight_caps(struct amdgpu_display_manager *dm, > dm->backlight_caps[bl_idx].min_input_signal = AMDGPU_DM_DEFAULT_MIN_BACKLIGHT; > dm->backlight_caps[bl_idx].max_input_signal = AMDGPU_DM_DEFAULT_MAX_BACKLIGHT; > #endif > + > + if (amdgpu_backlight_override_min[bl_idx] >= 0) { > + if (amdgpu_backlight_override_min[bl_idx] < dm->backlight_caps[bl_idx].max_input_signal) { > + DRM_INFO("amdgpu: backlight[%i]: overriding minimum brightness from %i to %i\n", > + bl_idx, > + dm->backlight_caps[bl_idx].min_input_signal, > + amdgpu_backlight_override_min[bl_idx]); > + dm->backlight_caps[bl_idx].min_input_signal = amdgpu_backlight_override_min[bl_idx]; > + } else { > + DRM_ERROR("amdgpu: backlight[%i]: minimum brightness override (%i) is not below maximum (%i)\n", > + bl_idx, > + amdgpu_backlight_override_min[bl_idx], > + dm->backlight_caps[bl_idx].max_input_signal); > + } > + } > } > > static int get_brightness_range(const struct amdgpu_dm_backlight_caps *caps, > > base-commit: d8c03bfe146fd5e081a252cd34f3f12ca0255357
On Sun, Oct 30, 2022 at 5:26 AM Filip Moc <dev@moc6.cz> wrote: > > There are some devices on which amdgpu won't allow user to set brightness > to sufficiently low values even though the hardware would support it just > fine. > > This usually happens in two cases when either configuration of brightness > levels via ACPI/ATIF is not available and amdgpu falls back to defaults > (currently 12 for minimum level) which may be too high for some devices or > even the configuration via ATIF is available but the minimum brightness > level provided by the manufacturer is set to unreasonably high value. > > In either case user can use this new module parameter to adjust the > minimum allowed backlight brightness level. > > Link: https://bugzilla.kernel.org/show_bug.cgi?id=203439 > Signed-off-by: Filip Moc <dev@moc6.cz> Does your system require an override and if so, what is it? It would be good to add a quirk for your system as well so that other users of the same system wouldn't need to manually figure out an apply the settings. Alex > --- > drivers/gpu/drm/amd/amdgpu/amdgpu.h | 3 +++ > drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c | 15 +++++++++++++++ > drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c | 15 +++++++++++++++ > 3 files changed, 33 insertions(+) > > diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu.h b/drivers/gpu/drm/amd/amdgpu/amdgpu.h > index 0e6ddf05c23c..c5445402c49d 100644 > --- a/drivers/gpu/drm/amd/amdgpu/amdgpu.h > +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu.h > @@ -200,6 +200,9 @@ extern uint amdgpu_dc_debug_mask; > extern uint amdgpu_dc_visual_confirm; > extern uint amdgpu_dm_abm_level; > extern int amdgpu_backlight; > +#ifdef CONFIG_DRM_AMD_DC > +extern int amdgpu_backlight_override_min[]; > +#endif > extern struct amdgpu_mgpu_info mgpu_info; > extern int amdgpu_ras_enable; > extern uint amdgpu_ras_mask; > diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c > index 16f6a313335e..f2fb549ac52f 100644 > --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c > +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c > @@ -43,6 +43,7 @@ > #include "amdgpu_irq.h" > #include "amdgpu_dma_buf.h" > #include "amdgpu_sched.h" > +#include "amdgpu_dm.h" > #include "amdgpu_fdinfo.h" > #include "amdgpu_amdkfd.h" > > @@ -853,6 +854,20 @@ int amdgpu_backlight = -1; > MODULE_PARM_DESC(backlight, "Backlight control (0 = pwm, 1 = aux, -1 auto (default))"); > module_param_named(backlight, amdgpu_backlight, bint, 0444); > > +/** > + * DOC: backlight_min (array of int) > + * Override minimum allowed backlight brightness signal (per display). > + * Must be less than the maximum brightness signal. > + * Negative value means no override. > + * > + * Defaults to all -1 (no override on any display). > + */ > +#ifdef CONFIG_DRM_AMD_DC > +int amdgpu_backlight_override_min[AMDGPU_DM_MAX_NUM_EDP] = {[0 ... (AMDGPU_DM_MAX_NUM_EDP-1)] = -1}; > +MODULE_PARM_DESC(backlight_min, "Override minimum backlight brightness signal (0..max-1, -1 = no override (default))"); > +module_param_array_named(backlight_min, amdgpu_backlight_override_min, int, NULL, 0444); > +#endif > + > /** > * DOC: tmz (int) > * Trusted Memory Zone (TMZ) is a method to protect data being written > diff --git a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c > index eb4ce7216104..e2c36ba93d05 100644 > --- a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c > +++ b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c > @@ -3911,6 +3911,21 @@ static void amdgpu_dm_update_backlight_caps(struct amdgpu_display_manager *dm, > dm->backlight_caps[bl_idx].min_input_signal = AMDGPU_DM_DEFAULT_MIN_BACKLIGHT; > dm->backlight_caps[bl_idx].max_input_signal = AMDGPU_DM_DEFAULT_MAX_BACKLIGHT; > #endif > + > + if (amdgpu_backlight_override_min[bl_idx] >= 0) { > + if (amdgpu_backlight_override_min[bl_idx] < dm->backlight_caps[bl_idx].max_input_signal) { > + DRM_INFO("amdgpu: backlight[%i]: overriding minimum brightness from %i to %i\n", > + bl_idx, > + dm->backlight_caps[bl_idx].min_input_signal, > + amdgpu_backlight_override_min[bl_idx]); > + dm->backlight_caps[bl_idx].min_input_signal = amdgpu_backlight_override_min[bl_idx]; > + } else { > + DRM_ERROR("amdgpu: backlight[%i]: minimum brightness override (%i) is not below maximum (%i)\n", > + bl_idx, > + amdgpu_backlight_override_min[bl_idx], > + dm->backlight_caps[bl_idx].max_input_signal); > + } > + } > } > > static int get_brightness_range(const struct amdgpu_dm_backlight_caps *caps, > > base-commit: d8c03bfe146fd5e081a252cd34f3f12ca0255357 > -- > 2.30.2 >
Hello Harry, thank you for your response. > amdgpu.backlight_min=2:-1 almost :-) Array elements in module parameters are separated by commas not colons. So for cmdline it should look like this: amdgpu.backlight_min=2,-1 Though you can just drop the ,-1 relying on kernel leaving the rest of array untouched. Which I would recommend as there is no point for user to follow AMDGPU_DM_MAX_NUM_EDP. Only when you need to override some other display than display 0 then you may need to use -1. E.g. backlight_min=-1,2 overrides display 1 to min backlight=2 while keeping display 0 with no override. When amdgpu is loaded as a kernel module, backlight_min can also be passed as a parameter to modprobe, e.g.: modprobe backlight_min=2 So in that case you probably want to add something like options amdgpu backlight_min=2 to /etc/modprobe.d/amdgpu.conf (and also run update-initramfs if amdgpu is loaded by initramfs). I'll add some examples to commit message in v2. Filip V Mon, Oct 31, 2022 at 10:24:25AM -0400, Harry Wentland napsal(a): > On 2022-10-29 15:13, Filip Moc wrote: > > There are some devices on which amdgpu won't allow user to set brightness > > to sufficiently low values even though the hardware would support it just > > fine. > > > > This usually happens in two cases when either configuration of brightness > > levels via ACPI/ATIF is not available and amdgpu falls back to defaults > > (currently 12 for minimum level) which may be too high for some devices or > > even the configuration via ATIF is available but the minimum brightness > > level provided by the manufacturer is set to unreasonably high value. > > > > In either case user can use this new module parameter to adjust the > > minimum allowed backlight brightness level. > > > > Thanks for this patch and covering all the bases. > > It might be useful to have an example in the commit description on > how to set the array property. I assume it looks like this if I > wanted to set the first device to a minimum of 2 and leave the default > for the 2nd one: > > amdgpu.backlight_min=2:-1 > > Either way, this patch is > Reviewed-by: Harry Wentland <harry.wentland@amd.com> > > Harry > > > Link: https://bugzilla.kernel.org/show_bug.cgi?id=203439>> > > Signed-off-by: Filip Moc <dev@moc6.cz> > > --- > > drivers/gpu/drm/amd/amdgpu/amdgpu.h | 3 +++ > > drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c | 15 +++++++++++++++ > > drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c | 15 +++++++++++++++ > > 3 files changed, 33 insertions(+) > > > > diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu.h b/drivers/gpu/drm/amd/amdgpu/amdgpu.h > > index 0e6ddf05c23c..c5445402c49d 100644 > > --- a/drivers/gpu/drm/amd/amdgpu/amdgpu.h > > +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu.h > > @@ -200,6 +200,9 @@ extern uint amdgpu_dc_debug_mask; > > extern uint amdgpu_dc_visual_confirm; > > extern uint amdgpu_dm_abm_level; > > extern int amdgpu_backlight; > > +#ifdef CONFIG_DRM_AMD_DC > > +extern int amdgpu_backlight_override_min[]; > > +#endif > > extern struct amdgpu_mgpu_info mgpu_info; > > extern int amdgpu_ras_enable; > > extern uint amdgpu_ras_mask; > > diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c > > index 16f6a313335e..f2fb549ac52f 100644 > > --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c > > +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c > > @@ -43,6 +43,7 @@ > > #include "amdgpu_irq.h" > > #include "amdgpu_dma_buf.h" > > #include "amdgpu_sched.h" > > +#include "amdgpu_dm.h" > > #include "amdgpu_fdinfo.h" > > #include "amdgpu_amdkfd.h" > > > > @@ -853,6 +854,20 @@ int amdgpu_backlight = -1; > > MODULE_PARM_DESC(backlight, "Backlight control (0 = pwm, 1 = aux, -1 auto (default))"); > > module_param_named(backlight, amdgpu_backlight, bint, 0444); > > > > +/** > > + * DOC: backlight_min (array of int) > > + * Override minimum allowed backlight brightness signal (per display). > > + * Must be less than the maximum brightness signal. > > + * Negative value means no override. > > + * > > + * Defaults to all -1 (no override on any display). > > + */ > > +#ifdef CONFIG_DRM_AMD_DC > > +int amdgpu_backlight_override_min[AMDGPU_DM_MAX_NUM_EDP] = {[0 ... (AMDGPU_DM_MAX_NUM_EDP-1)] = -1}; > > +MODULE_PARM_DESC(backlight_min, "Override minimum backlight brightness signal (0..max-1, -1 = no override (default))"); > > +module_param_array_named(backlight_min, amdgpu_backlight_override_min, int, NULL, 0444); > > +#endif > > + > > /** > > * DOC: tmz (int) > > * Trusted Memory Zone (TMZ) is a method to protect data being written > > diff --git a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c > > index eb4ce7216104..e2c36ba93d05 100644 > > --- a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c > > +++ b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c > > @@ -3911,6 +3911,21 @@ static void amdgpu_dm_update_backlight_caps(struct amdgpu_display_manager *dm, > > dm->backlight_caps[bl_idx].min_input_signal = AMDGPU_DM_DEFAULT_MIN_BACKLIGHT; > > dm->backlight_caps[bl_idx].max_input_signal = AMDGPU_DM_DEFAULT_MAX_BACKLIGHT; > > #endif > > + > > + if (amdgpu_backlight_override_min[bl_idx] >= 0) { > > + if (amdgpu_backlight_override_min[bl_idx] < dm->backlight_caps[bl_idx].max_input_signal) { > > + DRM_INFO("amdgpu: backlight[%i]: overriding minimum brightness from %i to %i\n", > > + bl_idx, > > + dm->backlight_caps[bl_idx].min_input_signal, > > + amdgpu_backlight_override_min[bl_idx]); > > + dm->backlight_caps[bl_idx].min_input_signal = amdgpu_backlight_override_min[bl_idx]; > > + } else { > > + DRM_ERROR("amdgpu: backlight[%i]: minimum brightness override (%i) is not below maximum (%i)\n", > > + bl_idx, > > + amdgpu_backlight_override_min[bl_idx], > > + dm->backlight_caps[bl_idx].max_input_signal); > > + } > > + } > > } > > > > static int get_brightness_range(const struct amdgpu_dm_backlight_caps *caps, > > > > base-commit: d8c03bfe146fd5e081a252cd34f3f12ca0255357 >
Hello Alex, thank you for your response. Yes, I have HP ENVY x360 Convertible 13-ay1xxx, and backlight_min=2 seems to work the best in my case. I added a dmi based quirk table. So far with support only for display 0 to make it simple. Support for more displays in quirk table can be added later if ever needed. According to [1] HP ENVY x360 Convertible 13-ag0xxx also needs a quirk so I'm going to use this to cover both: DMI_EXACT_MATCH(DMI_SYS_VENDOR, "HP") DMI_MATCH(DMI_PRODUCT_NAME, "HP ENVY x360 Convertible 13-") So far it seems to be working fine. I'll send this in v2 once I do some final tweaks and do more tests. [1] https://bugzilla.kernel.org/show_bug.cgi?id=203439#c5 Filip V Mon, Oct 31, 2022 at 11:36:09AM -0400, Alex Deucher napsal(a): > On Sun, Oct 30, 2022 at 5:26 AM Filip Moc <dev@moc6.cz> wrote: > > > > There are some devices on which amdgpu won't allow user to set brightness > > to sufficiently low values even though the hardware would support it just > > fine. > > > > This usually happens in two cases when either configuration of brightness > > levels via ACPI/ATIF is not available and amdgpu falls back to defaults > > (currently 12 for minimum level) which may be too high for some devices or > > even the configuration via ATIF is available but the minimum brightness > > level provided by the manufacturer is set to unreasonably high value. > > > > In either case user can use this new module parameter to adjust the > > minimum allowed backlight brightness level. > > > > Link: https://bugzilla.kernel.org/show_bug.cgi?id=203439 > > Signed-off-by: Filip Moc <dev@moc6.cz> > > Does your system require an override and if so, what is it? It would > be good to add a quirk for your system as well so that other users of > the same system wouldn't need to manually figure out an apply the > settings. > > Alex > > > > --- > > drivers/gpu/drm/amd/amdgpu/amdgpu.h | 3 +++ > > drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c | 15 +++++++++++++++ > > drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c | 15 +++++++++++++++ > > 3 files changed, 33 insertions(+) > > > > diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu.h b/drivers/gpu/drm/amd/amdgpu/amdgpu.h > > index 0e6ddf05c23c..c5445402c49d 100644 > > --- a/drivers/gpu/drm/amd/amdgpu/amdgpu.h > > +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu.h > > @@ -200,6 +200,9 @@ extern uint amdgpu_dc_debug_mask; > > extern uint amdgpu_dc_visual_confirm; > > extern uint amdgpu_dm_abm_level; > > extern int amdgpu_backlight; > > +#ifdef CONFIG_DRM_AMD_DC > > +extern int amdgpu_backlight_override_min[]; > > +#endif > > extern struct amdgpu_mgpu_info mgpu_info; > > extern int amdgpu_ras_enable; > > extern uint amdgpu_ras_mask; > > diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c > > index 16f6a313335e..f2fb549ac52f 100644 > > --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c > > +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c > > @@ -43,6 +43,7 @@ > > #include "amdgpu_irq.h" > > #include "amdgpu_dma_buf.h" > > #include "amdgpu_sched.h" > > +#include "amdgpu_dm.h" > > #include "amdgpu_fdinfo.h" > > #include "amdgpu_amdkfd.h" > > > > @@ -853,6 +854,20 @@ int amdgpu_backlight = -1; > > MODULE_PARM_DESC(backlight, "Backlight control (0 = pwm, 1 = aux, -1 auto (default))"); > > module_param_named(backlight, amdgpu_backlight, bint, 0444); > > > > +/** > > + * DOC: backlight_min (array of int) > > + * Override minimum allowed backlight brightness signal (per display). > > + * Must be less than the maximum brightness signal. > > + * Negative value means no override. > > + * > > + * Defaults to all -1 (no override on any display). > > + */ > > +#ifdef CONFIG_DRM_AMD_DC > > +int amdgpu_backlight_override_min[AMDGPU_DM_MAX_NUM_EDP] = {[0 ... (AMDGPU_DM_MAX_NUM_EDP-1)] = -1}; > > +MODULE_PARM_DESC(backlight_min, "Override minimum backlight brightness signal (0..max-1, -1 = no override (default))"); > > +module_param_array_named(backlight_min, amdgpu_backlight_override_min, int, NULL, 0444); > > +#endif > > + > > /** > > * DOC: tmz (int) > > * Trusted Memory Zone (TMZ) is a method to protect data being written > > diff --git a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c > > index eb4ce7216104..e2c36ba93d05 100644 > > --- a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c > > +++ b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c > > @@ -3911,6 +3911,21 @@ static void amdgpu_dm_update_backlight_caps(struct amdgpu_display_manager *dm, > > dm->backlight_caps[bl_idx].min_input_signal = AMDGPU_DM_DEFAULT_MIN_BACKLIGHT; > > dm->backlight_caps[bl_idx].max_input_signal = AMDGPU_DM_DEFAULT_MAX_BACKLIGHT; > > #endif > > + > > + if (amdgpu_backlight_override_min[bl_idx] >= 0) { > > + if (amdgpu_backlight_override_min[bl_idx] < dm->backlight_caps[bl_idx].max_input_signal) { > > + DRM_INFO("amdgpu: backlight[%i]: overriding minimum brightness from %i to %i\n", > > + bl_idx, > > + dm->backlight_caps[bl_idx].min_input_signal, > > + amdgpu_backlight_override_min[bl_idx]); > > + dm->backlight_caps[bl_idx].min_input_signal = amdgpu_backlight_override_min[bl_idx]; > > + } else { > > + DRM_ERROR("amdgpu: backlight[%i]: minimum brightness override (%i) is not below maximum (%i)\n", > > + bl_idx, > > + amdgpu_backlight_override_min[bl_idx], > > + dm->backlight_caps[bl_idx].max_input_signal); > > + } > > + } > > } > > > > static int get_brightness_range(const struct amdgpu_dm_backlight_caps *caps, > > > > base-commit: d8c03bfe146fd5e081a252cd34f3f12ca0255357 > > -- > > 2.30.2 > >
On Tue, Nov 1, 2022 at 11:42 AM Filip Moc <dev@moc6.cz> wrote: > > Hello Alex, > > thank you for your response. > > Yes, I have HP ENVY x360 Convertible 13-ay1xxx, and backlight_min=2 > seems to work the best in my case. > > I added a dmi based quirk table. So far with support only for display 0 > to make it simple. Support for more displays in quirk table can be added > later if ever needed. > > According to [1] HP ENVY x360 Convertible 13-ag0xxx also needs a quirk > so I'm going to use this to cover both: > DMI_EXACT_MATCH(DMI_SYS_VENDOR, "HP") > DMI_MATCH(DMI_PRODUCT_NAME, "HP ENVY x360 Convertible 13-") You might want to add an additional check for the panel name/vendor from the EDID as well in case HP uses multiple panels from different vendors on that system. Alex > > So far it seems to be working fine. > I'll send this in v2 once I do some final tweaks and do more tests. > > [1] https://bugzilla.kernel.org/show_bug.cgi?id=203439#c5 > > Filip > > > V Mon, Oct 31, 2022 at 11:36:09AM -0400, Alex Deucher napsal(a): > > On Sun, Oct 30, 2022 at 5:26 AM Filip Moc <dev@moc6.cz> wrote: > > > > > > There are some devices on which amdgpu won't allow user to set brightness > > > to sufficiently low values even though the hardware would support it just > > > fine. > > > > > > This usually happens in two cases when either configuration of brightness > > > levels via ACPI/ATIF is not available and amdgpu falls back to defaults > > > (currently 12 for minimum level) which may be too high for some devices or > > > even the configuration via ATIF is available but the minimum brightness > > > level provided by the manufacturer is set to unreasonably high value. > > > > > > In either case user can use this new module parameter to adjust the > > > minimum allowed backlight brightness level. > > > > > > Link: https://bugzilla.kernel.org/show_bug.cgi?id=203439 > > > Signed-off-by: Filip Moc <dev@moc6.cz> > > > > Does your system require an override and if so, what is it? It would > > be good to add a quirk for your system as well so that other users of > > the same system wouldn't need to manually figure out an apply the > > settings. > > > > Alex > > > > > > > --- > > > drivers/gpu/drm/amd/amdgpu/amdgpu.h | 3 +++ > > > drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c | 15 +++++++++++++++ > > > drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c | 15 +++++++++++++++ > > > 3 files changed, 33 insertions(+) > > > > > > diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu.h b/drivers/gpu/drm/amd/amdgpu/amdgpu.h > > > index 0e6ddf05c23c..c5445402c49d 100644 > > > --- a/drivers/gpu/drm/amd/amdgpu/amdgpu.h > > > +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu.h > > > @@ -200,6 +200,9 @@ extern uint amdgpu_dc_debug_mask; > > > extern uint amdgpu_dc_visual_confirm; > > > extern uint amdgpu_dm_abm_level; > > > extern int amdgpu_backlight; > > > +#ifdef CONFIG_DRM_AMD_DC > > > +extern int amdgpu_backlight_override_min[]; > > > +#endif > > > extern struct amdgpu_mgpu_info mgpu_info; > > > extern int amdgpu_ras_enable; > > > extern uint amdgpu_ras_mask; > > > diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c > > > index 16f6a313335e..f2fb549ac52f 100644 > > > --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c > > > +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c > > > @@ -43,6 +43,7 @@ > > > #include "amdgpu_irq.h" > > > #include "amdgpu_dma_buf.h" > > > #include "amdgpu_sched.h" > > > +#include "amdgpu_dm.h" > > > #include "amdgpu_fdinfo.h" > > > #include "amdgpu_amdkfd.h" > > > > > > @@ -853,6 +854,20 @@ int amdgpu_backlight = -1; > > > MODULE_PARM_DESC(backlight, "Backlight control (0 = pwm, 1 = aux, -1 auto (default))"); > > > module_param_named(backlight, amdgpu_backlight, bint, 0444); > > > > > > +/** > > > + * DOC: backlight_min (array of int) > > > + * Override minimum allowed backlight brightness signal (per display). > > > + * Must be less than the maximum brightness signal. > > > + * Negative value means no override. > > > + * > > > + * Defaults to all -1 (no override on any display). > > > + */ > > > +#ifdef CONFIG_DRM_AMD_DC > > > +int amdgpu_backlight_override_min[AMDGPU_DM_MAX_NUM_EDP] = {[0 ... (AMDGPU_DM_MAX_NUM_EDP-1)] = -1}; > > > +MODULE_PARM_DESC(backlight_min, "Override minimum backlight brightness signal (0..max-1, -1 = no override (default))"); > > > +module_param_array_named(backlight_min, amdgpu_backlight_override_min, int, NULL, 0444); > > > +#endif > > > + > > > /** > > > * DOC: tmz (int) > > > * Trusted Memory Zone (TMZ) is a method to protect data being written > > > diff --git a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c > > > index eb4ce7216104..e2c36ba93d05 100644 > > > --- a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c > > > +++ b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c > > > @@ -3911,6 +3911,21 @@ static void amdgpu_dm_update_backlight_caps(struct amdgpu_display_manager *dm, > > > dm->backlight_caps[bl_idx].min_input_signal = AMDGPU_DM_DEFAULT_MIN_BACKLIGHT; > > > dm->backlight_caps[bl_idx].max_input_signal = AMDGPU_DM_DEFAULT_MAX_BACKLIGHT; > > > #endif > > > + > > > + if (amdgpu_backlight_override_min[bl_idx] >= 0) { > > > + if (amdgpu_backlight_override_min[bl_idx] < dm->backlight_caps[bl_idx].max_input_signal) { > > > + DRM_INFO("amdgpu: backlight[%i]: overriding minimum brightness from %i to %i\n", > > > + bl_idx, > > > + dm->backlight_caps[bl_idx].min_input_signal, > > > + amdgpu_backlight_override_min[bl_idx]); > > > + dm->backlight_caps[bl_idx].min_input_signal = amdgpu_backlight_override_min[bl_idx]; > > > + } else { > > > + DRM_ERROR("amdgpu: backlight[%i]: minimum brightness override (%i) is not below maximum (%i)\n", > > > + bl_idx, > > > + amdgpu_backlight_override_min[bl_idx], > > > + dm->backlight_caps[bl_idx].max_input_signal); > > > + } > > > + } > > > } > > > > > > static int get_brightness_range(const struct amdgpu_dm_backlight_caps *caps, > > > > > > base-commit: d8c03bfe146fd5e081a252cd34f3f12ca0255357 > > > -- > > > 2.30.2 > > >
On 2022-11-01 11:33, Filip Moc wrote: > Hello Harry, > > thank you for your response. > >> amdgpu.backlight_min=2:-1 > > almost :-) > > Array elements in module parameters are separated by commas not colons. > So for cmdline it should look like this: > amdgpu.backlight_min=2,-1 > > Though you can just drop the ,-1 relying on kernel leaving the rest of array > untouched. Which I would recommend as there is no point for user to > follow AMDGPU_DM_MAX_NUM_EDP. > Only when you need to override some other display than display 0 then you may > need to use -1. E.g. backlight_min=-1,2 overrides display 1 to min backlight=2 > while keeping display 0 with no override. > > When amdgpu is loaded as a kernel module, backlight_min can also be passed as a > parameter to modprobe, e.g.: > modprobe backlight_min=2 > So in that case you probably want to add something like > options amdgpu backlight_min=2 to /etc/modprobe.d/amdgpu.conf > (and also run update-initramfs if amdgpu is loaded by initramfs). > > I'll add some examples to commit message in v2. > Awesome. Thanks. Harry > Filip > > > V Mon, Oct 31, 2022 at 10:24:25AM -0400, Harry Wentland napsal(a): >> On 2022-10-29 15:13, Filip Moc wrote: >>> There are some devices on which amdgpu won't allow user to set brightness >>> to sufficiently low values even though the hardware would support it just >>> fine. >>> >>> This usually happens in two cases when either configuration of brightness >>> levels via ACPI/ATIF is not available and amdgpu falls back to defaults >>> (currently 12 for minimum level) which may be too high for some devices or >>> even the configuration via ATIF is available but the minimum brightness >>> level provided by the manufacturer is set to unreasonably high value. >>> >>> In either case user can use this new module parameter to adjust the >>> minimum allowed backlight brightness level. >>> >> >> Thanks for this patch and covering all the bases. >> >> It might be useful to have an example in the commit description on >> how to set the array property. I assume it looks like this if I >> wanted to set the first device to a minimum of 2 and leave the default >> for the 2nd one: >> >> amdgpu.backlight_min=2:-1 >> >> Either way, this patch is >> Reviewed-by: Harry Wentland <harry.wentland@amd.com> >> >> Harry >> >>> Link: https://bugzilla.kernel.org/show_bug.cgi?id=203439 >>> Signed-off-by: Filip Moc <dev@moc6.cz> >>> --- >>> drivers/gpu/drm/amd/amdgpu/amdgpu.h | 3 +++ >>> drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c | 15 +++++++++++++++ >>> drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c | 15 +++++++++++++++ >>> 3 files changed, 33 insertions(+) >>> >>> diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu.h b/drivers/gpu/drm/amd/amdgpu/amdgpu.h >>> index 0e6ddf05c23c..c5445402c49d 100644 >>> --- a/drivers/gpu/drm/amd/amdgpu/amdgpu.h >>> +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu.h >>> @@ -200,6 +200,9 @@ extern uint amdgpu_dc_debug_mask; >>> extern uint amdgpu_dc_visual_confirm; >>> extern uint amdgpu_dm_abm_level; >>> extern int amdgpu_backlight; >>> +#ifdef CONFIG_DRM_AMD_DC >>> +extern int amdgpu_backlight_override_min[]; >>> +#endif >>> extern struct amdgpu_mgpu_info mgpu_info; >>> extern int amdgpu_ras_enable; >>> extern uint amdgpu_ras_mask; >>> diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c >>> index 16f6a313335e..f2fb549ac52f 100644 >>> --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c >>> +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c >>> @@ -43,6 +43,7 @@ >>> #include "amdgpu_irq.h" >>> #include "amdgpu_dma_buf.h" >>> #include "amdgpu_sched.h" >>> +#include "amdgpu_dm.h" >>> #include "amdgpu_fdinfo.h" >>> #include "amdgpu_amdkfd.h" >>> >>> @@ -853,6 +854,20 @@ int amdgpu_backlight = -1; >>> MODULE_PARM_DESC(backlight, "Backlight control (0 = pwm, 1 = aux, -1 auto (default))"); >>> module_param_named(backlight, amdgpu_backlight, bint, 0444); >>> >>> +/** >>> + * DOC: backlight_min (array of int) >>> + * Override minimum allowed backlight brightness signal (per display). >>> + * Must be less than the maximum brightness signal. >>> + * Negative value means no override. >>> + * >>> + * Defaults to all -1 (no override on any display). >>> + */ >>> +#ifdef CONFIG_DRM_AMD_DC >>> +int amdgpu_backlight_override_min[AMDGPU_DM_MAX_NUM_EDP] = {[0 ... (AMDGPU_DM_MAX_NUM_EDP-1)] = -1}; >>> +MODULE_PARM_DESC(backlight_min, "Override minimum backlight brightness signal (0..max-1, -1 = no override (default))"); >>> +module_param_array_named(backlight_min, amdgpu_backlight_override_min, int, NULL, 0444); >>> +#endif >>> + >>> /** >>> * DOC: tmz (int) >>> * Trusted Memory Zone (TMZ) is a method to protect data being written >>> diff --git a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c >>> index eb4ce7216104..e2c36ba93d05 100644 >>> --- a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c >>> +++ b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c >>> @@ -3911,6 +3911,21 @@ static void amdgpu_dm_update_backlight_caps(struct amdgpu_display_manager *dm, >>> dm->backlight_caps[bl_idx].min_input_signal = AMDGPU_DM_DEFAULT_MIN_BACKLIGHT; >>> dm->backlight_caps[bl_idx].max_input_signal = AMDGPU_DM_DEFAULT_MAX_BACKLIGHT; >>> #endif >>> + >>> + if (amdgpu_backlight_override_min[bl_idx] >= 0) { >>> + if (amdgpu_backlight_override_min[bl_idx] < dm->backlight_caps[bl_idx].max_input_signal) { >>> + DRM_INFO("amdgpu: backlight[%i]: overriding minimum brightness from %i to %i\n", >>> + bl_idx, >>> + dm->backlight_caps[bl_idx].min_input_signal, >>> + amdgpu_backlight_override_min[bl_idx]); >>> + dm->backlight_caps[bl_idx].min_input_signal = amdgpu_backlight_override_min[bl_idx]; >>> + } else { >>> + DRM_ERROR("amdgpu: backlight[%i]: minimum brightness override (%i) is not below maximum (%i)\n", >>> + bl_idx, >>> + amdgpu_backlight_override_min[bl_idx], >>> + dm->backlight_caps[bl_idx].max_input_signal); >>> + } >>> + } >>> } >>> >>> static int get_brightness_range(const struct amdgpu_dm_backlight_caps *caps, >>> >>> base-commit: d8c03bfe146fd5e081a252cd34f3f12ca0255357 >>
On Tue, Nov 01, 2022 at 12:06:55PM -0400, Alex Deucher wrote: > On Tue, Nov 1, 2022 at 11:42 AM Filip Moc <dev@moc6.cz> wrote: > > > > Hello Alex, > > > > thank you for your response. > > > > Yes, I have HP ENVY x360 Convertible 13-ay1xxx, and backlight_min=2 > > seems to work the best in my case. > > > > I added a dmi based quirk table. So far with support only for display 0 > > to make it simple. Support for more displays in quirk table can be added > > later if ever needed. > > > > According to [1] HP ENVY x360 Convertible 13-ag0xxx also needs a quirk > > so I'm going to use this to cover both: > > DMI_EXACT_MATCH(DMI_SYS_VENDOR, "HP") > > DMI_MATCH(DMI_PRODUCT_NAME, "HP ENVY x360 Convertible 13-") > > You might want to add an additional check for the panel name/vendor > from the EDID as well in case HP uses multiple panels from different > vendors on that system. Hello, thank you for this feedback. I agree it would be nice to have this additional check but I'm not sure if there is an easy way to do this. I don't think we can add this to the EDID quirk table in drm_edid.c as we also need to store the value for backlight min_input_signal. There might also be different laptop manufacturers using the same panel which only one of them needs a quirk or both of them might need a quirk but with different value. Or there also might be more devices with the same DMI but different panels where each panel needs a quirk with different value. So it seems if we want to cover all possible situations we need a nested quirk tables for this. One main table for DMI matches where each record would contain another table for EDID matches. Then there's also a question of how to obtain the EDID. The most simple and straightforward approach seems to be getting the EDID vendor/product identification from dc_edid_caps. But this seems to be going completely against the goal 10. in display/TODO. So another approach I'm considering is to use drm_edid_get_panel_id but for that we would need a pointer to i2c_adapter for the corresponding backlight_link. Which I think is currently only available via amdgpu_dm_connector which from dc_link is only accessible via void *priv. Which seems like something that shouldn't be touched here. So overall I don't know what would be the best way to implement this. It also seems too complex I'm not even sure if it's worth the trouble and maybe just hoping there won't be any two devices with the same DMI but different EDID which only one of them would need a quirk while the other would break with it might seem more reasonable. Or maybe I'm missing something? Please let me know what you think. Filip > > Alex > > > > > So far it seems to be working fine. > > I'll send this in v2 once I do some final tweaks and do more tests. > > > > [1] https://bugzilla.kernel.org/show_bug.cgi?id=203439#c5 > > > > Filip > > > > > > V Mon, Oct 31, 2022 at 11:36:09AM -0400, Alex Deucher napsal(a): > > > On Sun, Oct 30, 2022 at 5:26 AM Filip Moc <dev@moc6.cz> wrote: > > > > > > > > There are some devices on which amdgpu won't allow user to set brightness > > > > to sufficiently low values even though the hardware would support it just > > > > fine. > > > > > > > > This usually happens in two cases when either configuration of brightness > > > > levels via ACPI/ATIF is not available and amdgpu falls back to defaults > > > > (currently 12 for minimum level) which may be too high for some devices or > > > > even the configuration via ATIF is available but the minimum brightness > > > > level provided by the manufacturer is set to unreasonably high value. > > > > > > > > In either case user can use this new module parameter to adjust the > > > > minimum allowed backlight brightness level. > > > > > > > > Link: https://bugzilla.kernel.org/show_bug.cgi?id=203439 > > > > Signed-off-by: Filip Moc <dev@moc6.cz> > > > > > > Does your system require an override and if so, what is it? It would > > > be good to add a quirk for your system as well so that other users of > > > the same system wouldn't need to manually figure out an apply the > > > settings. > > > > > > Alex > > > > > > > > > > --- > > > > drivers/gpu/drm/amd/amdgpu/amdgpu.h | 3 +++ > > > > drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c | 15 +++++++++++++++ > > > > drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c | 15 +++++++++++++++ > > > > 3 files changed, 33 insertions(+) > > > > > > > > diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu.h b/drivers/gpu/drm/amd/amdgpu/amdgpu.h > > > > index 0e6ddf05c23c..c5445402c49d 100644 > > > > --- a/drivers/gpu/drm/amd/amdgpu/amdgpu.h > > > > +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu.h > > > > @@ -200,6 +200,9 @@ extern uint amdgpu_dc_debug_mask; > > > > extern uint amdgpu_dc_visual_confirm; > > > > extern uint amdgpu_dm_abm_level; > > > > extern int amdgpu_backlight; > > > > +#ifdef CONFIG_DRM_AMD_DC > > > > +extern int amdgpu_backlight_override_min[]; > > > > +#endif > > > > extern struct amdgpu_mgpu_info mgpu_info; > > > > extern int amdgpu_ras_enable; > > > > extern uint amdgpu_ras_mask; > > > > diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c > > > > index 16f6a313335e..f2fb549ac52f 100644 > > > > --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c > > > > +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c > > > > @@ -43,6 +43,7 @@ > > > > #include "amdgpu_irq.h" > > > > #include "amdgpu_dma_buf.h" > > > > #include "amdgpu_sched.h" > > > > +#include "amdgpu_dm.h" > > > > #include "amdgpu_fdinfo.h" > > > > #include "amdgpu_amdkfd.h" > > > > > > > > @@ -853,6 +854,20 @@ int amdgpu_backlight = -1; > > > > MODULE_PARM_DESC(backlight, "Backlight control (0 = pwm, 1 = aux, -1 auto (default))"); > > > > module_param_named(backlight, amdgpu_backlight, bint, 0444); > > > > > > > > +/** > > > > + * DOC: backlight_min (array of int) > > > > + * Override minimum allowed backlight brightness signal (per display). > > > > + * Must be less than the maximum brightness signal. > > > > + * Negative value means no override. > > > > + * > > > > + * Defaults to all -1 (no override on any display). > > > > + */ > > > > +#ifdef CONFIG_DRM_AMD_DC > > > > +int amdgpu_backlight_override_min[AMDGPU_DM_MAX_NUM_EDP] = {[0 ... (AMDGPU_DM_MAX_NUM_EDP-1)] = -1}; > > > > +MODULE_PARM_DESC(backlight_min, "Override minimum backlight brightness signal (0..max-1, -1 = no override (default))"); > > > > +module_param_array_named(backlight_min, amdgpu_backlight_override_min, int, NULL, 0444); > > > > +#endif > > > > + > > > > /** > > > > * DOC: tmz (int) > > > > * Trusted Memory Zone (TMZ) is a method to protect data being written > > > > diff --git a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c > > > > index eb4ce7216104..e2c36ba93d05 100644 > > > > --- a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c > > > > +++ b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c > > > > @@ -3911,6 +3911,21 @@ static void amdgpu_dm_update_backlight_caps(struct amdgpu_display_manager *dm, > > > > dm->backlight_caps[bl_idx].min_input_signal = AMDGPU_DM_DEFAULT_MIN_BACKLIGHT; > > > > dm->backlight_caps[bl_idx].max_input_signal = AMDGPU_DM_DEFAULT_MAX_BACKLIGHT; > > > > #endif > > > > + > > > > + if (amdgpu_backlight_override_min[bl_idx] >= 0) { > > > > + if (amdgpu_backlight_override_min[bl_idx] < dm->backlight_caps[bl_idx].max_input_signal) { > > > > + DRM_INFO("amdgpu: backlight[%i]: overriding minimum brightness from %i to %i\n", > > > > + bl_idx, > > > > + dm->backlight_caps[bl_idx].min_input_signal, > > > > + amdgpu_backlight_override_min[bl_idx]); > > > > + dm->backlight_caps[bl_idx].min_input_signal = amdgpu_backlight_override_min[bl_idx]; > > > > + } else { > > > > + DRM_ERROR("amdgpu: backlight[%i]: minimum brightness override (%i) is not below maximum (%i)\n", > > > > + bl_idx, > > > > + amdgpu_backlight_override_min[bl_idx], > > > > + dm->backlight_caps[bl_idx].max_input_signal); > > > > + } > > > > + } > > > > } > > > > > > > > static int get_brightness_range(const struct amdgpu_dm_backlight_caps *caps, > > > > > > > > base-commit: d8c03bfe146fd5e081a252cd34f3f12ca0255357 > > > > -- > > > > 2.30.2 > > > >
diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu.h b/drivers/gpu/drm/amd/amdgpu/amdgpu.h index 0e6ddf05c23c..c5445402c49d 100644 --- a/drivers/gpu/drm/amd/amdgpu/amdgpu.h +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu.h @@ -200,6 +200,9 @@ extern uint amdgpu_dc_debug_mask; extern uint amdgpu_dc_visual_confirm; extern uint amdgpu_dm_abm_level; extern int amdgpu_backlight; +#ifdef CONFIG_DRM_AMD_DC +extern int amdgpu_backlight_override_min[]; +#endif extern struct amdgpu_mgpu_info mgpu_info; extern int amdgpu_ras_enable; extern uint amdgpu_ras_mask; diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c index 16f6a313335e..f2fb549ac52f 100644 --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c @@ -43,6 +43,7 @@ #include "amdgpu_irq.h" #include "amdgpu_dma_buf.h" #include "amdgpu_sched.h" +#include "amdgpu_dm.h" #include "amdgpu_fdinfo.h" #include "amdgpu_amdkfd.h" @@ -853,6 +854,20 @@ int amdgpu_backlight = -1; MODULE_PARM_DESC(backlight, "Backlight control (0 = pwm, 1 = aux, -1 auto (default))"); module_param_named(backlight, amdgpu_backlight, bint, 0444); +/** + * DOC: backlight_min (array of int) + * Override minimum allowed backlight brightness signal (per display). + * Must be less than the maximum brightness signal. + * Negative value means no override. + * + * Defaults to all -1 (no override on any display). + */ +#ifdef CONFIG_DRM_AMD_DC +int amdgpu_backlight_override_min[AMDGPU_DM_MAX_NUM_EDP] = {[0 ... (AMDGPU_DM_MAX_NUM_EDP-1)] = -1}; +MODULE_PARM_DESC(backlight_min, "Override minimum backlight brightness signal (0..max-1, -1 = no override (default))"); +module_param_array_named(backlight_min, amdgpu_backlight_override_min, int, NULL, 0444); +#endif + /** * DOC: tmz (int) * Trusted Memory Zone (TMZ) is a method to protect data being written diff --git a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c index eb4ce7216104..e2c36ba93d05 100644 --- a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c +++ b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c @@ -3911,6 +3911,21 @@ static void amdgpu_dm_update_backlight_caps(struct amdgpu_display_manager *dm, dm->backlight_caps[bl_idx].min_input_signal = AMDGPU_DM_DEFAULT_MIN_BACKLIGHT; dm->backlight_caps[bl_idx].max_input_signal = AMDGPU_DM_DEFAULT_MAX_BACKLIGHT; #endif + + if (amdgpu_backlight_override_min[bl_idx] >= 0) { + if (amdgpu_backlight_override_min[bl_idx] < dm->backlight_caps[bl_idx].max_input_signal) { + DRM_INFO("amdgpu: backlight[%i]: overriding minimum brightness from %i to %i\n", + bl_idx, + dm->backlight_caps[bl_idx].min_input_signal, + amdgpu_backlight_override_min[bl_idx]); + dm->backlight_caps[bl_idx].min_input_signal = amdgpu_backlight_override_min[bl_idx]; + } else { + DRM_ERROR("amdgpu: backlight[%i]: minimum brightness override (%i) is not below maximum (%i)\n", + bl_idx, + amdgpu_backlight_override_min[bl_idx], + dm->backlight_caps[bl_idx].max_input_signal); + } + } } static int get_brightness_range(const struct amdgpu_dm_backlight_caps *caps,