Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

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

drm/radeon: rename fence_wait_last to fence_wait_empty 



As discussed with Michel that name better
describes the behavior of this function.

Signed-off-by: default avatarChristian König <deathsimple@vodafone.de>
Reviewed-by: default avatarMichel Dänzer <michel.daenzer@amd.com>
Reviewed-by: default avatarJerome Glisse <jglisse@redhat.com>
Signed-off-by: default avatarDave Airlie <airlied@redhat.com>
parent 2f6bfe11

drivers/gpu/drm/radeon/radeon.h

+1 −1
Original line number Diff line number Diff line
@@ -285,7 +285,7 @@ void radeon_fence_process(struct radeon_device *rdev, int ring); 
bool radeon_fence_signaled(struct radeon_fence *fence);

int radeon_fence_wait(struct radeon_fence *fence, bool interruptible);

int radeon_fence_wait_next(struct radeon_device *rdev, int ring);

int radeon_fence_wait_last(struct radeon_device *rdev, int ring);

int radeon_fence_wait_empty(struct radeon_device *rdev, int ring);

struct radeon_fence *radeon_fence_ref(struct radeon_fence *fence);

void radeon_fence_unref(struct radeon_fence **fence);

int radeon_fence_count_emitted(struct radeon_device *rdev, int ring);

drivers/gpu/drm/radeon/radeon_device.c

+1 −1
Original line number Diff line number Diff line
@@ -915,7 +915,7 @@ int radeon_suspend_kms(struct drm_device *dev, pm_message_t state) 
	radeon_bo_evict_vram(rdev);

	/* wait for gpu to finish processing current batch */

	for (i = 0; i < RADEON_NUM_RINGS; i++)

		radeon_fence_wait_last(rdev, i);

		radeon_fence_wait_empty(rdev, i);



	radeon_save_bios_scratch_regs(rdev);

drivers/gpu/drm/radeon/radeon_fence.c

+2 −2
Original line number Diff line number Diff line
@@ -297,7 +297,7 @@ int radeon_fence_wait_next(struct radeon_device *rdev, int ring) 
	return r;

}



int radeon_fence_wait_last(struct radeon_device *rdev, int ring)

int radeon_fence_wait_empty(struct radeon_device *rdev, int ring)

{

	unsigned long irq_flags;

	struct radeon_fence *fence;
@@ -442,7 +442,7 @@ void radeon_fence_driver_fini(struct radeon_device *rdev) 
	for (ring = 0; ring < RADEON_NUM_RINGS; ring++) {

		if (!rdev->fence_drv[ring].initialized)

			continue;

		radeon_fence_wait_last(rdev, ring);

		radeon_fence_wait_empty(rdev, ring);

		wake_up_all(&rdev->fence_drv[ring].queue);

		write_lock_irqsave(&rdev->fence_lock, irq_flags);

		radeon_scratch_free(rdev, rdev->fence_drv[ring].scratch_reg);