diff options
| author | Daniel Vetter <daniel.vetter@ffwll.ch> | 2020-12-18 16:22:10 +0100 |
|---|---|---|
| committer | Daniel Vetter <daniel.vetter@ffwll.ch> | 2020-12-18 16:22:10 +0100 |
| commit | 4efd7faba5e0687ae9143b7e6a19547ede20a7dd (patch) | |
| tree | 4d7400f40cae106e7ca11e11aa65d166a19565a0 /drivers/gpu/drm/i915/gem/i915_gem_execbuffer.c | |
| parent | f96f62597ea48cc15d6b16bddf05dc25437dcf2d (diff) | |
| parent | 046f70d31ddb2069941aec54966fec5b7fbc7b7b (diff) | |
| download | linux-4efd7faba5e0687ae9143b7e6a19547ede20a7dd.tar.bz2 | |
Merge tag 'drm-intel-next-fixes-2020-12-18' of git://anongit.freedesktop.org/drm/drm-intel into drm-next
drm/i915 fixes for the merge window
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
From: Jani Nikula <jani.nikula@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/87zh2bp34m.fsf@intel.com
Diffstat (limited to 'drivers/gpu/drm/i915/gem/i915_gem_execbuffer.c')
| -rw-r--r-- | drivers/gpu/drm/i915/gem/i915_gem_execbuffer.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/gpu/drm/i915/gem/i915_gem_execbuffer.c b/drivers/gpu/drm/i915/gem/i915_gem_execbuffer.c index b07dc1156a0e..bcc80f428172 100644 --- a/drivers/gpu/drm/i915/gem/i915_gem_execbuffer.c +++ b/drivers/gpu/drm/i915/gem/i915_gem_execbuffer.c @@ -382,7 +382,7 @@ eb_vma_misplaced(const struct drm_i915_gem_exec_object2 *entry, return true; if (!(flags & EXEC_OBJECT_SUPPORTS_48B_ADDRESS) && - (vma->node.start + vma->node.size - 1) >> 32) + (vma->node.start + vma->node.size + 4095) >> 32) return true; if (flags & __EXEC_OBJECT_NEEDS_MAP && |