diff options
| author | Jerome Glisse <jglisse@redhat.com> | 2010-01-13 15:16:38 +0100 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2010-01-14 02:53:55 +0100 |
| commit | 700a0cc088a42a2ed92c6f961534fdb38588af87 (patch) | |
| tree | 81072f73651c411080d82d7c6466dfe46f4ce0c4 /drivers/gpu/drm/radeon/radeon.h | |
| parent | drm/radeon/kms: Disable AGP is aperture size < 32M (diff) | |
| download | linux-700a0cc088a42a2ed92c6f961534fdb38588af87.tar.xz 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.h')
| -rw-r--r-- | drivers/gpu/drm/radeon/radeon.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/gpu/drm/radeon/radeon.h b/drivers/gpu/drm/radeon/radeon.h index eb5f99b9469d..ab37dd0f2e71 100644 --- a/drivers/gpu/drm/radeon/radeon.h +++ b/drivers/gpu/drm/radeon/radeon.h @@ -1017,6 +1017,8 @@ static inline void radeon_ring_write(struct radeon_device *rdev, uint32_t v) #define radeon_hpd_set_polarity(rdev, hpd) (rdev)->asic->hpd_set_polarity((rdev), (hpd)) /* Common functions */ +/* AGP */ +extern void radeon_agp_disable(struct radeon_device *rdev); extern int radeon_gart_table_vram_pin(struct radeon_device *rdev); extern int radeon_modeset_init(struct radeon_device *rdev); extern void radeon_modeset_fini(struct radeon_device *rdev); |