Skip to contentSkip to conversation

drm/amdgpu: PRT support for gfx9 (v3)

PATCH In review Junwei Zhang 2 participants 2 messages Apr 20, 2017 1 message not in the archive

Subsystems (2)
lore
Share & tools
lore
#0 lore raw

PATCH v3 1/1 drm/amdgpu: PRT support for gfx9 (v3)

From: "Zhang, Jerry" <[email protected]>

v2: unify PRT bit for all ASICs
v3: move PRT flag checking in amdgpu_vm_bo_split_mapping()

---
 drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c | 6 ++++++
 drivers/gpu/drm/amd/amdgpu/amdgpu_vm.h | 3 ++-
 2 files changed, 8 insertions(+), 1 deletion(-)
drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c +6 -0
index 30754ef..d363a9e 100644
@@ -1143,6 +1143,12 @@ static int amdgpu_vm_bo_split_mapping(struct amdgpu_device *adev,
 	flags &= ~AMDGPU_PTE_MTYPE_MASK;
 	flags |= (mapping->flags & AMDGPU_PTE_MTYPE_MASK);
 
+	if ((mapping->flags & AMDGPU_PTE_PRT) &&
+	    (adev->asic_type >= CHIP_VEGA10)) {
+		flags |= AMDGPU_PTE_PRT;
+		flags &= ~AMDGPU_PTE_VALID;
+	}
+
 	trace_amdgpu_vm_bo_update(mapping);
 
 	pfn = mapping->offset >> PAGE_SHIFT;
drivers/gpu/drm/amd/amdgpu/amdgpu_vm.h +2 -1
index 4904740..6c670d5 100644
@@ -65,7 +65,8 @@
 
 #define AMDGPU_PTE_FRAG(x)	((x & 0x1fULL) << 7)
 
-#define AMDGPU_PTE_PRT		(1ULL << 63)
+/* TILED for VEGA10, reserved for older ASICs  */
+#define AMDGPU_PTE_PRT		(1ULL << 51)
 
 /* VEGA10 only */
 #define AMDGPU_PTE_MTYPE(a)    ((uint64_t)a << 57)
Signature · 6 lines
1.9.1

_______________________________________________
amd-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/amd-gfx

A message that is not in the archive (sent off-list or not yet received): 1492671301-23509-1-git-send-email-Jerry.Zhang-5C7GfCeVMHo@public.gmane.org

Reviewed-by
#2 lore raw

Am 20.04.2017 um 08:55 schrieb Junwei Zhang:

Quoted 7 lines

From: "Zhang, Jerry" <[email protected]>

v2: unify PRT bit for all ASICs
v3: move PRT flag checking in amdgpu_vm_bo_split_mapping()

Quoted 27 lines
---
  drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c | 6 ++++++
  drivers/gpu/drm/amd/amdgpu/amdgpu_vm.h | 3 ++-
  2 files changed, 8 insertions(+), 1 deletion(-)
drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c +6 -0
index 30754ef..d363a9e 100644
@@ -1143,6 +1143,12 @@ static int amdgpu_vm_bo_split_mapping(struct amdgpu_device *adev,
  	flags &= ~AMDGPU_PTE_MTYPE_MASK;
  	flags |= (mapping->flags & AMDGPU_PTE_MTYPE_MASK);
 
+	if ((mapping->flags & AMDGPU_PTE_PRT) &&
+	    (adev->asic_type >= CHIP_VEGA10)) {
+		flags |= AMDGPU_PTE_PRT;
+		flags &= ~AMDGPU_PTE_VALID;
+	}
+
  	trace_amdgpu_vm_bo_update(mapping);
 
  	pfn = mapping->offset >> PAGE_SHIFT;
drivers/gpu/drm/amd/amdgpu/amdgpu_vm.h +0 -0
index 4904740..6c670d5 100644

drivers/gpu/drm/amd/amdgpu/amdgpu_vm.h line 72

Quoted 9 lines
drivers/gpu/drm/amd/amdgpu/amdgpu_vm.h +2 -1
@@ -65,7 +65,8 @@
 
  #define AMDGPU_PTE_FRAG(x)	((x & 0x1fULL) << 7)
 
-#define AMDGPU_PTE_PRT		(1ULL << 63)
+/* TILED for VEGA10, reserved for older ASICs  */
+#define AMDGPU_PTE_PRT		(1ULL << 51)
 
  /* VEGA10 only */
  #define AMDGPU_PTE_MTYPE(a)    ((uint64_t)a << 57)

_______________________________________________
amd-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/amd-gfx