[PATCH 4/6] drm/amdgpu:fix duplicated setting job's vram_lost

[Christian König]

Am 18.10.2017 um 10:48 schrieb Monk Liu:
> Change-Id: I7a29e1533fb3deb476bc0f3dba0f8b2e25baf8c1
> Signed-off-by: Monk Liu <Monk.Liu at amd.com>

Reviewed-by: Christian König <christian.koenig at amd.com>

> ---
>   drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c  | 1 -
>   drivers/gpu/drm/amd/amdgpu/amdgpu_job.c | 2 +-
>   2 files changed, 1 insertion(+), 2 deletions(-)
>
> diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c
> index 52dd78e..32cf83e 100644
> --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c
> +++ b/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)
>   		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) {
>   		ret = -ECANCELED;
>   		goto free_all_kdata;
> diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_job.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_job.c
> index a835788..0cfc68d 100644
> --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_job.c
> +++ b/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)->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);
>   	amdgpu_sync_create(&(*job)->sched_sync);
> +	(*job)->vram_lost_counter = atomic_read(&adev->vram_lost_counter);
>   
>   	return 0;
>   }