1 files changed, 48 insertions, 0 deletions
diff --git a/meta-amd-bsp/recipes-kernel/linux/linux-yocto-4.14.71/3940-drm-amdgpu-fix-the-missed-vram-gart-usage-counting-f.patch b/meta-amd-bsp/recipes-kernel/linux/linux-yocto-4.14.71/3940-drm-amdgpu-fix-the-missed-vram-gart-usage-counting-f.patch
new file mode 100644
index 00000000..5e30da96
--- /dev/null
+++ b/meta-amd-bsp/recipes-kernel/linux/linux-yocto-4.14.71/3940-drm-amdgpu-fix-the-missed-vram-gart-usage-counting-f.patch
@@ -0,0 +1,48 @@
+From c2b26d6ce8e419845694fc74bae98df57d3ebb6e Mon Sep 17 00:00:00 2001
+From: Huang Rui <ray.huang@amd.com>
+Date: Thu, 29 Mar 2018 11:50:41 +0800
+Subject: [PATCH 3940/4131] drm/amdgpu: fix the missed vram/gart usage counting
+ for direct gma
+
+Signed-off-by: Huang Rui <ray.huang@amd.com>
+Reviewed-by: Roger He <Hongbo.He@amd.com>
+---
+ drivers/gpu/drm/amd/amdgpu/amdgpu_gem.c | 14 ++++++++++++++
+ 1 file changed, 14 insertions(+)
+
+diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_gem.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_gem.c
+index 60870dd..e7e13dc 100644
+--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_gem.c
++++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_gem.c
+@@ -34,7 +34,16 @@
+ void amdgpu_gem_object_free(struct drm_gem_object *gobj)
+ {
+ 	struct amdgpu_bo *robj = gem_to_amdgpu_bo(gobj);
++	struct amdgpu_device *adev = amdgpu_ttm_adev(robj->tbo.bdev);
++
+         if (robj) {
++		if (robj->tbo.mem.mem_type == AMDGPU_PL_DGMA)
++                        atomic64_sub(amdgpu_bo_size(robj),
++                                     &adev->direct_gma.vram_usage);
++                else if (robj->tbo.mem.mem_type == AMDGPU_PL_DGMA_IMPORT)
++                        atomic64_sub(amdgpu_bo_size(robj),
++                                     &adev->direct_gma.gart_usage);
++
+                 amdgpu_mn_unregister(robj);
+                 amdgpu_bo_unref(&robj);
+         }
+@@ -83,6 +92,11 @@ int amdgpu_gem_object_create(struct amdgpu_device *adev, unsigned long size,
+ 	}
+ 	*obj = &bo->gem_base;
+ 
++	if (initial_domain & AMDGPU_GEM_DOMAIN_DGMA)
++		atomic64_add(size, &adev->direct_gma.vram_usage);
++	else if (initial_domain & AMDGPU_GEM_DOMAIN_DGMA_IMPORT)
++		atomic64_add(size, &adev->direct_gma.gart_usage);
++
+ 	return 0;
+ }
+ 
+-- 
+2.7.4
+