Patch "drm/amdgpu: fix firmware info version checks" has been added to the 4.7-stable tree
From: <gregkh@linuxfoundation.org>
Date: 2016-08-18 11:46:55
This is a note to let you know that I've just added the patch titled
drm/amdgpu: fix firmware info version checks
to the 4.7-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-fix-firmware-info-version-checks.patch
and it can be found in the queue-4.7 subdirectory.
If you, or anyone else, feels it should not be added to the stable tree,
please let [off-list ref] know about it.
From a8a04c994d41a489eb0f2899893209e04e030153 Mon Sep 17 00:00:00 2001
From: Alex Deucher <alexander.deucher@amd.com> Date: Wed, 27 Jul 2016 15:31:59 -0400 Subject: drm/amdgpu: fix firmware info version checks From: Alex Deucher <alexander.deucher@amd.com> commit a8a04c994d41a489eb0f2899893209e04e030153 upstream. Some of the checks didn't handle frev 2 tables properly. amdgpu doesn't support any tables pre-frev 2, so drop the checks. Signed-off-by: Alex Deucher <alexander.deucher@amd.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> --- drivers/gpu/drm/amd/amdgpu/amdgpu_atombios.c | 25 ++++++++----------------- 1 file changed, 8 insertions(+), 17 deletions(-)
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_atombios.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_atombios.c@@ -551,28 +551,19 @@ int amdgpu_atombios_get_clock_info(struc le16_to_cpu(firmware_info->info.usReferenceClock); ppll->reference_div = 0; - if (crev < 2) - ppll->pll_out_min = - le16_to_cpu(firmware_info->info.usMinPixelClockPLL_Output); - else - ppll->pll_out_min = - le32_to_cpu(firmware_info->info_12.ulMinPixelClockPLL_Output); + ppll->pll_out_min = + le32_to_cpu(firmware_info->info_12.ulMinPixelClockPLL_Output); ppll->pll_out_max = le32_to_cpu(firmware_info->info.ulMaxPixelClockPLL_Output); - if (crev >= 4) { - ppll->lcd_pll_out_min = - le16_to_cpu(firmware_info->info_14.usLcdMinPixelClockPLL_Output) * 100; - if (ppll->lcd_pll_out_min == 0) - ppll->lcd_pll_out_min = ppll->pll_out_min; - ppll->lcd_pll_out_max = - le16_to_cpu(firmware_info->info_14.usLcdMaxPixelClockPLL_Output) * 100; - if (ppll->lcd_pll_out_max == 0) - ppll->lcd_pll_out_max = ppll->pll_out_max; - } else { + ppll->lcd_pll_out_min = + le16_to_cpu(firmware_info->info_14.usLcdMinPixelClockPLL_Output) * 100; + if (ppll->lcd_pll_out_min == 0) ppll->lcd_pll_out_min = ppll->pll_out_min; + ppll->lcd_pll_out_max = + le16_to_cpu(firmware_info->info_14.usLcdMaxPixelClockPLL_Output) * 100; + if (ppll->lcd_pll_out_max == 0) ppll->lcd_pll_out_max = ppll->pll_out_max; - } if (ppll->pll_out_min == 0) ppll->pll_out_min = 64800;
Patches currently in stable-queue which might be from alexander.deucher@amd.com are queue-4.7/drm-amdgpu-support-backlight-control-for-uniphy3.patch queue-4.7/drm-amdgpu-fix-firmware-info-version-checks.patch queue-4.7/drm-radeon-add-a-delay-after-atpx-dgpu-power-off.patch queue-4.7/drm-amdgpu-add-a-delay-after-atpx-dgpu-power-off.patch queue-4.7/drm-amdgpu-poll-for-both-connect-disconnect-on-analog-connectors.patch queue-4.7/drm-radeon-support-backlight-control-for-uniphy3.patch queue-4.7/drm-radeon-poll-for-both-connect-disconnect-on-analog-connectors.patch queue-4.7/drm-radeon-fix-firmware-info-version-checks.patch queue-4.7/drm-amdgpu-gmc7-add-missing-mullins-case.patch queue-4.7/drm-amdgpu-disable-rpm-helpers-while-reprobing-connectors-on-resume.patch