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

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,