Attachment 31713 Details for Bug 25408 – fix vram setup on rs600

[patch] fix vram setup on rs600

0001-drm-radeon-kms-fix-vram-setup-on-rs600.patch (text/plain), 1.88 KB, created by Alex Deucher on 2009-12-03 13:25:25 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Alex Deucher

Created: 2009-12-03 13:25:25 UTC

Size: 1.88 KB

patch

obsolete

>From d01f1c26e987335c2b06c8b0a7cbbb16da23b183 Mon Sep 17 00:00:00 2001
>From: Alex Deucher <alexdeucher@gmail.com>
>Date: Thu, 3 Dec 2009 16:18:19 -0500
>Subject: [PATCH] drm/radeon/kms: fix vram setup on rs600
>
>also fix up rs690 mem width.
>
>should fix fdo bug 25408
>
>Signed-off-by: Alex Deucher <alexdeucher@gmail.com>
>---
> drivers/gpu/drm/radeon/rs600.c |    6 ++++++
> drivers/gpu/drm/radeon/rs690.c |   10 ++--------
> 2 files changed, 8 insertions(+), 8 deletions(-)
>
>diff --git a/drivers/gpu/drm/radeon/rs600.c b/drivers/gpu/drm/radeon/rs600.c
>index a0a2a08..a13bcce 100644
>--- a/drivers/gpu/drm/radeon/rs600.c
>+++ b/drivers/gpu/drm/radeon/rs600.c
>@@ -458,6 +458,12 @@ void rs600_vram_info(struct radeon_device *rdev)
> 	/* FIXME: to do or is these values sane ? */
> 	rdev->mc.vram_is_ddr = true;
> 	rdev->mc.vram_width = 128;
>+
>+	rdev->mc.real_vram_size = RREG32(RADEON_CONFIG_MEMSIZE);
>+	rdev->mc.mc_vram_size = rdev->mc.real_vram_size;
>+
>+	rdev->mc.aper_base = drm_get_resource_start(rdev->ddev, 0);
>+	rdev->mc.aper_size = drm_get_resource_len(rdev->ddev, 0);
> }
> 
> void rs600_bandwidth_update(struct radeon_device *rdev)
>diff --git a/drivers/gpu/drm/radeon/rs690.c b/drivers/gpu/drm/radeon/rs690.c
>index e7a5f87..81b8efc 100644
>--- a/drivers/gpu/drm/radeon/rs690.c
>+++ b/drivers/gpu/drm/radeon/rs690.c
>@@ -131,19 +131,13 @@ void rs690_pm_info(struct radeon_device *rdev)
> 
> void rs690_vram_info(struct radeon_device *rdev)
> {
>-	uint32_t tmp;
> 	fixed20_12 a;
> 
> 	rs400_gart_adjust_size(rdev);
> 	/* DDR for all card after R300 & IGP */
> 	rdev->mc.vram_is_ddr = true;
>-	/* FIXME: is this correct for RS690/RS740 ? */
>-	tmp = RREG32(RADEON_MEM_CNTL);
>-	if (tmp & R300_MEM_NUM_CHANNELS_MASK) {
>-		rdev->mc.vram_width = 128;
>-	} else {
>-		rdev->mc.vram_width = 64;
>-	}
>+	rdev->mc.vram_width = 128;
>+
> 	rdev->mc.real_vram_size = RREG32(RADEON_CONFIG_MEMSIZE);
> 	rdev->mc.mc_vram_size = rdev->mc.real_vram_size;
> 
>-- 
>1.5.6.3
>

Actions: View | Splinter Review

Attachments on bug 25408: 31688 | 31689 | 31690 | 31713 | 31770 | 31792 | 31793 | 31796 | 31797 | 31798 | 31799 | 35157 | 35202 | 35204

Use of freedesktop.org services, including Bugzilla, is subject to our Code of Conduct. How we collect and use information is described in our Privacy Policy.