diff options
| author | Dave Airlie <airlied@redhat.com> | 2017-02-01 08:26:02 +1000 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2017-02-01 08:26:02 +1000 |
| commit | 2643105558099a4703f8209f2cad768673aff12d (patch) | |
| tree | 24e3b3417936a37445829060e938fd6649d55683 /drivers/gpu/drm | |
| parent | a155b75264949d2c087a67fd2e832dd61d3f8409 (diff) | |
| parent | 8adabb8928bcf75d6dc3f81b30a82884e70599cf (diff) | |
Merge branch 'drm-intel-next' of git://anongit.freedesktop.org/git/drm-intel into drm-next
Updated pull request after I pulled first time :)
* 'drm-intel-next' of git://anongit.freedesktop.org/git/drm-intel:
drm/i915: Pevent copying uninitialised garbage into vma->ggtt_view
Diffstat (limited to 'drivers/gpu/drm')
| -rw-r--r-- | drivers/gpu/drm/i915/i915_vma.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/gpu/drm/i915/i915_vma.c b/drivers/gpu/drm/i915/i915_vma.c index 307b22ae7791..155906e84812 100644 --- a/drivers/gpu/drm/i915/i915_vma.c +++ b/drivers/gpu/drm/i915/i915_vma.c @@ -91,7 +91,7 @@ vma_create(struct drm_i915_gem_object *obj, vma->size = obj->base.size; vma->display_alignment = I915_GTT_MIN_ALIGNMENT; - if (view) { + if (view && view->type != I915_GGTT_VIEW_NORMAL) { vma->ggtt_view = *view; if (view->type == I915_GGTT_VIEW_PARTIAL) { GEM_BUG_ON(range_overflows_t(u64, |