diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2010-04-27 08:22:50 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-04-27 08:22:50 -0700 |
| commit | 0bfb82449c9c98a8cfb1f0f886b5b0c7f7b0ff1a (patch) | |
| tree | 5e576c9cca633f37790effd1a25ec87f515e39de /drivers/gpu/drm/radeon/r300.c | |
| parent | b91ce4d14a21fc04d165be30319541e0f9204f15 (diff) | |
| parent | 88b045077a1462a47503137fd4ca0c31772819ca (diff) | |
| download | op-kernel-dev-0bfb82449c9c98a8cfb1f0f886b5b0c7f7b0ff1a.zip op-kernel-dev-0bfb82449c9c98a8cfb1f0f886b5b0c7f7b0ff1a.tar.gz | |
Merge branch 'drm-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/airlied/drm-2.6
* 'drm-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/airlied/drm-2.6:
drm/radeon: Fix sparc regression in r300_scratch()
drm: make sure vblank interrupts are disabled at DPMS time
drm/radeon/kms/evergreen: No EnableYUV table
drm/radeon: 9800 SE has only one quadpipe
drm/radeon/kms: don't print error for legal crtcs.
drm/radeon/kms/evergreen: fix LUT setup
Diffstat (limited to 'drivers/gpu/drm/radeon/r300.c')
| -rw-r--r-- | drivers/gpu/drm/radeon/r300.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/drivers/gpu/drm/radeon/r300.c b/drivers/gpu/drm/radeon/r300.c index bd75f99..eaf1f6b 100644 --- a/drivers/gpu/drm/radeon/r300.c +++ b/drivers/gpu/drm/radeon/r300.c @@ -324,13 +324,12 @@ void r300_gpu_init(struct radeon_device *rdev) uint32_t gb_tile_config, tmp; r100_hdp_reset(rdev); - /* FIXME: rv380 one pipes ? */ if ((rdev->family == CHIP_R300 && rdev->pdev->device != 0x4144) || - (rdev->family == CHIP_R350)) { + (rdev->family == CHIP_R350 && rdev->pdev->device != 0x4148)) { /* r300,r350 */ rdev->num_gb_pipes = 2; } else { - /* rv350,rv370,rv380,r300 AD */ + /* rv350,rv370,rv380,r300 AD, r350 AH */ rdev->num_gb_pipes = 1; } rdev->num_z_pipes = 1; |
