[PATCH 1/3] drm/amdgpu/uvd6: fix allocation size in enc ring test (v2)

[Christian König]

Am 16.10.19 um 00:18 schrieb Alex Deucher:
> We need to allocate a large enough buffer for the
> session info, otherwise the IB test can overwrite
> other memory.
>
> v2: - session info is 128K according to mesa
>      - use the same session info for create and destroy
>
> Bug: https://bugzilla.kernel.org/show_bug.cgi?id=204241
> Signed-off-by: Alex Deucher <alexander.deucher at amd.com>

Yeah, that looks better than the version from James.

Acked-by: Christian König <christian.koenig at amd.com> for the series.

> ---
>   drivers/gpu/drm/amd/amdgpu/uvd_v6_0.c | 31 ++++++++++++++++++---------
>   1 file changed, 21 insertions(+), 10 deletions(-)
>
> diff --git a/drivers/gpu/drm/amd/amdgpu/uvd_v6_0.c b/drivers/gpu/drm/amd/amdgpu/uvd_v6_0.c
> index 670784a78512..217084d56ab8 100644
> --- a/drivers/gpu/drm/amd/amdgpu/uvd_v6_0.c
> +++ b/drivers/gpu/drm/amd/amdgpu/uvd_v6_0.c
> @@ -206,13 +206,14 @@ static int uvd_v6_0_enc_ring_test_ring(struct amdgpu_ring *ring)
>    * Open up a stream for HW test
>    */
>   static int uvd_v6_0_enc_get_create_msg(struct amdgpu_ring *ring, uint32_t handle,
> +				       struct amdgpu_bo *bo,
>   				       struct dma_fence **fence)
>   {
>   	const unsigned ib_size_dw = 16;
>   	struct amdgpu_job *job;
>   	struct amdgpu_ib *ib;
>   	struct dma_fence *f = NULL;
> -	uint64_t dummy;
> +	uint64_t addr;
>   	int i, r;
>   
>   	r = amdgpu_job_alloc_with_ib(ring->adev, ib_size_dw * 4, &job);
> @@ -220,15 +221,15 @@ static int uvd_v6_0_enc_get_create_msg(struct amdgpu_ring *ring, uint32_t handle
>   		return r;
>   
>   	ib = &job->ibs[0];
> -	dummy = ib->gpu_addr + 1024;
> +	addr = amdgpu_bo_gpu_offset(bo);
>   
>   	ib->length_dw = 0;
>   	ib->ptr[ib->length_dw++] = 0x00000018;
>   	ib->ptr[ib->length_dw++] = 0x00000001; /* session info */
>   	ib->ptr[ib->length_dw++] = handle;
>   	ib->ptr[ib->length_dw++] = 0x00010000;
> -	ib->ptr[ib->length_dw++] = upper_32_bits(dummy);
> -	ib->ptr[ib->length_dw++] = dummy;
> +	ib->ptr[ib->length_dw++] = upper_32_bits(addr);
> +	ib->ptr[ib->length_dw++] = addr;
>   
>   	ib->ptr[ib->length_dw++] = 0x00000014;
>   	ib->ptr[ib->length_dw++] = 0x00000002; /* task info */
> @@ -268,13 +269,14 @@ static int uvd_v6_0_enc_get_create_msg(struct amdgpu_ring *ring, uint32_t handle
>    */
>   static int uvd_v6_0_enc_get_destroy_msg(struct amdgpu_ring *ring,
>   					uint32_t handle,
> +					struct amdgpu_bo *bo,
>   					struct dma_fence **fence)
>   {
>   	const unsigned ib_size_dw = 16;
>   	struct amdgpu_job *job;
>   	struct amdgpu_ib *ib;
>   	struct dma_fence *f = NULL;
> -	uint64_t dummy;
> +	uint64_t addr;
>   	int i, r;
>   
>   	r = amdgpu_job_alloc_with_ib(ring->adev, ib_size_dw * 4, &job);
> @@ -282,15 +284,15 @@ static int uvd_v6_0_enc_get_destroy_msg(struct amdgpu_ring *ring,
>   		return r;
>   
>   	ib = &job->ibs[0];
> -	dummy = ib->gpu_addr + 1024;
> +	addr = amdgpu_bo_gpu_offset(bo);
>   
>   	ib->length_dw = 0;
>   	ib->ptr[ib->length_dw++] = 0x00000018;
>   	ib->ptr[ib->length_dw++] = 0x00000001; /* session info */
>   	ib->ptr[ib->length_dw++] = handle;
>   	ib->ptr[ib->length_dw++] = 0x00010000;
> -	ib->ptr[ib->length_dw++] = upper_32_bits(dummy);
> -	ib->ptr[ib->length_dw++] = dummy;
> +	ib->ptr[ib->length_dw++] = upper_32_bits(addr);
> +	ib->ptr[ib->length_dw++] = addr;
>   
>   	ib->ptr[ib->length_dw++] = 0x00000014;
>   	ib->ptr[ib->length_dw++] = 0x00000002; /* task info */
> @@ -327,13 +329,20 @@ static int uvd_v6_0_enc_get_destroy_msg(struct amdgpu_ring *ring,
>   static int uvd_v6_0_enc_ring_test_ib(struct amdgpu_ring *ring, long timeout)
>   {
>   	struct dma_fence *fence = NULL;
> +	struct amdgpu_bo *bo = NULL;
>   	long r;
>   
> -	r = uvd_v6_0_enc_get_create_msg(ring, 1, NULL);
> +	r = amdgpu_bo_create_reserved(ring->adev, 128 * 1024, PAGE_SIZE,
> +				      AMDGPU_GEM_DOMAIN_VRAM,
> +				      &bo, NULL, NULL);
> +	if (r)
> +		return r;
> +
> +	r = uvd_v6_0_enc_get_create_msg(ring, 1, bo, NULL);
>   	if (r)
>   		goto error;
>   
> -	r = uvd_v6_0_enc_get_destroy_msg(ring, 1, &fence);
> +	r = uvd_v6_0_enc_get_destroy_msg(ring, 1, bo, &fence);
>   	if (r)
>   		goto error;
>   
> @@ -345,6 +354,8 @@ static int uvd_v6_0_enc_ring_test_ib(struct amdgpu_ring *ring, long timeout)
>   
>   error:
>   	dma_fence_put(fence);
> +	amdgpu_bo_unreserve(bo);
> +	amdgpu_bo_unref(&bo);
>   	return r;
>   }
>