Skip to contentSkip to conversation

drm/amdgpu: Revert "Fix IB allocation sizes for page table updates"

PATCH In review Christian König 2 participants 5 messages Aug 31, 2017 4 messages not in the archive

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

PATCH 1/1 drm/amdgpu: Revert "Fix IB allocation sizes for page table updates"

From: Christian König <[email protected]>

The IB allocation sizes where correct.

This reverts commit d1551e7c7211fa135c4d79f09e237f5f9779e421.

---
 drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c +2 -2
index 473273d..b08f031 100644
@@ -1037,7 +1037,7 @@ static int amdgpu_vm_update_level(struct amdgpu_device *adev,
 		ndw = 64;
 
 		/* assume the worst case */
-		ndw += parent->last_entry_used * 10;
+		ndw += parent->last_entry_used * 6;
 
 		pd_addr = amdgpu_bo_gpu_offset(parent->base.bo);
 
@@ -1542,7 +1542,7 @@ static int amdgpu_vm_bo_update_mapping(struct amdgpu_device *adev,
 	ndw = 64;
 
 	/* one PDE write for each huge page */
-	ndw += ((nptes >> adev->vm_manager.block_size) + 1) * 10;
+	ndw += ((nptes >> adev->vm_manager.block_size) + 1) * 6;
 
 	if (pages_addr) {
 		/* copy commands needed */
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): 1504165548-2017-1-git-send-email-deathsimple-ANTagKRnAhcb1SvskN2V4Q@public.gmane.org

Reviewed-by Felix Kuehling
#2 lore raw

Sorry, I didn't think this one through. I'll keep looking for the real problem.
________________________________________
From: amd-gfx <[email protected]> on behalf of Christian König <[email protected]>
Sent: Thursday, August 31, 2017 3:45:48 AM
To: [email protected]
Subject: [PATCH] drm/amdgpu: Revert "Fix IB allocation sizes for page table updates"

From: Christian König <[email protected]>

The IB allocation sizes where correct.

This reverts commit d1551e7c7211fa135c4d79f09e237f5f9779e421.

---
 drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c +2 -2
index 473273d..b08f031 100644
@@ -1037,7 +1037,7 @@ static int amdgpu_vm_update_level(struct amdgpu_device *adev,
                ndw = 64;
 
                /* assume the worst case */
-               ndw += parent->last_entry_used * 10;
+               ndw += parent->last_entry_used * 6;
 
                pd_addr = amdgpu_bo_gpu_offset(parent->base.bo);
 
@@ -1542,7 +1542,7 @@ static int amdgpu_vm_bo_update_mapping(struct amdgpu_device *adev,
        ndw = 64;
 
        /* one PDE write for each huge page */
-       ndw += ((nptes >> adev->vm_manager.block_size) + 1) * 10;
+       ndw += ((nptes >> adev->vm_manager.block_size) + 1) * 6;
 
        if (pages_addr) {
                /* copy commands needed */

--
2.7.4

_______________________________________________
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): DM5PR1201MB0235F7D990F5C465305A6CE0929D0-grEf7a3NxMBd8L2jMOIKKmrFom/aUZj6nBOFsp37pqbUKgpGm//BTAC/[email protected]

#4 lore raw

Am 31.08.2017 um 15:42 schrieb Kuehling, Felix:

Quoted 1 line

Thanks.

Quoted 1 line

Sorry, I didn't think this one through. I'll keep looking for the real problem.

Is it possible that you merged my earlier patch to handle all fragment sizes?

Cause earlier versions had exactly that problem.

Christian.

Quoted 42 lines

________________________________________
From: amd-gfx <[email protected]> on behalf of Christian König <[email protected]>
Sent: Thursday, August 31, 2017 3:45:48 AM
To: [email protected]
Subject: [PATCH] drm/amdgpu: Revert "Fix IB allocation sizes for page table updates"

From: Christian König <[email protected]>

The IB allocation sizes where correct.

This reverts commit d1551e7c7211fa135c4d79f09e237f5f9779e421.

---
  drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c | 4 ++--
  1 file changed, 2 insertions(+), 2 deletions(-)
drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c +2 -3
index 473273d..b08f031 100644
@@ -1037,7 +1037,7 @@ static int amdgpu_vm_update_level(struct amdgpu_device *adev,
                 ndw = 64;
 
                 /* assume the worst case */
-               ndw += parent->last_entry_used * 10;
+               ndw += parent->last_entry_used * 6;
 
                 pd_addr = amdgpu_bo_gpu_offset(parent->base.bo);
 
@@ -1542,7 +1542,7 @@ static int amdgpu_vm_bo_update_mapping(struct amdgpu_device *adev,
         ndw = 64;
 
         /* one PDE write for each huge page */
-       ndw += ((nptes >> adev->vm_manager.block_size) + 1) * 10;
+       ndw += ((nptes >> adev->vm_manager.block_size) + 1) * 6;
 
         if (pages_addr) {
                 /* copy commands needed */
--

2.7.4

Quoted 8 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): bb71139f-f95c-8f1c-ebd9-f67679ea9b8e-ANTagKRnAhcb1SvskN2V4Q@public.gmane.org

#6 lore raw
Quoted 5 lines · Christian König

Am 31.08.2017 um 15:42 schrieb Kuehling, Felix:

Quoted 1 line

Thanks.

Quoted 7 lines
Quoted 2 lines

Sorry, I didn't think this one through. I'll keep looking for the real problem.

Is it possible that you merged my earlier patch to handle all fragment sizes?

Cause earlier versions had exactly that problem.

I don't think so. We merge from amd-staging-4.12. Was your earlier patch already submitted to the branch?

Regards,
Felix

Quoted 50 lines

Christian.

Quoted 47 lines

________________________________________
From: amd-gfx <[email protected]> on behalf of Christian König <[email protected]>
Sent: Thursday, August 31, 2017 3:45:48 AM
To: [email protected]
Subject: [PATCH] drm/amdgpu: Revert "Fix IB allocation sizes for page table updates"

From: Christian König <[email protected]>

The IB allocation sizes where correct.

This reverts commit d1551e7c7211fa135c4d79f09e237f5f9779e421.

---
  drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c | 4 ++--
  1 file changed, 2 insertions(+), 2 deletions(-)
drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c +2 -2
index 473273d..b08f031 100644
@@ -1037,7 +1037,7 @@ static int amdgpu_vm_update_level(struct
 amdgpu_device *adev,
                 ndw = 64;
 
                 /* assume the worst case */
-               ndw += parent->last_entry_used * 10;
+               ndw += parent->last_entry_used * 6;
 
                 pd_addr = amdgpu_bo_gpu_offset(parent->base.bo);
@@ -1542,7 +1542,7 @@ static int amdgpu_vm_bo_update_mapping(struct
 amdgpu_device *adev,
         ndw = 64;
 
         /* one PDE write for each huge page */
-       ndw += ((nptes >> adev->vm_manager.block_size) + 1) * 10;
+       ndw += ((nptes >> adev->vm_manager.block_size) + 1) * 6;
 
         if (pages_addr) {
                 /* copy commands needed */
Signature · 1 line
2.7.4
Quoted 10 lines
Quoted 8 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): 711b8e15-8826-5a5e-f994-4ae4a0c6baa7-5C7GfCeVMHo@public.gmane.org

#8 lore raw

Am 31.08.2017 um 17:50 schrieb Felix Kuehling:

Quoted 5 lines · Christian König
Quoted 4 lines

Am 31.08.2017 um 15:42 schrieb Kuehling, Felix:

Quoted 1 line

Thanks.

Quoted 8 lines
Quoted 6 lines
Quoted 2 lines

Sorry, I didn't think this one through. I'll keep looking for the real problem.

Is it possible that you merged my earlier patch to handle all fragment sizes?

Cause earlier versions had exactly that problem.

I don't think so. We merge from amd-staging-4.12. Was your earlier patch already submitted to the branch?

No, I haven't committed it yet. Just though that Roger might have merged that in the hybrid branch and you picked it up there.

Christian.

Quoted 62 lines

Regards,
Felix

Quoted 49 lines

Christian.

Quoted 47 lines

________________________________________
From: amd-gfx <[email protected]> on behalf of Christian König <[email protected]>
Sent: Thursday, August 31, 2017 3:45:48 AM
To: [email protected]
Subject: [PATCH] drm/amdgpu: Revert "Fix IB allocation sizes for page table updates"

From: Christian König <[email protected]>

The IB allocation sizes where correct.

This reverts commit d1551e7c7211fa135c4d79f09e237f5f9779e421.

---
   drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c | 4 ++--
   1 file changed, 2 insertions(+), 2 deletions(-)
drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c +2 -2
index 473273d..b08f031 100644
@@ -1037,7 +1037,7 @@ static int amdgpu_vm_update_level(struct
 amdgpu_device *adev,
                  ndw = 64;
 
                  /* assume the worst case */
-               ndw += parent->last_entry_used * 10;
+               ndw += parent->last_entry_used * 6;
 
                  pd_addr = amdgpu_bo_gpu_offset(parent->base.bo);
@@ -1542,7 +1542,7 @@ static int amdgpu_vm_bo_update_mapping(struct
 amdgpu_device *adev,
          ndw = 64;
 
          /* one PDE write for each huge page */
-       ndw += ((nptes >> adev->vm_manager.block_size) + 1) * 10;
+       ndw += ((nptes >> adev->vm_manager.block_size) + 1) * 6;
 
          if (pages_addr) {
                  /* copy commands needed */
Signature · 1 line
2.7.4
Quoted 9 lines
Quoted 8 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

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