Commit ff7a24a8 authored by Dave Airlie's avatar Dave Airlie
Browse files

Merge tag 'drm-intel-fixes-2021-06-03' of... 

Merge tag 'drm-intel-fixes-2021-06-03' of git://anongit.freedesktop.org/drm/drm-intel

 into drm-fixes

drm/i915 fixes for v5.13-rc5:
- Revert conversion to io_mapping_map_user() which lead to BUG_ON()
- Fix check for error valued returns in a selftest

Signed-off-by: default avatarDave Airlie <airlied@redhat.com>
From: Jani Nikula <jani.nikula@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/87lf7rpcmp.fsf@intel.com
parents 59dda702 b87482df

drivers/gpu/drm/i915/Kconfig

+0 −1
Original line number Diff line number Diff line
@@ -20,7 +20,6 @@ config DRM_I915 
	select INPUT if ACPI

	select ACPI_VIDEO if ACPI

	select ACPI_BUTTON if ACPI

	select IO_MAPPING

	select SYNC_FILE

	select IOSF_MBI

	select CRC32

drivers/gpu/drm/i915/gem/i915_gem_mman.c

+5 −4
Original line number Diff line number Diff line
@@ -367,10 +367,11 @@ static vm_fault_t vm_fault_gtt(struct vm_fault *vmf) 
		goto err_unpin;



	/* Finally, remap it using the new GTT offset */

	ret = io_mapping_map_user(&ggtt->iomap, area, area->vm_start +

			(vma->ggtt_view.partial.offset << PAGE_SHIFT),

	ret = remap_io_mapping(area,

			       area->vm_start + (vma->ggtt_view.partial.offset << PAGE_SHIFT),

			       (ggtt->gmadr.start + vma->node.start) >> PAGE_SHIFT,

			min_t(u64, vma->size, area->vm_end - area->vm_start));

			       min_t(u64, vma->size, area->vm_end - area->vm_start),

			       &ggtt->iomap);

	if (ret)

		goto err_fence;

drivers/gpu/drm/i915/i915_drv.h

+3 −0
Original line number Diff line number Diff line
@@ -1905,6 +1905,9 @@ int i915_reg_read_ioctl(struct drm_device *dev, void *data, 
			struct drm_file *file);



/* i915_mm.c */

int remap_io_mapping(struct vm_area_struct *vma,

		     unsigned long addr, unsigned long pfn, unsigned long size,

		     struct io_mapping *iomap);

int remap_io_sg(struct vm_area_struct *vma,

		unsigned long addr, unsigned long size,

		struct scatterlist *sgl, resource_size_t iobase);

drivers/gpu/drm/i915/i915_mm.c

+44 −0
Original line number Diff line number Diff line
@@ -37,6 +37,17 @@ struct remap_pfn { 
	resource_size_t iobase;

};



static int remap_pfn(pte_t *pte, unsigned long addr, void *data)

{

	struct remap_pfn *r = data;



	/* Special PTE are not associated with any struct page */

	set_pte_at(r->mm, addr, pte, pte_mkspecial(pfn_pte(r->pfn, r->prot)));

	r->pfn++;



	return 0;

}



#define use_dma(io) ((io) != -1)



static inline unsigned long sgt_pfn(const struct remap_pfn *r)
@@ -66,7 +77,40 @@ static int remap_sg(pte_t *pte, unsigned long addr, void *data) 
	return 0;

}



/**

 * remap_io_mapping - remap an IO mapping to userspace

 * @vma: user vma to map to

 * @addr: target user address to start at

 * @pfn: physical address of kernel memory

 * @size: size of map area

 * @iomap: the source io_mapping

 *

 *  Note: this is only safe if the mm semaphore is held when called.

 */

int remap_io_mapping(struct vm_area_struct *vma,

		     unsigned long addr, unsigned long pfn, unsigned long size,

		     struct io_mapping *iomap)

{

	struct remap_pfn r;

	int err;



#define EXPECTED_FLAGS (VM_PFNMAP | VM_DONTEXPAND | VM_DONTDUMP)

	GEM_BUG_ON((vma->vm_flags & EXPECTED_FLAGS) != EXPECTED_FLAGS);



	/* We rely on prevalidation of the io-mapping to skip track_pfn(). */

	r.mm = vma->vm_mm;

	r.pfn = pfn;

	r.prot = __pgprot((pgprot_val(iomap->prot) & _PAGE_CACHE_MASK) |

			  (pgprot_val(vma->vm_page_prot) & ~_PAGE_CACHE_MASK));



	err = apply_to_page_range(r.mm, addr, size, remap_pfn, &r);

	if (unlikely(err)) {

		zap_vma_ptes(vma, addr, (r.pfn - pfn) << PAGE_SHIFT);

		return err;

	}



	return 0;

}



/**

 * remap_io_sg - remap an IO mapping to userspace

drivers/gpu/drm/i915/selftests/i915_request.c

+2 −2
Original line number Diff line number Diff line
@@ -1592,8 +1592,8 @@ static int live_breadcrumbs_smoketest(void *arg) 


	for (n = 0; n < smoke[0].ncontexts; n++) {

		smoke[0].contexts[n] = live_context(i915, file);

		if (!smoke[0].contexts[n]) {

			ret = -ENOMEM;

		if (IS_ERR(smoke[0].contexts[n])) {

			ret = PTR_ERR(smoke[0].contexts[n]);

			goto out_contexts;

		}

	}