aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/gpu/drm/radeon/radeon_device.c
diff options
context:
space:
mode:
authorPauli Nieminen <suokkos@gmail.com>2010-02-11 12:55:35 -0500
committerDave Airlie <airlied@redhat.com>2010-02-17 23:47:49 -0500
commitd80eeb0f347b6effa06e11e7cbcb2e6c559bf404 (patch)
tree3e10468e430a07ba75428ab81abe3db665671ff9 /drivers/gpu/drm/radeon/radeon_device.c
parent93f319d31cc42a77bd5e953e861a8f2bfb277ad1 (diff)
drm/radeon/kms: Create asic structure for r300 pcie cards.
Setting global asic structure to point to different function would cause problem in system where is multiple r300 cards with different bus type. r300_asic_pcie is just copy from r300_asic with gart tlb functions replaced with pcie versions. Signed-off-by: Pauli Nieminen <suokkos@gmail.com> Signed-off-by: Dave Airlie <airlied@redhat.com>
Diffstat (limited to 'drivers/gpu/drm/radeon/radeon_device.c')
-rw-r--r--drivers/gpu/drm/radeon/radeon_device.c9
1 files changed, 4 insertions, 5 deletions
diff --git a/drivers/gpu/drm/radeon/radeon_device.c b/drivers/gpu/drm/radeon/radeon_device.c
index fb55faf8e284..7a30f6955e41 100644
--- a/drivers/gpu/drm/radeon/radeon_device.c
+++ b/drivers/gpu/drm/radeon/radeon_device.c
@@ -350,11 +350,10 @@ int radeon_asic_init(struct radeon_device *rdev)
350 case CHIP_R350: 350 case CHIP_R350:
351 case CHIP_RV350: 351 case CHIP_RV350:
352 case CHIP_RV380: 352 case CHIP_RV380:
353 rdev->asic = &r300_asic; 353 if (rdev->flags & RADEON_IS_PCIE)
354 if (rdev->flags & RADEON_IS_PCIE) { 354 rdev->asic = &r300_asic_pcie;
355 rdev->asic->gart_tlb_flush = &rv370_pcie_gart_tlb_flush; 355 else
356 rdev->asic->gart_set_page = &rv370_pcie_gart_set_page; 356 rdev->asic = &r300_asic;
357 }
358 break; 357 break;
359 case CHIP_R420: 358 case CHIP_R420:
360 case CHIP_R423: 359 case CHIP_R423: