Commit 14e47f93 authored by Christian König's avatar Christian König Committed by Alex Deucher
Browse files

drm/amdgpu: keep copy of VRAM lost counter in job 



Instead of reading the current counter from fpriv.

Signed-off-by: default avatarChristian König <christian.koenig@amd.com>
Reviewed-by: default avatarNicolai Hähnle <nicolai.haehnle@amd.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
parent 396bcb41

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

+1 −0
Original line number Diff line number Diff line
@@ -1125,6 +1125,7 @@ struct amdgpu_job { 
	uint32_t		gds_base, gds_size;

	uint32_t		gws_base, gws_size;

	uint32_t		oa_base, oa_size;

	uint32_t		vram_lost_counter;



	/* user fence handling */

	uint64_t		uf_addr;

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

+2 −0
Original line number Diff line number Diff line
@@ -172,6 +172,8 @@ static int amdgpu_cs_parser_init(struct amdgpu_cs_parser *p, void *data) 
	if (ret)

		goto free_all_kdata;



	p->job->vram_lost_counter = fpriv->vram_lost_counter;



	if (p->uf_entry.robj)

		p->job->uf_addr = uf_offset;

	kfree(chunk_array);

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

+7 −6
Original line number Diff line number Diff line
@@ -61,6 +61,7 @@ int amdgpu_job_alloc(struct amdgpu_device *adev, unsigned num_ibs, 
	(*job)->vm = vm;

	(*job)->ibs = (void *)&(*job)[1];

	(*job)->num_ibs = num_ibs;

	(*job)->vram_lost_counter = atomic_read(&adev->vram_lost_counter);



	amdgpu_sync_create(&(*job)->sync);

	amdgpu_sync_create(&(*job)->dep_sync);
@@ -180,8 +181,8 @@ static struct dma_fence *amdgpu_job_dependency(struct amd_sched_job *sched_job) 
static struct dma_fence *amdgpu_job_run(struct amd_sched_job *sched_job)

{

	struct dma_fence *fence = NULL;

	struct amdgpu_device *adev;

	struct amdgpu_job *job;

	struct amdgpu_fpriv *fpriv = NULL;

	int r;



	if (!sched_job) {
@@ -189,17 +190,17 @@ static struct dma_fence *amdgpu_job_run(struct amd_sched_job *sched_job) 
		return NULL;

	}

	job = to_amdgpu_job(sched_job);

	adev = job->adev;



	BUG_ON(amdgpu_sync_peek_fence(&job->sync, NULL));



	trace_amdgpu_sched_run_job(job);

	if (job->vm)

		fpriv = container_of(job->vm, struct amdgpu_fpriv, vm);

	/* skip ib schedule when vram is lost */

	if (fpriv && amdgpu_kms_vram_lost(job->adev, fpriv))

	if (job->vram_lost_counter != atomic_read(&adev->vram_lost_counter)) {

		DRM_ERROR("Skip scheduling IBs!\n");

	else {

		r = amdgpu_ib_schedule(job->ring, job->num_ibs, job->ibs, job, &fence);

	} else {

		r = amdgpu_ib_schedule(job->ring, job->num_ibs, job->ibs, job,

				       &fence);

		if (r)

			DRM_ERROR("Error scheduling IBs (%d)\n", r);

	}

CRA Git | Maintained and supported by SUSTech CRA and CCSE