]> git.itanic.dy.fi Git - linux-stable/commit
drm/i915: don't clobber the pipe param in sanitize_modesetting
authorDaniel Vetter <daniel.vetter@ffwll.ch>
Sun, 13 May 2012 20:29:25 +0000 (22:29 +0200)
committerBen Hutchings <ben@decadent.org.uk>
Wed, 30 May 2012 23:44:00 +0000 (00:44 +0100)
commit777ed7f9492361fa88eefbdb837937da888810a5
tree26f557e8fc8248b680d3b13ebd3d06f9a856b188
parentbe8ad46e10b99411acae4f0461be547f32a08686
drm/i915: don't clobber the pipe param in sanitize_modesetting

commit a9dcf84b14ef4e9a609910367576995e6f32f3dc upstream.

... we need it later on in the function to clean up pipe <-> plane
associations. This regression has been introduced in

commit f47166d2b0001fcb752b40c5a2d4db986dfbea68
Author: Chris Wilson <chris@chris-wilson.co.uk>
Date:   Thu Mar 22 15:00:50 2012 +0000

    drm/i915: Sanitize BIOS debugging bits from PIPECONF

Spotted by staring at debug output of an (as it turns out) totally
unrelated bug.

v2: I've totally failed to do the s/pipe/i/ correctly, spotted by
Chris Wilson.

Reviewed-by: Chris Wilson <chris@chris-wilson.co.uk>
Reviewed-by: Eugeni Dodonov <eugeni.dodonov@intel.com>
Signed-Off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
Signed-off-by: Ben Hutchings <ben@decadent.org.uk>
drivers/gpu/drm/i915/intel_display.c