Commit 37c3fc66 authored by Srinivasan Shanmugam's avatar Srinivasan Shanmugam Committed by Alex Deucher
Browse files

drm/amdgpu: Return -ENOMEM when there is no memory in 'amdgpu_gfx_mqd_sw_init' 



Return -ENOMEM, when there is no sufficient dynamically allocated memory
to create MQD backup for ring

Cc: Christian König <christian.koenig@amd.com>
Cc: Alex Deucher <alexander.deucher@amd.com>
Signed-off-by: default avatarSrinivasan Shanmugam <srinivasan.shanmugam@amd.com>
Reviewed-by: default avatarAlex Deucher <alexander.deucher@amd.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
parent 88dd0b18

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

+8 −3
Original line number Diff line number Diff line
@@ -407,8 +407,11 @@ int amdgpu_gfx_mqd_sw_init(struct amdgpu_device *adev, 


		/* prepare MQD backup */

		kiq->mqd_backup = kmalloc(mqd_size, GFP_KERNEL);

		if (!kiq->mqd_backup)

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

		if (!kiq->mqd_backup) {

			dev_warn(adev->dev,

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

			return -ENOMEM;

		}

	}



	if (adev->asic_type >= CHIP_NAVI10 && amdgpu_async_gfx_ring) {
@@ -427,8 +430,10 @@ int amdgpu_gfx_mqd_sw_init(struct amdgpu_device *adev, 
				ring->mqd_size = mqd_size;

				/* prepare MQD backup */

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

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

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

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

					return -ENOMEM;

				}

			}

		}

	}