Attachment 31792 Details for Bug 25408 – fix vram location

[patch] fix vram location

0001-drm-radeon-kms-fix-vram-setup-on-rs600-rs690-rs740.patch (text/plain), 3.06 KB, created by Alex Deucher on 2009-12-06 20:06:54 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Alex Deucher

Created: 2009-12-06 20:06:54 UTC

Size: 3.06 KB

patch

obsolete

>From 940f0e7fe6a9c76c2e5261ef93633ed5bffe8a3b Mon Sep 17 00:00:00 2001
>From: Alex Deucher <alexdeucher@gmail.com>
>Date: Sun, 6 Dec 2009 19:45:17 -0500
>Subject: [PATCH] drm/radeon/kms: fix vram setup on rs600/rs690/rs740
>
>Don't remap vram to 0 on IGP chips.
>
>Signed-off-by: Alex Deucher <alexdeucher@gmail.com>
>---
> drivers/gpu/drm/radeon/rs400.c |    2 +-
> drivers/gpu/drm/radeon/rs600.c |   18 +++++++++++++++++-
> drivers/gpu/drm/radeon/rs690.c |   17 ++++++++++++++++-
> 3 files changed, 34 insertions(+), 3 deletions(-)
>
>diff --git a/drivers/gpu/drm/radeon/rs400.c b/drivers/gpu/drm/radeon/rs400.c
>index 8d12b8a..eda6d75 100644
>--- a/drivers/gpu/drm/radeon/rs400.c
>+++ b/drivers/gpu/drm/radeon/rs400.c
>@@ -352,7 +352,7 @@ static int rs400_mc_init(struct radeon_device *rdev)
> 	u32 tmp;
> 
> 	/* Setup GPU memory space */
>-	tmp = G_00015C_MC_FB_START(RREG32(R_00015C_NB_TOM));
>+	tmp = RREG32(R_00015C_NB_TOM);
> 	rdev->mc.vram_location = G_00015C_MC_FB_START(tmp) << 16;
> 	rdev->mc.gtt_location = 0xFFFFFFFFUL;
> 	r = radeon_mc_setup(rdev);
>diff --git a/drivers/gpu/drm/radeon/rs600.c b/drivers/gpu/drm/radeon/rs600.c
>index ca29ed0..e1334e2 100644
>--- a/drivers/gpu/drm/radeon/rs600.c
>+++ b/drivers/gpu/drm/radeon/rs600.c
>@@ -460,6 +460,22 @@ void rs600_vram_info(struct radeon_device *rdev)
> 
> 	rdev->mc.aper_base = drm_get_resource_start(rdev->ddev, 0);
> 	rdev->mc.aper_size = drm_get_resource_len(rdev->ddev, 0);
>+
>+}
>+
>+static int rs600_mc_init(struct radeon_device *rdev)
>+{
>+	int r;
>+	u32 tmp;
>+
>+	/* Setup GPU memory space */
>+	tmp = RREG32_MC(R_000004_MC_FB_LOCATION);
>+	rdev->mc.vram_location = G_000004_MC_FB_START(tmp) << 16;
>+	rdev->mc.gtt_location = 0xFFFFFFFFUL;
>+	r = radeon_mc_setup(rdev);
>+	if (r)
>+		return r;
>+	return 0;
> }
> 
> void rs600_bandwidth_update(struct radeon_device *rdev)
>@@ -636,7 +652,7 @@ int rs600_init(struct radeon_device *rdev)
> 	/* Get vram informations */
> 	rs600_vram_info(rdev);
> 	/* Initialize memory controller (also test AGP) */
>-	r = r420_mc_init(rdev);
>+	r = rs600_mc_init(rdev);
> 	if (r)
> 		return r;
> 	rs600_debugfs(rdev);
>diff --git a/drivers/gpu/drm/radeon/rs690.c b/drivers/gpu/drm/radeon/rs690.c
>index 81b8efc..cd2e1a9 100644
>--- a/drivers/gpu/drm/radeon/rs690.c
>+++ b/drivers/gpu/drm/radeon/rs690.c
>@@ -155,6 +155,21 @@ void rs690_vram_info(struct radeon_device *rdev)
> 	rdev->pm.core_bandwidth.full = rfixed_div(rdev->pm.sclk, a);
> }
> 
>+static int rs690_mc_init(struct radeon_device *rdev)
>+{
>+	int r;
>+	u32 tmp;
>+
>+	/* Setup GPU memory space */
>+	tmp = RREG32_MC(R_000100_MCCFG_FB_LOCATION);
>+	rdev->mc.vram_location = G_000100_MC_FB_START(tmp) << 16;
>+	rdev->mc.gtt_location = 0xFFFFFFFFUL;
>+	r = radeon_mc_setup(rdev);
>+	if (r)
>+		return r;
>+	return 0;
>+}
>+
> void rs690_line_buffer_adjust(struct radeon_device *rdev,
> 			      struct drm_display_mode *mode1,
> 			      struct drm_display_mode *mode2)
>@@ -703,7 +718,7 @@ int rs690_init(struct radeon_device *rdev)
> 	/* Get vram informations */
> 	rs690_vram_info(rdev);
> 	/* Initialize memory controller (also test AGP) */
>-	r = r420_mc_init(rdev);
>+	r = rs690_mc_init(rdev);
> 	if (r)
> 		return r;
> 	rv515_debugfs(rdev);
>-- 
>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.