This is a note to let you know that I've just added the patch titled
drm/radeon/cik: fix overflow in vram fetch
to the 3.11-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-radeon-cik-fix-overflow-in-vram-fetch.patch
and it can be found in the queue-3.11 subdirectory.
If you, or anyone else, feels it should not be added to the stable tree,
please let <stable@xxxxxxxxxxxxxxx> know about it.
>From 13c5bfdad758bddc199850c22246ddf26adcec1f Mon Sep 17 00:00:00 2001
From: Alex Deucher <alexander.deucher@xxxxxxx>
Date: Tue, 24 Sep 2013 10:56:55 -0400
Subject: drm/radeon/cik: fix overflow in vram fetch
From: Alex Deucher <alexander.deucher@xxxxxxx>
commit 13c5bfdad758bddc199850c22246ddf26adcec1f upstream.
Missing ULL when calculating the amount of vram
leads to an overflow when the amount of vram is >= 4G.
Signed-off-by: Alex Deucher <alexander.deucher@xxxxxxx>
Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxxxxxxxxxxxxxx>
---
drivers/gpu/drm/radeon/cik.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
--- a/drivers/gpu/drm/radeon/cik.c
+++ b/drivers/gpu/drm/radeon/cik.c
@@ -4225,8 +4225,8 @@ static int cik_mc_init(struct radeon_dev
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) * 1024 * 1024;
- rdev->mc.real_vram_size = RREG32(CONFIG_MEMSIZE) * 1024 * 1024;
+ rdev->mc.mc_vram_size = RREG32(CONFIG_MEMSIZE) * 1024ULL * 1024ULL;
+ rdev->mc.real_vram_size = RREG32(CONFIG_MEMSIZE) * 1024ULL * 1024ULL;
rdev->mc.visible_vram_size = rdev->mc.aper_size;
si_vram_gtt_location(rdev, &rdev->mc);
radeon_update_bandwidth_info(rdev);
Patches currently in stable-queue which might be from alexander.deucher@xxxxxxx are
queue-3.11/drm-radeon-disable-tests-benchmarks-if-accel-is-disabled.patch
queue-3.11/drm-radeon-make-r100_cp_ring_info-and-radeon_ring_gfx-safe-v2.patch
queue-3.11/drm-radeon-add-missing-hdmi-callbacks-for-rv6xx.patch
queue-3.11/drm-radeon-cik-fix-overflow-in-vram-fetch.patch
queue-3.11/drm-radeon-cik-fix-printing-of-client-name-on-vm-protection-fault.patch
queue-3.11/drm-radeon-avoid-uvd-corruption-on-agp-cards-using-gpu-gart.patch
queue-3.11/drm-radeon-cik-fix-encoding-of-number-of-banks-in-tiling-configuration-info.patch
queue-3.11/drm-radeon-don-t-set-default-clocks-for-si-when-dpm-is-disabled.patch
queue-3.11/drm-radeon-fix-hdmi-audio-on-dce3.0-3.1-asics.patch
--
To unsubscribe from this list: send the line "unsubscribe stable" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html