Commit 148144f6 authored by Mario Limonciello's avatar Mario Limonciello Committed by Alex Deucher
Browse files

drm/amd/display: Only read ACPI backlight caps once 



[WHY]
Backlight caps are read already in amdgpu_dm_update_backlight_caps().
They may be updated by update_connector_ext_caps(). Reading again when
registering backlight device may cause wrong values to be used.

[HOW]
Use backlight caps already registered to the dm.

Cc: Mario Limonciello <mario.limonciello@amd.com>
Cc: Alex Deucher <alexander.deucher@amd.com>
Reviewed-by: default avatarRoman Li <roman.li@amd.com>
Signed-off-by: default avatarMario Limonciello <mario.limonciello@amd.com>
Signed-off-by: default avatarAlex Hung <alex.hung@amd.com>
Tested-by: default avatarDaniel Wheeler <daniel.wheeler@amd.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
parent 11baa497

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

+7 −7
Original line number Diff line number Diff line
@@ -4911,7 +4911,7 @@ amdgpu_dm_register_backlight_device(struct amdgpu_dm_connector *aconnector) 
	struct drm_device *drm = aconnector->base.dev;

	struct amdgpu_display_manager *dm = &drm_to_adev(drm)->dm;

	struct backlight_properties props = { 0 };

	struct amdgpu_dm_backlight_caps caps = { 0 };

	struct amdgpu_dm_backlight_caps *caps;

	char bl_name[16];

	int min, max;
@@ -4925,20 +4925,20 @@ amdgpu_dm_register_backlight_device(struct amdgpu_dm_connector *aconnector) 
		return;

	}



	amdgpu_acpi_get_backlight_caps(&caps);

	if (caps.caps_valid && get_brightness_range(&caps, &min, &max)) {

	caps = &dm->backlight_caps[aconnector->bl_idx];

	if (get_brightness_range(caps, &min, &max)) {

		if (power_supply_is_system_supplied() > 0)

			props.brightness = (max - min) * DIV_ROUND_CLOSEST(caps.ac_level, 100);

			props.brightness = (max - min) * DIV_ROUND_CLOSEST(caps->ac_level, 100);

		else

			props.brightness = (max - min) * DIV_ROUND_CLOSEST(caps.dc_level, 100);

			props.brightness = (max - min) * DIV_ROUND_CLOSEST(caps->dc_level, 100);

		/* min is zero, so max needs to be adjusted */

		props.max_brightness = max - min;

		drm_dbg(drm, "Backlight caps: min: %d, max: %d, ac %d, dc %d\n", min, max,

			caps.ac_level, caps.dc_level);

			caps->ac_level, caps->dc_level);

	} else

		props.brightness = AMDGPU_MAX_BL_LEVEL;



	if (caps.data_points && !(amdgpu_dc_debug_mask & DC_DISABLE_CUSTOM_BRIGHTNESS_CURVE))

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

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

	props.max_brightness = AMDGPU_MAX_BL_LEVEL;

	props.type = BACKLIGHT_RAW;