From fe51c931b5238f4ef1960255d3015df1f45e3b06 Mon Sep 17 00:00:00 2001 From: Jerome Glisse Date: Wed, 9 Sep 2009 22:23:27 +0200 Subject: [PATCH] --- yaml --- r: 163991 b: refs/heads/master c: a18d7ea15356679f58c2fafe2957786c5f7f9201 h: refs/heads/master i: 163989: 8e97e3326ca71190db35d2eab4f2054066b506f3 163987: 8f6c8b3fbe706c3d59b3a566d4837672ce670857 163983: b121e540bcb48f19385aa95bd1a0596a05889db6 v: v3 --- [refs] | 2 +- trunk/drivers/gpu/drm/radeon/r100.c | 3 +-- trunk/drivers/gpu/drm/radeon/radeon.h | 3 +++ 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 4fcaaa1ce1b6..94c4754607fc 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 45600232b3dbb97817c9e15de848c742901893e1 +refs/heads/master: a18d7ea15356679f58c2fafe2957786c5f7f9201 diff --git a/trunk/drivers/gpu/drm/radeon/r100.c b/trunk/drivers/gpu/drm/radeon/r100.c index 938a6936d929..4e1c55162ccb 100644 --- a/trunk/drivers/gpu/drm/radeon/r100.c +++ b/trunk/drivers/gpu/drm/radeon/r100.c @@ -734,8 +734,7 @@ void r100_cp_fini(struct radeon_device *rdev) DRM_ERROR("Wait for CP idle timeout, shutting down CP.\n"); } /* Disable ring */ - rdev->cp.ready = false; - WREG32(RADEON_CP_CSQ_CNTL, 0); + r100_cp_disable(rdev); radeon_ring_fini(rdev); DRM_INFO("radeon: cp finalized\n"); } diff --git a/trunk/drivers/gpu/drm/radeon/radeon.h b/trunk/drivers/gpu/drm/radeon/radeon.h index 3299733ac300..24574bc0f2af 100644 --- a/trunk/drivers/gpu/drm/radeon/radeon.h +++ b/trunk/drivers/gpu/drm/radeon/radeon.h @@ -933,4 +933,7 @@ static inline void radeon_ring_write(struct radeon_device *rdev, uint32_t v) #define radeon_clear_surface_reg(rdev, r) ((rdev)->asic->clear_surface_reg((rdev), (r))) #define radeon_bandwidth_update(rdev) (rdev)->asic->bandwidth_update((rdev)) +/* r100,rv100,rs100,rv200,rs200,r200,rv250,rs300,rv280 */ +void r100_cp_disable(struct radeon_device *rdev); + #endif