drm/i915/chv: Pipe select change for DP and HDMI

With additional of pipe C, current 1 bit registers for pipe select
for HDMI and DP are no longer able to gather for 3 pipes. As a result,
new bits location in the same registers are added.

For HDMI, VLV uses bit 30, CHV uses bit 24-25.

For DP, VLV uses bit 30, CHV uses bit 16-17.

Reviewed-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Signed-off-by: Chon Ming Lee <chon.ming.lee@intel.com>
Reviewed-by: Imre Deak <imre.deak@intel.com>
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>

1 files changed, 2 insertions, 0 deletions

diff --git a/drivers/gpu/drm/i915/intel_hdmi.c b/drivers/gpu/drm/i915/intel_hdmi.c
index 586cee04cc06..e422cfaebb03 100644
--- a/drivers/gpu/drm/i915/intel_hdmi.c
+++ b/drivers/gpu/drm/i915/intel_hdmi.c
@@ -664,6 +664,8 @@ static void intel_hdmi_mode_set(struct intel_encoder *encoder)
 
         if (HAS_PCH_CPT(dev))
                 hdmi_val |= SDVO_PIPE_SEL_CPT(crtc->pipe);
+        else if (IS_CHERRYVIEW(dev))
+                hdmi_val |= SDVO_PIPE_SEL_CHV(crtc->pipe);
         else
                 hdmi_val |= SDVO_PIPE_SEL(crtc->pipe);