On 2019-08-06 22:31, Zeng, Oak wrote:
> The new memory mapping scheme is:
> Fine-grain coherency: local CC and remote UC, with snoop.
> Coarse-grain coherency: local RW and remote UC, with snoop.
>
> Change-Id: I6a071249f953cbed813bfd953b6a2e0826f54f86
> Signed-off-by: Oak Zeng <Oak.Zeng@xxxxxxx>
> ---
> drivers/gpu/drm/amd/amdgpu/gmc_v6_0.c | 1 +
> drivers/gpu/drm/amd/amdgpu/gmc_v9_0.c | 23 ++++++++++++++++++++++-
> 2 files changed, 23 insertions(+), 1 deletion(-)
>
> diff --git a/drivers/gpu/drm/amd/amdgpu/gmc_v6_0.c b/drivers/gpu/drm/amd/amdgpu/gmc_v6_0.c
> index 2b2af6a..51dae7f 100644
> --- a/drivers/gpu/drm/amd/amdgpu/gmc_v6_0.c
> +++ b/drivers/gpu/drm/amd/amdgpu/gmc_v6_0.c
> @@ -420,6 +420,7 @@ static uint32_t gmc_v6_0_get_vm_mapping_flags(struct amdgpu_device *adev,
>
> return mapping_flags;
> }
> +
> static void gmc_v6_0_set_fault_enable_default(struct amdgpu_device *adev,
> bool value)
> {
> diff --git a/drivers/gpu/drm/amd/amdgpu/gmc_v9_0.c b/drivers/gpu/drm/amd/amdgpu/gmc_v9_0.c
> index 8beefaf..718b388 100644
> --- a/drivers/gpu/drm/amd/amdgpu/gmc_v9_0.c
> +++ b/drivers/gpu/drm/amd/amdgpu/gmc_v9_0.c
> @@ -687,6 +687,27 @@ static uint32_t gmc_v9_0_get_vm_mapping_flags(struct amdgpu_device *adev,
> return mapping_flags;
> }
>
> +static uint32_t gmc_v9_0_arcturus_get_vm_mapping_flags(struct amdgpu_device *adev,
> + uint32_t alloc_flags, bool remote_mapping)
> +{
> + uint32_t mapping_flags = AMDGPU_VM_PAGE_READABLE;
> +
> + if (alloc_flags & ALLOC_MEM_FLAGS_WRITABLE)
> + mapping_flags |= AMDGPU_VM_PAGE_WRITEABLE;
> + if (alloc_flags & ALLOC_MEM_FLAGS_EXECUTABLE)
> + mapping_flags |= AMDGPU_VM_PAGE_EXECUTABLE;
> + if ((alloc_flags & ALLOC_MEM_FLAGS_VRAM) && !remote_mapping) {
> + if (alloc_flags & ALLOC_MEM_FLAGS_COHERENT)
> + mapping_flags |= AMDGPU_VM_MTYPE_CC;
> + else
> + mapping_flags |= AMDGPU_VM_MTYPE_RW;
> + } else {
> + mapping_flags |= AMDGPU_VM_MTYPE_UC;
> + mapping_flags |= AMDGPU_VM_PAGE_SNOOPED;
This seems incorrect. It treats all system memory the same as remote
VRAM as uncached on the GPU.
Regards,
Felix
> + }
> +
> + return mapping_flags;
> +}
>
> static const struct amdgpu_gmc_funcs gmc_v9_0_gmc_funcs = {
> .flush_gpu_tlb = gmc_v9_0_flush_gpu_tlb,
> @@ -703,7 +724,7 @@ static const struct amdgpu_gmc_funcs gmc_v9_0_arcturus_gmc_funcs = {
> .emit_pasid_mapping = gmc_v9_0_emit_pasid_mapping,
> .get_vm_pte_flags = gmc_v9_0_arcturus_get_vm_pte_flags,
> .get_vm_pde = gmc_v9_0_get_vm_pde,
> - .get_vm_mapping_flags = gmc_v9_0_get_vm_mapping_flags
> + .get_vm_mapping_flags = gmc_v9_0_arcturus_get_vm_mapping_flags
> };
>
> static void gmc_v9_0_set_gmc_funcs(struct amdgpu_device *adev)
_______________________________________________
amd-gfx mailing list
amd-gfx@xxxxxxxxxxxxxxxxxxxxx
https://lists.freedesktop.org/mailman/listinfo/amd-gfx
