Commit 131b4b36 authored by Alex Deucher's avatar Alex Deucher
Browse files

drm/amdgpu: rename amdgpu_wb_* functions 



add device for consistency.

Acked-by: default avatarChristian König <christian.koenig@amd.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
parent 75758255

drivers/gpu/drm/amd/amdgpu/amdgpu.h

+2 −2
Original line number Diff line number Diff line
@@ -1171,8 +1171,8 @@ struct amdgpu_wb { 
	unsigned long		used[DIV_ROUND_UP(AMDGPU_MAX_WB, BITS_PER_LONG)];

};



int amdgpu_wb_get(struct amdgpu_device *adev, u32 *wb);

void amdgpu_wb_free(struct amdgpu_device *adev, u32 wb);

int amdgpu_device_wb_get(struct amdgpu_device *adev, u32 *wb);

void amdgpu_device_wb_free(struct amdgpu_device *adev, u32 wb);



void amdgpu_get_pcie_info(struct amdgpu_device *adev);

drivers/gpu/drm/amd/amdgpu/amdgpu_device.c

+4 −4
Original line number Diff line number Diff line
@@ -530,7 +530,7 @@ static int amdgpu_device_wb_init(struct amdgpu_device *adev) 
}



/**

 * amdgpu_wb_get - Allocate a wb entry

 * amdgpu_device_wb_get - Allocate a wb entry

 *

 * @adev: amdgpu_device pointer

 * @wb: wb index
@@ -538,7 +538,7 @@ static int amdgpu_device_wb_init(struct amdgpu_device *adev) 
 * Allocate a wb slot for use by the driver (all asics).

 * Returns 0 on success or -EINVAL on failure.

 */

int amdgpu_wb_get(struct amdgpu_device *adev, u32 *wb)

int amdgpu_device_wb_get(struct amdgpu_device *adev, u32 *wb)

{

	unsigned long offset = find_first_zero_bit(adev->wb.used, adev->wb.num_wb);
@@ -552,14 +552,14 @@ int amdgpu_wb_get(struct amdgpu_device *adev, u32 *wb) 
}



/**

 * amdgpu_wb_free - Free a wb entry

 * amdgpu_device_wb_free - Free a wb entry

 *

 * @adev: amdgpu_device pointer

 * @wb: wb index

 *

 * Free a wb slot allocated for use by the driver (all asics)

 */

void amdgpu_wb_free(struct amdgpu_device *adev, u32 wb)

void amdgpu_device_wb_free(struct amdgpu_device *adev, u32 wb)

{

	if (wb < adev->wb.num_wb)

		__clear_bit(wb >> 3, adev->wb.used);

drivers/gpu/drm/amd/amdgpu/amdgpu_gfx.c

+2 −2
Original line number Diff line number Diff line
@@ -203,7 +203,7 @@ int amdgpu_gfx_kiq_init_ring(struct amdgpu_device *adev, 


	spin_lock_init(&kiq->ring_lock);



	r = amdgpu_wb_get(adev, &adev->virt.reg_val_offs);

	r = amdgpu_device_wb_get(adev, &adev->virt.reg_val_offs);

	if (r)

		return r;
@@ -229,7 +229,7 @@ int amdgpu_gfx_kiq_init_ring(struct amdgpu_device *adev, 
void amdgpu_gfx_kiq_free_ring(struct amdgpu_ring *ring,

			      struct amdgpu_irq_src *irq)

{

	amdgpu_wb_free(ring->adev, ring->adev->virt.reg_val_offs);

	amdgpu_device_wb_free(ring->adev, ring->adev->virt.reg_val_offs);

	amdgpu_ring_fini(ring);

}

drivers/gpu/drm/amd/amdgpu/amdgpu_ih.c

+5 −5
Original line number Diff line number Diff line
@@ -92,15 +92,15 @@ int amdgpu_ih_ring_init(struct amdgpu_device *adev, unsigned ring_size, 
		}

		return 0;

	} else {

		r = amdgpu_wb_get(adev, &adev->irq.ih.wptr_offs);

		r = amdgpu_device_wb_get(adev, &adev->irq.ih.wptr_offs);

		if (r) {

			dev_err(adev->dev, "(%d) ih wptr_offs wb alloc failed\n", r);

			return r;

		}



		r = amdgpu_wb_get(adev, &adev->irq.ih.rptr_offs);

		r = amdgpu_device_wb_get(adev, &adev->irq.ih.rptr_offs);

		if (r) {

			amdgpu_wb_free(adev, adev->irq.ih.wptr_offs);

			amdgpu_device_wb_free(adev, adev->irq.ih.wptr_offs);

			dev_err(adev->dev, "(%d) ih rptr_offs wb alloc failed\n", r);

			return r;

		}
@@ -133,8 +133,8 @@ void amdgpu_ih_ring_fini(struct amdgpu_device *adev) 
		amdgpu_bo_free_kernel(&adev->irq.ih.ring_obj,

				      &adev->irq.ih.gpu_addr,

				      (void **)&adev->irq.ih.ring);

		amdgpu_wb_free(adev, adev->irq.ih.wptr_offs);

		amdgpu_wb_free(adev, adev->irq.ih.rptr_offs);

		amdgpu_device_wb_free(adev, adev->irq.ih.wptr_offs);

		amdgpu_device_wb_free(adev, adev->irq.ih.rptr_offs);

	}

}

drivers/gpu/drm/amd/amdgpu/amdgpu_ring.c

+8 −8
Original line number Diff line number Diff line
@@ -263,25 +263,25 @@ int amdgpu_ring_init(struct amdgpu_device *adev, struct amdgpu_ring *ring, 
			return r;

	}



	r = amdgpu_wb_get(adev, &ring->rptr_offs);

	r = amdgpu_device_wb_get(adev, &ring->rptr_offs);

	if (r) {

		dev_err(adev->dev, "(%d) ring rptr_offs wb alloc failed\n", r);

		return r;

	}



	r = amdgpu_wb_get(adev, &ring->wptr_offs);

	r = amdgpu_device_wb_get(adev, &ring->wptr_offs);

	if (r) {

		dev_err(adev->dev, "(%d) ring wptr_offs wb alloc failed\n", r);

		return r;

	}



	r = amdgpu_wb_get(adev, &ring->fence_offs);

	r = amdgpu_device_wb_get(adev, &ring->fence_offs);

	if (r) {

		dev_err(adev->dev, "(%d) ring fence_offs wb alloc failed\n", r);

		return r;

	}



	r = amdgpu_wb_get(adev, &ring->cond_exe_offs);

	r = amdgpu_device_wb_get(adev, &ring->cond_exe_offs);

	if (r) {

		dev_err(adev->dev, "(%d) ring cond_exec_polling wb alloc failed\n", r);

		return r;
@@ -348,11 +348,11 @@ void amdgpu_ring_fini(struct amdgpu_ring *ring) 
	if (!(ring->adev) || !(ring->adev->rings[ring->idx]))

		return;



	amdgpu_wb_free(ring->adev, ring->rptr_offs);

	amdgpu_wb_free(ring->adev, ring->wptr_offs);

	amdgpu_device_wb_free(ring->adev, ring->rptr_offs);

	amdgpu_device_wb_free(ring->adev, ring->wptr_offs);



	amdgpu_wb_free(ring->adev, ring->cond_exe_offs);

	amdgpu_wb_free(ring->adev, ring->fence_offs);

	amdgpu_device_wb_free(ring->adev, ring->cond_exe_offs);

	amdgpu_device_wb_free(ring->adev, ring->fence_offs);



	amdgpu_bo_free_kernel(&ring->ring_obj,

			      &ring->gpu_addr,