Commit a18d7ea1 authored by Jerome Glisse's avatar Jerome Glisse Committed by Dave Airlie
Browse files

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: default avatarJerome Glisse <jglisse@redhat.com>
Signed-off-by: default avatarDave Airlie <airlied@redhat.com>
parent 45600232

drivers/gpu/drm/radeon/r100.c

+1 −2
Original line number Diff line number Diff line
@@ -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");

}

drivers/gpu/drm/radeon/radeon.h

+3 −0
Original line number Diff line number Diff line
@@ -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

CRA Git | Maintained and supported by SUSTech CRA and CCSE