From: Greg Kroah-Hartman Date: Wed, 18 Dec 2013 19:22:07 +0000 (-0800) Subject: 3.10-stable patches X-Git-Tag: v3.4.75~25 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=e08d0508a918a586003c9f327c6a7a45bf0842d0;p=thirdparty%2Fkernel%2Fstable-queue.git 3.10-stable patches added patches: drm-radeon-fixup-bad-vram-size-on-si.patch drm-radeon-program-dce2-audio-dto-just-like-dce3.patch x86-efi-don-t-use-u-efi-time-services-on-32-bit.patch --- diff --git a/queue-3.10/drm-radeon-fixup-bad-vram-size-on-si.patch b/queue-3.10/drm-radeon-fixup-bad-vram-size-on-si.patch new file mode 100644 index 00000000000..34ba18f6617 --- /dev/null +++ b/queue-3.10/drm-radeon-fixup-bad-vram-size-on-si.patch @@ -0,0 +1,41 @@ +From 0ca223b029a261e82fb2f50c52eb85d510f4260e Mon Sep 17 00:00:00 2001 +From: Alex Deucher +Date: Tue, 3 Dec 2013 09:24:30 -0500 +Subject: drm/radeon: fixup bad vram size on SI + +From: Alex Deucher + +commit 0ca223b029a261e82fb2f50c52eb85d510f4260e upstream. + +Some boards seem to have garbage in the upper +16 bits of the vram size register. Check for +this and clamp the size properly. Fixes +boards reporting bogus amounts of vram. + +Signed-off-by: Alex Deucher +Signed-off-by: Greg Kroah-Hartman + +--- + drivers/gpu/drm/radeon/si.c | 11 +++++++++-- + 1 file changed, 9 insertions(+), 2 deletions(-) + +--- a/drivers/gpu/drm/radeon/si.c ++++ b/drivers/gpu/drm/radeon/si.c +@@ -3615,8 +3615,15 @@ static int si_mc_init(struct radeon_devi + rdev->mc.aper_base = pci_resource_start(rdev->pdev, 0); + rdev->mc.aper_size = pci_resource_len(rdev->pdev, 0); + /* size in MB on si */ +- rdev->mc.mc_vram_size = RREG32(CONFIG_MEMSIZE) * 1024ULL * 1024ULL; +- rdev->mc.real_vram_size = RREG32(CONFIG_MEMSIZE) * 1024ULL * 1024ULL; ++ tmp = RREG32(CONFIG_MEMSIZE); ++ /* some boards may have garbage in the upper 16 bits */ ++ if (tmp & 0xffff0000) { ++ DRM_INFO("Probable bad vram size: 0x%08x\n", tmp); ++ if (tmp & 0xffff) ++ tmp &= 0xffff; ++ } ++ rdev->mc.mc_vram_size = tmp * 1024ULL * 1024ULL; ++ rdev->mc.real_vram_size = rdev->mc.mc_vram_size; + rdev->mc.visible_vram_size = rdev->mc.aper_size; + si_vram_gtt_location(rdev, &rdev->mc); + radeon_update_bandwidth_info(rdev); diff --git a/queue-3.10/drm-radeon-program-dce2-audio-dto-just-like-dce3.patch b/queue-3.10/drm-radeon-program-dce2-audio-dto-just-like-dce3.patch new file mode 100644 index 00000000000..d758f0bb7f7 --- /dev/null +++ b/queue-3.10/drm-radeon-program-dce2-audio-dto-just-like-dce3.patch @@ -0,0 +1,47 @@ +From 55d4e020fb8ddd3896a8cd3351028f5c3a2c4bd3 Mon Sep 17 00:00:00 2001 +From: Alex Deucher +Date: Mon, 25 Nov 2013 13:20:59 -0500 +Subject: drm/radeon: program DCE2 audio dto just like DCE3 + +From: Alex Deucher + +commit 55d4e020fb8ddd3896a8cd3351028f5c3a2c4bd3 upstream. + +Seems to work like the DCE3 version despite what +the register spec says. + +bug: +https://bugs.freedesktop.org/show_bug.cgi?id=71975 + +Signed-off-by: Alex Deucher +Signed-off-by: Greg Kroah-Hartman + +--- + drivers/gpu/drm/radeon/r600_hdmi.c | 8 ++------ + 1 file changed, 2 insertions(+), 6 deletions(-) + +--- a/drivers/gpu/drm/radeon/r600_hdmi.c ++++ b/drivers/gpu/drm/radeon/r600_hdmi.c +@@ -279,9 +279,9 @@ void r600_audio_set_dto(struct drm_encod + WREG32(DCCG_AUDIO_DTO1_MODULE, clock * 100); + WREG32(DCCG_AUDIO_DTO_SELECT, 1); /* select DTO1 */ + } +- } else if (ASIC_IS_DCE3(rdev)) { ++ } else { + /* according to the reg specs, this should DCE3.2 only, but in +- * practice it seems to cover DCE3.0/3.1 as well. ++ * practice it seems to cover DCE2.0/3.0/3.1 as well. + */ + if (dig->dig_encoder == 0) { + WREG32(DCCG_AUDIO_DTO0_PHASE, base_rate * 100); +@@ -292,10 +292,6 @@ void r600_audio_set_dto(struct drm_encod + WREG32(DCCG_AUDIO_DTO1_MODULE, clock * 100); + WREG32(DCCG_AUDIO_DTO_SELECT, 1); /* select DTO1 */ + } +- } else { +- /* according to the reg specs, this should be DCE2.0 and DCE3.0/3.1 */ +- WREG32(AUDIO_DTO, AUDIO_DTO_PHASE(base_rate / 10) | +- AUDIO_DTO_MODULE(clock / 10)); + } + } + diff --git a/queue-3.10/series b/queue-3.10/series index 42ec93bcf47..fc025808216 100644 --- a/queue-3.10/series +++ b/queue-3.10/series @@ -42,3 +42,6 @@ mac80211-don-t-attempt-to-reorder-multicast-frames.patch iwlwifi-mvm-check-sta_id-drain-values-in-debugfs.patch mwifiex-fix-memory-leak-issue-for-ibss-join.patch igb-fix-for-issue-where-values-could-be-too-high-for-udelay-function.patch +drm-radeon-program-dce2-audio-dto-just-like-dce3.patch +drm-radeon-fixup-bad-vram-size-on-si.patch +x86-efi-don-t-use-u-efi-time-services-on-32-bit.patch diff --git a/queue-3.10/x86-efi-don-t-use-u-efi-time-services-on-32-bit.patch b/queue-3.10/x86-efi-don-t-use-u-efi-time-services-on-32-bit.patch new file mode 100644 index 00000000000..04a6bf935bb --- /dev/null +++ b/queue-3.10/x86-efi-don-t-use-u-efi-time-services-on-32-bit.patch @@ -0,0 +1,41 @@ +From 04bf9ba720fcc4fa313fa122b799ae0989b6cd50 Mon Sep 17 00:00:00 2001 +From: Matthew Garrett +Date: Fri, 29 Nov 2013 14:44:43 -0500 +Subject: x86, efi: Don't use (U)EFI time services on 32 bit + +From: Matthew Garrett + +commit 04bf9ba720fcc4fa313fa122b799ae0989b6cd50 upstream. + +UEFI time services are often broken once we're in virtual mode. We were +already refusing to use them on 64-bit systems, but it turns out that +they're also broken on some 32-bit firmware, including the Dell Venue. +Disable them for now, we can revisit once we have the 1:1 mappings code +incorporated. + +Signed-off-by: Matthew Garrett +Link: http://lkml.kernel.org/r/1385754283-2464-1-git-send-email-matthew.garrett@nebula.com +Cc: Matt Fleming +Signed-off-by: H. Peter Anvin +Signed-off-by: Greg Kroah-Hartman + +--- + arch/x86/platform/efi/efi.c | 7 ------- + 1 file changed, 7 deletions(-) + +--- a/arch/x86/platform/efi/efi.c ++++ b/arch/x86/platform/efi/efi.c +@@ -766,13 +766,6 @@ void __init efi_init(void) + + set_bit(EFI_MEMMAP, &x86_efi_facility); + +-#ifdef CONFIG_X86_32 +- if (efi_is_native()) { +- x86_platform.get_wallclock = efi_get_time; +- x86_platform.set_wallclock = efi_set_rtc_mmss; +- } +-#endif +- + #if EFI_DEBUG + print_efi_memmap(); + #endif