Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 2d6adadf authored by Alex Deucher's avatar Alex Deucher Committed by Sasha Levin
Browse files

drm/radeon: fix firmware info version checks 



[ Upstream commit 3edc38a0facef45ee22af8afdce3737f421f36ab ]

Some of the checks didn't handle frev 2 tables properly.

Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
Cc: stable@vger.kernel.org
Signed-off-by: default avatarSasha Levin <alexander.levin@verizon.com>
parent be17cd2e

drivers/gpu/drm/radeon/radeon_atombios.c

+2 −2
Original line number Diff line number Diff line
@@ -1128,7 +1128,7 @@ bool radeon_atom_get_clock_info(struct drm_device *dev) 
		    le16_to_cpu(firmware_info->info.usReferenceClock);

		p1pll->reference_div = 0;



		if (crev < 2)

		if ((frev < 2) && (crev < 2))

			p1pll->pll_out_min =

				le16_to_cpu(firmware_info->info.usMinPixelClockPLL_Output);

		else
@@ -1137,7 +1137,7 @@ bool radeon_atom_get_clock_info(struct drm_device *dev) 
		p1pll->pll_out_max =

		    le32_to_cpu(firmware_info->info.ulMaxPixelClockPLL_Output);



		if (crev >= 4) {

		if (((frev < 2) && (crev >= 4)) || (frev >= 2)) {

			p1pll->lcd_pll_out_min =

				le16_to_cpu(firmware_info->info_14.usLcdMinPixelClockPLL_Output) * 100;

			if (p1pll->lcd_pll_out_min == 0)