diff options
| author | Chris Wilson | 2018-10-25 11:18:23 +0200 |
|---|---|---|
| committer | Greg Kroah-Hartman | 2018-11-21 09:19:27 +0100 |
| commit | b4aa9db0b24f8504ee8e4de36bc84eae4f9fad63 (patch) | |
| tree | e2c79f0eae5680dbb8c4d10893791c91ddf71110 /drivers/gpu/drm/i915/i915_gem_execbuffer.c | |
| parent | drm/i915: Fix ilk+ watermarks when disabling pipes (diff) | |
| download | kernel-qcow2-linux-b4aa9db0b24f8504ee8e4de36bc84eae4f9fad63.tar.gz kernel-qcow2-linux-b4aa9db0b24f8504ee8e4de36bc84eae4f9fad63.tar.xz kernel-qcow2-linux-b4aa9db0b24f8504ee8e4de36bc84eae4f9fad63.zip | |
drm/i915: Compare user's 64b GTT offset even on 32b
commit 085603287452fc96376ed4888bf29f8c095d2b40 upstream.
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: Sergii Romantsov <sergii.romantsov@globallogic.com>
Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=108282
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
Cc: Joonas Lahtinen <joonas.lahtinen@linux.intel.com>
Cc: stable@vger.kernel.org
Reviewed-by: Matthew Auld <matthew.auld@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20181025091823.20571-2-chris@chris-wilson.co.uk
(cherry picked from commit 6fc4e48f9ed46e9adff236a0c350074aafa3b7fa)
Signed-off-by: Joonas Lahtinen <joonas.lahtinen@linux.intel.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/gpu/drm/i915/i915_gem_execbuffer.c')
| -rw-r--r-- | drivers/gpu/drm/i915/i915_gem_execbuffer.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/gpu/drm/i915/i915_gem_execbuffer.c b/drivers/gpu/drm/i915/i915_gem_execbuffer.c index 3f0c612d42e7..679bbae52945 100644 --- a/drivers/gpu/drm/i915/i915_gem_execbuffer.c +++ b/drivers/gpu/drm/i915/i915_gem_execbuffer.c @@ -458,7 +458,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 */ |