aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/gpu/drm/radeon/r300.c
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/gpu/drm/radeon/r300.c')
-rw-r--r--drivers/gpu/drm/radeon/r300.c6
1 files changed, 4 insertions, 2 deletions
diff --git a/drivers/gpu/drm/radeon/r300.c b/drivers/gpu/drm/radeon/r300.c
index 1023eeb65872..2b9affe754ce 100644
--- a/drivers/gpu/drm/radeon/r300.c
+++ b/drivers/gpu/drm/radeon/r300.c
@@ -26,6 +26,7 @@
26 * Jerome Glisse 26 * Jerome Glisse
27 */ 27 */
28#include <linux/seq_file.h> 28#include <linux/seq_file.h>
29#include <linux/slab.h>
29#include "drmP.h" 30#include "drmP.h"
30#include "drm.h" 31#include "drm.h"
31#include "radeon_reg.h" 32#include "radeon_reg.h"
@@ -324,11 +325,12 @@ void r300_gpu_init(struct radeon_device *rdev)
324 325
325 r100_hdp_reset(rdev); 326 r100_hdp_reset(rdev);
326 /* FIXME: rv380 one pipes ? */ 327 /* FIXME: rv380 one pipes ? */
327 if ((rdev->family == CHIP_R300) || (rdev->family == CHIP_R350)) { 328 if ((rdev->family == CHIP_R300 && rdev->pdev->device != 0x4144) ||
329 (rdev->family == CHIP_R350)) {
328 /* r300,r350 */ 330 /* r300,r350 */
329 rdev->num_gb_pipes = 2; 331 rdev->num_gb_pipes = 2;
330 } else { 332 } else {
331 /* rv350,rv370,rv380 */ 333 /* rv350,rv370,rv380,r300 AD */
332 rdev->num_gb_pipes = 1; 334 rdev->num_gb_pipes = 1;
333 } 335 }
334 rdev->num_z_pipes = 1; 336 rdev->num_z_pipes = 1;