This is a note to let you know that I've just added the patch titled
drm/amdgpu/display: simplify backlight setting
to the 5.10-stable tree which can be found at:
http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary
The filename of the patch is:
drm-amdgpu-display-simplify-backlight-setting.patch
and it can be found in the queue-5.10 subdirectory.
If you, or anyone else, feels it should not be added to the stable tree,
please let <stable@xxxxxxxxxxxxxxx> know about it.
>From a2f8d988698d7d3645b045f4940415b045140b81 Mon Sep 17 00:00:00 2001
From: Alex Deucher <alexander.deucher@xxxxxxx>
Date: Thu, 10 Dec 2020 01:18:40 -0500
Subject: drm/amdgpu/display: simplify backlight setting
From: Alex Deucher <alexander.deucher@xxxxxxx>
commit a2f8d988698d7d3645b045f4940415b045140b81 upstream.
Avoid the extra wrapper function.
Reviewed-by: Nicholas Kazlauskas <nicholas.kazlauskas@xxxxxxx>
Signed-off-by: Alex Deucher <alexander.deucher@xxxxxxx>
Cc: stable@xxxxxxxxxxxxxxx
Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxxxxxxxxxxxxxx>
---
drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c | 20 ++++----------------
1 file changed, 4 insertions(+), 16 deletions(-)
--- a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c
+++ b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c
@@ -3043,19 +3043,6 @@ static void amdgpu_dm_update_backlight_c
#endif
}
-static int set_backlight_via_aux(struct dc_link *link, uint32_t brightness)
-{
- bool rc;
-
- if (!link)
- return 1;
-
- rc = dc_link_set_backlight_level_nits(link, true, brightness,
- AUX_BL_DEFAULT_TRANSITION_TIME_MS);
-
- return rc ? 0 : 1;
-}
-
static int get_brightness_range(const struct amdgpu_dm_backlight_caps *caps,
unsigned *min, unsigned *max)
{
@@ -3118,9 +3105,10 @@ static int amdgpu_dm_backlight_update_st
brightness = convert_brightness_from_user(&caps, bd->props.brightness);
// Change brightness based on AUX property
if (caps.aux_support)
- return set_backlight_via_aux(link, brightness);
-
- rc = dc_link_set_backlight_level(dm->backlight_link, brightness, 0);
+ rc = dc_link_set_backlight_level_nits(link, true, brightness,
+ AUX_BL_DEFAULT_TRANSITION_TIME_MS);
+ else
+ rc = dc_link_set_backlight_level(dm->backlight_link, brightness, 0);
return rc ? 0 : 1;
}
Patches currently in stable-queue which might be from alexander.deucher@xxxxxxx are
queue-5.10/drm-amd-display-fix-nested-fpu-context-in-dcn21_validate_bandwidth.patch
queue-5.10/drm-amd-display-add-a-backlight-module-option.patch
queue-5.10/drm-amdgpu-display-simplify-backlight-setting.patch
queue-5.10/drm-amdgpu-display-use-gfp_atomic-in-dcn21_validate_bandwidth_fp.patch
queue-5.10/drm-amdgpu-display-handle-aux-backlight-in-backlight_get_brightness.patch
queue-5.10/drm-amdgpu-display-don-t-assert-in-set-backlight-function.patch
queue-5.10/drm-amd-pm-bug-fix-for-pcie-dpm.patch
