All of lore.kernel.org
 help / color / mirror / Atom feed
* [PATCH] drm/amdgpu: Apply noretry setting for mmhub9.4
@ 2019-11-22 22:55 ` Oak Zeng
  0 siblings, 0 replies; 6+ messages in thread
From: Oak Zeng @ 2019-11-22 22:55 UTC (permalink / raw)
  To: amd-gfx-PD4FTy7X32lNgt0PjOBp9y5qC8QIuHrW
  Cc: Felix.Kuehling-5C7GfCeVMHo, Jay.Cornwall-5C7GfCeVMHo, Oak Zeng

Config the translation retry behavior according to noretry
kernel parameter

Change-Id: I5b91ea77715137cf8cb84e258ccdfbb19c7a4ed1
Signed-off-by: Oak Zeng <Oak.Zeng@amd.com>
Suggested-by: Jay Cornwall <Jay.Cornwall@amd.com>
---
 drivers/gpu/drm/amd/amdgpu/mmhub_v9_4.c | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/drivers/gpu/drm/amd/amdgpu/mmhub_v9_4.c b/drivers/gpu/drm/amd/amdgpu/mmhub_v9_4.c
index 753eea2..8599bfd 100644
--- a/drivers/gpu/drm/amd/amdgpu/mmhub_v9_4.c
+++ b/drivers/gpu/drm/amd/amdgpu/mmhub_v9_4.c
@@ -314,7 +314,8 @@ static void mmhub_v9_4_setup_vmid_config(struct amdgpu_device *adev, int hubid)
 				    adev->vm_manager.block_size - 9);
 		/* Send no-retry XNACK on fault to suppress VM fault storm. */
 		tmp = REG_SET_FIELD(tmp, VML2VC0_VM_CONTEXT1_CNTL,
-				    RETRY_PERMISSION_OR_INVALID_PAGE_FAULT, 0);
+				    RETRY_PERMISSION_OR_INVALID_PAGE_FAULT,
+				    !amdgpu_noretry);
 		WREG32_SOC15_OFFSET(MMHUB, 0, mmVML2VC0_VM_CONTEXT1_CNTL,
 				    hubid * MMHUB_INSTANCE_REGISTER_OFFSET + i,
 				    tmp);
@@ -905,4 +906,4 @@ static void mmhub_v9_4_query_ras_error_count(struct amdgpu_device *adev,
 const struct amdgpu_mmhub_funcs mmhub_v9_4_funcs = {
 	.ras_late_init = amdgpu_mmhub_ras_late_init,
 	.query_ras_error_count = mmhub_v9_4_query_ras_error_count,
-};
\ No newline at end of file
+};
-- 
2.7.4

_______________________________________________
amd-gfx mailing list
amd-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/amd-gfx

^ permalink raw reply related	[flat|nested] 6+ messages in thread
* [PATCH] drm/amdgpu: Apply noretry setting for mmhub9.4
@ 2019-11-22 22:55 ` Oak Zeng
  0 siblings, 0 replies; 6+ messages in thread
From: Oak Zeng @ 2019-11-22 22:55 UTC (permalink / raw)
  To: amd-gfx; +Cc: Felix.Kuehling, Jay.Cornwall, Oak Zeng

Config the translation retry behavior according to noretry
kernel parameter

Change-Id: I5b91ea77715137cf8cb84e258ccdfbb19c7a4ed1
Signed-off-by: Oak Zeng <Oak.Zeng@amd.com>
Suggested-by: Jay Cornwall <Jay.Cornwall@amd.com>
---
 drivers/gpu/drm/amd/amdgpu/mmhub_v9_4.c | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/drivers/gpu/drm/amd/amdgpu/mmhub_v9_4.c b/drivers/gpu/drm/amd/amdgpu/mmhub_v9_4.c
index 753eea2..8599bfd 100644
--- a/drivers/gpu/drm/amd/amdgpu/mmhub_v9_4.c
+++ b/drivers/gpu/drm/amd/amdgpu/mmhub_v9_4.c
@@ -314,7 +314,8 @@ static void mmhub_v9_4_setup_vmid_config(struct amdgpu_device *adev, int hubid)
 				    adev->vm_manager.block_size - 9);
 		/* Send no-retry XNACK on fault to suppress VM fault storm. */
 		tmp = REG_SET_FIELD(tmp, VML2VC0_VM_CONTEXT1_CNTL,
-				    RETRY_PERMISSION_OR_INVALID_PAGE_FAULT, 0);
+				    RETRY_PERMISSION_OR_INVALID_PAGE_FAULT,
+				    !amdgpu_noretry);
 		WREG32_SOC15_OFFSET(MMHUB, 0, mmVML2VC0_VM_CONTEXT1_CNTL,
 				    hubid * MMHUB_INSTANCE_REGISTER_OFFSET + i,
 				    tmp);
@@ -905,4 +906,4 @@ static void mmhub_v9_4_query_ras_error_count(struct amdgpu_device *adev,
 const struct amdgpu_mmhub_funcs mmhub_v9_4_funcs = {
 	.ras_late_init = amdgpu_mmhub_ras_late_init,
 	.query_ras_error_count = mmhub_v9_4_query_ras_error_count,
-};
\ No newline at end of file
+};
-- 
2.7.4

_______________________________________________
amd-gfx mailing list
amd-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/amd-gfx

^ permalink raw reply related	[flat|nested] 6+ messages in thread
* Re: [PATCH] drm/amdgpu: Apply noretry setting for mmhub9.4
@ 2019-11-22 23:21     ` Felix Kuehling
  0 siblings, 0 replies; 6+ messages in thread
From: Felix Kuehling @ 2019-11-22 23:21 UTC (permalink / raw)
  To: Oak Zeng, amd-gfx-PD4FTy7X32lNgt0PjOBp9y5qC8QIuHrW
  Cc: Jay.Cornwall-5C7GfCeVMHo

On 2019-11-22 5:55 p.m., Oak Zeng wrote:
> Config the translation retry behavior according to noretry
> kernel parameter
>
> Change-Id: I5b91ea77715137cf8cb84e258ccdfbb19c7a4ed1
> Signed-off-by: Oak Zeng <Oak.Zeng@amd.com>
> Suggested-by: Jay Cornwall <Jay.Cornwall@amd.com>

Reviewed-by: Felix Kuehling <Felix.Kuehling@amd.com>


> ---
>   drivers/gpu/drm/amd/amdgpu/mmhub_v9_4.c | 5 +++--
>   1 file changed, 3 insertions(+), 2 deletions(-)
>
> diff --git a/drivers/gpu/drm/amd/amdgpu/mmhub_v9_4.c b/drivers/gpu/drm/amd/amdgpu/mmhub_v9_4.c
> index 753eea2..8599bfd 100644
> --- a/drivers/gpu/drm/amd/amdgpu/mmhub_v9_4.c
> +++ b/drivers/gpu/drm/amd/amdgpu/mmhub_v9_4.c
> @@ -314,7 +314,8 @@ static void mmhub_v9_4_setup_vmid_config(struct amdgpu_device *adev, int hubid)
>   				    adev->vm_manager.block_size - 9);
>   		/* Send no-retry XNACK on fault to suppress VM fault storm. */
>   		tmp = REG_SET_FIELD(tmp, VML2VC0_VM_CONTEXT1_CNTL,
> -				    RETRY_PERMISSION_OR_INVALID_PAGE_FAULT, 0);
> +				    RETRY_PERMISSION_OR_INVALID_PAGE_FAULT,
> +				    !amdgpu_noretry);
>   		WREG32_SOC15_OFFSET(MMHUB, 0, mmVML2VC0_VM_CONTEXT1_CNTL,
>   				    hubid * MMHUB_INSTANCE_REGISTER_OFFSET + i,
>   				    tmp);
> @@ -905,4 +906,4 @@ static void mmhub_v9_4_query_ras_error_count(struct amdgpu_device *adev,
>   const struct amdgpu_mmhub_funcs mmhub_v9_4_funcs = {
>   	.ras_late_init = amdgpu_mmhub_ras_late_init,
>   	.query_ras_error_count = mmhub_v9_4_query_ras_error_count,
> -};
> \ No newline at end of file
> +};
_______________________________________________
amd-gfx mailing list
amd-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/amd-gfx

^ permalink raw reply	[flat|nested] 6+ messages in thread
* Re: [PATCH] drm/amdgpu: Apply noretry setting for mmhub9.4
@ 2019-11-22 23:21     ` Felix Kuehling
  0 siblings, 0 replies; 6+ messages in thread
From: Felix Kuehling @ 2019-11-22 23:21 UTC (permalink / raw)
  To: Oak Zeng, amd-gfx; +Cc: Jay.Cornwall

On 2019-11-22 5:55 p.m., Oak Zeng wrote:
> Config the translation retry behavior according to noretry
> kernel parameter
>
> Change-Id: I5b91ea77715137cf8cb84e258ccdfbb19c7a4ed1
> Signed-off-by: Oak Zeng <Oak.Zeng@amd.com>
> Suggested-by: Jay Cornwall <Jay.Cornwall@amd.com>

Reviewed-by: Felix Kuehling <Felix.Kuehling@amd.com>


> ---
>   drivers/gpu/drm/amd/amdgpu/mmhub_v9_4.c | 5 +++--
>   1 file changed, 3 insertions(+), 2 deletions(-)
>
> diff --git a/drivers/gpu/drm/amd/amdgpu/mmhub_v9_4.c b/drivers/gpu/drm/amd/amdgpu/mmhub_v9_4.c
> index 753eea2..8599bfd 100644
> --- a/drivers/gpu/drm/amd/amdgpu/mmhub_v9_4.c
> +++ b/drivers/gpu/drm/amd/amdgpu/mmhub_v9_4.c
> @@ -314,7 +314,8 @@ static void mmhub_v9_4_setup_vmid_config(struct amdgpu_device *adev, int hubid)
>   				    adev->vm_manager.block_size - 9);
>   		/* Send no-retry XNACK on fault to suppress VM fault storm. */
>   		tmp = REG_SET_FIELD(tmp, VML2VC0_VM_CONTEXT1_CNTL,
> -				    RETRY_PERMISSION_OR_INVALID_PAGE_FAULT, 0);
> +				    RETRY_PERMISSION_OR_INVALID_PAGE_FAULT,
> +				    !amdgpu_noretry);
>   		WREG32_SOC15_OFFSET(MMHUB, 0, mmVML2VC0_VM_CONTEXT1_CNTL,
>   				    hubid * MMHUB_INSTANCE_REGISTER_OFFSET + i,
>   				    tmp);
> @@ -905,4 +906,4 @@ static void mmhub_v9_4_query_ras_error_count(struct amdgpu_device *adev,
>   const struct amdgpu_mmhub_funcs mmhub_v9_4_funcs = {
>   	.ras_late_init = amdgpu_mmhub_ras_late_init,
>   	.query_ras_error_count = mmhub_v9_4_query_ras_error_count,
> -};
> \ No newline at end of file
> +};
_______________________________________________
amd-gfx mailing list
amd-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/amd-gfx

^ permalink raw reply	[flat|nested] 6+ messages in thread
* Re: [PATCH] drm/amdgpu: Apply noretry setting for mmhub9.4
@ 2019-11-26 12:07         ` Christian König
  0 siblings, 0 replies; 6+ messages in thread
From: Christian König @ 2019-11-26 12:07 UTC (permalink / raw)
  To: Felix Kuehling, Oak Zeng, amd-gfx-PD4FTy7X32lNgt0PjOBp9y5qC8QIuHrW
  Cc: Jay.Cornwall-5C7GfCeVMHo

Am 23.11.19 um 00:21 schrieb Felix Kuehling:
> On 2019-11-22 5:55 p.m., Oak Zeng wrote:
>> Config the translation retry behavior according to noretry
>> kernel parameter
>>
>> Change-Id: I5b91ea77715137cf8cb84e258ccdfbb19c7a4ed1
>> Signed-off-by: Oak Zeng <Oak.Zeng@amd.com>
>> Suggested-by: Jay Cornwall <Jay.Cornwall@amd.com>
>
> Reviewed-by: Felix Kuehling <Felix.Kuehling@amd.com>

Reviewed-by: Christian König <christian.koenig@amd.com>

>
>
>> ---
>>   drivers/gpu/drm/amd/amdgpu/mmhub_v9_4.c | 5 +++--
>>   1 file changed, 3 insertions(+), 2 deletions(-)
>>
>> diff --git a/drivers/gpu/drm/amd/amdgpu/mmhub_v9_4.c 
>> b/drivers/gpu/drm/amd/amdgpu/mmhub_v9_4.c
>> index 753eea2..8599bfd 100644
>> --- a/drivers/gpu/drm/amd/amdgpu/mmhub_v9_4.c
>> +++ b/drivers/gpu/drm/amd/amdgpu/mmhub_v9_4.c
>> @@ -314,7 +314,8 @@ static void mmhub_v9_4_setup_vmid_config(struct 
>> amdgpu_device *adev, int hubid)
>>                       adev->vm_manager.block_size - 9);
>>           /* Send no-retry XNACK on fault to suppress VM fault storm. */
>>           tmp = REG_SET_FIELD(tmp, VML2VC0_VM_CONTEXT1_CNTL,
>> -                    RETRY_PERMISSION_OR_INVALID_PAGE_FAULT, 0);
>> +                    RETRY_PERMISSION_OR_INVALID_PAGE_FAULT,
>> +                    !amdgpu_noretry);
>>           WREG32_SOC15_OFFSET(MMHUB, 0, mmVML2VC0_VM_CONTEXT1_CNTL,
>>                       hubid * MMHUB_INSTANCE_REGISTER_OFFSET + i,
>>                       tmp);
>> @@ -905,4 +906,4 @@ static void 
>> mmhub_v9_4_query_ras_error_count(struct amdgpu_device *adev,
>>   const struct amdgpu_mmhub_funcs mmhub_v9_4_funcs = {
>>       .ras_late_init = amdgpu_mmhub_ras_late_init,
>>       .query_ras_error_count = mmhub_v9_4_query_ras_error_count,
>> -};
>> \ No newline at end of file
>> +};
> _______________________________________________
> amd-gfx mailing list
> amd-gfx@lists.freedesktop.org
> https://lists.freedesktop.org/mailman/listinfo/amd-gfx

_______________________________________________
amd-gfx mailing list
amd-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/amd-gfx

^ permalink raw reply	[flat|nested] 6+ messages in thread
* Re: [PATCH] drm/amdgpu: Apply noretry setting for mmhub9.4
@ 2019-11-26 12:07         ` Christian König
  0 siblings, 0 replies; 6+ messages in thread
From: Christian König @ 2019-11-26 12:07 UTC (permalink / raw)
  To: Felix Kuehling, Oak Zeng, amd-gfx; +Cc: Jay.Cornwall

Am 23.11.19 um 00:21 schrieb Felix Kuehling:
> On 2019-11-22 5:55 p.m., Oak Zeng wrote:
>> Config the translation retry behavior according to noretry
>> kernel parameter
>>
>> Change-Id: I5b91ea77715137cf8cb84e258ccdfbb19c7a4ed1
>> Signed-off-by: Oak Zeng <Oak.Zeng@amd.com>
>> Suggested-by: Jay Cornwall <Jay.Cornwall@amd.com>
>
> Reviewed-by: Felix Kuehling <Felix.Kuehling@amd.com>

Reviewed-by: Christian König <christian.koenig@amd.com>

>
>
>> ---
>>   drivers/gpu/drm/amd/amdgpu/mmhub_v9_4.c | 5 +++--
>>   1 file changed, 3 insertions(+), 2 deletions(-)
>>
>> diff --git a/drivers/gpu/drm/amd/amdgpu/mmhub_v9_4.c 
>> b/drivers/gpu/drm/amd/amdgpu/mmhub_v9_4.c
>> index 753eea2..8599bfd 100644
>> --- a/drivers/gpu/drm/amd/amdgpu/mmhub_v9_4.c
>> +++ b/drivers/gpu/drm/amd/amdgpu/mmhub_v9_4.c
>> @@ -314,7 +314,8 @@ static void mmhub_v9_4_setup_vmid_config(struct 
>> amdgpu_device *adev, int hubid)
>>                       adev->vm_manager.block_size - 9);
>>           /* Send no-retry XNACK on fault to suppress VM fault storm. */
>>           tmp = REG_SET_FIELD(tmp, VML2VC0_VM_CONTEXT1_CNTL,
>> -                    RETRY_PERMISSION_OR_INVALID_PAGE_FAULT, 0);
>> +                    RETRY_PERMISSION_OR_INVALID_PAGE_FAULT,
>> +                    !amdgpu_noretry);
>>           WREG32_SOC15_OFFSET(MMHUB, 0, mmVML2VC0_VM_CONTEXT1_CNTL,
>>                       hubid * MMHUB_INSTANCE_REGISTER_OFFSET + i,
>>                       tmp);
>> @@ -905,4 +906,4 @@ static void 
>> mmhub_v9_4_query_ras_error_count(struct amdgpu_device *adev,
>>   const struct amdgpu_mmhub_funcs mmhub_v9_4_funcs = {
>>       .ras_late_init = amdgpu_mmhub_ras_late_init,
>>       .query_ras_error_count = mmhub_v9_4_query_ras_error_count,
>> -};
>> \ No newline at end of file
>> +};
> _______________________________________________
> amd-gfx mailing list
> amd-gfx@lists.freedesktop.org
> https://lists.freedesktop.org/mailman/listinfo/amd-gfx

_______________________________________________
amd-gfx mailing list
amd-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/amd-gfx

^ permalink raw reply	[flat|nested] 6+ messages in thread
end of thread, other threads:[~2019-11-26 12:07 UTC | newest]

Thread overview: 6+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2019-11-22 22:55 [PATCH] drm/amdgpu: Apply noretry setting for mmhub9.4 Oak Zeng
2019-11-22 22:55 ` Oak Zeng
     [not found] ` <1574463347-27961-1-git-send-email-Oak.Zeng-5C7GfCeVMHo@public.gmane.org>
2019-11-22 23:21   ` Felix Kuehling
2019-11-22 23:21     ` Felix Kuehling
     [not found]     ` <68bce28c-6b9d-8626-b2e0-09d6f4b3bb05-5C7GfCeVMHo@public.gmane.org>
2019-11-26 12:07       ` Christian König
2019-11-26 12:07         ` Christian König

This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.