diff options
| author | Dave Airlie <airlied@redhat.com> | 2019-03-14 11:56:59 +1000 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2019-03-14 11:57:11 +1000 |
| commit | ad7ad48e09871e7bf6d75db80243f2abb30b4db9 (patch) | |
| tree | 1ce55ec72e0d0e5fd8cdd9b48d426a24fc3fc447 /drivers/gpu/drm/i915/i915_gem.c | |
| parent | 74cd45fa90a234de92a3f3ce8bdabeb643b546a5 (diff) | |
| parent | ca22f32a6296cbfa29de56328c8505560a18cfa8 (diff) | |
| download | talos-op-linux-ad7ad48e09871e7bf6d75db80243f2abb30b4db9.tar.gz talos-op-linux-ad7ad48e09871e7bf6d75db80243f2abb30b4db9.zip | |
Merge tag 'drm-intel-next-fixes-2019-03-12' of git://anongit.freedesktop.org/drm/drm-intel into drm-next
- HDCP state handling in ddi_update_pipe
- Protect i915_active iterators from the shrinker
- Reacquire priolist cache after dropping the engine lock
- (Selftest) Always free spinner on __sseu_prepare error
- Acquire breadcrumb ref before canceling
- Fix atomic state leak on HDMI link reset
- Relax mmap VMA check
Signed-off-by: Dave Airlie <airlied@redhat.com>
From: Rodrigo Vivi <rodrigo.vivi@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20190312205551.GA7701@intel.com
Diffstat (limited to 'drivers/gpu/drm/i915/i915_gem.c')
| -rw-r--r-- | drivers/gpu/drm/i915/i915_gem.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/gpu/drm/i915/i915_gem.c b/drivers/gpu/drm/i915/i915_gem.c index 6728ea5c71d4..30d516e975c6 100644 --- a/drivers/gpu/drm/i915/i915_gem.c +++ b/drivers/gpu/drm/i915/i915_gem.c @@ -1688,7 +1688,8 @@ __vma_matches(struct vm_area_struct *vma, struct file *filp, if (vma->vm_file != filp) return false; - return vma->vm_start == addr && (vma->vm_end - vma->vm_start) == size; + return vma->vm_start == addr && + (vma->vm_end - vma->vm_start) == PAGE_ALIGN(size); } /** |
