diff options
Diffstat (limited to 'common/recipes-kernel/linux/linux-yocto-4.19.8/0180-drm-amdgpu-move-setting-the-GART-addr-into-TTM.patch')
| -rw-r--r-- | common/recipes-kernel/linux/linux-yocto-4.19.8/0180-drm-amdgpu-move-setting-the-GART-addr-into-TTM.patch | 52 |
1 files changed, 52 insertions, 0 deletions
diff --git a/common/recipes-kernel/linux/linux-yocto-4.19.8/0180-drm-amdgpu-move-setting-the-GART-addr-into-TTM.patch b/common/recipes-kernel/linux/linux-yocto-4.19.8/0180-drm-amdgpu-move-setting-the-GART-addr-into-TTM.patch new file mode 100644 index 00000000..7720f6cb --- /dev/null +++ b/common/recipes-kernel/linux/linux-yocto-4.19.8/0180-drm-amdgpu-move-setting-the-GART-addr-into-TTM.patch @@ -0,0 +1,52 @@ +From 291c800160d6e78be2eb7508320ab3135d3de49f Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Christian=20K=C3=B6nig?= <christian.koenig@amd.com> +Date: Tue, 21 Aug 2018 16:47:01 +0200 +Subject: [PATCH 0180/2940] drm/amdgpu: move setting the GART addr into TTM +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +Move setting the GART addr for window based copies into the TTM code who +uses it. + +Signed-off-by: Christian König <christian.koenig@amd.com> +Reviewed-by: Huang Rui <ray.huang@amd.com> +Reviewed-by: Junwei Zhang <Jerry.Zhang@amd.com> +Signed-off-by: Alex Deucher <alexander.deucher@amd.com> +--- + drivers/gpu/drm/amd/amdgpu/amdgpu_job.c | 2 -- + drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c | 5 ++++- + 2 files changed, 4 insertions(+), 3 deletions(-) + +diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_job.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_job.c +index 56804d4e5371..6c77c50a404e 100644 +--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_job.c ++++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_job.c +@@ -84,8 +84,6 @@ int amdgpu_job_alloc_with_ib(struct amdgpu_device *adev, unsigned size, + r = amdgpu_ib_get(adev, NULL, size, &(*job)->ibs[0]); + if (r) + kfree(*job); +- else +- (*job)->vm_pd_addr = adev->gart.table_addr; + + return r; + } +diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c +index 67bb65cda2e7..9ed423a9cca9 100644 +--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c ++++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c +@@ -2260,7 +2260,10 @@ int amdgpu_copy_buffer(struct amdgpu_ring *ring, uint64_t src_offset, + if (r) + return r; + +- job->vm_needs_flush = vm_needs_flush; ++ if (vm_needs_flush) { ++ job->vm_pd_addr = adev->gart.table_addr; ++ job->vm_needs_flush = true; ++ } + if (resv) { + r = amdgpu_sync_resv(adev, &job->sync, resv, + AMDGPU_FENCE_OWNER_UNDEFINED, +-- +2.17.1 + |