diff options
Diffstat (limited to 'meta-amd-bsp/recipes-kernel/linux/linux-yocto-4.14.71/2025-drm-amdgpu-fix-duplicated-setting-job-s-vram_lost.patch')
| -rw-r--r-- | meta-amd-bsp/recipes-kernel/linux/linux-yocto-4.14.71/2025-drm-amdgpu-fix-duplicated-setting-job-s-vram_lost.patch | 48 |
1 files changed, 48 insertions, 0 deletions
diff --git a/meta-amd-bsp/recipes-kernel/linux/linux-yocto-4.14.71/2025-drm-amdgpu-fix-duplicated-setting-job-s-vram_lost.patch b/meta-amd-bsp/recipes-kernel/linux/linux-yocto-4.14.71/2025-drm-amdgpu-fix-duplicated-setting-job-s-vram_lost.patch new file mode 100644 index 00000000..76fe8602 --- /dev/null +++ b/meta-amd-bsp/recipes-kernel/linux/linux-yocto-4.14.71/2025-drm-amdgpu-fix-duplicated-setting-job-s-vram_lost.patch @@ -0,0 +1,48 @@ +From ed82b2b9b2b80092c83b501f70a99c9d7782c94d Mon Sep 17 00:00:00 2001 +From: Monk Liu <Monk.Liu@amd.com> +Date: Mon, 16 Oct 2017 20:02:08 +0800 +Subject: [PATCH 2025/4131] drm/amdgpu:fix duplicated setting job's vram_lost +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +Change-Id: I7a29e1533fb3deb476bc0f3dba0f8b2e25baf8c1 +Signed-off-by: Monk Liu <Monk.Liu@amd.com> +Reviewed-by: Christian König <christian.koenig@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 8285ac1..6794670 100644 +--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c ++++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c +@@ -178,7 +178,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; + } +-- +2.7.4 + |