Skip to contentSkip to conversation

drm/amd/amdgpu: Change vram debugfs to NO_KIQ for VM environments

PATCH In review Tom St Denis 3 participants 4 messages Sep 13, 2017 3 messages not in the archive

Subsystems (2)
DRM drivers Radeon and amdgpu DRM drivers
lore
Share & tools
lore

Tom St Denis

author
#0 lore raw

PATCH 1/1 drm/amd/amdgpu: Change vram debugfs to NO_KIQ for VM environments

Signed-off-by Tom St Denis <[email protected]>
---
 drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)
drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c +6 -6
index 0d4c2c5a7948..2180ed3eae3b 100644
@@ -1696,9 +1696,9 @@ static ssize_t amdgpu_ttm_vram_read(struct file *f, char __user *buf,
 			return result;
 
 		spin_lock_irqsave(&adev->mmio_idx_lock, flags);
-		WREG32(mmMM_INDEX, ((uint32_t)*pos) | 0x80000000);
-		WREG32(mmMM_INDEX_HI, *pos >> 31);
-		value = RREG32(mmMM_DATA);
+		WREG32_NO_KIQ(mmMM_INDEX, ((uint32_t)*pos) | 0x80000000);
+		WREG32_NO_KIQ(mmMM_INDEX_HI, *pos >> 31);
+		value = RREG32_NO_KIQ(mmMM_DATA);
 		spin_unlock_irqrestore(&adev->mmio_idx_lock, flags);
 
 		r = put_user(value, (uint32_t *)buf);

@@ -1739,9 +1739,9 @@ static ssize_t amdgpu_ttm_vram_write(struct file *f, const char __user *buf,
 			return r;
 
 		spin_lock_irqsave(&adev->mmio_idx_lock, flags);
-		WREG32(mmMM_INDEX, ((uint32_t)*pos) | 0x80000000);
-		WREG32(mmMM_INDEX_HI, *pos >> 31);
-		WREG32(mmMM_DATA, value);
+		WREG32_NO_KIQ(mmMM_INDEX, ((uint32_t)*pos) | 0x80000000);
+		WREG32_NO_KIQ(mmMM_INDEX_HI, *pos >> 31);
+		WREG32_NO_KIQ(mmMM_DATA, value);
 		spin_unlock_irqrestore(&adev->mmio_idx_lock, flags);
 
 		result += 4;
Signature · 6 lines
2.12.0

_______________________________________________
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]

Reviewed-by Alex Deucher
#2 lore raw
Quoted 10 lines

-----Original Message-----
From: amd-gfx [mailto:[email protected]] On Behalf Of Tom St Denis
Sent: Wednesday, September 13, 2017 12:38 PM
To: [email protected]
Cc: StDenis, Tom
Subject: [PATCH] drm/amd/amdgpu: Change vram debugfs to NO_KIQ for VM environments

Signed-off-by Tom St Denis <[email protected]>
Reviewed-by Alex Deucher <[email protected]>
Quoted 38 lines
---
 drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)
drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c +3 -3
index 0d4c2c5a7948..2180ed3eae3b 100644
@@ -1696,9 +1696,9 @@ static ssize_t amdgpu_ttm_vram_read(struct file
 *f, char __user *buf,
 			return result;
 
 		spin_lock_irqsave(&adev->mmio_idx_lock, flags);
-		WREG32(mmMM_INDEX, ((uint32_t)*pos) | 0x80000000);
-		WREG32(mmMM_INDEX_HI, *pos >> 31);
-		value = RREG32(mmMM_DATA);
+		WREG32_NO_KIQ(mmMM_INDEX, ((uint32_t)*pos) |
 0x80000000);
+		WREG32_NO_KIQ(mmMM_INDEX_HI, *pos >> 31);
+		value = RREG32_NO_KIQ(mmMM_DATA);
 		spin_unlock_irqrestore(&adev->mmio_idx_lock, flags);
drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c +3 -3
 		r = put_user(value, (uint32_t *)buf);

@@ -1739,9 +1739,9 @@ static ssize_t amdgpu_ttm_vram_write(struct file
 *f, const char __user *buf,
 			return r;
 
 		spin_lock_irqsave(&adev->mmio_idx_lock, flags);
-		WREG32(mmMM_INDEX, ((uint32_t)*pos) | 0x80000000);
-		WREG32(mmMM_INDEX_HI, *pos >> 31);
-		WREG32(mmMM_DATA, value);
+		WREG32_NO_KIQ(mmMM_INDEX, ((uint32_t)*pos) |
 0x80000000);
+		WREG32_NO_KIQ(mmMM_INDEX_HI, *pos >> 31);
+		WREG32_NO_KIQ(mmMM_DATA, value);
 		spin_unlock_irqrestore(&adev->mmio_idx_lock, flags);
Quoted 8 lines

result += 4;
--
2.12.0

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

_______________________________________________
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): BN6PR12MB1652385B5D4D403E8F4532F3F76E0-/b2+HYfkarQqUD6E6FAiowdYzm3356FpvxpqHgZTriW3zl9H0oFU5g@public.gmane.org

Reviewed-by
#4 lore raw

Am 13.09.2017 um 18:47 schrieb Deucher, Alexander:

Quoted 11 lines
Quoted 10 lines

-----Original Message-----
From: amd-gfx [mailto:[email protected]] On Behalf Of Tom St Denis
Sent: Wednesday, September 13, 2017 12:38 PM
To: [email protected]
Cc: StDenis, Tom
Subject: [PATCH] drm/amd/amdgpu: Change vram debugfs to NO_KIQ for VM environments

Signed-off-by Tom St Denis <[email protected]>
Reviewed-by Alex Deucher <[email protected]>
Reviewed-by Christian König <[email protected]>

BTW: There are another instance in amdgpu_ttm_access_memory() which needs to be fixed as well.

Might be a good idea to separate that into amdgpu_vram_read/amdgpu_vram_write functions as well.

Regards,
Christian.

Quoted 43 lines
Quoted 43 lines
---
  drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c | 12 ++++++------
  1 file changed, 6 insertions(+), 6 deletions(-)
drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c +3 -3
index 0d4c2c5a7948..2180ed3eae3b 100644
@@ -1696,9 +1696,9 @@ static ssize_t amdgpu_ttm_vram_read(struct file
 *f, char __user *buf,
  			return result;
 
  		spin_lock_irqsave(&adev->mmio_idx_lock, flags);
-		WREG32(mmMM_INDEX, ((uint32_t)*pos) | 0x80000000);
-		WREG32(mmMM_INDEX_HI, *pos >> 31);
-		value = RREG32(mmMM_DATA);
+		WREG32_NO_KIQ(mmMM_INDEX, ((uint32_t)*pos) |
 0x80000000);
+		WREG32_NO_KIQ(mmMM_INDEX_HI, *pos >> 31);
+		value = RREG32_NO_KIQ(mmMM_DATA);
  		spin_unlock_irqrestore(&adev->mmio_idx_lock, flags);

  		r = put_user(value, (uint32_t *)buf);
drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c +3 -3
@@ -1739,9 +1739,9 @@ static ssize_t amdgpu_ttm_vram_write(struct file
 *f, const char __user *buf,
  			return r;
 
  		spin_lock_irqsave(&adev->mmio_idx_lock, flags);
-		WREG32(mmMM_INDEX, ((uint32_t)*pos) | 0x80000000);
-		WREG32(mmMM_INDEX_HI, *pos >> 31);
-		WREG32(mmMM_DATA, value);
+		WREG32_NO_KIQ(mmMM_INDEX, ((uint32_t)*pos) |
 0x80000000);
+		WREG32_NO_KIQ(mmMM_INDEX_HI, *pos >> 31);
+		WREG32_NO_KIQ(mmMM_DATA, value);
  		spin_unlock_irqrestore(&adev->mmio_idx_lock, flags);

result += 4;
--
2.12.0

Quoted 8 lines
Quoted 4 lines

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

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

_______________________________________________
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): 6f02d915-9b5f-7345-5d3a-e12603e02853-ANTagKRnAhcb1SvskN2V4Q@public.gmane.org

author
#6 lore raw
Quoted 10 lines · Christian König

Am 13.09.2017 um 18:47 schrieb Deucher, Alexander:

Quoted 9 lines
Quoted 9 lines

-----Original Message-----
From: amd-gfx [mailto:[email protected]] On Behalf Of Tom St Denis
Sent: Wednesday, September 13, 2017 12:38 PM
To: [email protected]
Cc: StDenis, Tom
Subject: [PATCH] drm/amd/amdgpu: Change vram debugfs to NO_KIQ for VM environments

Quoted 8 lines
Quoted 2 lines
Quoted 1 line
Signed-off-by Tom St Denis <[email protected]>
Reviewed-by Alex Deucher <[email protected]>
Reviewed-by Christian König <[email protected]>

BTW: There are another instance in amdgpu_ttm_access_memory() which needs to be fixed as well.

Might be a good idea to separate that into amdgpu_vram_read/amdgpu_vram_write functions as well.

Sure I'll craft something up upon the morrow.

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