[PATCH 08/11] drm/amdgpu/vce4: replaced with virt_alloc_mm_table

[Deucher, Alexander]

> -----Original Message-----
> From: amd-gfx [mailto:amd-gfx-bounces at lists.freedesktop.org] On Behalf
> Of Xiangliang Yu
> Sent: Monday, April 24, 2017 2:58 AM
> To: amd-gfx at lists.freedesktop.org
> Cc: Yu, Xiangliang
> Subject: [PATCH 08/11] drm/amdgpu/vce4: replaced with
> virt_alloc_mm_table
> 
> Used virt_alloc_mm_table function to allocate MM table memory.
> 
> Signed-off-by: Xiangliang Yu <Xiangliang.Yu at amd.com>

Reviewed-by: Alex Deucher <alexander.deucher at amd.com>

> ---
>  drivers/gpu/drm/amd/amdgpu/vce_v4_0.c | 20 +++-----------------
>  1 file changed, 3 insertions(+), 17 deletions(-)
> 
> diff --git a/drivers/gpu/drm/amd/amdgpu/vce_v4_0.c
> b/drivers/gpu/drm/amd/amdgpu/vce_v4_0.c
> index a3d9d4d..a34cdbd 100644
> --- a/drivers/gpu/drm/amd/amdgpu/vce_v4_0.c
> +++ b/drivers/gpu/drm/amd/amdgpu/vce_v4_0.c
> @@ -444,20 +444,9 @@ static int vce_v4_0_sw_init(void *handle)
>  			return r;
>  	}
> 
> -	if (amdgpu_sriov_vf(adev)) {
> -		r = amdgpu_bo_create_kernel(adev, PAGE_SIZE, PAGE_SIZE,
> -					    AMDGPU_GEM_DOMAIN_VRAM,
> -					    &adev->virt.mm_table.bo,
> -					    &adev->virt.mm_table.gpu_addr,
> -					    (void *)&adev-
> >virt.mm_table.cpu_addr);
> -		if (!r) {
> -			memset((void *)adev->virt.mm_table.cpu_addr, 0,
> PAGE_SIZE);
> -			printk("mm table gpu addr = 0x%llx, cpu addr = %p.
> \n",
> -			       adev->virt.mm_table.gpu_addr,
> -			       adev->virt.mm_table.cpu_addr);
> -		}
> +	r = amdgpu_virt_alloc_mm_table(adev);
> +	if (r)
>  		return r;
> -	}
> 
>  	return r;
>  }
> @@ -468,10 +457,7 @@ static int vce_v4_0_sw_fini(void *handle)
>  	struct amdgpu_device *adev = (struct amdgpu_device *)handle;
> 
>  	/* free MM table */
> -	if (amdgpu_sriov_vf(adev))
> -		amdgpu_bo_free_kernel(&adev->virt.mm_table.bo,
> -				      &adev->virt.mm_table.gpu_addr,
> -				      (void *)&adev->virt.mm_table.cpu_addr);
> +	amdgpu_virt_free_mm_table(adev);
> 
>  	r = amdgpu_vce_suspend(adev);
>  	if (r)
> --
> 2.7.4
> 
> _______________________________________________
> amd-gfx mailing list
> amd-gfx at lists.freedesktop.org
> https://lists.freedesktop.org/mailman/listinfo/amd-gfx