From: Roman Li Roman.Li@amd.com
[Why] After commit ("drm/amdgpu/display: add support for multiple backlights") number of eDPs is defined while registering backlight device. However the panel's extended caps get updated once before register call. That leads to regression with extended caps like oled brightness control.
[How] Update connector ext caps after register_backlight_device
Fixes: 7fd13baeb7a3a4 ("drm/amdgpu/display: add support for multiple backlights") Link: https://www.reddit.com/r/AMDLaptops/comments/qst0fm/after_updating_to_linux_...
Signed-off-by: Roman Li Roman.Li@amd.com Tested-by: Samuel Čavoj samuel@cavoj.net Acked-by: Alex Deucher alexander.deucher@amd.com Reviewed-by: Jasdeep Dhillon Jasdeep.Dhillon@amd.com Signed-off-by: Alex Deucher alexander.deucher@amd.com Cc: stable@vger.kernel.org (cherry picked from commit dab60582685aabdae2d4ff7ce716456bd0dc7a0f) --- drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c | 3 +++ 1 file changed, 3 insertions(+)
diff --git a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c index 1ea31dcc7a8b..a70c57e73cce 100644 --- a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c +++ b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c @@ -3839,6 +3839,9 @@ static int amdgpu_dm_initialize_drm_device(struct amdgpu_device *adev) } else if (dc_link_detect(link, DETECT_REASON_BOOT)) { amdgpu_dm_update_connector_after_detect(aconnector); register_backlight_device(dm, link); + + if (dm->num_of_edps) + update_connector_ext_caps(aconnector); if (amdgpu_dc_feature_mask & DC_PSR_MASK) amdgpu_dm_set_psr_caps(link); }
On Wed, Nov 24, 2021 at 01:01:22PM -0500, Alex Deucher wrote:
From: Roman Li Roman.Li@amd.com
[Why] After commit ("drm/amdgpu/display: add support for multiple backlights") number of eDPs is defined while registering backlight device. However the panel's extended caps get updated once before register call. That leads to regression with extended caps like oled brightness control.
[How] Update connector ext caps after register_backlight_device
Fixes: 7fd13baeb7a3a4 ("drm/amdgpu/display: add support for multiple backlights") Link: https://www.reddit.com/r/AMDLaptops/comments/qst0fm/after_updating_to_linux_...
Signed-off-by: Roman Li Roman.Li@amd.com Tested-by: Samuel Čavoj samuel@cavoj.net Acked-by: Alex Deucher alexander.deucher@amd.com Reviewed-by: Jasdeep Dhillon Jasdeep.Dhillon@amd.com Signed-off-by: Alex Deucher alexander.deucher@amd.com Cc: stable@vger.kernel.org (cherry picked from commit dab60582685aabdae2d4ff7ce716456bd0dc7a0f)
Now queued up for 5.10 and 5.15, thanks.
greg k-h
On Sun, Nov 28, 2021 at 01:03:59PM +0100, Greg KH wrote:
On Wed, Nov 24, 2021 at 01:01:22PM -0500, Alex Deucher wrote:
From: Roman Li Roman.Li@amd.com
[Why] After commit ("drm/amdgpu/display: add support for multiple backlights") number of eDPs is defined while registering backlight device. However the panel's extended caps get updated once before register call. That leads to regression with extended caps like oled brightness control.
[How] Update connector ext caps after register_backlight_device
Fixes: 7fd13baeb7a3a4 ("drm/amdgpu/display: add support for multiple backlights") Link: https://www.reddit.com/r/AMDLaptops/comments/qst0fm/after_updating_to_linux_...
Signed-off-by: Roman Li Roman.Li@amd.com Tested-by: Samuel Čavoj samuel@cavoj.net Acked-by: Alex Deucher alexander.deucher@amd.com Reviewed-by: Jasdeep Dhillon Jasdeep.Dhillon@amd.com Signed-off-by: Alex Deucher alexander.deucher@amd.com Cc: stable@vger.kernel.org (cherry picked from commit dab60582685aabdae2d4ff7ce716456bd0dc7a0f)
Now queued up for 5.10 and 5.15, thanks.
Oops, only for 5.15, not for 5.10, sorry.
greg k-h
linux-stable-mirror@lists.linaro.org