[Intel-gfx] [CI 6/7] drm/i915: Eliminate superfluous i915_ggtt_view_rotated

[Chris Wilson]

On Mon, Jan 23, 2017 at 02:22:38PM +0000, Matthew Auld wrote:
> On 23 January 2017 at 14:02, Chris Wilson <chris at chris-wilson.co.uk> wrote:
> > On Mon, Jan 23, 2017 at 01:51:54PM +0000, Matthew Auld wrote:
> >> On 14 January 2017 at 00:28, Chris Wilson <chris at chris-wilson.co.uk> wrote:
> >> > It is only being used to clear a struct and set the type, after which it
> >> > is overwritten. Since we no longer check the unset bits of the union,
> >> > skipping the clear is permissible.
> >> >
> >> > Signed-off-by: Chris Wilson <chris at chris-wilson.co.uk>
> >> > Reviewed-by: Joonas Lahtinen <joonas.lahtinen at linux.intel.com>
> >> My machine is all of a sudden hanging just after boot and bisection
> >> points to this as the culprit. When I revert back to the old behaviour
> >> of copying from the zeroed struct for the normal case, then the issue
> >> disappears, which doesn't make any sense. Any ideas?
> >
> > Quick diff of which clear you need?
> 
> -       view->type = I915_GGTT_VIEW_NORMAL;
>         if (drm_rotation_90_or_270(rotation)) {
>                 view->type = I915_GGTT_VIEW_ROTATED;
>                 view->rotated = to_intel_framebuffer(fb)->rot_info;
> +       } else {
> +               *view = i915_ggtt_view_normal;
>         }
>  }

For no good reason, perhaps?
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) {

-- 
Chris Wilson, Intel Open Source Technology Centre