drm/radeon/kms: call r100_cp_disable rather than duplicating code.
Subsystems (2)
PATCH 1/1 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 <[email protected]>
--- drivers/gpu/drm/radeon/r100.c | 3 +-- drivers/gpu/drm/radeon/radeon.h | 3 +++ 2 files changed, 4 insertions(+), 2 deletions(-)
drivers/gpu/drm/radeon/r100.c +1 -2
@@ -719,8 +719,7 @@ int r100_cp_init(struct radeon_device *rdev, unsigned ring_size)void r100_cp_fini (struct radeon_device *rdev) {/* 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" ); }
drivers/gpu/drm/radeon/radeon.h +3 -0
@@ -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
Signature · 1 line
1.6.4.1