Commit 34305ac3 authored by Guchun Chen's avatar Guchun Chen Committed by Alex Deucher
Browse files

drm/amdgpu: check correct allocated mqd_backup object after alloc 



Instead of the default one, check the right mqd_backup object.

Signed-off-by: default avatarGuchun Chen <guchun.chen@amd.com>
Cc: Le Ma <le.ma@amd.com>
Reviewed-by: default avatarLe Ma <le.ma@amd.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
parent 7a4685cd

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

+5 −4
Original line number Diff line number Diff line
@@ -379,7 +379,7 @@ int amdgpu_gfx_kiq_init(struct amdgpu_device *adev, 
int amdgpu_gfx_mqd_sw_init(struct amdgpu_device *adev,

			   unsigned mqd_size, int xcc_id)

{

	int r, i;

	int r, i, j;

	struct amdgpu_kiq *kiq = &adev->gfx.kiq[xcc_id];

	struct amdgpu_ring *ring = &kiq->ring;
@@ -431,7 +431,8 @@ int amdgpu_gfx_mqd_sw_init(struct amdgpu_device *adev, 


	/* create MQD for each KCQ */

	for (i = 0; i < adev->gfx.num_compute_rings; i++) {

		ring = &adev->gfx.compute_ring[i + xcc_id * adev->gfx.num_compute_rings];

		j = i + xcc_id * adev->gfx.num_compute_rings;

		ring = &adev->gfx.compute_ring[j];

		if (!ring->mqd_obj) {

			r = amdgpu_bo_create_kernel(adev, mqd_size, PAGE_SIZE,

						    AMDGPU_GEM_DOMAIN_GTT, &ring->mqd_obj,
@@ -443,8 +444,8 @@ int amdgpu_gfx_mqd_sw_init(struct amdgpu_device *adev, 


			ring->mqd_size = mqd_size;

			/* prepare MQD backup */

			adev->gfx.mec.mqd_backup[i + xcc_id * adev->gfx.num_compute_rings] = kmalloc(mqd_size, GFP_KERNEL);

			if (!adev->gfx.mec.mqd_backup[i])

			adev->gfx.mec.mqd_backup[j] = kmalloc(mqd_size, GFP_KERNEL);

			if (!adev->gfx.mec.mqd_backup[j])

				dev_warn(adev->dev, "no memory to create MQD backup for ring %s\n", ring->name);

		}

	}