diff options
author | Jerome Glisse <jglisse@redhat.com> | 2010-01-13 15:16:38 +0100 |
---|---|---|
committer | Dave Airlie <airlied@redhat.com> | 2010-01-14 11:53:55 +1000 |
commit | 700a0cc088a42a2ed92c6f961534fdb38588af87 (patch) | |
tree | 81072f73651c411080d82d7c6466dfe46f4ce0c4 /drivers/gpu/drm/radeon/radeon_device.c | |
parent | 0a3f316370da07fcdb11fde4f5a683d60713b7fd (diff) | |
download | blackbird-op-linux-700a0cc088a42a2ed92c6f961534fdb38588af87.tar.gz blackbird-op-linux-700a0cc088a42a2ed92c6f961534fdb38588af87.zip |
drm/radeon/kms: Use radeon_agp_disable when disabling AGP
Use same common function to disable agp so we replace the GART
callback by the proper one when we do so. This fix oops if
radeon_agp_init report failure.
This patch also move radeon_agp_init out of *_mc_init for r600
& rv770 so that we can have a similar behavior than for previous
hw, ie if agp_init fails it will fallback to GPU GART and disable
AGP.
Signed-off-by: Jerome Glisse <jglisse@redhat.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.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/gpu/drm/radeon/radeon_device.c b/drivers/gpu/drm/radeon/radeon_device.c index 0c51f8e46613..768b1509fa03 100644 --- a/drivers/gpu/drm/radeon/radeon_device.c +++ b/drivers/gpu/drm/radeon/radeon_device.c @@ -544,6 +544,7 @@ void radeon_agp_disable(struct radeon_device *rdev) rdev->asic->gart_tlb_flush = &r100_pci_gart_tlb_flush; rdev->asic->gart_set_page = &r100_pci_gart_set_page; } + rdev->mc.gtt_size = radeon_gart_size * 1024 * 1024; } void radeon_check_arguments(struct radeon_device *rdev) |