Move source tree closer to the 2.6.32.17 mainline
/drivers/gpu/drm/radeon/r300.c
blob:2f43ee8e40480cc2895c663fec62751570a1332f -> blob:d8c4f72eef8ed6eaaf9e3a53335162af0d8491da
--- drivers/gpu/drm/radeon/r300.c
+++ drivers/gpu/drm/radeon/r300.c
@@ -346,11 +346,12 @@ void r300_gpu_init(struct radeon_device
r100_hdp_reset(rdev);
/* FIXME: rv380 one pipes ? */
- if ((rdev->family == CHIP_R300) || (rdev->family == CHIP_R350)) {
+ if ((rdev->family == CHIP_R300 && rdev->pdev->device != 0x4144) ||
+ (rdev->family == CHIP_R350)) {
/* r300,r350 */
rdev->num_gb_pipes = 2;
} else {
- /* rv350,rv370,rv380 */
+ /* rv350,rv370,rv380,r300 AD */
rdev->num_gb_pipes = 1;
}
rdev->num_z_pipes = 1;