diff options
| author | Dave Airlie <airlied@redhat.com> | 2007-11-27 08:43:14 +1000 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2007-11-27 08:43:14 +1000 |
| commit | e51b3c8ff4bb88bc0f57473b7c3fe7fcd6b1a916 (patch) | |
| tree | c16930bbdcce3faedd5403dd965921f5fea22984 /shared-core/radeon_cp.c | |
| parent | 66079b91f38cd8e21ae4c8ea1e74c56d44b82329 (diff) | |
r500: add a bunch of all r5xx pci ids..
fix up a range that may be needed for r500 mesa
Diffstat (limited to 'shared-core/radeon_cp.c')
| -rw-r--r-- | shared-core/radeon_cp.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/shared-core/radeon_cp.c b/shared-core/radeon_cp.c index 518b2e75..9ea98a84 100644 --- a/shared-core/radeon_cp.c +++ b/shared-core/radeon_cp.c @@ -1114,7 +1114,7 @@ static int radeon_do_engine_reset(struct drm_device * dev) radeon_do_pixcache_flush(dev_priv); - if (dev_priv->flags & RADEON_FAMILY_MASK < CHIP_RV515) { + if ((dev_priv->flags & RADEON_FAMILY_MASK) < CHIP_RV515) { clock_cntl_index = RADEON_READ(RADEON_CLOCK_CNTL_INDEX); mclk_cntl = RADEON_READ_PLL(dev, RADEON_MCLK_CNTL); @@ -1152,7 +1152,6 @@ static int radeon_do_engine_reset(struct drm_device * dev) RADEON_WRITE(RADEON_RBBM_SOFT_RESET, rbbm_soft_reset); } -reset_cp: /* Reset the CP ring */ radeon_do_cp_reset(dev_priv); @@ -1887,7 +1886,7 @@ int radeon_cp_init(struct drm_device *dev, void *data, struct drm_file *file_pri LOCK_TEST_WITH_RETURN(dev, file_priv); if (init->func == RADEON_INIT_R300_CP) - r300_init_reg_flags(); + r300_init_reg_flags(dev); switch (init->func) { case RADEON_INIT_CP: |