aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/gpu/drm/radeon/r300.c
diff options
context:
space:
mode:
authorMichel Dänzer <daenzer@vmware.com>2010-04-02 12:59:06 -0400
committerDave Airlie <airlied@redhat.com>2010-04-05 19:56:40 -0400
commit57b54ea6b7863ccfeb41851b5f58f9fd1b83c79e (patch)
tree96897aad6541db089db80e3064501636351de4d2 /drivers/gpu/drm/radeon/r300.c
parentd668046c13024d74af7d04a124ba55f406380fe7 (diff)
drm/radeon: R300 AD only has one quad pipe.
Gleaned from the Mesa code. Fixes https://bugs.freedesktop.org/show_bug.cgi?id=27355 . Signed-off-by: Michel Dänzer <daenzer@vmware.com> Cc: stable@kernel.org Signed-off-by: Dave Airlie <airlied@redhat.com>
Diffstat (limited to 'drivers/gpu/drm/radeon/r300.c')
-rw-r--r--drivers/gpu/drm/radeon/r300.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/drivers/gpu/drm/radeon/r300.c b/drivers/gpu/drm/radeon/r300.c
index 1023eeb65872..0e9eb761a90f 100644
--- a/drivers/gpu/drm/radeon/r300.c
+++ b/drivers/gpu/drm/radeon/r300.c
@@ -324,11 +324,12 @@ void r300_gpu_init(struct radeon_device *rdev)
324 324
325 r100_hdp_reset(rdev); 325 r100_hdp_reset(rdev);
326 /* FIXME: rv380 one pipes ? */ 326 /* FIXME: rv380 one pipes ? */
327 if ((rdev->family == CHIP_R300) || (rdev->family == CHIP_R350)) { 327 if ((rdev->family == CHIP_R300 && rdev->pdev->device != 0x4144) ||
328 (rdev->family == CHIP_R350)) {
328 /* r300,r350 */ 329 /* r300,r350 */
329 rdev->num_gb_pipes = 2; 330 rdev->num_gb_pipes = 2;
330 } else { 331 } else {
331 /* rv350,rv370,rv380 */ 332 /* rv350,rv370,rv380,r300 AD */
332 rdev->num_gb_pipes = 1; 333 rdev->num_gb_pipes = 1;
333 } 334 }
334 rdev->num_z_pipes = 1; 335 rdev->num_z_pipes = 1;