Home Explore Help
Register Sign In
phyus
/
linux-vybrid_public
8
0
Fork 0
Files Issues 0 Pull Requests 0 Wiki
Browse Source

drm/radeon/kms: call r100_cp_disable rather than duplicating code.

r100_cp_fini was duplicating code of r100_cp_disable, call r100_cp_disable
instead.

Signed-off-by: Jerome Glisse <jglisse@redhat.com>
Signed-off-by: Dave Airlie <airlied@redhat.com>
Jerome Glisse 16 years ago
parent
45600232b3
commit
a18d7ea153
2 changed files with 4 additions and 2 deletions
Unified View Show Diff Stats
  1. 1 2
      drivers/gpu/drm/radeon/r100.c
  2. 3 0
      drivers/gpu/drm/radeon/radeon.h

+ 1 - 2
drivers/gpu/drm/radeon/r100.c
View File 

@@ -734,8 +734,7 @@ void r100_cp_fini(struct radeon_device *rdev)
 
 		DRM_ERROR("Wait for CP idle timeout, shutting down CP.\n");
 
 		DRM_ERROR("Wait for CP idle timeout, shutting down CP.\n");
 
 	}
 
 	}
 
 	/* Disable ring */
 
 	/* Disable ring */
 
-	rdev->cp.ready = false;
 
-	WREG32(RADEON_CP_CSQ_CNTL, 0);
 
+	r100_cp_disable(rdev);
 
 	radeon_ring_fini(rdev);
 
 	radeon_ring_fini(rdev);
 
 	DRM_INFO("radeon: cp finalized\n");
 
 	DRM_INFO("radeon: cp finalized\n");
 
 }
 
 }

+ 3 - 0
drivers/gpu/drm/radeon/radeon.h
View File 

@@ -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_clear_surface_reg(rdev, r) ((rdev)->asic->clear_surface_reg((rdev), (r)))
 
 #define radeon_bandwidth_update(rdev) (rdev)->asic->bandwidth_update((rdev))
 
 #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
 
 #endif