Commit 2a360840 authored by Dave Airlie's avatar Dave Airlie
Browse files

Merge tag 'drm-fixes-5.4-2019-10-23' of git://people.freedesktop.org/~agd5f/linux into drm-fixes 



drm-fixes-5.4-2019-10-23:

amdgpu:
- Fix suspend/resume issue related to multi-media engines
- Fix memory leak in user ptr code related to hmm conversion
- Fix possible VM faults when allocating page table memory
- Fix error handling in bo list ioctl

Signed-off-by: default avatarDave Airlie <airlied@redhat.com>
From: Alex Deucher <alexdeucher@gmail.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20191024031809.3155-1-alexander.deucher@amd.com
parents 20975806 ee027828

drivers/gpu/drm/amd/amdgpu/amdgpu_bo_list.c

+6 −1
Original line number Diff line number Diff line
@@ -140,7 +140,12 @@ int amdgpu_bo_list_create(struct amdgpu_device *adev, struct drm_file *filp, 
	return 0;



error_free:

	while (i--) {

	for (i = 0; i < last_entry; ++i) {

		struct amdgpu_bo *bo = ttm_to_amdgpu_bo(array[i].tv.bo);



		amdgpu_bo_unref(&bo);

	}

	for (i = first_userptr; i < num_entries; ++i) {

		struct amdgpu_bo *bo = ttm_to_amdgpu_bo(array[i].tv.bo);



		amdgpu_bo_unref(&bo);

drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c

+2 −6
Original line number Diff line number Diff line
@@ -536,7 +536,6 @@ static int amdgpu_cs_list_validate(struct amdgpu_cs_parser *p, 


	list_for_each_entry(lobj, validated, tv.head) {

		struct amdgpu_bo *bo = ttm_to_amdgpu_bo(lobj->tv.bo);

		bool binding_userptr = false;

		struct mm_struct *usermm;



		usermm = amdgpu_ttm_tt_get_usermm(bo->tbo.ttm);
@@ -553,7 +552,6 @@ static int amdgpu_cs_list_validate(struct amdgpu_cs_parser *p, 


			amdgpu_ttm_tt_set_user_pages(bo->tbo.ttm,

						     lobj->user_pages);

			binding_userptr = true;

		}



		if (p->evictable == lobj)
@@ -563,11 +561,9 @@ static int amdgpu_cs_list_validate(struct amdgpu_cs_parser *p, 
		if (r)

			return r;



		if (binding_userptr) {

		kvfree(lobj->user_pages);

		lobj->user_pages = NULL;

	}

	}

	return 0;

}

drivers/gpu/drm/amd/amdgpu/amdgpu_object.c

+2 −1
Original line number Diff line number Diff line
@@ -453,7 +453,8 @@ static int amdgpu_bo_do_create(struct amdgpu_device *adev, 
		.interruptible = (bp->type != ttm_bo_type_kernel),

		.no_wait_gpu = false,

		.resv = bp->resv,

		.flags = TTM_OPT_FLAG_ALLOW_RES_EVICT

		.flags = bp->type != ttm_bo_type_kernel ?

			TTM_OPT_FLAG_ALLOW_RES_EVICT : 0

	};

	struct amdgpu_bo *bo;

	unsigned long page_align, size = bp->size;

drivers/gpu/drm/amd/amdgpu/amdgpu_vce.c

+15 −5
Original line number Diff line number Diff line
@@ -429,13 +429,14 @@ void amdgpu_vce_free_handles(struct amdgpu_device *adev, struct drm_file *filp) 
 * Open up a stream for HW test

 */

int amdgpu_vce_get_create_msg(struct amdgpu_ring *ring, uint32_t handle,

			      struct amdgpu_bo *bo,

			      struct dma_fence **fence)

{

	const unsigned ib_size_dw = 1024;

	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);
@@ -444,7 +445,7 @@ int amdgpu_vce_get_create_msg(struct amdgpu_ring *ring, uint32_t handle, 


	ib = &job->ibs[0];



	dummy = ib->gpu_addr + 1024;

	addr = amdgpu_bo_gpu_offset(bo);



	/* stitch together an VCE create msg */

	ib->length_dw = 0;
@@ -476,8 +477,8 @@ int amdgpu_vce_get_create_msg(struct amdgpu_ring *ring, uint32_t handle, 


	ib->ptr[ib->length_dw++] = 0x00000014; /* len */

	ib->ptr[ib->length_dw++] = 0x05000005; /* feedback buffer */

	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++] = 0x00000001;



	for (i = ib->length_dw; i < ib_size_dw; ++i)
@@ -1110,13 +1111,20 @@ int amdgpu_vce_ring_test_ring(struct amdgpu_ring *ring) 
int amdgpu_vce_ring_test_ib(struct amdgpu_ring *ring, long timeout)

{

	struct dma_fence *fence = NULL;

	struct amdgpu_bo *bo = NULL;

	long r;



	/* skip vce ring1/2 ib test for now, since it's not reliable */

	if (ring != &ring->adev->vce.ring[0])

		return 0;



	r = amdgpu_vce_get_create_msg(ring, 1, NULL);

	r = amdgpu_bo_create_reserved(ring->adev, 512, PAGE_SIZE,

				      AMDGPU_GEM_DOMAIN_VRAM,

				      &bo, NULL, NULL);

	if (r)

		return r;



	r = amdgpu_vce_get_create_msg(ring, 1, bo, NULL);

	if (r)

		goto error;
@@ -1132,5 +1140,7 @@ int amdgpu_vce_ring_test_ib(struct amdgpu_ring *ring, long timeout) 


error:

	dma_fence_put(fence);

	amdgpu_bo_unreserve(bo);

	amdgpu_bo_unref(&bo);

	return r;

}

drivers/gpu/drm/amd/amdgpu/amdgpu_vce.h

+1 −0
Original line number Diff line number Diff line
@@ -59,6 +59,7 @@ int amdgpu_vce_entity_init(struct amdgpu_device *adev); 
int amdgpu_vce_suspend(struct amdgpu_device *adev);

int amdgpu_vce_resume(struct amdgpu_device *adev);

int amdgpu_vce_get_create_msg(struct amdgpu_ring *ring, uint32_t handle,

			      struct amdgpu_bo *bo,

			      struct dma_fence **fence);

int amdgpu_vce_get_destroy_msg(struct amdgpu_ring *ring, uint32_t handle,

			       bool direct, struct dma_fence **fence);

CRA Git | Maintained and supported by SUSTech CRA and CCSE