diff options
| author | Dave Airlie <airlied@redhat.com> | 2008-09-04 11:57:00 +1000 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2008-09-04 11:57:00 +1000 |
| commit | fe59d04a7c30692952652f77529deb22a3e0c8bb (patch) | |
| tree | e29d5e089e2e8d33830a974243d07e738f383054 /linux-core | |
| parent | d88d1eac8925f6bbc8edf50b35639f09fac84019 (diff) | |
radeon: fixup a number of avivo checks for rs690
Diffstat (limited to 'linux-core')
| -rw-r--r-- | linux-core/radeon_display.c | 2 | ||||
| -rw-r--r-- | linux-core/radeon_gem.c | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/linux-core/radeon_display.c b/linux-core/radeon_display.c index 2877cd3b..d105e1ae 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 eceb5207..44a0f1d1 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); |