Skip to contentSkip to conversation

drm/amdgpu: Differentiate two set_pte_pde function pointers

PATCH NAK Zhao, Yong 2 participants 3 messages Feb 21, 2019 – Feb 25, 2019 2 messages not in the archive

Subsystems (2)
lore
Share & tools
lore

Zhao, Yong

author
#0 lore raw

PATCH 1/1 drm/amdgpu: Differentiate two set_pte_pde function pointers

There were two set_pte_pde function pointers in amdgpu_gmc_funcs and amdgpu_vm_pte_funcs respectively. Because they are so similar, sometimes it is confusing. So Rename the one in amdgpu_vm_pte_funcs to write_pte_pde.

---
 drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c | 6 +++---
 drivers/gpu/drm/amd/amdgpu/amdgpu_vm.h | 4 ++--
 drivers/gpu/drm/amd/amdgpu/cik_sdma.c  | 6 +++---
 drivers/gpu/drm/amd/amdgpu/sdma_v2_4.c | 6 +++---
 drivers/gpu/drm/amd/amdgpu/sdma_v3_0.c | 6 +++---
 drivers/gpu/drm/amd/amdgpu/sdma_v4_0.c | 6 +++---
 drivers/gpu/drm/amd/amdgpu/si_dma.c    | 6 +++---
 7 files changed, 20 insertions(+), 20 deletions(-)
drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c +3 -3
index 942b5ebc6dc2..fa86be694e48 100644
@@ -806,7 +806,7 @@ static int amdgpu_vm_clear_bo(struct amdgpu_device *adev,
 		if (level != AMDGPU_VM_PTB)
 			ats_value |= AMDGPU_PDE_PTE;
 
-		amdgpu_vm_set_pte_pde(adev, &job->ibs[0], addr, 0,
+		amdgpu_vm_write_pte_pde(adev, &job->ibs[0], addr, 0,
 				      ats_entries, 0, ats_value);
 		addr += ats_entries * 8;
 	}
@@ -818,7 +818,7 @@ static int amdgpu_vm_clear_bo(struct amdgpu_device *adev,
 		if (level == AMDGPU_VM_PTB && adev->asic_type >= CHIP_VEGA10)
 			value = AMDGPU_PTE_EXECUTABLE;
 
-		amdgpu_vm_set_pte_pde(adev, &job->ibs[0], addr, 0,
+		amdgpu_vm_write_pte_pde(adev, &job->ibs[0], addr, 0,
 				      entries, 0, value);
 	}
 
@@ -1235,7 +1235,7 @@ static void amdgpu_vm_do_set_ptes(struct amdgpu_pte_update_params *params,
 				    addr | flags, count, incr);
 
 	} else {
-		amdgpu_vm_set_pte_pde(params->adev, params->ib, pe, addr,
+		amdgpu_vm_write_pte_pde(params->adev, params->ib, pe, addr,
 				      count, incr, flags);
 	}
 }
drivers/gpu/drm/amd/amdgpu/amdgpu_vm.h +2 -2
index 81ff8177f092..7e345ec2671f 100644
@@ -161,7 +161,7 @@ struct amdgpu_vm_pte_funcs {
 			  uint64_t value, unsigned count,
 			  uint32_t incr);
 	/* for linear pte/pde updates without addr mapping */
-	void (*set_pte_pde)(struct amdgpu_ib *ib,
+	void (*write_pte_pde)(struct amdgpu_ib *ib,
 			    uint64_t pe,
 			    uint64_t addr, unsigned count,
 			    uint32_t incr, uint64_t flags);
@@ -287,7 +287,7 @@ struct amdgpu_vm_manager {
 
 #define amdgpu_vm_copy_pte(adev, ib, pe, src, count) ((adev)->vm_manager.vm_pte_funcs->copy_pte((ib), (pe), (src), (count)))
 #define amdgpu_vm_write_pte(adev, ib, pe, value, count, incr) ((adev)->vm_manager.vm_pte_funcs->write_pte((ib), (pe), (value), (count), (incr)))
-#define amdgpu_vm_set_pte_pde(adev, ib, pe, addr, count, incr, flags) ((adev)->vm_manager.vm_pte_funcs->set_pte_pde((ib), (pe), (addr), (count), (incr), (flags)))
+#define amdgpu_vm_write_pte_pde(adev, ib, pe, addr, count, incr, flags) ((adev)->vm_manager.vm_pte_funcs->write_pte_pde((ib), (pe), (addr), (count), (incr), (flags)))
 
 void amdgpu_vm_manager_init(struct amdgpu_device *adev);
 void amdgpu_vm_manager_fini(struct amdgpu_device *adev);
drivers/gpu/drm/amd/amdgpu/cik_sdma.c +3 -3
index 189599b694e8..07b874a44ddf 100644
@@ -769,7 +769,7 @@ static void cik_sdma_vm_write_pte(struct amdgpu_ib *ib, uint64_t pe,
 }
 
 /**
- * cik_sdma_vm_set_pages - update the page tables using sDMA
+ * cik_sdma_vm_write_pte_pde - update the page tables using sDMA
  *
  * @ib: indirect buffer to fill with commands
  * @pe: addr of the page entry
@@ -780,7 +780,7 @@ static void cik_sdma_vm_write_pte(struct amdgpu_ib *ib, uint64_t pe,
  *
  * Update the page tables using sDMA (CIK).
  */
-static void cik_sdma_vm_set_pte_pde(struct amdgpu_ib *ib, uint64_t pe,
+static void cik_sdma_vm_write_pte_pde(struct amdgpu_ib *ib, uint64_t pe,
 				    uint64_t addr, unsigned count,
 				    uint32_t incr, uint64_t flags)
 {
@@ -1365,7 +1365,7 @@ static const struct amdgpu_vm_pte_funcs cik_sdma_vm_pte_funcs = {
 	.copy_pte = cik_sdma_vm_copy_pte,
 
 	.write_pte = cik_sdma_vm_write_pte,
-	.set_pte_pde = cik_sdma_vm_set_pte_pde,
+	.write_pte_pde = cik_sdma_vm_write_pte_pde,
 };
 
 static void cik_sdma_set_vm_pte_funcs(struct amdgpu_device *adev)
drivers/gpu/drm/amd/amdgpu/sdma_v2_4.c +3 -3
index cca3552b36ed..3161871c1a57 100644
@@ -707,7 +707,7 @@ static void sdma_v2_4_vm_write_pte(struct amdgpu_ib *ib, uint64_t pe,
 }
 
 /**
- * sdma_v2_4_vm_set_pte_pde - update the page tables using sDMA
+ * sdma_v2_4_vm_write_pte_pde - update the page tables using sDMA
  *
  * @ib: indirect buffer to fill with commands
  * @pe: addr of the page entry
@@ -718,7 +718,7 @@ static void sdma_v2_4_vm_write_pte(struct amdgpu_ib *ib, uint64_t pe,
  *
  * Update the page tables using sDMA (CIK).
  */
-static void sdma_v2_4_vm_set_pte_pde(struct amdgpu_ib *ib, uint64_t pe,
+static void sdma_v2_4_vm_write_pte_pde(struct amdgpu_ib *ib, uint64_t pe,
 				     uint64_t addr, unsigned count,
 				     uint32_t incr, uint64_t flags)
 {
@@ -1252,7 +1252,7 @@ static const struct amdgpu_vm_pte_funcs sdma_v2_4_vm_pte_funcs = {
 	.copy_pte = sdma_v2_4_vm_copy_pte,
 
 	.write_pte = sdma_v2_4_vm_write_pte,
-	.set_pte_pde = sdma_v2_4_vm_set_pte_pde,
+	.write_pte_pde = sdma_v2_4_vm_write_pte_pde,
 };
 
 static void sdma_v2_4_set_vm_pte_funcs(struct amdgpu_device *adev)
drivers/gpu/drm/amd/amdgpu/sdma_v3_0.c +3 -3
index 0ce8331baeb2..e369013a6bce 100644
@@ -978,7 +978,7 @@ static void sdma_v3_0_vm_write_pte(struct amdgpu_ib *ib, uint64_t pe,
 }
 
 /**
- * sdma_v3_0_vm_set_pte_pde - update the page tables using sDMA
+ * sdma_v3_0_vm_write_pte_pde - update the page tables using sDMA
  *
  * @ib: indirect buffer to fill with commands
  * @pe: addr of the page entry
@@ -989,7 +989,7 @@ static void sdma_v3_0_vm_write_pte(struct amdgpu_ib *ib, uint64_t pe,
  *
  * Update the page tables using sDMA (CIK).
  */
-static void sdma_v3_0_vm_set_pte_pde(struct amdgpu_ib *ib, uint64_t pe,
+static void sdma_v3_0_vm_write_pte_pde(struct amdgpu_ib *ib, uint64_t pe,
 				     uint64_t addr, unsigned count,
 				     uint32_t incr, uint64_t flags)
 {
@@ -1690,7 +1690,7 @@ static const struct amdgpu_vm_pte_funcs sdma_v3_0_vm_pte_funcs = {
 	.copy_pte = sdma_v3_0_vm_copy_pte,
 
 	.write_pte = sdma_v3_0_vm_write_pte,
-	.set_pte_pde = sdma_v3_0_vm_set_pte_pde,
+	.write_pte_pde = sdma_v3_0_vm_write_pte_pde,
 };
 
 static void sdma_v3_0_set_vm_pte_funcs(struct amdgpu_device *adev)
drivers/gpu/drm/amd/amdgpu/sdma_v4_0.c +3 -3
index c816e55d43a9..e5e9eac1758d 100644
@@ -1343,7 +1343,7 @@ static void sdma_v4_0_vm_write_pte(struct amdgpu_ib *ib, uint64_t pe,
 }
 
 /**
- * sdma_v4_0_vm_set_pte_pde - update the page tables using sDMA
+ * sdma_v4_0_vm_write_pte_pde - update the page tables using sDMA
  *
  * @ib: indirect buffer to fill with commands
  * @pe: addr of the page entry
@@ -1354,7 +1354,7 @@ static void sdma_v4_0_vm_write_pte(struct amdgpu_ib *ib, uint64_t pe,
  *
  * Update the page tables using sDMA (VEGA10).
  */
-static void sdma_v4_0_vm_set_pte_pde(struct amdgpu_ib *ib,
+static void sdma_v4_0_vm_write_pte_pde(struct amdgpu_ib *ib,
 				     uint64_t pe,
 				     uint64_t addr, unsigned count,
 				     uint32_t incr, uint64_t flags)
@@ -2088,7 +2088,7 @@ static const struct amdgpu_vm_pte_funcs sdma_v4_0_vm_pte_funcs = {
 	.copy_pte = sdma_v4_0_vm_copy_pte,
 
 	.write_pte = sdma_v4_0_vm_write_pte,
-	.set_pte_pde = sdma_v4_0_vm_set_pte_pde,
+	.write_pte_pde = sdma_v4_0_vm_write_pte_pde,
 };
 
 static void sdma_v4_0_set_vm_pte_funcs(struct amdgpu_device *adev)
drivers/gpu/drm/amd/amdgpu/si_dma.c +3 -3
index f15f196684ba..4c1e1ce895f7 100644
@@ -353,7 +353,7 @@ static void si_dma_vm_write_pte(struct amdgpu_ib *ib, uint64_t pe,
 }
 
 /**
- * si_dma_vm_set_pte_pde - update the page tables using sDMA
+ * si_dma_vm_write_pte_pde - update the page tables using sDMA
  *
  * @ib: indirect buffer to fill with commands
  * @pe: addr of the page entry
@@ -364,7 +364,7 @@ static void si_dma_vm_write_pte(struct amdgpu_ib *ib, uint64_t pe,
  *
  * Update the page tables using sDMA (CIK).
  */
-static void si_dma_vm_set_pte_pde(struct amdgpu_ib *ib,
+static void si_dma_vm_write_pte_pde(struct amdgpu_ib *ib,
 				     uint64_t pe,
 				     uint64_t addr, unsigned count,
 				     uint32_t incr, uint64_t flags)
@@ -829,7 +829,7 @@ static const struct amdgpu_vm_pte_funcs si_dma_vm_pte_funcs = {
 	.copy_pte = si_dma_vm_copy_pte,
 
 	.write_pte = si_dma_vm_write_pte,
-	.set_pte_pde = si_dma_vm_set_pte_pde,
+	.write_pte_pde = si_dma_vm_write_pte_pde,
 };
 
 static void si_dma_set_vm_pte_funcs(struct amdgpu_device *adev)
Signature · 6 lines
2.17.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): [email protected]

#2 lore raw

Am 21.02.19 um 23:58 schrieb Zhao, Yong:

Quoted 4 lines

There were two set_pte_pde function pointers in amdgpu_gmc_funcs and amdgpu_vm_pte_funcs respectively. Because they are so similar, sometimes it is confusing. So Rename the one in amdgpu_vm_pte_funcs to write_pte_pde.

NAK, we also already have a write_pte function. So this only increases the confusion.

Instead we should rather just completely remove the gmc_*_set_pte_pde() functions because they actually do exactly the same on all generations.

Christian.

Quoted 212 lines
---
  drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c | 6 +++---
  drivers/gpu/drm/amd/amdgpu/amdgpu_vm.h | 4 ++--
  drivers/gpu/drm/amd/amdgpu/cik_sdma.c  | 6 +++---
  drivers/gpu/drm/amd/amdgpu/sdma_v2_4.c | 6 +++---
  drivers/gpu/drm/amd/amdgpu/sdma_v3_0.c | 6 +++---
  drivers/gpu/drm/amd/amdgpu/sdma_v4_0.c | 6 +++---
  drivers/gpu/drm/amd/amdgpu/si_dma.c    | 6 +++---
  7 files changed, 20 insertions(+), 20 deletions(-)
drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c +3 -3
index 942b5ebc6dc2..fa86be694e48 100644
@@ -806,7 +806,7 @@ static int amdgpu_vm_clear_bo(struct amdgpu_device *adev,
  		if (level != AMDGPU_VM_PTB)
  			ats_value |= AMDGPU_PDE_PTE;
 
-		amdgpu_vm_set_pte_pde(adev, &job->ibs[0], addr, 0,
+		amdgpu_vm_write_pte_pde(adev, &job->ibs[0], addr, 0,
  				      ats_entries, 0, ats_value);
  		addr += ats_entries * 8;
  	}
@@ -818,7 +818,7 @@ static int amdgpu_vm_clear_bo(struct amdgpu_device *adev,
  		if (level == AMDGPU_VM_PTB && adev->asic_type >= CHIP_VEGA10)
  			value = AMDGPU_PTE_EXECUTABLE;
 
-		amdgpu_vm_set_pte_pde(adev, &job->ibs[0], addr, 0,
+		amdgpu_vm_write_pte_pde(adev, &job->ibs[0], addr, 0,
  				      entries, 0, value);
  	}
 
@@ -1235,7 +1235,7 @@ static void amdgpu_vm_do_set_ptes(struct amdgpu_pte_update_params *params,
  				    addr | flags, count, incr);
 
  	} else {
-		amdgpu_vm_set_pte_pde(params->adev, params->ib, pe, addr,
+		amdgpu_vm_write_pte_pde(params->adev, params->ib, pe, addr,
  				      count, incr, flags);
  	}
  }
drivers/gpu/drm/amd/amdgpu/amdgpu_vm.h +2 -2
index 81ff8177f092..7e345ec2671f 100644
@@ -161,7 +161,7 @@ struct amdgpu_vm_pte_funcs {
  			  uint64_t value, unsigned count,
  			  uint32_t incr);
  	/* for linear pte/pde updates without addr mapping */
-	void (*set_pte_pde)(struct amdgpu_ib *ib,
+	void (*write_pte_pde)(struct amdgpu_ib *ib,
  			    uint64_t pe,
  			    uint64_t addr, unsigned count,
  			    uint32_t incr, uint64_t flags);
@@ -287,7 +287,7 @@ struct amdgpu_vm_manager {
 
  #define amdgpu_vm_copy_pte(adev, ib, pe, src, count) ((adev)->vm_manager.vm_pte_funcs->copy_pte((ib), (pe), (src), (count)))
  #define amdgpu_vm_write_pte(adev, ib, pe, value, count, incr) ((adev)->vm_manager.vm_pte_funcs->write_pte((ib), (pe), (value), (count), (incr)))
-#define amdgpu_vm_set_pte_pde(adev, ib, pe, addr, count, incr, flags) ((adev)->vm_manager.vm_pte_funcs->set_pte_pde((ib), (pe), (addr), (count), (incr), (flags)))
+#define amdgpu_vm_write_pte_pde(adev, ib, pe, addr, count, incr, flags) ((adev)->vm_manager.vm_pte_funcs->write_pte_pde((ib), (pe), (addr), (count), (incr), (flags)))
 
  void amdgpu_vm_manager_init(struct amdgpu_device *adev);
  void amdgpu_vm_manager_fini(struct amdgpu_device *adev);
drivers/gpu/drm/amd/amdgpu/cik_sdma.c +3 -3
index 189599b694e8..07b874a44ddf 100644
@@ -769,7 +769,7 @@ static void cik_sdma_vm_write_pte(struct amdgpu_ib *ib, uint64_t pe,
  }
 
  /**
- * cik_sdma_vm_set_pages - update the page tables using sDMA
+ * cik_sdma_vm_write_pte_pde - update the page tables using sDMA
   *
   * @ib: indirect buffer to fill with commands
   * @pe: addr of the page entry
@@ -780,7 +780,7 @@ static void cik_sdma_vm_write_pte(struct amdgpu_ib *ib, uint64_t pe,
   *
   * Update the page tables using sDMA (CIK).
   */
-static void cik_sdma_vm_set_pte_pde(struct amdgpu_ib *ib, uint64_t pe,
+static void cik_sdma_vm_write_pte_pde(struct amdgpu_ib *ib, uint64_t pe,
  				    uint64_t addr, unsigned count,
  				    uint32_t incr, uint64_t flags)
  {
@@ -1365,7 +1365,7 @@ static const struct amdgpu_vm_pte_funcs cik_sdma_vm_pte_funcs = {
  	.copy_pte = cik_sdma_vm_copy_pte,
 
  	.write_pte = cik_sdma_vm_write_pte,
-	.set_pte_pde = cik_sdma_vm_set_pte_pde,
+	.write_pte_pde = cik_sdma_vm_write_pte_pde,
  };
 
  static void cik_sdma_set_vm_pte_funcs(struct amdgpu_device *adev)
drivers/gpu/drm/amd/amdgpu/sdma_v2_4.c +3 -3
index cca3552b36ed..3161871c1a57 100644
@@ -707,7 +707,7 @@ static void sdma_v2_4_vm_write_pte(struct amdgpu_ib *ib, uint64_t pe,
  }
 
  /**
- * sdma_v2_4_vm_set_pte_pde - update the page tables using sDMA
+ * sdma_v2_4_vm_write_pte_pde - update the page tables using sDMA
   *
   * @ib: indirect buffer to fill with commands
   * @pe: addr of the page entry
@@ -718,7 +718,7 @@ static void sdma_v2_4_vm_write_pte(struct amdgpu_ib *ib, uint64_t pe,
   *
   * Update the page tables using sDMA (CIK).
   */
-static void sdma_v2_4_vm_set_pte_pde(struct amdgpu_ib *ib, uint64_t pe,
+static void sdma_v2_4_vm_write_pte_pde(struct amdgpu_ib *ib, uint64_t pe,
  				     uint64_t addr, unsigned count,
  				     uint32_t incr, uint64_t flags)
  {
@@ -1252,7 +1252,7 @@ static const struct amdgpu_vm_pte_funcs sdma_v2_4_vm_pte_funcs = {
  	.copy_pte = sdma_v2_4_vm_copy_pte,
 
  	.write_pte = sdma_v2_4_vm_write_pte,
-	.set_pte_pde = sdma_v2_4_vm_set_pte_pde,
+	.write_pte_pde = sdma_v2_4_vm_write_pte_pde,
  };
 
  static void sdma_v2_4_set_vm_pte_funcs(struct amdgpu_device *adev)
drivers/gpu/drm/amd/amdgpu/sdma_v3_0.c +3 -3
index 0ce8331baeb2..e369013a6bce 100644
@@ -978,7 +978,7 @@ static void sdma_v3_0_vm_write_pte(struct amdgpu_ib *ib, uint64_t pe,
  }
 
  /**
- * sdma_v3_0_vm_set_pte_pde - update the page tables using sDMA
+ * sdma_v3_0_vm_write_pte_pde - update the page tables using sDMA
   *
   * @ib: indirect buffer to fill with commands
   * @pe: addr of the page entry
@@ -989,7 +989,7 @@ static void sdma_v3_0_vm_write_pte(struct amdgpu_ib *ib, uint64_t pe,
   *
   * Update the page tables using sDMA (CIK).
   */
-static void sdma_v3_0_vm_set_pte_pde(struct amdgpu_ib *ib, uint64_t pe,
+static void sdma_v3_0_vm_write_pte_pde(struct amdgpu_ib *ib, uint64_t pe,
  				     uint64_t addr, unsigned count,
  				     uint32_t incr, uint64_t flags)
  {
@@ -1690,7 +1690,7 @@ static const struct amdgpu_vm_pte_funcs sdma_v3_0_vm_pte_funcs = {
  	.copy_pte = sdma_v3_0_vm_copy_pte,
 
  	.write_pte = sdma_v3_0_vm_write_pte,
-	.set_pte_pde = sdma_v3_0_vm_set_pte_pde,
+	.write_pte_pde = sdma_v3_0_vm_write_pte_pde,
  };
 
  static void sdma_v3_0_set_vm_pte_funcs(struct amdgpu_device *adev)
drivers/gpu/drm/amd/amdgpu/sdma_v4_0.c +3 -3
index c816e55d43a9..e5e9eac1758d 100644
@@ -1343,7 +1343,7 @@ static void sdma_v4_0_vm_write_pte(struct amdgpu_ib *ib, uint64_t pe,
  }
 
  /**
- * sdma_v4_0_vm_set_pte_pde - update the page tables using sDMA
+ * sdma_v4_0_vm_write_pte_pde - update the page tables using sDMA
   *
   * @ib: indirect buffer to fill with commands
   * @pe: addr of the page entry
@@ -1354,7 +1354,7 @@ static void sdma_v4_0_vm_write_pte(struct amdgpu_ib *ib, uint64_t pe,
   *
   * Update the page tables using sDMA (VEGA10).
   */
-static void sdma_v4_0_vm_set_pte_pde(struct amdgpu_ib *ib,
+static void sdma_v4_0_vm_write_pte_pde(struct amdgpu_ib *ib,
  				     uint64_t pe,
  				     uint64_t addr, unsigned count,
  				     uint32_t incr, uint64_t flags)
@@ -2088,7 +2088,7 @@ static const struct amdgpu_vm_pte_funcs sdma_v4_0_vm_pte_funcs = {
  	.copy_pte = sdma_v4_0_vm_copy_pte,
 
  	.write_pte = sdma_v4_0_vm_write_pte,
-	.set_pte_pde = sdma_v4_0_vm_set_pte_pde,
+	.write_pte_pde = sdma_v4_0_vm_write_pte_pde,
  };
 
  static void sdma_v4_0_set_vm_pte_funcs(struct amdgpu_device *adev)
drivers/gpu/drm/amd/amdgpu/si_dma.c +2 -2
index f15f196684ba..4c1e1ce895f7 100644
@@ -353,7 +353,7 @@ static void si_dma_vm_write_pte(struct amdgpu_ib *ib, uint64_t pe,
  }
 
  /**
- * si_dma_vm_set_pte_pde - update the page tables using sDMA
+ * si_dma_vm_write_pte_pde - update the page tables using sDMA
   *
   * @ib: indirect buffer to fill with commands
   * @pe: addr of the page entry
@@ -364,7 +364,7 @@ static void si_dma_vm_write_pte(struct amdgpu_ib *ib, uint64_t pe,
   *
   * Update the page tables using sDMA (CIK).
   */
-static void si_dma_vm_set_pte_pde(struct amdgpu_ib *ib,
+static void si_dma_vm_write_pte_pde(struct amdgpu_ib *ib,
  				     uint64_t pe,
  				     uint64_t addr, unsigned count,
  				     uint32_t incr, uint64_t flags)

drivers/gpu/drm/amd/amdgpu/si_dma.c static const struct amdgpu_vm_pte_funcs si_dma_vm_pte_funcs = { · line 835

Quoted 8 lines
drivers/gpu/drm/amd/amdgpu/si_dma.c +1 -1
@@ -829,7 +829,7 @@ static const struct amdgpu_vm_pte_funcs si_dma_vm_pte_funcs = {
  	.copy_pte = si_dma_vm_copy_pte,
 
  	.write_pte = si_dma_vm_write_pte,
-	.set_pte_pde = si_dma_vm_set_pte_pde,
+	.write_pte_pde = si_dma_vm_write_pte_pde,
  };
 
  static void si_dma_set_vm_pte_funcs(struct amdgpu_device *adev)

_______________________________________________
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): 61a1ea5e-0957-394a-be33-a7bca485e70c-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org

author NAK
#4 lore raw

Agree. That's much better actually.

Yong
________________________________
From: Christian K?nig <[email protected]>
Sent: Monday, February 25, 2019 10:44 AM
To: Zhao, Yong; [email protected]
Subject: Re: [PATCH] drm/amdgpu: Differentiate two set_pte_pde function pointers

Am 21.02.19 um 23:58 schrieb Zhao, Yong:

Quoted 4 lines

There were two set_pte_pde function pointers in amdgpu_gmc_funcs and amdgpu_vm_pte_funcs respectively. Because they are so similar, sometimes it is confusing. So Rename the one in amdgpu_vm_pte_funcs to write_pte_pde.

NAK, we also already have a write_pte function. So this only increases the confusion.

Instead we should rather just completely remove the gmc_*_set_pte_pde() functions because they actually do exactly the same on all generations.

Christian.

Quoted 212 lines
---
  drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c | 6 +++---
  drivers/gpu/drm/amd/amdgpu/amdgpu_vm.h | 4 ++--
  drivers/gpu/drm/amd/amdgpu/cik_sdma.c  | 6 +++---
  drivers/gpu/drm/amd/amdgpu/sdma_v2_4.c | 6 +++---
  drivers/gpu/drm/amd/amdgpu/sdma_v3_0.c | 6 +++---
  drivers/gpu/drm/amd/amdgpu/sdma_v4_0.c | 6 +++---
  drivers/gpu/drm/amd/amdgpu/si_dma.c    | 6 +++---
  7 files changed, 20 insertions(+), 20 deletions(-)
drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c +3 -3
index 942b5ebc6dc2..fa86be694e48 100644
@@ -806,7 +806,7 @@ static int amdgpu_vm_clear_bo(struct amdgpu_device *adev,
               if (level != AMDGPU_VM_PTB)
                       ats_value |= AMDGPU_PDE_PTE;
 
-             amdgpu_vm_set_pte_pde(adev, &job->ibs[0], addr, 0,
+             amdgpu_vm_write_pte_pde(adev, &job->ibs[0], addr, 0,
                                     ats_entries, 0, ats_value);
               addr += ats_entries * 8;
       }
@@ -818,7 +818,7 @@ static int amdgpu_vm_clear_bo(struct amdgpu_device *adev,
               if (level == AMDGPU_VM_PTB && adev->asic_type >= CHIP_VEGA10)
                       value = AMDGPU_PTE_EXECUTABLE;
 
-             amdgpu_vm_set_pte_pde(adev, &job->ibs[0], addr, 0,
+             amdgpu_vm_write_pte_pde(adev, &job->ibs[0], addr, 0,
                                     entries, 0, value);
       }
 
@@ -1235,7 +1235,7 @@ static void amdgpu_vm_do_set_ptes(struct amdgpu_pte_update_params *params,
                                   addr | flags, count, incr);
 
       } else {
-             amdgpu_vm_set_pte_pde(params->adev, params->ib, pe, addr,
+             amdgpu_vm_write_pte_pde(params->adev, params->ib, pe, addr,
                                     count, incr, flags);
       }
  }
drivers/gpu/drm/amd/amdgpu/amdgpu_vm.h +2 -2
index 81ff8177f092..7e345ec2671f 100644
@@ -161,7 +161,7 @@ struct amdgpu_vm_pte_funcs {
                         uint64_t value, unsigned count,
                         uint32_t incr);
       /* for linear pte/pde updates without addr mapping */
-     void (*set_pte_pde)(struct amdgpu_ib *ib,
+     void (*write_pte_pde)(struct amdgpu_ib *ib,
                           uint64_t pe,
                           uint64_t addr, unsigned count,
                           uint32_t incr, uint64_t flags);
@@ -287,7 +287,7 @@ struct amdgpu_vm_manager {
 
  #define amdgpu_vm_copy_pte(adev, ib, pe, src, count) ((adev)->vm_manager.vm_pte_funcs->copy_pte((ib), (pe), (src), (count)))
  #define amdgpu_vm_write_pte(adev, ib, pe, value, count, incr) ((adev)->vm_manager.vm_pte_funcs->write_pte((ib), (pe), (value), (count), (incr)))
-#define amdgpu_vm_set_pte_pde(adev, ib, pe, addr, count, incr, flags) ((adev)->vm_manager.vm_pte_funcs->set_pte_pde((ib), (pe), (addr), (count), (incr), (flags)))
+#define amdgpu_vm_write_pte_pde(adev, ib, pe, addr, count, incr, flags) ((adev)->vm_manager.vm_pte_funcs->write_pte_pde((ib), (pe), (addr), (count), (incr), (flags)))
 
  void amdgpu_vm_manager_init(struct amdgpu_device *adev);
  void amdgpu_vm_manager_fini(struct amdgpu_device *adev);
drivers/gpu/drm/amd/amdgpu/cik_sdma.c +3 -3
index 189599b694e8..07b874a44ddf 100644
@@ -769,7 +769,7 @@ static void cik_sdma_vm_write_pte(struct amdgpu_ib *ib, uint64_t pe,
  }
 
  /**
- * cik_sdma_vm_set_pages - update the page tables using sDMA
+ * cik_sdma_vm_write_pte_pde - update the page tables using sDMA
   *
   * @ib: indirect buffer to fill with commands
   * @pe: addr of the page entry
@@ -780,7 +780,7 @@ static void cik_sdma_vm_write_pte(struct amdgpu_ib *ib, uint64_t pe,
   *
   * Update the page tables using sDMA (CIK).
   */
-static void cik_sdma_vm_set_pte_pde(struct amdgpu_ib *ib, uint64_t pe,
+static void cik_sdma_vm_write_pte_pde(struct amdgpu_ib *ib, uint64_t pe,
                                   uint64_t addr, unsigned count,
                                   uint32_t incr, uint64_t flags)
  {
@@ -1365,7 +1365,7 @@ static const struct amdgpu_vm_pte_funcs cik_sdma_vm_pte_funcs = {
       .copy_pte = cik_sdma_vm_copy_pte,
 
       .write_pte = cik_sdma_vm_write_pte,
-     .set_pte_pde = cik_sdma_vm_set_pte_pde,
+     .write_pte_pde = cik_sdma_vm_write_pte_pde,
  };
 
  static void cik_sdma_set_vm_pte_funcs(struct amdgpu_device *adev)
drivers/gpu/drm/amd/amdgpu/sdma_v2_4.c +3 -3
index cca3552b36ed..3161871c1a57 100644
@@ -707,7 +707,7 @@ static void sdma_v2_4_vm_write_pte(struct amdgpu_ib *ib, uint64_t pe,
  }
 
  /**
- * sdma_v2_4_vm_set_pte_pde - update the page tables using sDMA
+ * sdma_v2_4_vm_write_pte_pde - update the page tables using sDMA
   *
   * @ib: indirect buffer to fill with commands
   * @pe: addr of the page entry
@@ -718,7 +718,7 @@ static void sdma_v2_4_vm_write_pte(struct amdgpu_ib *ib, uint64_t pe,
   *
   * Update the page tables using sDMA (CIK).
   */
-static void sdma_v2_4_vm_set_pte_pde(struct amdgpu_ib *ib, uint64_t pe,
+static void sdma_v2_4_vm_write_pte_pde(struct amdgpu_ib *ib, uint64_t pe,
                                    uint64_t addr, unsigned count,
                                    uint32_t incr, uint64_t flags)
  {
@@ -1252,7 +1252,7 @@ static const struct amdgpu_vm_pte_funcs sdma_v2_4_vm_pte_funcs = {
       .copy_pte = sdma_v2_4_vm_copy_pte,
 
       .write_pte = sdma_v2_4_vm_write_pte,
-     .set_pte_pde = sdma_v2_4_vm_set_pte_pde,
+     .write_pte_pde = sdma_v2_4_vm_write_pte_pde,
  };
 
  static void sdma_v2_4_set_vm_pte_funcs(struct amdgpu_device *adev)
drivers/gpu/drm/amd/amdgpu/sdma_v3_0.c +3 -3
index 0ce8331baeb2..e369013a6bce 100644
@@ -978,7 +978,7 @@ static void sdma_v3_0_vm_write_pte(struct amdgpu_ib *ib, uint64_t pe,
  }
 
  /**
- * sdma_v3_0_vm_set_pte_pde - update the page tables using sDMA
+ * sdma_v3_0_vm_write_pte_pde - update the page tables using sDMA
   *
   * @ib: indirect buffer to fill with commands
   * @pe: addr of the page entry
@@ -989,7 +989,7 @@ static void sdma_v3_0_vm_write_pte(struct amdgpu_ib *ib, uint64_t pe,
   *
   * Update the page tables using sDMA (CIK).
   */
-static void sdma_v3_0_vm_set_pte_pde(struct amdgpu_ib *ib, uint64_t pe,
+static void sdma_v3_0_vm_write_pte_pde(struct amdgpu_ib *ib, uint64_t pe,
                                    uint64_t addr, unsigned count,
                                    uint32_t incr, uint64_t flags)
  {
@@ -1690,7 +1690,7 @@ static const struct amdgpu_vm_pte_funcs sdma_v3_0_vm_pte_funcs = {
       .copy_pte = sdma_v3_0_vm_copy_pte,
 
       .write_pte = sdma_v3_0_vm_write_pte,
-     .set_pte_pde = sdma_v3_0_vm_set_pte_pde,
+     .write_pte_pde = sdma_v3_0_vm_write_pte_pde,
  };
 
  static void sdma_v3_0_set_vm_pte_funcs(struct amdgpu_device *adev)
drivers/gpu/drm/amd/amdgpu/sdma_v4_0.c +3 -3
index c816e55d43a9..e5e9eac1758d 100644
@@ -1343,7 +1343,7 @@ static void sdma_v4_0_vm_write_pte(struct amdgpu_ib *ib, uint64_t pe,
  }
 
  /**
- * sdma_v4_0_vm_set_pte_pde - update the page tables using sDMA
+ * sdma_v4_0_vm_write_pte_pde - update the page tables using sDMA
   *
   * @ib: indirect buffer to fill with commands
   * @pe: addr of the page entry
@@ -1354,7 +1354,7 @@ static void sdma_v4_0_vm_write_pte(struct amdgpu_ib *ib, uint64_t pe,
   *
   * Update the page tables using sDMA (VEGA10).
   */
-static void sdma_v4_0_vm_set_pte_pde(struct amdgpu_ib *ib,
+static void sdma_v4_0_vm_write_pte_pde(struct amdgpu_ib *ib,
                                    uint64_t pe,
                                    uint64_t addr, unsigned count,
                                    uint32_t incr, uint64_t flags)
@@ -2088,7 +2088,7 @@ static const struct amdgpu_vm_pte_funcs sdma_v4_0_vm_pte_funcs = {
       .copy_pte = sdma_v4_0_vm_copy_pte,
 
       .write_pte = sdma_v4_0_vm_write_pte,
-     .set_pte_pde = sdma_v4_0_vm_set_pte_pde,
+     .write_pte_pde = sdma_v4_0_vm_write_pte_pde,
  };
 
  static void sdma_v4_0_set_vm_pte_funcs(struct amdgpu_device *adev)
drivers/gpu/drm/amd/amdgpu/si_dma.c +2 -2
index f15f196684ba..4c1e1ce895f7 100644
@@ -353,7 +353,7 @@ static void si_dma_vm_write_pte(struct amdgpu_ib *ib, uint64_t pe,
  }
 
  /**
- * si_dma_vm_set_pte_pde - update the page tables using sDMA
+ * si_dma_vm_write_pte_pde - update the page tables using sDMA
   *
   * @ib: indirect buffer to fill with commands
   * @pe: addr of the page entry
@@ -364,7 +364,7 @@ static void si_dma_vm_write_pte(struct amdgpu_ib *ib, uint64_t pe,
   *
   * Update the page tables using sDMA (CIK).
   */
-static void si_dma_vm_set_pte_pde(struct amdgpu_ib *ib,
+static void si_dma_vm_write_pte_pde(struct amdgpu_ib *ib,
                                    uint64_t pe,
                                    uint64_t addr, unsigned count,
                                    uint32_t incr, uint64_t flags)

drivers/gpu/drm/amd/amdgpu/si_dma.c static const struct amdgpu_vm_pte_funcs si_dma_vm_pte_funcs = { · line 835

Quoted 8 lines
drivers/gpu/drm/amd/amdgpu/si_dma.c +1 -1
@@ -829,7 +829,7 @@ static const struct amdgpu_vm_pte_funcs si_dma_vm_pte_funcs = {
       .copy_pte = si_dma_vm_copy_pte,
 
       .write_pte = si_dma_vm_write_pte,
-     .set_pte_pde = si_dma_vm_set_pte_pde,
+     .write_pte_pde = si_dma_vm_write_pte_pde,
  };
 
  static void si_dma_set_vm_pte_funcs(struct amdgpu_device *adev)

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