Commit 16e04007 authored by Dave Airlie's avatar Dave Airlie
Browse files

Merge tag 'drm-intel-fixes-2022-04-13' of... 

Merge tag 'drm-intel-fixes-2022-04-13' of git://anongit.freedesktop.org/drm/drm-intel

 into drm-fixes

- Correct legacy mmap disabling to use GRAPHICS_VER_FULL

Signed-off-by: default avatarDave Airlie <airlied@redhat.com>
From: Joonas Lahtinen <joonas.lahtinen@linux.intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/YlZma8iA20iakK62@jlahtine-mobl.ger.corp.intel.com
parents ce522ba9 1acb34e7

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

+1 −1
Original line number Diff line number Diff line
@@ -70,7 +70,7 @@ i915_gem_mmap_ioctl(struct drm_device *dev, void *data, 
	 * mmap ioctl is disallowed for all discrete platforms,

	 * and for all platforms with GRAPHICS_VER > 12.

	 */

	if (IS_DGFX(i915) || GRAPHICS_VER(i915) > 12)

	if (IS_DGFX(i915) || GRAPHICS_VER_FULL(i915) > IP_VER(12, 0))

		return -EOPNOTSUPP;



	if (args->flags & ~(I915_MMAP_WC))