Commit 4fc6a88f authored by Hawking Zhang's avatar Hawking Zhang Committed by Alex Deucher
Browse files

drm/amdgpu: rename amdgpu_gfx_compute_mqd_sw_init 



The function now will create mqd bos for both gfx queue and compute queue

Signed-off-by: default avatarHawking Zhang <Hawking.Zhang@amd.com>
Reviewed-by: default avatarJack Xiao <jack.xiao@amd.com>
Reviewed-by: default avatarAlex Deucher <alexander.deucher@amd.com>
Acked-by: default avatarFelix Kuehling <Felix.Kuehling@amd.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
parent 7470bfcf

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

+4 −4
Original line number Diff line number Diff line
@@ -360,8 +360,8 @@ int amdgpu_gfx_kiq_init(struct amdgpu_device *adev, 
	return 0;

}



/* create MQD for each compute queue */

int amdgpu_gfx_compute_mqd_sw_init(struct amdgpu_device *adev,

/* create MQD for each compute/gfx queue */

int amdgpu_gfx_mqd_sw_init(struct amdgpu_device *adev,

			   unsigned mqd_size)

{

	struct amdgpu_ring *ring = NULL;
@@ -411,7 +411,7 @@ int amdgpu_gfx_compute_mqd_sw_init(struct amdgpu_device *adev, 
	return 0;

}



void amdgpu_gfx_compute_mqd_sw_fini(struct amdgpu_device *adev)

void amdgpu_gfx_mqd_sw_fini(struct amdgpu_device *adev)

{

	struct amdgpu_ring *ring = NULL;

	int i;

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

+3 −3
Original line number Diff line number Diff line
@@ -330,9 +330,9 @@ void amdgpu_gfx_kiq_fini(struct amdgpu_device *adev); 
int amdgpu_gfx_kiq_init(struct amdgpu_device *adev,

			unsigned hpd_size);



int amdgpu_gfx_compute_mqd_sw_init(struct amdgpu_device *adev,

int amdgpu_gfx_mqd_sw_init(struct amdgpu_device *adev,

			   unsigned mqd_size);

void amdgpu_gfx_compute_mqd_sw_fini(struct amdgpu_device *adev);

void amdgpu_gfx_mqd_sw_fini(struct amdgpu_device *adev);



void amdgpu_gfx_compute_queue_acquire(struct amdgpu_device *adev);

void amdgpu_gfx_graphics_queue_acquire(struct amdgpu_device *adev);

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

+2 −2
Original line number Diff line number Diff line
@@ -2042,7 +2042,7 @@ static int gfx_v8_0_sw_init(void *handle) 
		return r;



	/* create MQD for all compute queues as well as KIQ for SRIOV case */

	r = amdgpu_gfx_compute_mqd_sw_init(adev, sizeof(struct vi_mqd_allocation));

	r = amdgpu_gfx_mqd_sw_init(adev, sizeof(struct vi_mqd_allocation));

	if (r)

		return r;
@@ -2065,7 +2065,7 @@ static int gfx_v8_0_sw_fini(void *handle) 
	for (i = 0; i < adev->gfx.num_compute_rings; i++)

		amdgpu_ring_fini(&adev->gfx.compute_ring[i]);



	amdgpu_gfx_compute_mqd_sw_fini(adev);

	amdgpu_gfx_mqd_sw_fini(adev);

	amdgpu_gfx_kiq_free_ring(&adev->gfx.kiq.ring, &adev->gfx.kiq.irq);

	amdgpu_gfx_kiq_fini(adev);

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

+2 −2
Original line number Diff line number Diff line
@@ -1757,7 +1757,7 @@ static int gfx_v9_0_sw_init(void *handle) 
		return r;



	/* create MQD for all compute queues as wel as KIQ for SRIOV case */

	r = amdgpu_gfx_compute_mqd_sw_init(adev, sizeof(struct v9_mqd_allocation));

	r = amdgpu_gfx_mqd_sw_init(adev, sizeof(struct v9_mqd_allocation));

	if (r)

		return r;
@@ -1799,7 +1799,7 @@ static int gfx_v9_0_sw_fini(void *handle) 
	for (i = 0; i < adev->gfx.num_compute_rings; i++)

		amdgpu_ring_fini(&adev->gfx.compute_ring[i]);



	amdgpu_gfx_compute_mqd_sw_fini(adev);

	amdgpu_gfx_mqd_sw_fini(adev);

	amdgpu_gfx_kiq_free_ring(&adev->gfx.kiq.ring, &adev->gfx.kiq.irq);

	amdgpu_gfx_kiq_fini(adev);