drm/i915: consolidate swizzling control bit frobbing
authorDaniel Vetter <daniel.vetter@ffwll.ch>
Tue, 31 Jan 2012 15:47:55 +0000 (16:47 +0100)
committerDaniel Vetter <daniel.vetter@ffwll.ch>
Wed, 8 Feb 2012 22:18:27 +0000 (23:18 +0100)
commit11782b0233c06a35776786f30e19dc4168eb5406
tree3e5111c96497fa994503146d98ae2e8514497a03
parentf691e2f4cec334e906f971471b3bf1460c6256d4
drm/i915: consolidate swizzling control bit frobbing

On gen5 we also need to correctly set up swizzling in the display
scanout engine, but only there. Consolidate this into the same
function.

This has a small effect on ums setups - the kernel now also sets this
bit in addition to userspace setting it. Given that this code only
runs when userspace either can't (resume, gpu reset) or explicitly
won't(gem_init) touch the hw this shouldn't have an adverse effect.

Reviewed-by: Ben Widawsky <ben@bwidawsk.net>
Signed-Off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
drivers/gpu/drm/i915/i915_gem.c
drivers/gpu/drm/i915/intel_display.c