[PATCH 1/6] drm/amdgpu: write PTEs directly into the IB.

[Edward O'Callaghan]

This series is,

Reviewed-by: Edward O'Callaghan <funfunctor at folklore1984.net>

actually quite a nice cleanup!

On 08/12/2016 11:52 PM, Christian König wrote:
> From: Christian König <christian.koenig at amd.com>
> 
> Write the PTEs at the end of the IB instead of directly into the SDMA commands.
> This can save quite some CPU cycles building the entries.
> 
> Signed-off-by: Christian König <christian.koenig at amd.com>
> ---
>  drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c | 26 +++++++++++++++++++++-----
>  1 file changed, 21 insertions(+), 5 deletions(-)
> 
> diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c
> index 2843132..7efcbe3 100644
> --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c
> +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c
> @@ -910,15 +910,15 @@ static int amdgpu_vm_bo_update_mapping(struct amdgpu_device *adev,
>  	/* padding, etc. */
>  	ndw = 64;
>  
> -	if (params.src) {
> +	if (src) {
>  		/* only copy commands needed */
>  		ndw += ncmds * 7;
>  
> -	} else if (params.pages_addr) {
> -		/* header for write data commands */
> -		ndw += ncmds * 4;
> +	} else if (pages_addr) {
> +		/* copy commands needed */
> +		ndw += ncmds * 7;
>  
> -		/* body of write data command */
> +		/* and also PTEs */
>  		ndw += nptes * 2;
>  
>  	} else {
> @@ -935,6 +935,22 @@ static int amdgpu_vm_bo_update_mapping(struct amdgpu_device *adev,
>  
>  	params.ib = &job->ibs[0];
>  
> +	if (!src && pages_addr) {
> +		uint64_t *pte;
> +		unsigned i;
> +
> +		/* Put the PTEs at the end of the IB. */
> +		i = ndw - nptes * 2;
> +		pte= (uint64_t *)&(job->ibs->ptr[i]);
> +		params.src = job->ibs->gpu_addr + i * 4;
> +
> +		for (i = 0; i < nptes; ++i) {
> +			pte[i] = amdgpu_vm_map_gart(pages_addr, addr + i *
> +						    AMDGPU_GPU_PAGE_SIZE);
> +			pte[i] |= flags;
> +		}
> +	}
> +
>  	r = amdgpu_sync_fence(adev, &job->sync, exclusive);
>  	if (r)
>  		goto error_free;
> 

-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 819 bytes
Desc: OpenPGP digital signature
URL: <https://lists.freedesktop.org/archives/amd-gfx/attachments/20160813/9ba8d8f3/attachment.sig>