From: Dave Airlie <airlied@redhat.com>
Date: Thu, 4 Sep 2008 01:57:00 +0000 (+1000)
Subject: radeon: fixup a number of avivo checks for rs690
X-Git-Tag: submit/1.0/20121108.012404~642^2~82
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=fe59d04a7c30692952652f77529deb22a3e0c8bb;p=profile%2Fivi%2Flibdrm.git

radeon: fixup a number of avivo checks for rs690
---

diff --git a/linux-core/radeon_display.c b/linux-core/radeon_display.c
index 2877cd3..d105e1a 100644
--- a/linux-core/radeon_display.c
+++ b/linux-core/radeon_display.c
@@ -194,7 +194,7 @@ static void radeon_crtc_init(struct drm_device *dev, int index)
 		radeon_crtc->lut_b[i] = i;
 	}
 
-	if (dev_priv->is_atom_bios && dev_priv->chip_family > CHIP_RS690)
+	if (dev_priv->is_atom_bios && radeon_is_avivo(dev_priv))
 		radeon_atombios_init_crtc(dev, radeon_crtc);
 	else
 		radeon_legacy_init_crtc(dev, radeon_crtc);
diff --git a/linux-core/radeon_gem.c b/linux-core/radeon_gem.c
index eceb520..44a0f1d 100644
--- a/linux-core/radeon_gem.c
+++ b/linux-core/radeon_gem.c
@@ -483,7 +483,7 @@ static uint32_t radeon_get_accessible_vram(struct drm_device *dev)
 	    dev_priv->chip_family == CHIP_RV380 ||
 	    dev_priv->chip_family == CHIP_R420 ||
 	    dev_priv->chip_family == CHIP_RV410 ||
-	    dev_priv->chip_family >= CHIP_RS600) {
+	    radeon_is_avivo(dev_priv)) {
 		uint32_t temp = RADEON_READ(RADEON_HOST_PATH_CNTL);
 		temp |= RADEON_HDP_APER_CNTL;
 		RADEON_WRITE(RADEON_HOST_PATH_CNTL, temp);
@@ -515,7 +515,7 @@ void radeon_vram_setup(struct drm_device *dev)
 	uint32_t vram;
 	uint32_t accessible,  bar_size;
 
-	if ((dev_priv->chip_family <= CHIP_RV515) && (dev_priv->flags & RADEON_IS_IGP)) {
+	if (!radeon_is_avivo(dev_priv) && (dev_priv->flags & RADEON_IS_IGP)) {
 		uint32_t tom = RADEON_READ(RADEON_NB_TOM);
 
 		vram = (((tom >> 16) - (tom & 0xffff) + 1) << 6);