drm/amd/display: Scale custom brightness curve from full range
PATCH 1/1 drm/amd/display: Scale custom brightness curve from full range
Custom brightness curves use an 8-bit input signal. After exporting the full PWM range to userspace, the curve normalizer still divides requests by the physical PWM span. On panels with a nonzero minimum PWM level, this can produce a curve input greater than 255 and send an invalid backlight level to DC.
Scale the userspace [0..max] range to the curve's [0..255] range instead. This retains the full advertised range and keeps the reverse readback conversion unchanged.
--- drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-)
drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c +4 -4
@@ -5131,10 +5131,10 @@ static int get_brightness_range(const struct amdgpu_dm_backlight_caps *caps,return 1 ; } -/* Rescale from [min..max] to [0..AMDGPU_MAX_BL_LEVEL] */ -static inline u32 scale_input_to_fw (int min,int max,u64 input) +/* Rescale userspace [0..max] to the firmware curve's [0..255]. */ +static inline u32 scale_input_to_fw (int max,u64 input) { -return DIV_ROUND_CLOSEST_ULL (input *AMDGPU_MAX_BL_LEVEL , max - min); +return DIV_ROUND_CLOSEST_ULL (input *AMDGPU_MAX_BL_LEVEL , max); }/* Rescale from [0..AMDGPU_MAX_BL_LEVEL] to [min..max] */
@@ -5147,7 +5147,7 @@ static void convert_custom_brightness(const struct amdgpu_dm_backlight_caps *cap unsigned int min, unsigned int max, uint32_t *user_brightness) { - u32 brightness = scale_input_to_fw(min, max, *user_brightness); + u32 brightness = scale_input_to_fw(max, *user_brightness);u8 lower_signal, upper_signal, upper_lum, lower_lum, lum;int left, right;
Signature · 1 line
2.55.0
[email protected]
AI reviewThank you for your contribution! Sashiko AI review found 1 potential issue(s) to consider:
Thank you for your contribution! Sashiko AI review found 1 potential issue(s) to consider:
Pre-existing issues:
- [High] Double scaling of the brightness value when a custom brightness curve is used, causing the minimum backlight level to be incorrectly raised. --
--- Patch [1]: [PATCH] drm/amd/display: Scale custom brightness curve from full range --- commit d7add749f0052e896a6fee3206021e51b2fd8540
Author: Akhmed Zhitaev <[email protected]>
drm/amd/display: Scale custom brightness curve from full range
This patch changes the input scaling for custom brightness curves to map the userspace [0..max] range to the curve's [0..255] range. This prevents generating a curve input greater than 255 for panels with a nonzero minimum PWM level.
Quoted 4 lines
drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c +0
-0
[ ... ]
Quoted 11 lines
drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c +3
-3-/* Rescale from [min..max] to [0..AMDGPU_MAX_BL_LEVEL] */ -static inline u32 scale_input_to_fw (int min,int max,u64 input) +/* Rescale userspace [0..max] to the firmware curve's [0..255]. */ +static inline u32 scale_input_to_fw (int max,u64 input) { -return DIV_ROUND_CLOSEST_ULL (input *AMDGPU_MAX_BL_LEVEL , max - min); +return DIV_ROUND_CLOSEST_ULL (input *AMDGPU_MAX_BL_LEVEL , max); }/* Rescale from [0..AMDGPU_MAX_BL_LEVEL] to [min..max] */
drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c static void convert_custom_brightness(const struct amdgpu_dm_backlight_caps *cap · line 5286
Quoted 7 lines
drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c +1
-1@@ -5281,7 +5281,7 @@ static void convert_custom_brightness(const struct amdgpu_dm_backlight_caps *cap unsigned int min, unsigned int max, uint32_t *user_brightness) { - u32 brightness = scale_input_to_fw(min, max, *user_brightness); + u32 brightness = scale_input_to_fw(max, *user_brightness);u8 lower_signal, upper_signal, upper_lum, lower_lum, lum;int left, right;
[Severity: High]
This isn't a bug introduced by this patch, but does the current code double-scale the brightness when a custom brightness curve is used?
Looking at scale_fw_to_input() in drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c, it maps the curve's [0..255] output to [min..max]:
static inline u32 scale_fw_to_input(int min, int max, u64 input)
{
return min + DIV_ROUND_CLOSEST_ULL(input * (max - min),
AMDGPU_MAX_BL_LEVEL);
}This is used at the end of convert_custom_brightness(), meaning the output brightness value is returned in the [min..max] range.
However, in convert_brightness_from_user(), the output gets rescaled again:
convert_custom_brightness(caps, min, max, &brightness); // Rescale 0..max to min..max return min + DIV_ROUND_CLOSEST_ULL((u64)(max - min) * brightness, max);
Because scale_fw_to_input() already mapped it to [min..max], and convert_brightness_from_user() rescales it to [min..max] again under the assumption that the value is in [0..max], the minimum offset is applied twice.
Since this patch explicitly aims to fix the brightness scaling logic introduced by commit 8dbd72cb7900, should scale_fw_to_input() or convert_brightness_from_user() also be updated to avoid raising the minimum backlight level incorrectly for panels using custom brightness curves?
Signature · 1 line
Sashiko AI review · https://sashiko.dev/#/patchset/[email protected]?part=1
Quoted 36 lines · Akhmed Zhitaev
Custom brightness curves use an 8-bit input signal. After exporting the full PWM range to userspace, the curve normalizer still divides requests by the physical PWM span. On panels with a nonzero minimum PWM level, this can produce a curve input greater than 255 and send an invalid backlight level to DC.
Scale the userspace [0..max] range to the curve's [0..255] range instead. This retains the full advertised range and keeps the reverse readback conversion unchanged.
Fixes 8dbd72cb7900 ("drm/amd/display: Export full brightness range to userspace")Signed-off-by Akhmed Zhitaev <[email protected]>--- drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-)drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c +3
-3@@ -5131,10 +5131,10 @@ static int get_brightness_range(const struct amdgpu_dm_backlight_caps *caps,return 1 ; } -/* Rescale from [min..max] to [0..AMDGPU_MAX_BL_LEVEL] */ -static inline u32 scale_input_to_fw (int min,int max,u64 input) +/* Rescale userspace [0..max] to the firmware curve's [0..255]. */ +static inline u32 scale_input_to_fw (int max,u64 input) { -return DIV_ROUND_CLOSEST_ULL (input *AMDGPU_MAX_BL_LEVEL , max - min); +return DIV_ROUND_CLOSEST_ULL (input *AMDGPU_MAX_BL_LEVEL , max); }/* Rescale from [0..AMDGPU_MAX_BL_LEVEL] to [min..max] */
drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c static void convert_custom_brightness(const struct amdgpu_dm_backlight_caps *cap · line 5153
Quoted 8 lines
drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c +1
-1@@ -5147,7 +5147,7 @@ static void convert_custom_brightness(const struct amdgpu_dm_backlight_caps *cap unsigned int min, unsigned int max, uint32_t *user_brightness) { - u32 brightness = scale_input_to_fw(min, max, *user_brightness); + u32 brightness = scale_input_to_fw(max, *user_brightness);u8 lower_signal, upper_signal, upper_lum, lower_lum, lum;int left, right;
Is this still needed with
"drm/amd/display: Fix backlight max_brightness to match exported range"
https://github.com/torvalds/linux/commit/f1b5d8f9cc54ae8a2567ac126867ae488e1bf625
Yes, this is still needed.
f1b5d8f9cc54 fixes the advertised max_brightness mismatch by restoring the full userspace range [0..max].
The issue fixed by this patch is different: the custom brightness curve input is still normalized by (max - min). On panels with a non-zero PWM minimum, valid userspace requests near the top of the [0..max] range can therefore produce a curve input above 255.
On my panel, min=3084 and max=65535. Without this patch, requests above the upper boundary caused the backlight to drop dark; with this patch, the full range maps into [0..255] and the issue no longer reproduces.
I also tested with the f1b5d8f9cc54 semantics present, so the regression is still present without this change.
чт, 13 авг. 2026 г. в 22:45, Mario Limonciello <[email protected]>:
Quoted 54 lines · Akhmed Zhitaev
Quoted 36 lines
Custom brightness curves use an 8-bit input signal. After exporting the full PWM range to userspace, the curve normalizer still divides requests by the physical PWM span. On panels with a nonzero minimum PWM level, this can produce a curve input greater than 255 and send an invalid backlight level to DC.
Scale the userspace [0..max] range to the curve's [0..255] range instead. This retains the full advertised range and keeps the reverse readback conversion unchanged.
Fixes 8dbd72cb7900 ("drm/amd/display: Export full brightness range to userspace")Signed-off-by Akhmed Zhitaev <[email protected]>--- drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-)drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c +3
-3@@ -5131,10 +5131,10 @@ static int get_brightness_range(const struct amdgpu_dm_backlight_caps *caps,return 1 ; } -/* Rescale from [min..max] to [0..AMDGPU_MAX_BL_LEVEL] */ -static inline u32 scale_input_to_fw (int min,int max,u64 input) +/* Rescale userspace [0..max] to the firmware curve's [0..255]. */ +static inline u32 scale_input_to_fw (int max,u64 input) { -return DIV_ROUND_CLOSEST_ULL (input *AMDGPU_MAX_BL_LEVEL , max - min); +return DIV_ROUND_CLOSEST_ULL (input *AMDGPU_MAX_BL_LEVEL , max); }/* Rescale from [0..AMDGPU_MAX_BL_LEVEL] to [min..max] */ drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c static void convert_custom_brightness(const struct amdgpu_dm_backlight_caps *cap · line 5153
Quoted 8 lines
drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c +1
-1@@ -5147,7 +5147,7 @@ static void convert_custom_brightness(const struct amdgpu_dm_backlight_caps *cap unsigned int min, unsigned int max, uint32_t *user_brightness) { - u32 brightness = scale_input_to_fw(min, max, *user_brightness); + u32 brightness = scale_input_to_fw(max, *user_brightness);u8 lower_signal, upper_signal, upper_lum, lower_lum, lum;int left, right;Is this still needed with
"drm/amd/display: Fix backlight
max_brightnessto match exported range"https://github.com/torvalds/linux/commit/f1b5d8f9cc54ae8a2567ac126867ae488e1bf625
Yes, this is still needed.
f1b5d8f9cc54 fixes the advertised max_brightness mismatch by restoring the full userspace range [0..max].
The issue fixed by this patch is different: the custom brightness curve input is still normalized by (max - min). On panels with a non-zero PWM minimum, valid userspace requests near the top of the [0..max] range can therefore produce a curve input above 255.
On my panel, min=3084 and max=65535. Without this patch, requests above the upper boundary caused the backlight to drop dark; with this patch, the full range maps into [0..255] and the issue no longer reproduces.
I also tested with the f1b5d8f9cc54 semantics present, so the regression is still present without this change.
чт, 13 авг. 2026 г. в 22:45, Mario Limonciello <[email protected]>:
Quoted 60 lines · Akhmed Zhitaev
Quoted 11 lines
Custom brightness curves use an 8-bit input signal. After exporting the full PWM range to userspace, the curve normalizer still divides requests by the physical PWM span. On panels with a nonzero minimum PWM level, this can produce a curve input greater than 255 and send an invalid backlight level to DC.
Scale the userspace [0..max] range to the curve's [0..255] range instead. This retains the full advertised range and keeps the reverse readback conversion unchanged.
Fixes 8dbd72cb7900 ("drm/amd/display: Export full brightness range touserspace")
Review
Quoted 7 lines
Signed-off-by Akhmed Zhitaev <[email protected]>--- drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-)(quoted diff) +0
-0
b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.cdrivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c static int get_brightness_range(const struct
Quoted 4 lines
index
40d82a3ee..533c69f0b100644drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c +0
-0@@ -5131,10 +5131,10 @@ static int get_brightness_range(const struct
amdgpu_dm_backlight_caps*caps,drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c static int get_brightness_range(const struct amdgpu_dm_backlight_caps *caps,
Quoted 9 lines
drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c +2
-3return 1 ; } -/* Rescale from [min..max] to [0..AMDGPU_MAX_BL_LEVEL] */ -static inline u32 scale_input_to_fw (int min,int max,u64 input) +/* Rescale userspace [0..max] to the firmware curve's [0..255]. */ +static inline u32 scale_input_to_fw (int max,u64 input) { - return DIV_ROUND_CLOSEST_ULL(input * AMDGPU_MAX_BL_LEVEL, max -min);
drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c static void convert_custom_brightness(const struct
Quoted 5 lines
drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c +1
-0+return DIV_ROUND_CLOSEST_ULL (input *AMDGPU_MAX_BL_LEVEL , max); }/* Rescale from [0..AMDGPU_MAX_BL_LEVEL] to [min..max] */ @@ -5147,7 +5147,7 @@ static void convert_custom_brightness(const struct
amdgpu_dm_backlight_caps*capdrivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c static void convert_custom_brightness(const struct amdgpu_dm_backlight_caps *cap · line 5153
Quoted 8 lines
drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c +1
-1unsigned int min, unsigned int max, uint32_t *user_brightness) { - u32 brightness = scale_input_to_fw(min, max, *user_brightness); + u32 brightness = scale_input_to_fw(max, *user_brightness);u8 lower_signal, upper_signal, upper_lum, lower_lum, lum;int left, right;Is this still needed with
"drm/amd/display: Fix backlight
max_brightnessto match exported range"https://github.com/torvalds/linux/commit/f1b5d8f9cc54ae8a2567ac126867ae488e1bf625
Quoted 6 lines · Akhmed Zhitaev
Custom brightness curves use an 8-bit input signal. After exporting the full PWM range to userspace, the curve normalizer still divides requests by the physical PWM span. On panels with a nonzero minimum PWM level, this can produce a curve input greater than 255 and send an invalid backlight level to DC.
Quoted 7 lines
Scale the userspace [0..max] range to the curve's [0..255] range instead. This retains the full advertised range and keeps the reverse readback conversion unchanged.
Fixes 8dbd72cb7900 ("drm/amd/display: Export full brightness range to userspace")Signed-off-by Akhmed Zhitaev <[email protected]>
Thanks for this.
We have moved the code in amd-staging-drm-next
https://gitlab.freedesktop.org/agd5f/linux/-/commit/6c2b46e9774f13e45985f6da9f7d5f8458767b98
As your changes are trivial, I'll adjust while commiting.
Quoted 31 lines
--- drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-)drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c +4
-4@@ -5131,10 +5131,10 @@ static int get_brightness_range(const struct amdgpu_dm_backlight_caps *caps,return 1 ; } -/* Rescale from [min..max] to [0..AMDGPU_MAX_BL_LEVEL] */ -static inline u32 scale_input_to_fw (int min,int max,u64 input) +/* Rescale userspace [0..max] to the firmware curve's [0..255]. */ +static inline u32 scale_input_to_fw (int max,u64 input) { -return DIV_ROUND_CLOSEST_ULL (input *AMDGPU_MAX_BL_LEVEL , max - min); +return DIV_ROUND_CLOSEST_ULL (input *AMDGPU_MAX_BL_LEVEL , max); }/* Rescale from [0..AMDGPU_MAX_BL_LEVEL] to [min..max] */ @@ -5147,7 +5147,7 @@ static void convert_custom_brightness(const struct amdgpu_dm_backlight_caps *cap unsigned int min, unsigned int max, uint32_t *user_brightness) { - u32 brightness = scale_input_to_fw(min, max, *user_brightness); + u32 brightness = scale_input_to_fw(max, *user_brightness);u8 lower_signal, upper_signal, upper_lum, lower_lum, lum;int left, right;
🎉
Реакция пользователя Ахмед через Gmail
<https://www.google.com/gmail/about/?utm_source=gmail-in-product&utm_medium=et&utm_campaign=emojireactionemail#app>
пт, 14 авг. 2026 г., 00:38 Mario Limonciello <[email protected]>:
Quoted 50 lines · Akhmed Zhitaev
Quoted 11 lines
Custom brightness curves use an 8-bit input signal. After exporting the full PWM range to userspace, the curve normalizer still divides requests by the physical PWM span. On panels with a nonzero minimum PWM level, this can produce a curve input greater than 255 and send an invalid backlight level to DC.
Scale the userspace [0..max] range to the curve's [0..255] range instead. This retains the full advertised range and keeps the reverse readback conversion unchanged.
Fixes 8dbd72cb7900 ("drm/amd/display: Export full brightness range touserspace")
Quoted 2 lines
Signed-off-by Akhmed Zhitaev <[email protected]>Thanks for this.
We have moved the code in amd-staging-drm-next
https://gitlab.freedesktop.org/agd5f/linux/-/commit/6c2b46e9774f13e45985f6da9f7d5f8458767b98
As your changes are trivial, I'll adjust while commiting.
Reviewed-by Mario Limonciello (AMD) <[email protected]>Review
Quoted 5 lines
--- drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-)(quoted diff) +0
-0
b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.cdrivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c static int get_brightness_range(const struct
Quoted 4 lines
index
40d82a3ee..533c69f0b100644drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c +0
-0@@ -5131,10 +5131,10 @@ static int get_brightness_range(const struct
amdgpu_dm_backlight_caps*caps,drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c static int get_brightness_range(const struct amdgpu_dm_backlight_caps *caps,
Quoted 9 lines
drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c +2
-3return 1 ; } -/* Rescale from [min..max] to [0..AMDGPU_MAX_BL_LEVEL] */ -static inline u32 scale_input_to_fw (int min,int max,u64 input) +/* Rescale userspace [0..max] to the firmware curve's [0..255]. */ +static inline u32 scale_input_to_fw (int max,u64 input) { - return DIV_ROUND_CLOSEST_ULL(input * AMDGPU_MAX_BL_LEVEL, max -min);
Quoted 16 lines
drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c static void convert_custom_brightness(const struct
Quoted 5 lines
drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c +1
-0+return DIV_ROUND_CLOSEST_ULL (input *AMDGPU_MAX_BL_LEVEL , max); }/* Rescale from [0..AMDGPU_MAX_BL_LEVEL] to [min..max] */ @@ -5147,7 +5147,7 @@ static void convert_custom_brightness(const struct
amdgpu_dm_backlight_caps*capQuoted 8 lines
drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c +1
-1unsigned int min, unsigned int max, uint32_t *user_brightness) { - u32 brightness = scale_input_to_fw(min, max, *user_brightness); + u32 brightness = scale_input_to_fw(max, *user_brightness);u8 lower_signal, upper_signal, upper_lum, lower_lum, lum;int left, right;
{
"emoji": "🎉",
"version": 1
}