Commit abfaa44b authored by Christian König's avatar Christian König Committed by Dave Airlie
Browse files

drm/radeon: remove cayman_gpu_is_lockup 



Since it is now identical to evergreen_gpu_is_lockup.

Signed-off-by: default avatarChristian König <deathsimple@vodafone.de>
Reviewed-by: default avatarJerome Glisse <jglisse@redhat.com>
Signed-off-by: default avatarDave Airlie <airlied@redhat.com>
parent 8ba957b5

drivers/gpu/drm/radeon/ni.c

+0 −19
Original line number Diff line number Diff line
@@ -1392,25 +1392,6 @@ int cayman_cp_resume(struct radeon_device *rdev) 
	return 0;

}



bool cayman_gpu_is_lockup(struct radeon_device *rdev, struct radeon_ring *ring)

{

	u32 srbm_status;

	u32 grbm_status;

	u32 grbm_status_se0, grbm_status_se1;



	srbm_status = RREG32(SRBM_STATUS);

	grbm_status = RREG32(GRBM_STATUS);

	grbm_status_se0 = RREG32(GRBM_STATUS_SE0);

	grbm_status_se1 = RREG32(GRBM_STATUS_SE1);

	if (!(grbm_status & GUI_ACTIVE)) {

		radeon_ring_lockup_update(ring);

		return false;

	}

	/* force CP activities */

	radeon_ring_force_activity(rdev, ring);

	return radeon_ring_test_lockup(rdev, ring);

}



static int cayman_gpu_soft_reset(struct radeon_device *rdev)

{

	struct evergreen_mc_save save;

drivers/gpu/drm/radeon/radeon_asic.c

+6 −6
Original line number Diff line number Diff line
@@ -1339,7 +1339,7 @@ static struct radeon_asic cayman_asic = { 
			.cs_parse = &evergreen_cs_parse,

			.ring_test = &r600_ring_test,

			.ib_test = &r600_ib_test,

			.is_lockup = &cayman_gpu_is_lockup,

			.is_lockup = &evergreen_gpu_is_lockup,

		},

		[CAYMAN_RING_TYPE_CP1_INDEX] = {

			.ib_execute = &cayman_ring_ib_execute,
@@ -1349,7 +1349,7 @@ static struct radeon_asic cayman_asic = { 
			.cs_parse = &evergreen_cs_parse,

			.ring_test = &r600_ring_test,

			.ib_test = &r600_ib_test,

			.is_lockup = &cayman_gpu_is_lockup,

			.is_lockup = &evergreen_gpu_is_lockup,

		},

		[CAYMAN_RING_TYPE_CP2_INDEX] = {

			.ib_execute = &cayman_ring_ib_execute,
@@ -1359,7 +1359,7 @@ static struct radeon_asic cayman_asic = { 
			.cs_parse = &evergreen_cs_parse,

			.ring_test = &r600_ring_test,

			.ib_test = &r600_ib_test,

			.is_lockup = &cayman_gpu_is_lockup,

			.is_lockup = &evergreen_gpu_is_lockup,

		}

	},

	.irq = {
@@ -1433,7 +1433,7 @@ static struct radeon_asic trinity_asic = { 
			.cs_parse = &evergreen_cs_parse,

			.ring_test = &r600_ring_test,

			.ib_test = &r600_ib_test,

			.is_lockup = &cayman_gpu_is_lockup,

			.is_lockup = &evergreen_gpu_is_lockup,

		},

		[CAYMAN_RING_TYPE_CP1_INDEX] = {

			.ib_execute = &cayman_ring_ib_execute,
@@ -1443,7 +1443,7 @@ static struct radeon_asic trinity_asic = { 
			.cs_parse = &evergreen_cs_parse,

			.ring_test = &r600_ring_test,

			.ib_test = &r600_ib_test,

			.is_lockup = &cayman_gpu_is_lockup,

			.is_lockup = &evergreen_gpu_is_lockup,

		},

		[CAYMAN_RING_TYPE_CP2_INDEX] = {

			.ib_execute = &cayman_ring_ib_execute,
@@ -1453,7 +1453,7 @@ static struct radeon_asic trinity_asic = { 
			.cs_parse = &evergreen_cs_parse,

			.ring_test = &r600_ring_test,

			.ib_test = &r600_ib_test,

			.is_lockup = &cayman_gpu_is_lockup,

			.is_lockup = &evergreen_gpu_is_lockup,

		}

	},

	.irq = {

drivers/gpu/drm/radeon/radeon_asic.h

+0 −1
Original line number Diff line number Diff line
@@ -437,7 +437,6 @@ int cayman_init(struct radeon_device *rdev); 
void cayman_fini(struct radeon_device *rdev);

int cayman_suspend(struct radeon_device *rdev);

int cayman_resume(struct radeon_device *rdev);

bool cayman_gpu_is_lockup(struct radeon_device *rdev, struct radeon_ring *cp);

int cayman_asic_reset(struct radeon_device *rdev);

void cayman_ring_ib_execute(struct radeon_device *rdev, struct radeon_ib *ib);

int cayman_vm_init(struct radeon_device *rdev);