Skip to content

Commit 5b85204

Browse files
superm1alexdeucher
authored andcommitted
drm/amd/display: Fix AMDGPU_MAX_BL_LEVEL value
[Why] commit 16dc8bc ("drm/amd/display: Export full brightness range to userspace") adjusted the brightness range to scale to larger values, but missed updating AMDGPU_MAX_BL_LEVEL which is needed to make sure that scaling works properly with custom brightness curves. [How] As the change for max brightness of 0xFFFF only applies to devices supporting DC, use existing DC define MAX_BACKLIGHT_LEVEL. Fixes: 16dc8bc ("drm/amd/display: Export full brightness range to userspace") Acked-by: Alex Deucher <[email protected]> Link: https://lore.kernel.org/r/[email protected] Signed-off-by: Mario Limonciello <[email protected]> Signed-off-by: Alex Deucher <[email protected]>
1 parent 518f13f commit 5b85204

File tree

1 file changed

+5
-5
lines changed

1 file changed

+5
-5
lines changed

drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -4752,16 +4752,16 @@ static int get_brightness_range(const struct amdgpu_dm_backlight_caps *caps,
47524752
return 1;
47534753
}
47544754

4755-
/* Rescale from [min..max] to [0..AMDGPU_MAX_BL_LEVEL] */
4755+
/* Rescale from [min..max] to [0..MAX_BACKLIGHT_LEVEL] */
47564756
static inline u32 scale_input_to_fw(int min, int max, u64 input)
47574757
{
4758-
return DIV_ROUND_CLOSEST_ULL(input * AMDGPU_MAX_BL_LEVEL, max - min);
4758+
return DIV_ROUND_CLOSEST_ULL(input * MAX_BACKLIGHT_LEVEL, max - min);
47594759
}
47604760

4761-
/* Rescale from [0..AMDGPU_MAX_BL_LEVEL] to [min..max] */
4761+
/* Rescale from [0..MAX_BACKLIGHT_LEVEL] to [min..max] */
47624762
static inline u32 scale_fw_to_input(int min, int max, u64 input)
47634763
{
4764-
return min + DIV_ROUND_CLOSEST_ULL(input * (max - min), AMDGPU_MAX_BL_LEVEL);
4764+
return min + DIV_ROUND_CLOSEST_ULL(input * (max - min), MAX_BACKLIGHT_LEVEL);
47654765
}
47664766

47674767
static void convert_custom_brightness(const struct amdgpu_dm_backlight_caps *caps,
@@ -4981,7 +4981,7 @@ amdgpu_dm_register_backlight_device(struct amdgpu_dm_connector *aconnector)
49814981
drm_dbg(drm, "Backlight caps: min: %d, max: %d, ac %d, dc %d\n", min, max,
49824982
caps->ac_level, caps->dc_level);
49834983
} else
4984-
props.brightness = props.max_brightness = AMDGPU_MAX_BL_LEVEL;
4984+
props.brightness = props.max_brightness = MAX_BACKLIGHT_LEVEL;
49854985

49864986
if (caps->data_points && !(amdgpu_dc_debug_mask & DC_DISABLE_CUSTOM_BRIGHTNESS_CURVE))
49874987
drm_info(drm, "Using custom brightness curve\n");

0 commit comments

Comments
 (0)