[Oneiric SRU] drm/i915: Fix PCH port pipe select in CPT disable paths

[Keng-Yu Lin]

SRU Justification:

Impact:
  The external monitor becomes blank at times on extended or mirror mode.

Fix:
  Upstream commit 1519b9956eb4b4180fa3f47c73341463cdcfaa37
  with some conflicts resolved.

Testcase:
  Tested on Asus K54C, both analog VGA and HDMI ports work good.

BugLink: http://bugs.launchpad.net/bugs/906756

Keith Packard (1):
  drm/i915: Fix PCH port pipe select in CPT disable paths

 drivers/gpu/drm/i915/i915_reg.h      |   13 ++----
 drivers/gpu/drm/i915/intel_display.c |   81 +++++++++++++++++++++++++++++++---
 2 files changed, 79 insertions(+), 15 deletions(-)

-- 
1.7.5.4