Commit 5117c363 authored by Dave Airlie's avatar Dave Airlie
Browse files

Merge tag 'drm-misc-fixes-2020-03-26' of git://anongit.freedesktop.org/drm/drm-misc into drm-fixes 



drm-misc-fixes for v5.6:
- SG fixes for prime, radeon and amdgpu.

Signed-off-by: default avatarDave Airlie <airlied@redhat.com>

From: Maarten Lankhorst <maarten.lankhorst@linux.intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/ef10e822-76dd-125d-ec1f-9a78c5f76bc3@linux.intel.com
parents 16fbf79b 47f7826c

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

+1 −1
Original line number Diff line number Diff line
@@ -974,7 +974,7 @@ static int amdgpu_ttm_tt_pin_userptr(struct ttm_tt *ttm) 
	/* Map SG to device */

	r = -ENOMEM;

	nents = dma_map_sg(adev->dev, ttm->sg->sgl, ttm->sg->nents, direction);

	if (nents != ttm->sg->nents)

	if (nents == 0)

		goto release_sg;



	/* convert SG to linear array of pages and dma addresses */

drivers/gpu/drm/drm_prime.c

+1 −1
Original line number Diff line number Diff line
@@ -967,7 +967,7 @@ int drm_prime_sg_to_page_addr_arrays(struct sg_table *sgt, struct page **pages, 


	index = 0;

	for_each_sg(sgt->sgl, sg, sgt->nents, count) {

		len = sg->length;

		len = sg_dma_len(sg);

		page = sg_page(sg);

		addr = sg_dma_address(sg);

drivers/gpu/drm/radeon/radeon_ttm.c

+1 −1
Original line number Diff line number Diff line
@@ -528,7 +528,7 @@ static int radeon_ttm_tt_pin_userptr(struct ttm_tt *ttm) 


	r = -ENOMEM;

	nents = dma_map_sg(rdev->dev, ttm->sg->sgl, ttm->sg->nents, direction);

	if (nents != ttm->sg->nents)

	if (nents == 0)

		goto release_sg;



	drm_prime_sg_to_page_addr_arrays(ttm->sg, ttm->pages,

CRA Git | Maintained and supported by SUSTech CRA and CCSE