[Intel-gfx] [PATCH 2/4] drm/i915: preserve swizzle settings if necessary v4

[Jesse Barnes]

On Tue, 21 Oct 2014 16:49:12 +0200
Daniel Vetter <daniel at ffwll.ch> wrote:

> On Thu, Oct 09, 2014 at 12:57:43PM -0700, Jesse Barnes wrote:
> > Some machines (like MBAs) might use a tiled framebuffer but not
> > enable display swizzling at boot time.  We want to preserve that
> > configuration if possible to prevent a boot time mode set.  On IVB+
> > it shouldn't affect performance anyway since the memory controller
> > does internal swizzling anyway.
> > 
> > For most other configs we'll be able to enable swizzling at boot
> > time, since the initial framebuffer won't be tiled, thus we won't
> > see any corruption when we enable it.
> > 
> > v2: preserve swizzling if BIOS had it set (Daniel)
> > v3: preserve swizzling only if we inherited a tiled framebuffer
> > (Daniel) check display swizzle setting in detect_bit_6_swizzle
> > (Daniel) use gen6 as cutoff point (Daniel)
> > v4: fixup swizzle preserve again, had wrong init order (Daniel)
> > 
> > Reported-by: Kristian Høgsberg <hoegsberg at gmail.com>
> > Signed-off-by: Jesse Barnes <jbarnes at virtuousgeek.org>
> 
> lgtm. Queued for -next, thanks for the patch.

Can you pick up the SSC one too (earlier in this thread)?  I applied
Jani's requested change which should address your concerns about the
BIOS and kernel disagreeing.

I'll ping Kristian again about the not-quite-preferred mode on his MBA.

Thanks,
Jesse