Commit 66abb996 authored by Mario Limonciello's avatar Mario Limonciello Committed by Alex Deucher
Browse files

drm/amd/display: Fix AMDGPU_MAX_BL_LEVEL value 



[Why]
commit 16dc8bc2 ("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: 16dc8bc2 ("drm/amd/display: Export full brightness range to userspace")
Acked-by: default avatarAlex Deucher <alexander.deucher@amd.com>
Link: https://lore.kernel.org/r/20250623171114.1156451-1-mario.limonciello@amd.com


Signed-off-by: default avatarMario Limonciello <mario.limonciello@amd.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
(cherry picked from commit 5b852044)
Cc: stable@vger.kernel.org
parent 31135cc9

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

+5 −5
Original line number Diff line number Diff line
@@ -4718,16 +4718,16 @@ static int get_brightness_range(const struct amdgpu_dm_backlight_caps *caps, 
	return 1;

}



/* Rescale from [min..max] to [0..AMDGPU_MAX_BL_LEVEL] */

/* Rescale from [min..max] to [0..MAX_BACKLIGHT_LEVEL] */

static inline u32 scale_input_to_fw(int min, int max, u64 input)

{

	return DIV_ROUND_CLOSEST_ULL(input * AMDGPU_MAX_BL_LEVEL, max - min);

	return DIV_ROUND_CLOSEST_ULL(input * MAX_BACKLIGHT_LEVEL, max - min);

}



/* Rescale from [0..AMDGPU_MAX_BL_LEVEL] to [min..max] */

/* Rescale from [0..MAX_BACKLIGHT_LEVEL] 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);

	return min + DIV_ROUND_CLOSEST_ULL(input * (max - min), MAX_BACKLIGHT_LEVEL);

}



static void convert_custom_brightness(const struct amdgpu_dm_backlight_caps *caps,
@@ -4947,7 +4947,7 @@ amdgpu_dm_register_backlight_device(struct amdgpu_dm_connector *aconnector) 
		drm_dbg(drm, "Backlight caps: min: %d, max: %d, ac %d, dc %d\n", min, max,

			caps->ac_level, caps->dc_level);

	} else

		props.brightness = props.max_brightness = AMDGPU_MAX_BL_LEVEL;

		props.brightness = props.max_brightness = MAX_BACKLIGHT_LEVEL;



	if (caps->data_points && !(amdgpu_dc_debug_mask & DC_DISABLE_CUSTOM_BRIGHTNESS_CURVE))

		drm_info(drm, "Using custom brightness curve\n");