瀏覽代碼

drm/amdgpu:fix duplicated setting job's vram_lost

Signed-off-by: Monk Liu <Monk.Liu@amd.com>
Reviewed-by: Christian König <christian.koenig@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
Monk Liu 7 年之前
父節點
當前提交
c70b78a71e
共有 2 個文件被更改,包括 1 次插入2 次删除
  1. 0 1
      drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c
  2. 1 1
      drivers/gpu/drm/amd/amdgpu/amdgpu_job.c

+ 0 - 1
drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c

@@ -172,7 +172,6 @@ static int amdgpu_cs_parser_init(struct amdgpu_cs_parser *p, void *data)
 	if (ret)
 	if (ret)
 		goto free_all_kdata;
 		goto free_all_kdata;
 
 
-	p->job->vram_lost_counter = atomic_read(&p->adev->vram_lost_counter);
 	if (p->ctx->vram_lost_counter != p->job->vram_lost_counter) {
 	if (p->ctx->vram_lost_counter != p->job->vram_lost_counter) {
 		ret = -ECANCELED;
 		ret = -ECANCELED;
 		goto free_all_kdata;
 		goto free_all_kdata;

+ 1 - 1
drivers/gpu/drm/amd/amdgpu/amdgpu_job.c

@@ -61,11 +61,11 @@ int amdgpu_job_alloc(struct amdgpu_device *adev, unsigned num_ibs,
 	(*job)->vm = vm;
 	(*job)->vm = vm;
 	(*job)->ibs = (void *)&(*job)[1];
 	(*job)->ibs = (void *)&(*job)[1];
 	(*job)->num_ibs = num_ibs;
 	(*job)->num_ibs = num_ibs;
-	(*job)->vram_lost_counter = atomic_read(&adev->vram_lost_counter);
 
 
 	amdgpu_sync_create(&(*job)->sync);
 	amdgpu_sync_create(&(*job)->sync);
 	amdgpu_sync_create(&(*job)->dep_sync);
 	amdgpu_sync_create(&(*job)->dep_sync);
 	amdgpu_sync_create(&(*job)->sched_sync);
 	amdgpu_sync_create(&(*job)->sched_sync);
+	(*job)->vram_lost_counter = atomic_read(&adev->vram_lost_counter);
 
 
 	return 0;
 	return 0;
 }
 }