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

Commit 08560328 authored by Chris Wilson's avatar Chris Wilson Committed by Joonas Lahtinen
Browse files

drm/i915: Compare user's 64b GTT offset even on 32b 



Beware mixing unsigned long constants and 64b values, as on 32b the
constant will be zero extended and discard the high 32b when used as
a mask!

Reported-by: default avatarSergii Romantsov <sergii.romantsov@globallogic.com>
Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=108282


Signed-off-by: default avatarChris Wilson <chris@chris-wilson.co.uk>
Cc: Joonas Lahtinen <joonas.lahtinen@linux.intel.com>
Cc: stable@vger.kernel.org
Reviewed-by: default avatarMatthew Auld <matthew.auld@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20181025091823.20571-2-chris@chris-wilson.co.uk


(cherry picked from commit 6fc4e48f)
Signed-off-by: default avatarJoonas Lahtinen <joonas.lahtinen@linux.intel.com>
parent c5828105

drivers/gpu/drm/i915/gvt/gtt.h

+0 −1
Original line number Diff line number Diff line
@@ -35,7 +35,6 @@ 
#define _GVT_GTT_H_



#define I915_GTT_PAGE_SHIFT         12

#define I915_GTT_PAGE_MASK		(~(I915_GTT_PAGE_SIZE - 1))



struct intel_vgpu_mm;

drivers/gpu/drm/i915/i915_gem_execbuffer.c

+1 −1
Original line number Diff line number Diff line
@@ -460,7 +460,7 @@ eb_validate_vma(struct i915_execbuffer *eb, 
	 * any non-page-aligned or non-canonical addresses.

	 */

	if (unlikely(entry->flags & EXEC_OBJECT_PINNED &&

		     entry->offset != gen8_canonical_addr(entry->offset & PAGE_MASK)))

		     entry->offset != gen8_canonical_addr(entry->offset & I915_GTT_PAGE_MASK)))

		return -EINVAL;



	/* pad_to_size was once a reserved field, so sanitize it */

drivers/gpu/drm/i915/i915_gem_gtt.h

+2 −0
Original line number Diff line number Diff line
@@ -49,6 +49,8 @@ 
#define I915_GTT_PAGE_SIZE I915_GTT_PAGE_SIZE_4K

#define I915_GTT_MAX_PAGE_SIZE I915_GTT_PAGE_SIZE_2M



#define I915_GTT_PAGE_MASK -I915_GTT_PAGE_SIZE



#define I915_GTT_MIN_ALIGNMENT I915_GTT_PAGE_SIZE



#define I915_FENCE_REG_NONE -1