aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/gpu/drm/radeon/rs600.c
diff options
context:
space:
mode:
authorDave Airlie <airlied@redhat.com>2010-02-05 01:00:07 -0500
committerDave Airlie <airlied@redhat.com>2010-02-11 04:11:32 -0500
commit82568565683b4991964a5fc89a9ca0c7122818e8 (patch)
tree3c04fa40a00a440a322c802abd41175e90b71e21 /drivers/gpu/drm/radeon/rs600.c
parente34398952e056bbd99f9099fae77be26e5c6aa78 (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/rs600.c')
-rw-r--r--drivers/gpu/drm/radeon/rs600.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/gpu/drm/radeon/rs600.c b/drivers/gpu/drm/radeon/rs600.c
index 979b00034de9..28c8690c7a35 100644
--- a/drivers/gpu/drm/radeon/rs600.c
+++ b/drivers/gpu/drm/radeon/rs600.c
@@ -213,6 +213,7 @@ int rs600_gart_enable(struct radeon_device *rdev)
213 r = radeon_gart_table_vram_pin(rdev); 213 r = radeon_gart_table_vram_pin(rdev);
214 if (r) 214 if (r)
215 return r; 215 return r;
216 radeon_gart_restore(rdev);
216 /* Enable bus master */ 217 /* Enable bus master */
217 tmp = RREG32(R_00004C_BUS_CNTL) & C_00004C_BUS_MASTER_DIS; 218 tmp = RREG32(R_00004C_BUS_CNTL) & C_00004C_BUS_MASTER_DIS;
218 WREG32(R_00004C_BUS_CNTL, tmp); 219 WREG32(R_00004C_BUS_CNTL, tmp);