[PATCH v2] drm/amdgpu: Change extended-scope MTYPE on GC 9.4.3

[Felix Kuehling]

On 2023-11-08 12:25, David Yat Sin wrote:
> Change local memory type to MTYPE_UC on revision id 0
>
> Signed-off-by: David Yat Sin <David.YatSin at amd.com>

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


> ---
>   drivers/gpu/drm/amd/amdgpu/gmc_v9_0.c | 7 +++++--
>   drivers/gpu/drm/amd/amdkfd/kfd_svm.c  | 8 +++++---
>   2 files changed, 10 insertions(+), 5 deletions(-)
>
> diff --git a/drivers/gpu/drm/amd/amdgpu/gmc_v9_0.c b/drivers/gpu/drm/amd/amdgpu/gmc_v9_0.c
> index b66c5f7e1c56..5ecddd08c363 100644
> --- a/drivers/gpu/drm/amd/amdgpu/gmc_v9_0.c
> +++ b/drivers/gpu/drm/amd/amdgpu/gmc_v9_0.c
> @@ -1176,7 +1176,10 @@ static void gmc_v9_0_get_coherence_flags(struct amdgpu_device *adev,
>   		if (uncached) {
>   			mtype = MTYPE_UC;
>   		} else if (ext_coherent) {
> -			mtype = is_local ? MTYPE_CC : MTYPE_UC;
> +			if (adev->rev_id)
> +				mtype = is_local ? MTYPE_CC : MTYPE_UC;
> +			else
> +				mtype = MTYPE_UC;
>   		} else if (adev->flags & AMD_IS_APU) {
>   			mtype = is_local ? mtype_local : MTYPE_NC;
>   		} else {
> @@ -1297,7 +1300,7 @@ static void gmc_v9_0_override_vm_pte_flags(struct amdgpu_device *adev,
>   
>   			*flags = (*flags & ~AMDGPU_PTE_MTYPE_VG10_MASK) |
>   				 AMDGPU_PTE_MTYPE_VG10(mtype_local);
> -		} else {
> +		} else if (adev->rev_id) {
>   			/* MTYPE_UC case */
>   			*flags = (*flags & ~AMDGPU_PTE_MTYPE_VG10_MASK) |
>   				 AMDGPU_PTE_MTYPE_VG10(MTYPE_CC);
> diff --git a/drivers/gpu/drm/amd/amdkfd/kfd_svm.c b/drivers/gpu/drm/amd/amdkfd/kfd_svm.c
> index fe937670c927..b23ba92a794c 100644
> --- a/drivers/gpu/drm/amd/amdkfd/kfd_svm.c
> +++ b/drivers/gpu/drm/amd/amdkfd/kfd_svm.c
> @@ -1253,9 +1253,11 @@ svm_range_get_pte_flags(struct kfd_node *node,
>   		}
>   		break;
>   	case IP_VERSION(9, 4, 3):
> -		mtype_local = amdgpu_mtype_local == 1 ? AMDGPU_VM_MTYPE_NC :
> -			      (amdgpu_mtype_local == 2 || ext_coherent ?
> -					AMDGPU_VM_MTYPE_CC : AMDGPU_VM_MTYPE_RW);
> +		if (ext_coherent)
> +			mtype_local = node->adev->rev_id ? AMDGPU_VM_MTYPE_CC : AMDGPU_VM_MTYPE_UC;
> +		else
> +			mtype_local = amdgpu_mtype_local == 1 ? AMDGPU_VM_MTYPE_NC :
> +				amdgpu_mtype_local == 2 ? AMDGPU_VM_MTYPE_CC : AMDGPU_VM_MTYPE_RW;
>   		snoop = true;
>   		if (uncached) {
>   			mapping_flags |= AMDGPU_VM_MTYPE_UC;