Skip to contentSkip to conversation

drm/amdgpu: Optimize a function called by every IB sheduling

PATCH In review Alex Xie 4 participants 12 messages May 30, 2017 – May 31, 2017 6 messages not in the archive

Subsystems (2)
lore
Share & tools
lore

Alex Xie

author
#0 lore raw

PATCH 1/3 drm/amdgpu: Optimize a function called by every IB sheduling

Move several if statements and a loop statment from run time to initialization time.

---
 drivers/gpu/drm/amd/amdgpu/amdgpu_ring.c | 33 ++++++++++++++++++++++++++++++++
 drivers/gpu/drm/amd/amdgpu/amdgpu_ring.h |  6 ++++++
 drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c   | 28 +--------------------------
 3 files changed, 40 insertions(+), 27 deletions(-)
drivers/gpu/drm/amd/amdgpu/amdgpu_ring.c +33 -0
index 6a85db0..7d95435 100644
@@ -153,6 +153,36 @@ void amdgpu_ring_undo(struct amdgpu_ring *ring)
 }
 
 /**
+ * amdgpu_ring_check_compute_vm_bug - check whether this ring has compute vm bug
+ *
+ * @adev: amdgpu_device pointer
+ * @ring: amdgpu_ring structure holding ring information
+ */
+static void amdgpu_ring_check_compute_vm_bug(struct amdgpu_device *adev,
+					struct amdgpu_ring *ring)
+{
+	const struct amdgpu_ip_block *ip_block;
+
+	ring->has_compute_vm_bug = false;
+
+	if (ring->funcs->type != AMDGPU_RING_TYPE_COMPUTE)
+		/* only compute rings */
+		return;
+
+	ip_block = amdgpu_get_ip_block(adev, AMD_IP_BLOCK_TYPE_GFX);
+	if (!ip_block)
+		return;
+
+	/* Compute ring has a VM bug for GFX version < 7.
+           And compute ring has a VM bug for GFX 8 MEC firmware version < 673.*/
+	if (ip_block->version->major <= 7) {
+		ring->has_compute_vm_bug = true;
+	} else if (ip_block->version->major == 8)
+		if (adev->gfx.mec_fw_version < 673)
+			ring->has_compute_vm_bug = true;
+}
+
+/**
  * amdgpu_ring_init - init driver ring struct.
  *
  * @adev: amdgpu_device pointer
@@ -257,6 +287,9 @@ int amdgpu_ring_init(struct amdgpu_device *adev, struct amdgpu_ring *ring,
 	if (amdgpu_debugfs_ring_init(adev, ring)) {
 		DRM_ERROR("Failed to register debugfs file for rings !\n");
 	}
+
+	amdgpu_ring_check_compute_vm_bug(adev, ring);
+
 	return 0;
 }
 
drivers/gpu/drm/amd/amdgpu/amdgpu_ring.h +6 -0
index a9223a8..334307e 100644
@@ -185,6 +185,7 @@ struct amdgpu_ring {
 	u64			cond_exe_gpu_addr;
 	volatile u32		*cond_exe_cpu_addr;
 	unsigned		vm_inv_eng;
+	bool			has_compute_vm_bug;
 #if defined(CONFIG_DEBUG_FS)
 	struct dentry *ent;
 #endif
@@ -207,4 +208,9 @@ static inline void amdgpu_ring_clear_ring(struct amdgpu_ring *ring)
 
 }
 
+static inline bool amdgpu_ring_has_compute_vm_bug(struct amdgpu_ring *ring)
+{
+	return ring->has_compute_vm_bug;
+}
+
 #endif
drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c +1 -27
index b2384b8..7a323f9 100644
@@ -656,32 +656,6 @@ static int amdgpu_vm_alloc_reserved_vmid(struct amdgpu_device *adev,
 	return r;
 }
 
-static bool amdgpu_vm_ring_has_compute_vm_bug(struct amdgpu_ring *ring)
-{
-	struct amdgpu_device *adev = ring->adev;
-	const struct amdgpu_ip_block *ip_block;
-
-	if (ring->funcs->type != AMDGPU_RING_TYPE_COMPUTE)
-		/* only compute rings */
-		return false;
-
-	ip_block = amdgpu_get_ip_block(adev, AMD_IP_BLOCK_TYPE_GFX);
-	if (!ip_block)
-		return false;
-
-	if (ip_block->version->major <= 7) {
-		/* gfx7 has no workaround */
-		return true;
-	} else if (ip_block->version->major == 8) {
-		if (adev->gfx.mec_fw_version >= 673)
-			/* gfx8 is fixed in MEC firmware 673 */
-			return false;
-		else
-			return true;
-	}
-	return false;
-}
-
 bool amdgpu_vm_need_pipeline_sync(struct amdgpu_ring *ring,
 				  struct amdgpu_job *job)
 {
@@ -691,7 +665,7 @@ bool amdgpu_vm_need_pipeline_sync(struct amdgpu_ring *ring,
 	struct amdgpu_vm_id *id;
 	bool gds_switch_needed;
 	bool vm_flush_needed = job->vm_needs_flush ||
-		amdgpu_vm_ring_has_compute_vm_bug(ring);
+		amdgpu_ring_has_compute_vm_bug(ring);
 
 	if (job->vm_id == 0)
 		return false;
Signature · 6 lines
2.7.4

_______________________________________________
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): 1496180868-2617-1-git-send-email-AlexBin.Xie-5C7GfCeVMHo@public.gmane.org

author
#2 lore raw

PATCH 2/3 drm/amdgpu: Remove two ! operations in an if condition

Make the code easier to understand.

---
 drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)
drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c +4 -2
index 7a323f9..9fdeb82 100644
@@ -680,9 +680,11 @@ bool amdgpu_vm_need_pipeline_sync(struct amdgpu_ring *ring,
 
 	if (amdgpu_vm_had_gpu_reset(adev, id))
 		return true;
-	if (!vm_flush_needed && !gds_switch_needed)
+
+	if (vm_flush_needed || gds_switch_needed)
+		return true;
+	else
 		return false;
-	return true;
 }
 
 /**
Signature · 6 lines
2.7.4

_______________________________________________
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): 1496180868-2617-2-git-send-email-AlexBin.Xie-5C7GfCeVMHo@public.gmane.org

#4 lore raw

Re: [PATCH 2/3] drm/amdgpu: Remove two ! operations in an if condition

Quoted 3 lines · Alex Xie

Make the code easier to understand.

ok to me, Reviewed-by: Chunming Zhou <[email protected]>

Quoted 12 lines
---
  drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c | 6 ++++--
  1 file changed, 4 insertions(+), 2 deletions(-)
drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c +0 -0
index 7a323f9..9fdeb82 100644
@@ -680,9 +680,11 @@ bool amdgpu_vm_need_pipeline_sync(struct amdgpu_ring *ring,
 
  	if (amdgpu_vm_had_gpu_reset(adev, id))
  		return true;

drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c bool amdgpu_vm_need_pipeline_sync(struct amdgpu_ring *ring, · line 690

Quoted 10 lines
drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c +4 -2
-	if (!vm_flush_needed && !gds_switch_needed)
+
+	if (vm_flush_needed || gds_switch_needed)
+		return true;
+	else
  		return false;
-	return true;
  }
 
  /**

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

Reviewed-by
#5 lore raw

Re: [PATCH 2/3] drm/amdgpu: Remove two ! operations in an if condition

In reply to a message not in the archive
Quoted 12 lines · Alex Xie

Make the code easier to understand.

---
 drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)
drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c +0 -0
index 7a323f9..9fdeb82 100644

drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c bool amdgpu_vm_need_pipeline_sync(struct amdgpu_ring *ring, · line 687

Quoted 9 lines
drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c +4 -1
@@ -680,9 +680,11 @@ bool amdgpu_vm_need_pipeline_sync(struct amdgpu_ring *ring,
 
 	if (amdgpu_vm_had_gpu_reset(adev, id))
 		return true;
-	if (!vm_flush_needed && !gds_switch_needed)
+
+	if (vm_flush_needed || gds_switch_needed)
+		return true;
+	else
 		return false;

This can be further simplified to

	return vm_flush_needed || gds_switch_needed;

With that,

Signature · 6 lines
Earthling Michel Dänzer               |               http://www.amd.com
Libre software enthusiast             |             Mesa and X developer
_______________________________________________
amd-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/amd-gfx
#6 lore raw

Re: [PATCH 2/3] drm/amdgpu: Remove two ! operations in an if condition

In reply to a message not in the archive

Am 30.05.2017 um 23:47 schrieb Alex Xie:

Quoted 12 lines

Make the code easier to understand.

---
  drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c | 6 ++++--
  1 file changed, 4 insertions(+), 2 deletions(-)
drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c +0 -0
index 7a323f9..9fdeb82 100644

drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c bool amdgpu_vm_need_pipeline_sync(struct amdgpu_ring *ring, · line 685

Quoted 10 lines
drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c +4 -2
@@ -680,9 +680,11 @@ bool amdgpu_vm_need_pipeline_sync(struct amdgpu_ring *ring,
 
  	if (amdgpu_vm_had_gpu_reset(adev, id))
  		return true;
-	if (!vm_flush_needed && !gds_switch_needed)
+
+	if (vm_flush_needed || gds_switch_needed)
+		return true;
+	else
  		return false;
-	return true;

Actually that should even use the canonical form, e.g. something like "return vm_flush_needed || gds_switch_needed;".

Apart from that looks good to me,
Christian.

drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c bool amdgpu_vm_need_pipeline_sync(struct amdgpu_ring *ring, · line 690

Quoted 3 lines
drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c +0 -0
  }
 
  /**

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

author
#7 lore raw

PATCH 3/3 drm/amdgpu: clean up code to make it easier to understand

In reply to a message not in the archive

The original code convert pointer from amdgpu_crtc to drm_crtc then later convert the pointer back. It is difficult to understand why it was written that way.

---
 drivers/gpu/drm/amd/amdgpu/amdgpu_kms.c | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)
drivers/gpu/drm/amd/amdgpu/amdgpu_kms.c +1 -2
index 4dd83a3..7317fc9 100644
@@ -258,8 +258,7 @@ static int amdgpu_info_ioctl(struct drm_device *dev, void *data, struct drm_file
 		for (i = 0, found = 0; i < adev->mode_info.num_crtc; i++) {
 			crtc = (struct drm_crtc *)minfo->crtcs[i];
 			if (crtc && crtc->base.id == info->mode_crtc.id) {
-				struct amdgpu_crtc *amdgpu_crtc = to_amdgpu_crtc(crtc);
-				ui32 = amdgpu_crtc->crtc_id;
+				ui32 = minfo->crtcs[i]->crtc_id;
 				found = 1;
 				break;
 			}
Signature · 6 lines
2.7.4

_______________________________________________
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): 1496180868-2617-3-git-send-email-AlexBin.Xie-5C7GfCeVMHo@public.gmane.org

#9 lore raw

Re: [PATCH 3/3] drm/amdgpu: clean up code to make it easier to understand

Quoted 15 lines · Alex Xie

The original code convert pointer from amdgpu_crtc to drm_crtc then later convert the pointer back. It is difficult to understand why it was written that way.

---
  drivers/gpu/drm/amd/amdgpu/amdgpu_kms.c | 3 +--
  1 file changed, 1 insertion(+), 2 deletions(-)
drivers/gpu/drm/amd/amdgpu/amdgpu_kms.c +0 -0
index 4dd83a3..7317fc9 100644

drivers/gpu/drm/amd/amdgpu/amdgpu_kms.c static int amdgpu_info_ioctl(struct drm_device *dev, void *data, struct drm_file · line 261

Quoted 6 lines
drivers/gpu/drm/amd/amdgpu/amdgpu_kms.c +1 -2
@@ -258,8 +258,7 @@ static int amdgpu_info_ioctl(struct drm_device *dev, void *data, struct drm_file
  		for (i = 0, found = 0; i < adev->mode_info.num_crtc; i++) {
  			crtc = (struct drm_crtc *)minfo->crtcs[i];
  			if (crtc && crtc->base.id == info->mode_crtc.id) {
-				struct amdgpu_crtc *amdgpu_crtc = to_amdgpu_crtc(crtc);
-				ui32 = amdgpu_crtc->crtc_id;
+				ui32 = minfo->crtcs[i]->crtc_id;

I feel previous code is more clear, it differentiates drm_crtc and amdgpu_crtc, which makes more clear for accessing their member.
If totally not convert, then we will see the below code, when we read the code, we will need to check struct amdgpu_mode_info, struct amdgpu_crtc and struct drm_crtc for condition line.

if (minfo->crtcs[i] && minfo->crtcs[i]->base.base.id == info->mode_crtc.id) {
    ui32 = minfo->crtcs[i]->crtc_id;

Regards,
David Zhou

drivers/gpu/drm/amd/amdgpu/amdgpu_kms.c static int amdgpu_info_ioctl(struct drm_device *dev, void *data, struct drm_file · line 264

Quoted 3 lines
drivers/gpu/drm/amd/amdgpu/amdgpu_kms.c +0 -0
  				found = 1;
  				break;
  			}

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

#10 lore raw
In reply to a message not in the archive
Quoted 4 lines · Alex Xie

Move several if statements and a loop statment from run time to initialization time.

nice, Reviewed-by: Chunming Zhou <[email protected]>

Quoted 117 lines
---
  drivers/gpu/drm/amd/amdgpu/amdgpu_ring.c | 33 ++++++++++++++++++++++++++++++++
  drivers/gpu/drm/amd/amdgpu/amdgpu_ring.h |  6 ++++++
  drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c   | 28 +--------------------------
  3 files changed, 40 insertions(+), 27 deletions(-)
drivers/gpu/drm/amd/amdgpu/amdgpu_ring.c +33 -0
index 6a85db0..7d95435 100644
@@ -153,6 +153,36 @@ void amdgpu_ring_undo(struct amdgpu_ring *ring)
  }
 
  /**
+ * amdgpu_ring_check_compute_vm_bug - check whether this ring has compute vm bug
+ *
+ * @adev: amdgpu_device pointer
+ * @ring: amdgpu_ring structure holding ring information
+ */
+static void amdgpu_ring_check_compute_vm_bug(struct amdgpu_device *adev,
+					struct amdgpu_ring *ring)
+{
+	const struct amdgpu_ip_block *ip_block;
+
+	ring->has_compute_vm_bug = false;
+
+	if (ring->funcs->type != AMDGPU_RING_TYPE_COMPUTE)
+		/* only compute rings */
+		return;
+
+	ip_block = amdgpu_get_ip_block(adev, AMD_IP_BLOCK_TYPE_GFX);
+	if (!ip_block)
+		return;
+
+	/* Compute ring has a VM bug for GFX version < 7.
+           And compute ring has a VM bug for GFX 8 MEC firmware version < 673.*/
+	if (ip_block->version->major <= 7) {
+		ring->has_compute_vm_bug = true;
+	} else if (ip_block->version->major == 8)
+		if (adev->gfx.mec_fw_version < 673)
+			ring->has_compute_vm_bug = true;
+}
+
+/**
   * amdgpu_ring_init - init driver ring struct.
   *
   * @adev: amdgpu_device pointer
@@ -257,6 +287,9 @@ int amdgpu_ring_init(struct amdgpu_device *adev, struct amdgpu_ring *ring,
  	if (amdgpu_debugfs_ring_init(adev, ring)) {
  		DRM_ERROR("Failed to register debugfs file for rings !\n");
  	}
+
+	amdgpu_ring_check_compute_vm_bug(adev, ring);
+
  	return 0;
  }
 
drivers/gpu/drm/amd/amdgpu/amdgpu_ring.h +6 -0
index a9223a8..334307e 100644
@@ -185,6 +185,7 @@ struct amdgpu_ring {
  	u64			cond_exe_gpu_addr;
  	volatile u32		*cond_exe_cpu_addr;
  	unsigned		vm_inv_eng;
+	bool			has_compute_vm_bug;
  #if defined(CONFIG_DEBUG_FS)
  	struct dentry *ent;
  #endif
@@ -207,4 +208,9 @@ static inline void amdgpu_ring_clear_ring(struct amdgpu_ring *ring)
 
  }
 
+static inline bool amdgpu_ring_has_compute_vm_bug(struct amdgpu_ring *ring)
+{
+	return ring->has_compute_vm_bug;
+}
+
  #endif
drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c +0 -26
index b2384b8..7a323f9 100644
@@ -656,32 +656,6 @@ static int amdgpu_vm_alloc_reserved_vmid(struct amdgpu_device *adev,
  	return r;
  }
 
-static bool amdgpu_vm_ring_has_compute_vm_bug(struct amdgpu_ring *ring)
-{
-	struct amdgpu_device *adev = ring->adev;
-	const struct amdgpu_ip_block *ip_block;
-
-	if (ring->funcs->type != AMDGPU_RING_TYPE_COMPUTE)
-		/* only compute rings */
-		return false;
-
-	ip_block = amdgpu_get_ip_block(adev, AMD_IP_BLOCK_TYPE_GFX);
-	if (!ip_block)
-		return false;
-
-	if (ip_block->version->major <= 7) {
-		/* gfx7 has no workaround */
-		return true;
-	} else if (ip_block->version->major == 8) {
-		if (adev->gfx.mec_fw_version >= 673)
-			/* gfx8 is fixed in MEC firmware 673 */
-			return false;
-		else
-			return true;
-	}
-	return false;
-}
-
  bool amdgpu_vm_need_pipeline_sync(struct amdgpu_ring *ring,
  				  struct amdgpu_job *job)
  {

drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c bool amdgpu_vm_need_pipeline_sync(struct amdgpu_ring *ring, · line 671

Quoted 8 lines
drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c +1 -1
@@ -691,7 +665,7 @@ bool amdgpu_vm_need_pipeline_sync(struct amdgpu_ring *ring,
  	struct amdgpu_vm_id *id;
  	bool gds_switch_needed;
  	bool vm_flush_needed = job->vm_needs_flush ||
-		amdgpu_vm_ring_has_compute_vm_bug(ring);
+		amdgpu_ring_has_compute_vm_bug(ring);
 
  	if (job->vm_id == 0)
  		return false;

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

#11 lore raw
In reply to a message not in the archive

Am 30.05.2017 um 23:47 schrieb Alex Xie:

Quoted 2 lines

Move several if statements and a loop statment from run time to initialization time.

Yeah, that's exactly what I've suggested before as well.

Just keep the code inside amdgpu_vm.c (and the variable inside amdgpu_vm_manager), since this isn't related to ring management at all.

Regards,
Christian.

Quoted 119 lines
---
  drivers/gpu/drm/amd/amdgpu/amdgpu_ring.c | 33 ++++++++++++++++++++++++++++++++
  drivers/gpu/drm/amd/amdgpu/amdgpu_ring.h |  6 ++++++
  drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c   | 28 +--------------------------
  3 files changed, 40 insertions(+), 27 deletions(-)
drivers/gpu/drm/amd/amdgpu/amdgpu_ring.c +33 -0
index 6a85db0..7d95435 100644
@@ -153,6 +153,36 @@ void amdgpu_ring_undo(struct amdgpu_ring *ring)
  }
 
  /**
+ * amdgpu_ring_check_compute_vm_bug - check whether this ring has compute vm bug
+ *
+ * @adev: amdgpu_device pointer
+ * @ring: amdgpu_ring structure holding ring information
+ */
+static void amdgpu_ring_check_compute_vm_bug(struct amdgpu_device *adev,
+					struct amdgpu_ring *ring)
+{
+	const struct amdgpu_ip_block *ip_block;
+
+	ring->has_compute_vm_bug = false;
+
+	if (ring->funcs->type != AMDGPU_RING_TYPE_COMPUTE)
+		/* only compute rings */
+		return;
+
+	ip_block = amdgpu_get_ip_block(adev, AMD_IP_BLOCK_TYPE_GFX);
+	if (!ip_block)
+		return;
+
+	/* Compute ring has a VM bug for GFX version < 7.
+           And compute ring has a VM bug for GFX 8 MEC firmware version < 673.*/
+	if (ip_block->version->major <= 7) {
+		ring->has_compute_vm_bug = true;
+	} else if (ip_block->version->major == 8)
+		if (adev->gfx.mec_fw_version < 673)
+			ring->has_compute_vm_bug = true;
+}
+
+/**
   * amdgpu_ring_init - init driver ring struct.
   *
   * @adev: amdgpu_device pointer
@@ -257,6 +287,9 @@ int amdgpu_ring_init(struct amdgpu_device *adev, struct amdgpu_ring *ring,
  	if (amdgpu_debugfs_ring_init(adev, ring)) {
  		DRM_ERROR("Failed to register debugfs file for rings !\n");
  	}
+
+	amdgpu_ring_check_compute_vm_bug(adev, ring);
+
  	return 0;
  }
 
drivers/gpu/drm/amd/amdgpu/amdgpu_ring.h +6 -0
index a9223a8..334307e 100644
@@ -185,6 +185,7 @@ struct amdgpu_ring {
  	u64			cond_exe_gpu_addr;
  	volatile u32		*cond_exe_cpu_addr;
  	unsigned		vm_inv_eng;
+	bool			has_compute_vm_bug;
  #if defined(CONFIG_DEBUG_FS)
  	struct dentry *ent;
  #endif
@@ -207,4 +208,9 @@ static inline void amdgpu_ring_clear_ring(struct amdgpu_ring *ring)
 
  }
 
+static inline bool amdgpu_ring_has_compute_vm_bug(struct amdgpu_ring *ring)
+{
+	return ring->has_compute_vm_bug;
+}
+
  #endif
drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c +0 -26
index b2384b8..7a323f9 100644
@@ -656,32 +656,6 @@ static int amdgpu_vm_alloc_reserved_vmid(struct amdgpu_device *adev,
  	return r;
  }
 
-static bool amdgpu_vm_ring_has_compute_vm_bug(struct amdgpu_ring *ring)
-{
-	struct amdgpu_device *adev = ring->adev;
-	const struct amdgpu_ip_block *ip_block;
-
-	if (ring->funcs->type != AMDGPU_RING_TYPE_COMPUTE)
-		/* only compute rings */
-		return false;
-
-	ip_block = amdgpu_get_ip_block(adev, AMD_IP_BLOCK_TYPE_GFX);
-	if (!ip_block)
-		return false;
-
-	if (ip_block->version->major <= 7) {
-		/* gfx7 has no workaround */
-		return true;
-	} else if (ip_block->version->major == 8) {
-		if (adev->gfx.mec_fw_version >= 673)
-			/* gfx8 is fixed in MEC firmware 673 */
-			return false;
-		else
-			return true;
-	}
-	return false;
-}
-
  bool amdgpu_vm_need_pipeline_sync(struct amdgpu_ring *ring,
  				  struct amdgpu_job *job)
  {

drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c bool amdgpu_vm_need_pipeline_sync(struct amdgpu_ring *ring, · line 671

Quoted 8 lines
drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c +1 -1
@@ -691,7 +665,7 @@ bool amdgpu_vm_need_pipeline_sync(struct amdgpu_ring *ring,
  	struct amdgpu_vm_id *id;
  	bool gds_switch_needed;
  	bool vm_flush_needed = job->vm_needs_flush ||
-		amdgpu_vm_ring_has_compute_vm_bug(ring);
+		amdgpu_ring_has_compute_vm_bug(ring);
 
  	if (job->vm_id == 0)
  		return false;

_______________________________________________
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): 966bbfa3-488d-2a12-7ebd-cf59812928d6-ANTagKRnAhcb1SvskN2V4Q@public.gmane.org

#13 lore raw

HI Christian,

Too late. The code has been committed.

I don't have strong opinion about where the code should be. But if we put this code in VM, there will be one extra array index operation because the VM bug is ring related. VM manager need to maintain an array to manage this information.

In the amdgpu_ring structure, there is already information like vm_inv_eng and vmhub. Those are VM related information too. So this one extra information is not new.

Thanks,

Alex Bin

________________________________
From: Christian König <[email protected]>
Sent: Wednesday, May 31, 2017 2:57 AM
To: Xie, AlexBin; [email protected]
Subject: Re: [PATCH 1/3] drm/amdgpu: Optimize a function called by every IB sheduling

Am 30.05.2017 um 23:47 schrieb Alex Xie:

Quoted 2 lines

Move several if statements and a loop statment from run time to initialization time.

Yeah, that's exactly what I've suggested before as well.

Just keep the code inside amdgpu_vm.c (and the variable inside amdgpu_vm_manager), since this isn't related to ring management at all.

Regards,
Christian.

Quoted 119 lines
---
  drivers/gpu/drm/amd/amdgpu/amdgpu_ring.c | 33 ++++++++++++++++++++++++++++++++
  drivers/gpu/drm/amd/amdgpu/amdgpu_ring.h |  6 ++++++
  drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c   | 28 +--------------------------
  3 files changed, 40 insertions(+), 27 deletions(-)
drivers/gpu/drm/amd/amdgpu/amdgpu_ring.c +33 -0
index 6a85db0..7d95435 100644
@@ -153,6 +153,36 @@ void amdgpu_ring_undo(struct amdgpu_ring *ring)
  }
 
  /**
+ * amdgpu_ring_check_compute_vm_bug - check whether this ring has compute vm bug
+ *
+ * @adev: amdgpu_device pointer
+ * @ring: amdgpu_ring structure holding ring information
+ */
+static void amdgpu_ring_check_compute_vm_bug(struct amdgpu_device *adev,
+                                     struct amdgpu_ring *ring)
+{
+     const struct amdgpu_ip_block *ip_block;
+
+     ring->has_compute_vm_bug = false;
+
+     if (ring->funcs->type != AMDGPU_RING_TYPE_COMPUTE)
+             /* only compute rings */
+             return;
+
+     ip_block = amdgpu_get_ip_block(adev, AMD_IP_BLOCK_TYPE_GFX);
+     if (!ip_block)
+             return;
+
+     /* Compute ring has a VM bug for GFX version < 7.
+           And compute ring has a VM bug for GFX 8 MEC firmware version < 673.*/
+     if (ip_block->version->major <= 7) {
+             ring->has_compute_vm_bug = true;
+     } else if (ip_block->version->major == 8)
+             if (adev->gfx.mec_fw_version < 673)
+                     ring->has_compute_vm_bug = true;
+}
+
+/**
   * amdgpu_ring_init - init driver ring struct.
   *
   * @adev: amdgpu_device pointer
@@ -257,6 +287,9 @@ int amdgpu_ring_init(struct amdgpu_device *adev, struct amdgpu_ring *ring,
       if (amdgpu_debugfs_ring_init(adev, ring)) {
               DRM_ERROR("Failed to register debugfs file for rings !\n");
       }
+
+     amdgpu_ring_check_compute_vm_bug(adev, ring);
+
       return 0;
  }
 
drivers/gpu/drm/amd/amdgpu/amdgpu_ring.h +6 -0
index a9223a8..334307e 100644
@@ -185,6 +185,7 @@ struct amdgpu_ring {
       u64                     cond_exe_gpu_addr;
       volatile u32            *cond_exe_cpu_addr;
       unsigned                vm_inv_eng;
+     bool                    has_compute_vm_bug;
  #if defined(CONFIG_DEBUG_FS)
       struct dentry *ent;
  #endif
@@ -207,4 +208,9 @@ static inline void amdgpu_ring_clear_ring(struct amdgpu_ring *ring)
 
  }
 
+static inline bool amdgpu_ring_has_compute_vm_bug(struct amdgpu_ring *ring)
+{
+     return ring->has_compute_vm_bug;
+}
+
  #endif
drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c +0 -26
index b2384b8..7a323f9 100644
@@ -656,32 +656,6 @@ static int amdgpu_vm_alloc_reserved_vmid(struct amdgpu_device *adev,
       return r;
  }
 
-static bool amdgpu_vm_ring_has_compute_vm_bug(struct amdgpu_ring *ring)
-{
-     struct amdgpu_device *adev = ring->adev;
-     const struct amdgpu_ip_block *ip_block;
-
-     if (ring->funcs->type != AMDGPU_RING_TYPE_COMPUTE)
-             /* only compute rings */
-             return false;
-
-     ip_block = amdgpu_get_ip_block(adev, AMD_IP_BLOCK_TYPE_GFX);
-     if (!ip_block)
-             return false;
-
-     if (ip_block->version->major <= 7) {
-             /* gfx7 has no workaround */
-             return true;
-     } else if (ip_block->version->major == 8) {
-             if (adev->gfx.mec_fw_version >= 673)
-                     /* gfx8 is fixed in MEC firmware 673 */
-                     return false;
-             else
-                     return true;
-     }
-     return false;
-}
-
  bool amdgpu_vm_need_pipeline_sync(struct amdgpu_ring *ring,
                                 struct amdgpu_job *job)
  {

drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c bool amdgpu_vm_need_pipeline_sync(struct amdgpu_ring *ring, · line 671

Quoted 8 lines
drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c +1 -1
@@ -691,7 +665,7 @@ bool amdgpu_vm_need_pipeline_sync(struct amdgpu_ring *ring,
       struct amdgpu_vm_id *id;
       bool gds_switch_needed;
       bool vm_flush_needed = job->vm_needs_flush ||
-             amdgpu_vm_ring_has_compute_vm_bug(ring);
+             amdgpu_ring_has_compute_vm_bug(ring);
 
       if (job->vm_id == 0)
               return false;

_______________________________________________
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): MWHPR1201MB0045FC6C00CA6008273C385BF2F10-3iK1xFAIwjq45V35fqe+hGrFom/aUZj6nBOFsp37pqbUKgpGm//BTAC/[email protected]

#15 lore raw
Quoted 2 lines

I don't have strong opinion about where the code should be. But if we put this code in VM, there will be one extra array index operation because the VM bug is ring related. VM manager need to maintain an array to manage this information.

Yeah, but array index suck when you access cache cold stuff as well.

My concern is not so much where to put the field, but rather where to put the code to detect this condition. That is a bug very deeply related to how the CP manages VMs and VMIDs and actually not specific to the ring.

Just send out a patch which uses the ring type again to check if that workaround applies or not. The heavy stuff was calling amdgpu_get_ip_block() on every command submission, one additional if shouldn't hurt us here.

Regards,
Christian.

Am 31.05.2017 um 14:53 schrieb Xie, AlexBin:

Quoted 159 lines

HI Christian,

Too late. The code has been committed.

I don't have strong opinion about where the code should be. But if we put this code in VM, there will be one extra array index operation because the VM bug is ring related. VM manager need to maintain an array to manage this information.

In the amdgpu_ring structure, there is already information like vm_inv_eng and vmhub. Those are VM related information too. So this one extra information is not new.

Thanks,

Alex Bin

------------------------------------------------------------------------
*From:* Christian König <[email protected]> *Sent:* Wednesday, May 31, 2017 2:57 AM
*To:* Xie, AlexBin; [email protected] *Subject:* Re: [PATCH 1/3] drm/amdgpu: Optimize a function called by every IB sheduling Am 30.05.2017 um 23:47 schrieb Alex Xie:

Quoted 2 lines

Move several if statements and a loop statment from run time to initialization time.

Yeah, that's exactly what I've suggested before as well.

Just keep the code inside amdgpu_vm.c (and the variable inside amdgpu_vm_manager), since this isn't related to ring management at all.

Regards,
Christian.

Quoted 4 lines
---
  drivers/gpu/drm/amd/amdgpu/amdgpu_ring.c | 33 

++++++++++++++++++++++++++++++++

Quoted 2 lines
  drivers/gpu/drm/amd/amdgpu/amdgpu_ring.h |  6 ++++++
  drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c   | 28 
+--------------------------
>   3 files changed, 40 insertions(+), 27 deletions(-)

Review

Quoted 2 lines
(quoted diff) +0 -0

b/drivers/gpu/drm/amd/amdgpu/amdgpu_ring.c

drivers/gpu/drm/amd/amdgpu/amdgpu_ring.c void amdgpu_ring_undo(struct amdgpu_ring *ring) · line 156

Quoted 8 lines

index 6a85db0..7d95435 100644

drivers/gpu/drm/amd/amdgpu/amdgpu_ring.c +1 -0
@@ -153,6 +153,36 @@ void amdgpu_ring_undo(struct amdgpu_ring *ring)
  }
 
  /**
+ * amdgpu_ring_check_compute_vm_bug - check whether this ring has 

compute vm bug

drivers/gpu/drm/amd/amdgpu/amdgpu_ring.c void amdgpu_ring_undo(struct amdgpu_ring *ring)

Quoted 5 lines
drivers/gpu/drm/amd/amdgpu/amdgpu_ring.c +5 -0
+ *
+ * @adev: amdgpu_device pointer
+ * @ring: amdgpu_ring structure holding ring information
+ */
+static void amdgpu_ring_check_compute_vm_bug(struct amdgpu_device 

*adev,

Quoted 6 lines
drivers/gpu/drm/amd/amdgpu/amdgpu_ring.c +6 -0
+                                     struct amdgpu_ring *ring)
+{
+     const struct amdgpu_ip_block *ip_block;
+
+     ring->has_compute_vm_bug = false;
+

drivers/gpu/drm/amd/amdgpu/amdgpu_ring.c void amdgpu_ring_undo(struct amdgpu_ring *ring)

Quoted 10 lines
drivers/gpu/drm/amd/amdgpu/amdgpu_ring.c +10 -0
+     if (ring->funcs->type != AMDGPU_RING_TYPE_COMPUTE)
+             /* only compute rings */
+             return;
+
+     ip_block = amdgpu_get_ip_block(adev, AMD_IP_BLOCK_TYPE_GFX);
+     if (!ip_block)
+             return;
+
+     /* Compute ring has a VM bug for GFX version < 7.
+           And compute ring has a VM bug for GFX 8 MEC firmware 

version < 673.*/

drivers/gpu/drm/amd/amdgpu/amdgpu_ring.c int amdgpu_ring_init(struct amdgpu_device *adev,

Quoted 12 lines
drivers/gpu/drm/amd/amdgpu/amdgpu_ring.c +8 -0
+     if (ip_block->version->major <= 7) {
+             ring->has_compute_vm_bug = true;
+     } else if (ip_block->version->major == 8)
+             if (adev->gfx.mec_fw_version < 673)
+                     ring->has_compute_vm_bug = true;
+}
+
+/**
   * amdgpu_ring_init - init driver ring struct.
   *
   * @adev: amdgpu_device pointer
@@ -257,6 +287,9 @@ int amdgpu_ring_init(struct amdgpu_device *adev, 

struct amdgpu_ring *ring,

drivers/gpu/drm/amd/amdgpu/amdgpu_ring.c int amdgpu_ring_init(struct amdgpu_device *adev, · line 288

Quoted 2 lines
drivers/gpu/drm/amd/amdgpu/amdgpu_ring.c +0 -0
       if (amdgpu_debugfs_ring_init(adev, ring)) {
               DRM_ERROR("Failed to register debugfs file for rings 

!\n");

Review

Quoted 8 lines
drivers/gpu/drm/amd/amdgpu/amdgpu_ring.c +3 -0
       }
+
+     amdgpu_ring_check_compute_vm_bug(adev, ring);
+
       return 0;
  }
 
(quoted diff) +0 -0

b/drivers/gpu/drm/amd/amdgpu/amdgpu_ring.h

drivers/gpu/drm/amd/amdgpu/amdgpu_ring.h static inline void amdgpu_ring_clear_ring(struct

Quoted 12 lines

index a9223a8..334307e 100644

drivers/gpu/drm/amd/amdgpu/amdgpu_ring.h +1 -0
@@ -185,6 +185,7 @@ struct amdgpu_ring {
       u64                     cond_exe_gpu_addr;
       volatile u32            *cond_exe_cpu_addr;
       unsigned                vm_inv_eng;
+     bool                    has_compute_vm_bug;
  #if defined(CONFIG_DEBUG_FS)
       struct dentry *ent;
  #endif
@@ -207,4 +208,9 @@ static inline void amdgpu_ring_clear_ring(struct 

amdgpu_ring *ring)

drivers/gpu/drm/amd/amdgpu/amdgpu_ring.h static inline void amdgpu_ring_clear_ring(struct · line 210

Quoted 4 lines
drivers/gpu/drm/amd/amdgpu/amdgpu_ring.h +1 -0
  }
 
+static inline bool amdgpu_ring_has_compute_vm_bug(struct 

amdgpu_ring *ring)

Review

Quoted 6 lines
drivers/gpu/drm/amd/amdgpu/amdgpu_ring.h +4 -0
+{
+     return ring->has_compute_vm_bug;
+}
+
  #endif
(quoted diff) +0 -0

b/drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c

drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c static int amdgpu_vm_alloc_reserved_vmid(struct

Quoted 4 lines

index b2384b8..7a323f9 100644

drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c +0 -0
@@ -656,32 +656,6 @@ static int amdgpu_vm_alloc_reserved_vmid(struct 

amdgpu_device *adev,

Quoted 26 lines
drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c +0 -23
       return r;
  }
 
-static bool amdgpu_vm_ring_has_compute_vm_bug(struct amdgpu_ring *ring)
-{
-     struct amdgpu_device *adev = ring->adev;
-     const struct amdgpu_ip_block *ip_block;
-
-     if (ring->funcs->type != AMDGPU_RING_TYPE_COMPUTE)
-             /* only compute rings */
-             return false;
-
-     ip_block = amdgpu_get_ip_block(adev, AMD_IP_BLOCK_TYPE_GFX);
-     if (!ip_block)
-             return false;
-
-     if (ip_block->version->major <= 7) {
-             /* gfx7 has no workaround */
-             return true;
-     } else if (ip_block->version->major == 8) {
-             if (adev->gfx.mec_fw_version >= 673)
-                     /* gfx8 is fixed in MEC firmware 673 */
-                     return false;
-             else
-                     return true;
-     }
Quoted 18 lines

drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c bool amdgpu_vm_need_pipeline_sync(struct

Quoted 7 lines
drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c +0 -3
-     return false;
-}
-
  bool amdgpu_vm_need_pipeline_sync(struct amdgpu_ring *ring,
                                 struct amdgpu_job *job)
  {
@@ -691,7 +665,7 @@ bool amdgpu_vm_need_pipeline_sync(struct 

amdgpu_ring *ring,

Quoted 8 lines
drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c +1 -1
       struct amdgpu_vm_id *id;
       bool gds_switch_needed;
       bool vm_flush_needed = job->vm_needs_flush ||
- amdgpu_vm_ring_has_compute_vm_bug(ring);
+             amdgpu_ring_has_compute_vm_bug(ring);
 
       if (job->vm_id == 0)
               return false;

_______________________________________________
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): c856088d-e779-4f5f-6252-d7f547124861-ANTagKRnAhcb1SvskN2V4Q@public.gmane.org

#17 lore raw

Hi Christian,

I have asked for code review of a new patch.

It turns out that the index operation is not needed. But there is one extra if statement in every IB submission, which will be a slight performance hit.

Function amdgpu_vm_check_compute_bug is called in amdgpu_device_init.

Function amdgpu_vm_check_compute_bug cannot be called in amdgpu_vm_manager_init, in which GFX is not initialized yet. MEC firmware version information is not available yet.

Thanks,

Alex Bin Xie

________________________________
From: Christian König <[email protected]>
Sent: Wednesday, May 31, 2017 9:07 AM
To: Xie, AlexBin; [email protected]
Subject: Re: [PATCH 1/3] drm/amdgpu: Optimize a function called by every IB sheduling

I don't have strong opinion about where the code should be. But if we put this code in VM, there will be one extra array index operation because the VM bug is ring related. VM manager need to maintain an array to manage this information.

Yeah, but array index suck when you access cache cold stuff as well.

My concern is not so much where to put the field, but rather where to put the code to detect this condition. That is a bug very deeply related to how the CP manages VMs and VMIDs and actually not specific to the ring.

Just send out a patch which uses the ring type again to check if that workaround applies or not. The heavy stuff was calling amdgpu_get_ip_block() on every command submission, one additional if shouldn't hurt us here.

Regards,
Christian.

Am 31.05.2017 um 14:53 schrieb Xie, AlexBin:

HI Christian,

Too late. The code has been committed.

I don't have strong opinion about where the code should be. But if we put this code in VM, there will be one extra array index operation because the VM bug is ring related. VM manager need to maintain an array to manage this information.

In the amdgpu_ring structure, there is already information like vm_inv_eng and vmhub. Those are VM related information too. So this one extra information is not new.

Thanks,

Alex Bin

________________________________
From: Christian König <[email protected]><mailto:[email protected]>
Sent: Wednesday, May 31, 2017 2:57 AM
To: Xie, AlexBin; [email protected]<mailto:[email protected]>
Subject: Re: [PATCH 1/3] drm/amdgpu: Optimize a function called by every IB sheduling

Am 30.05.2017 um 23:47 schrieb Alex Xie:

Quoted 2 lines

Move several if statements and a loop statment from run time to initialization time.

Yeah, that's exactly what I've suggested before as well.

Just keep the code inside amdgpu_vm.c (and the variable inside amdgpu_vm_manager), since this isn't related to ring management at all.

Regards,
Christian.

Quoted 119 lines
---
  drivers/gpu/drm/amd/amdgpu/amdgpu_ring.c | 33 ++++++++++++++++++++++++++++++++
  drivers/gpu/drm/amd/amdgpu/amdgpu_ring.h |  6 ++++++
  drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c   | 28 +--------------------------
  3 files changed, 40 insertions(+), 27 deletions(-)
drivers/gpu/drm/amd/amdgpu/amdgpu_ring.c +33 -0
index 6a85db0..7d95435 100644
@@ -153,6 +153,36 @@ void amdgpu_ring_undo(struct amdgpu_ring *ring)
  }
 
  /**
+ * amdgpu_ring_check_compute_vm_bug - check whether this ring has compute vm bug
+ *
+ * @adev: amdgpu_device pointer
+ * @ring: amdgpu_ring structure holding ring information
+ */
+static void amdgpu_ring_check_compute_vm_bug(struct amdgpu_device *adev,
+                                     struct amdgpu_ring *ring)
+{
+     const struct amdgpu_ip_block *ip_block;
+
+     ring->has_compute_vm_bug = false;
+
+     if (ring->funcs->type != AMDGPU_RING_TYPE_COMPUTE)
+             /* only compute rings */
+             return;
+
+     ip_block = amdgpu_get_ip_block(adev, AMD_IP_BLOCK_TYPE_GFX);
+     if (!ip_block)
+             return;
+
+     /* Compute ring has a VM bug for GFX version < 7.
+           And compute ring has a VM bug for GFX 8 MEC firmware version < 673.*/
+     if (ip_block->version->major <= 7) {
+             ring->has_compute_vm_bug = true;
+     } else if (ip_block->version->major == 8)
+             if (adev->gfx.mec_fw_version < 673)
+                     ring->has_compute_vm_bug = true;
+}
+
+/**
   * amdgpu_ring_init - init driver ring struct.
   *
   * @adev: amdgpu_device pointer
@@ -257,6 +287,9 @@ int amdgpu_ring_init(struct amdgpu_device *adev, struct amdgpu_ring *ring,
       if (amdgpu_debugfs_ring_init(adev, ring)) {
               DRM_ERROR("Failed to register debugfs file for rings !\n");
       }
+
+     amdgpu_ring_check_compute_vm_bug(adev, ring);
+
       return 0;
  }
 
drivers/gpu/drm/amd/amdgpu/amdgpu_ring.h +6 -0
index a9223a8..334307e 100644
@@ -185,6 +185,7 @@ struct amdgpu_ring {
       u64                     cond_exe_gpu_addr;
       volatile u32            *cond_exe_cpu_addr;
       unsigned                vm_inv_eng;
+     bool                    has_compute_vm_bug;
  #if defined(CONFIG_DEBUG_FS)
       struct dentry *ent;
  #endif
@@ -207,4 +208,9 @@ static inline void amdgpu_ring_clear_ring(struct amdgpu_ring *ring)
 
  }
 
+static inline bool amdgpu_ring_has_compute_vm_bug(struct amdgpu_ring *ring)
+{
+     return ring->has_compute_vm_bug;
+}
+
  #endif
drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c +0 -26
index b2384b8..7a323f9 100644
@@ -656,32 +656,6 @@ static int amdgpu_vm_alloc_reserved_vmid(struct amdgpu_device *adev,
       return r;
  }
 
-static bool amdgpu_vm_ring_has_compute_vm_bug(struct amdgpu_ring *ring)
-{
-     struct amdgpu_device *adev = ring->adev;
-     const struct amdgpu_ip_block *ip_block;
-
-     if (ring->funcs->type != AMDGPU_RING_TYPE_COMPUTE)
-             /* only compute rings */
-             return false;
-
-     ip_block = amdgpu_get_ip_block(adev, AMD_IP_BLOCK_TYPE_GFX);
-     if (!ip_block)
-             return false;
-
-     if (ip_block->version->major <= 7) {
-             /* gfx7 has no workaround */
-             return true;
-     } else if (ip_block->version->major == 8) {
-             if (adev->gfx.mec_fw_version >= 673)
-                     /* gfx8 is fixed in MEC firmware 673 */
-                     return false;
-             else
-                     return true;
-     }
-     return false;
-}
-
  bool amdgpu_vm_need_pipeline_sync(struct amdgpu_ring *ring,
                                 struct amdgpu_job *job)
  {

drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c bool amdgpu_vm_need_pipeline_sync(struct amdgpu_ring *ring, · line 671

Quoted 8 lines
drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c +1 -1
@@ -691,7 +665,7 @@ bool amdgpu_vm_need_pipeline_sync(struct amdgpu_ring *ring,
       struct amdgpu_vm_id *id;
       bool gds_switch_needed;
       bool vm_flush_needed = job->vm_needs_flush ||
-             amdgpu_vm_ring_has_compute_vm_bug(ring);
+             amdgpu_ring_has_compute_vm_bug(ring);
 
       if (job->vm_id == 0)
               return false;

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