All of lore.kernel.org
 help / color / mirror / Atom feed
From: Chunming Zhou <David1.Zhou-5C7GfCeVMHo@public.gmane.org>
To: amd-gfx-PD4FTy7X32lNgt0PjOBp9y5qC8QIuHrW@public.gmane.org
Cc: Chunming Zhou <David1.Zhou-5C7GfCeVMHo@public.gmane.org>
Subject: [PATCH 10/10] drm/amdgpu: add backup condition for vm
Date: Mon, 15 Aug 2016 14:06:42 +0800	[thread overview]
Message-ID: <1471241202-11463-11-git-send-email-David1.Zhou@amd.com> (raw)
In-Reply-To: <1471241202-11463-1-git-send-email-David1.Zhou-5C7GfCeVMHo@public.gmane.org>

Change-Id: I73aa32cda17cd1039232125afa4aad299b264705
Signed-off-by: Chunming Zhou <David1.Zhou@amd.com>
---
 drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c | 20 ++++++++++++++------
 1 file changed, 14 insertions(+), 6 deletions(-)

diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c
index df10795..3f770ec 100644
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c
@@ -713,9 +713,11 @@ int amdgpu_vm_update_page_directory(struct amdgpu_device *adev,
 {
 	int r;
 
-	r = amdgpu_vm_update_pd_or_shadow(adev, vm, true);
-	if (r)
-		return r;
+	if (amdgpu_need_backup(adev)) {
+		r = amdgpu_vm_update_pd_or_shadow(adev, vm, true);
+		if (r)
+			return r;
+	}
 	return amdgpu_vm_update_pd_or_shadow(adev, vm, false);
 }
 
@@ -729,6 +731,9 @@ int amdgpu_vm_recover_page_table_from_shadow(struct amdgpu_device *adev,
 	uint32_t domain;
 	int r;
 
+	if (!amdgpu_need_backup(adev))
+		return 0;
+
 	if (!vm->page_directory->shadow)
 		return 0;
 
@@ -1037,7 +1042,8 @@ static int amdgpu_vm_bo_update_mapping(struct amdgpu_device *adev,
 	if (r)
 		goto error_free;
 
-	amdgpu_vm_frag_ptes(&params, vm, start, last + 1, addr, flags, true);
+	if (amdgpu_need_backup(adev))
+		amdgpu_vm_frag_ptes(&params, vm, start, last + 1, addr, flags, true);
 	amdgpu_vm_frag_ptes(&params, vm, start, last + 1, addr, flags, false);
 
 	amdgpu_ring_pad_ib(ring, params.ib);
@@ -1418,7 +1424,8 @@ int amdgpu_vm_bo_map(struct amdgpu_device *adev,
 				     AMDGPU_GPU_PAGE_SIZE, true,
 				     AMDGPU_GEM_DOMAIN_VRAM,
 				     AMDGPU_GEM_CREATE_NO_CPU_ACCESS |
-				     AMDGPU_GEM_CREATE_SHADOW,
+				     (amdgpu_need_backup(adev) ?
+				      AMDGPU_GEM_CREATE_SHADOW : 0),
 				     NULL, resv, &pt);
 		if (r)
 			goto error_free;
@@ -1619,7 +1626,8 @@ int amdgpu_vm_init(struct amdgpu_device *adev, struct amdgpu_vm *vm)
 	r = amdgpu_bo_create(adev, pd_size, align, true,
 			     AMDGPU_GEM_DOMAIN_VRAM,
 			     AMDGPU_GEM_CREATE_NO_CPU_ACCESS |
-			     AMDGPU_GEM_CREATE_SHADOW,
+			     (amdgpu_need_backup(adev) ?
+			      AMDGPU_GEM_CREATE_SHADOW : 0),
 			     NULL, NULL, &vm->page_directory);
 	if (r)
 		goto error_free_sched_entity;
-- 
1.9.1

_______________________________________________
amd-gfx mailing list
amd-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/amd-gfx

  parent reply	other threads:[~2016-08-15  6:06 UTC|newest]

Thread overview: 13+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2016-08-15  6:06 [PATCH 00/10] shadow page table support V4 Chunming Zhou
     [not found] ` <1471241202-11463-1-git-send-email-David1.Zhou-5C7GfCeVMHo@public.gmane.org>
2016-08-15  6:06   ` [PATCH 01/10] drm/amdgpu: add direct submision option for copy_buffer Chunming Zhou
2016-08-15  6:06   ` [PATCH 02/10] drm/amdgpu: sync bo and shadow V2 Chunming Zhou
2016-08-15  6:06   ` [PATCH 03/10] drm/amdgpu: implement vm recovery function from " Chunming Zhou
2016-08-15  6:06   ` [PATCH 04/10] drm/amdgpu: update pd shadow while updating pd Chunming Zhou
2016-08-15  6:06   ` [PATCH 05/10] drm/amdgpu: update pt shadow while updating pt Chunming Zhou
2016-08-15  6:06   ` [PATCH 06/10] drm/amdgpu: link all vm clients Chunming Zhou
2016-08-15  6:06   ` [PATCH 07/10] drm/amdgpu: add vm_list_lock Chunming Zhou
2016-08-15  6:06   ` [PATCH 08/10] drm/amdgpu: recover page tables after gpu reset Chunming Zhou
2016-08-15  6:06   ` [PATCH 09/10] drm/amdgpu: add need backup function Chunming Zhou
2016-08-15  6:06   ` Chunming Zhou [this message]
2016-08-16  6:12   ` [PATCH 00/10] shadow page table support V4 Zhou, David(ChunMing)
     [not found]     ` <BY2PR12MB0632F1E417D92B9A50CD4A80B4130-K//h7OWB4q7Oa05ISQ/vsQdYzm3356FpvxpqHgZTriW3zl9H0oFU5g@public.gmane.org>
2016-08-16  9:23       ` Christian König

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1471241202-11463-11-git-send-email-David1.Zhou@amd.com \
    --to=david1.zhou-5c7gfcevmho@public.gmane.org \
    --cc=amd-gfx-PD4FTy7X32lNgt0PjOBp9y5qC8QIuHrW@public.gmane.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body. 
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.