aboutsummaryrefslogtreecommitdiffstats
path: root/meta-v1000/recipes-kernel/linux/linux-yocto-4.14.71/0800-drm-amdgpu-refactor-direct-gma-bus-addr-calc.patch
diff options
context:
space:
mode:
Diffstat (limited to 'meta-v1000/recipes-kernel/linux/linux-yocto-4.14.71/0800-drm-amdgpu-refactor-direct-gma-bus-addr-calc.patch')
-rw-r--r--meta-v1000/recipes-kernel/linux/linux-yocto-4.14.71/0800-drm-amdgpu-refactor-direct-gma-bus-addr-calc.patch49
1 files changed, 49 insertions, 0 deletions
diff --git a/meta-v1000/recipes-kernel/linux/linux-yocto-4.14.71/0800-drm-amdgpu-refactor-direct-gma-bus-addr-calc.patch b/meta-v1000/recipes-kernel/linux/linux-yocto-4.14.71/0800-drm-amdgpu-refactor-direct-gma-bus-addr-calc.patch
new file mode 100644
index 00000000..c1b21188
--- /dev/null
+++ b/meta-v1000/recipes-kernel/linux/linux-yocto-4.14.71/0800-drm-amdgpu-refactor-direct-gma-bus-addr-calc.patch
@@ -0,0 +1,49 @@
+From 9258dbb0db3025c3c38bb02f423808f91b3fb6b1 Mon Sep 17 00:00:00 2001
+From: Flora Cui <Flora.Cui@amd.com>
+Date: Wed, 19 Apr 2017 17:50:40 +0800
+Subject: [PATCH 0800/4131] drm/amdgpu: refactor direct gma bus addr calc
+
+Change-Id: I32e30cb73a5a45ef084fcd6214944e0e85de1cad
+Signed-off-by: Flora Cui <Flora.Cui@amd.com>
+Reviewed-by: Hawking Zhang <Hawking.Zhang@amd.com>
+---
+ drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c | 22 ++++++++++------------
+ 1 file changed, 10 insertions(+), 12 deletions(-)
+
+diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c
+index 42d6512..9512f27 100644
+--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c
++++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c
+@@ -588,19 +588,17 @@ static int amdgpu_ttm_io_mem_reserve(struct ttm_bo_device *bdev, struct ttm_mem_
+ break;
+ case TTM_PL_VRAM:
+ case AMDGPU_PL_DGMA:
++ mem->bus.offset = (mem->start << PAGE_SHIFT) + man->gpu_offset -
++ adev->mc.vram_start;
++ /* check if it's visible */
++ if ((mem->bus.offset + mem->bus.size) > adev->mc.visible_vram_size)
++ return -EINVAL;
++ mem->bus.base = adev->mc.aper_base;
++ mem->bus.is_iomem = true;
++ break;
+ case AMDGPU_PL_DGMA_IMPORT:
+- if (mem->mem_type != AMDGPU_PL_DGMA_IMPORT) {
+- mem->bus.offset = (mem->start << PAGE_SHIFT) + man->gpu_offset -
+- adev->mc.vram_start;
+- /* check if it's visible */
+- if ((mem->bus.offset + mem->bus.size) > adev->mc.visible_vram_size)
+- return -EINVAL;
+- mem->bus.base = adev->mc.aper_base;
+- } else {
+- mem->bus.offset = backup.bus.offset;
+- mem->bus.base = backup.bus.base;
+- }
+-
++ mem->bus.offset = backup.bus.offset;
++ mem->bus.base = backup.bus.base;
+ mem->bus.is_iomem = true;
+ break;
+ default:
+--
+2.7.4
+