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

Commit c648ed7c authored by Chunming Zhou's avatar Chunming Zhou Committed by Alex Deucher
Browse files

drm/amdgpu: handle error case for ctx 



Properly handle ctx init failure.

Signed-off-by: default avatarChunming Zhou <David1.Zhou@amd.com>
Reviewed-by: default avatarChristian König <christian.koenig@amd.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
parent e8deea2d

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

+5 −2
Original line number Diff line number Diff line
@@ -56,7 +56,6 @@ int amdgpu_ctx_init(struct amdgpu_device *adev, enum amd_sched_priority pri, 
			for (j = 0; j < i; j++)

				amd_sched_entity_fini(&adev->rings[j]->sched,

						      &ctx->rings[j].entity);

			kfree(ctx);

			return r;

		}

	}
@@ -103,8 +102,12 @@ static int amdgpu_ctx_alloc(struct amdgpu_device *adev, 
	}

	*id = (uint32_t)r;

	r = amdgpu_ctx_init(adev, AMD_SCHED_PRIORITY_NORMAL, ctx);

	if (r) {

		idr_remove(&mgr->ctx_handles, *id);

		*id = 0;

		kfree(ctx);

	}

	mutex_unlock(&mgr->lock);



	return r;

}