Attachment 30983 Details for Bug 24218 – fix rs880

[patch] fix rs880

0001-drm-radeon-kms-r600-fix-rs880-support.patch (text/plain), 4.19 KB, created by Alex Deucher on 2009-11-05 07:17:00 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Alex Deucher

Created: 2009-11-05 07:17:00 UTC

Size: 4.19 KB

patch

obsolete

>From ce4bf053e8ffc6b904c8932a360e9e7291d54cfc Mon Sep 17 00:00:00 2001
>From: Alex Deucher <alexdeucher@gmail.com>
>Date: Thu, 5 Nov 2009 01:38:58 -0500
>Subject: [PATCH] drm/radeon/kms/r600: fix rs880 support
>
>Lots of cases were wrong or missing.
>
>Signed-off-by: Alex Deucher <alexdeucher@gmail.com>
>---
> drivers/gpu/drm/radeon/r600.c            |   20 +++++++++++++-------
> drivers/gpu/drm/radeon/r600_blit_kms.c   |    2 +-
> drivers/gpu/drm/radeon/radeon_atombios.c |    3 ++-
> 3 files changed, 16 insertions(+), 9 deletions(-)
>
>diff --git a/drivers/gpu/drm/radeon/r600.c b/drivers/gpu/drm/radeon/r600.c
>index 60fbb23..8f95ad8 100644
>--- a/drivers/gpu/drm/radeon/r600.c
>+++ b/drivers/gpu/drm/radeon/r600.c
>@@ -409,7 +409,7 @@ int r600_mc_init(struct radeon_device *rdev)
> 			rdev->mc.gtt_location = rdev->mc.mc_vram_size;
> 		}
> 	} else {
>-		if (rdev->family == CHIP_RS780 || rdev->family == CHIP_RS880) {
>+		if (rdev->flags & RADEON_IS_IGP) {
> 			rdev->mc.vram_location = (RREG32(MC_VM_FB_LOCATION) &
> 								0xFFFF) << 24;
> 			rdev->mc.gtt_size = radeon_gart_size * 1024 * 1024;
>@@ -864,7 +864,8 @@ void r600_gpu_init(struct radeon_device *rdev)
> 	    ((rdev->family) == CHIP_RV630) ||
> 	    ((rdev->family) == CHIP_RV610) ||
> 	    ((rdev->family) == CHIP_RV620) ||
>-	    ((rdev->family) == CHIP_RS780)) {
>+	    ((rdev->family) == CHIP_RS780) ||
>+	    ((rdev->family) == CHIP_RS880)) {
> 		WREG32(DB_DEBUG, PREZ_MUST_WAIT_FOR_POSTZ_DONE);
> 	} else {
> 		WREG32(DB_DEBUG, 0);
>@@ -881,7 +882,8 @@ void r600_gpu_init(struct radeon_device *rdev)
> 	tmp = RREG32(SQ_MS_FIFO_SIZES);
> 	if (((rdev->family) == CHIP_RV610) ||
> 	    ((rdev->family) == CHIP_RV620) ||
>-	    ((rdev->family) == CHIP_RS780)) {
>+	    ((rdev->family) == CHIP_RS780) ||
>+	    ((rdev->family) == CHIP_RS880)) {
> 		tmp = (CACHE_FIFO_SIZE(0xa) |
> 		       FETCH_FIFO_HIWATER(0xa) |
> 		       DONE_FIFO_HIWATER(0xe0) |
>@@ -924,7 +926,8 @@ void r600_gpu_init(struct radeon_device *rdev)
> 					    NUM_ES_STACK_ENTRIES(0));
> 	} else if (((rdev->family) == CHIP_RV610) ||
> 		   ((rdev->family) == CHIP_RV620) ||
>-		   ((rdev->family) == CHIP_RS780)) {
>+		   ((rdev->family) == CHIP_RS780) ||
>+		   ((rdev->family) == CHIP_RS880)) {
> 		/* no vertex cache */
> 		sq_config &= ~VC_ENABLE;
> 
>@@ -981,7 +984,8 @@ void r600_gpu_init(struct radeon_device *rdev)
> 
> 	if (((rdev->family) == CHIP_RV610) ||
> 	    ((rdev->family) == CHIP_RV620) ||
>-	    ((rdev->family) == CHIP_RS780)) {
>+	    ((rdev->family) == CHIP_RS780) ||
>+	    ((rdev->family) == CHIP_RS880)) {
> 		WREG32(VGT_CACHE_INVALIDATION, CACHE_INVALIDATION(TC_ONLY));
> 	} else {
> 		WREG32(VGT_CACHE_INVALIDATION, CACHE_INVALIDATION(VC_AND_TC));
>@@ -1007,8 +1011,9 @@ void r600_gpu_init(struct radeon_device *rdev)
> 	tmp = rdev->config.r600.max_pipes * 16;
> 	switch (rdev->family) {
> 	case CHIP_RV610:
>-	case CHIP_RS780:
> 	case CHIP_RV620:
>+	case CHIP_RS780:
>+	case CHIP_RS880:
> 		tmp += 32;
> 		break;
> 	case CHIP_RV670:
>@@ -1049,8 +1054,9 @@ void r600_gpu_init(struct radeon_device *rdev)
> 
> 	switch (rdev->family) {
> 	case CHIP_RV610:
>-	case CHIP_RS780:
> 	case CHIP_RV620:
>+	case CHIP_RS780:
>+	case CHIP_RS880:
> 		tmp = TC_L2_SIZE(8);
> 		break;
> 	case CHIP_RV630:
>diff --git a/drivers/gpu/drm/radeon/r600_blit_kms.c b/drivers/gpu/drm/radeon/r600_blit_kms.c
>index acae33e..dbf716e 100644
>--- a/drivers/gpu/drm/radeon/r600_blit_kms.c
>+++ b/drivers/gpu/drm/radeon/r600_blit_kms.c
>@@ -368,7 +368,7 @@ set_default_state(struct radeon_device *rdev)
> 	if ((rdev->family == CHIP_RV610) ||
> 	    (rdev->family == CHIP_RV620) ||
> 	    (rdev->family == CHIP_RS780) ||
>-	    (rdev->family == CHIP_RS780) ||
>+	    (rdev->family == CHIP_RS880) ||
> 	    (rdev->family == CHIP_RV710))
> 		sq_config = 0;
> 	else
>diff --git a/drivers/gpu/drm/radeon/radeon_atombios.c b/drivers/gpu/drm/radeon/radeon_atombios.c
>index 1c9a9c4..0507224 100644
>--- a/drivers/gpu/drm/radeon/radeon_atombios.c
>+++ b/drivers/gpu/drm/radeon/radeon_atombios.c
>@@ -277,7 +277,8 @@ bool radeon_get_atom_connector_info_from_object_table(struct drm_device *dev)
> 				ATOM_DEVICE_CV_SUPPORT)
> 				continue;
> 
>-			if ((rdev->family == CHIP_RS780) &&
>+			/* IGP chips */
>+			if ((rdev->flags & RADEON_IS_IGP) &&
> 			    (con_obj_id ==
> 			     CONNECTOR_OBJECT_ID_PCIE_CONNECTOR)) {
> 				uint16_t igp_offset = 0;
>-- 
>1.5.6.3
>

Actions: View | Splinter Review

Attachments on bug 24218: 29942 | 29943 | 29944 | 30113 | 30114 | 30983

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.