Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 8cf13f71 authored by Dave Airlie's avatar Dave Airlie
Browse files

Merge tag 'drm-intel-fixes-2019-03-20' of... 

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

 into drm-fixes

A protection on our mmap against attempts to map past the end of the object;
plus a fix off-by-one in our hang report and a protection;
and a fix for eDP panels on Gen9 platforms on VBT absence.

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

From: Rodrigo Vivi <rodrigo.vivi@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20190320201451.GA7993@intel.com
parents cd845791 000c4f90

drivers/gpu/drm/i915/i915_gem.c

+9 −6
Original line number Diff line number Diff line
@@ -1734,8 +1734,13 @@ i915_gem_mmap_ioctl(struct drm_device *dev, void *data, 
	 * pages from.

	 */

	if (!obj->base.filp) {

		i915_gem_object_put(obj);

		return -ENXIO;

		addr = -ENXIO;

		goto err;

	}



	if (range_overflows(args->offset, args->size, (u64)obj->base.size)) {

		addr = -EINVAL;

		goto err;

	}



	addr = vm_mmap(obj->base.filp, 0, args->size,
@@ -1749,8 +1754,8 @@ i915_gem_mmap_ioctl(struct drm_device *dev, void *data, 
		struct vm_area_struct *vma;



		if (down_write_killable(&mm->mmap_sem)) {

			i915_gem_object_put(obj);

			return -EINTR;

			addr = -EINTR;

			goto err;

		}

		vma = find_vma(mm, addr);

		if (vma && __vma_matches(vma, obj->base.filp, addr, args->size))
@@ -1768,12 +1773,10 @@ i915_gem_mmap_ioctl(struct drm_device *dev, void *data, 
	i915_gem_object_put(obj);



	args->addr_ptr = (u64)addr;



	return 0;



err:

	i915_gem_object_put(obj);



	return addr;

}

drivers/gpu/drm/i915/i915_gpu_error.c

+1 −1
Original line number Diff line number Diff line
@@ -1721,7 +1721,7 @@ error_msg(struct i915_gpu_state *error, unsigned long engines, const char *msg) 
			i915_error_generate_code(error, engines));

	if (engines) {

		/* Just show the first executing process, more is confusing */

		i = ffs(engines);

		i = __ffs(engines);

		len += scnprintf(error->error_msg + len,

				 sizeof(error->error_msg) - len,

				 ", in %s [%d]",

drivers/gpu/drm/i915/intel_bios.c

+1 −0
Original line number Diff line number Diff line
@@ -1673,6 +1673,7 @@ init_vbt_missing_defaults(struct drm_i915_private *dev_priv) 
		info->supports_dvi = (port != PORT_A && port != PORT_E);

		info->supports_hdmi = info->supports_dvi;

		info->supports_dp = (port != PORT_E);

		info->supports_edp = (port == PORT_A);

	}

}