diff options
author | Dave Airlie <airlied@redhat.com> | 2010-02-05 01:00:07 -0500 |
---|---|---|
committer | Dave Airlie <airlied@redhat.com> | 2010-02-11 04:11:32 -0500 |
commit | 82568565683b4991964a5fc89a9ca0c7122818e8 (patch) | |
tree | 3c04fa40a00a440a322c802abd41175e90b71e21 /drivers/gpu/drm/radeon/r100.c | |
parent | e34398952e056bbd99f9099fae77be26e5c6aa78 (diff) |
drm/radeon/kms: set gart pages to invalid on unbind and point to dummy page
this uses a new entrypoint to invalidate gart entries instead of using 0.
Changed to rather than pointing to 0 address point empty entry to dummy
page. This might help to avoid hard lockup if for some wrong
reasons GPU try to access unmapped GART entry.
I'm not 100% sure this is going to work, we probably need to allocate
a dummy page and point all the GTT entries at it similiar to what AGP does.
but we can test this first I suppose.
Signed-off-by: Jerome Glisse <jglisse@redhat.com>
Signed-off-by: Dave Airlie <airlied@redhat.com>
Diffstat (limited to 'drivers/gpu/drm/radeon/r100.c')
-rw-r--r-- | drivers/gpu/drm/radeon/r100.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/gpu/drm/radeon/r100.c b/drivers/gpu/drm/radeon/r100.c index 346ae3d7e0d4..bc7d9e9211c8 100644 --- a/drivers/gpu/drm/radeon/r100.c +++ b/drivers/gpu/drm/radeon/r100.c | |||
@@ -197,6 +197,7 @@ int r100_pci_gart_enable(struct radeon_device *rdev) | |||
197 | { | 197 | { |
198 | uint32_t tmp; | 198 | uint32_t tmp; |
199 | 199 | ||
200 | radeon_gart_restore(rdev); | ||
200 | /* discard memory request outside of configured range */ | 201 | /* discard memory request outside of configured range */ |
201 | tmp = RREG32(RADEON_AIC_CNTL) | RADEON_DIS_OUT_OF_PCI_GART_ACCESS; | 202 | tmp = RREG32(RADEON_AIC_CNTL) | RADEON_DIS_OUT_OF_PCI_GART_ACCESS; |
202 | WREG32(RADEON_AIC_CNTL, tmp); | 203 | WREG32(RADEON_AIC_CNTL, tmp); |