drm/i915: Set crtc_state->lane_count for HDMI
authorAnder Conselvan de Oliveira <ander.conselvan.de.oliveira@intel.com>
Wed, 27 Apr 2016 12:44:16 +0000 (15:44 +0300)
committerAnder Conselvan de Oliveira <ander.conselvan.de.oliveira@intel.com>
Fri, 29 Apr 2016 06:55:08 +0000 (09:55 +0300)
Set the lane count for HDMI to 4. This will make it easier to
unduplicate CHV phy code.

This also fixes the the soft reset programming for HDMI with CHV. After
commit a8f327fb8464 ("drm/i915: Clean up CHV lane soft reset
programming"), it wouldn't set the right bits for PCS23 since it relied
on a lane count that was never set.

v2: Set lane_count in *_get_config() to please state checker. (0day)
v3: Set lane_count for DDI in DVI mode too. (CI)
v4: Add note about CHV soft lane reset. (Ander)

Fixes: a8f327fb8464 ("drm/i915: Clean up CHV lane soft reset programming")
Signed-off-by: Ander Conselvan de Oliveira <ander.conselvan.de.oliveira@intel.com>
Reviewed-by: Jim Bride <jim.bride@linux.intel.com>
Link: http://patchwork.freedesktop.org/patch/msgid/1461761065-21195-2-git-send-email-ander.conselvan.de.oliveira@intel.com
drivers/gpu/drm/i915/intel_ddi.c
drivers/gpu/drm/i915/intel_hdmi.c

index e30e1781fd713bc0b315503fdda9c0257ffa6b18..422ec81ef59bf3dd65c2d0cbd379ee2e5c08fb8c 100644 (file)
@@ -2197,8 +2197,10 @@ void intel_ddi_get_config(struct intel_encoder *encoder,
 
                if (intel_hdmi->infoframe_enabled(&encoder->base, pipe_config))
                        pipe_config->has_infoframe = true;
-               break;
+               /* fall through */
        case TRANS_DDI_MODE_SELECT_DVI:
+               pipe_config->lane_count = 4;
+               break;
        case TRANS_DDI_MODE_SELECT_FDI:
                break;
        case TRANS_DDI_MODE_SELECT_DP_SST:
index 2cdab73046f8a8165a9e8e2965afd45501fbf65d..718eba2527e8feb8685ef4a031d006e4195dc782 100644 (file)
@@ -953,6 +953,8 @@ static void intel_hdmi_get_config(struct intel_encoder *encoder,
                dotclock /= pipe_config->pixel_multiplier;
 
        pipe_config->base.adjusted_mode.crtc_clock = dotclock;
+
+       pipe_config->lane_count = 4;
 }
 
 static void intel_enable_hdmi_audio(struct intel_encoder *encoder)
@@ -1337,6 +1339,8 @@ bool intel_hdmi_compute_config(struct intel_encoder *encoder,
        /* Set user selected PAR to incoming mode's member */
        adjusted_mode->picture_aspect_ratio = intel_hdmi->aspect_ratio;
 
+       pipe_config->lane_count = 4;
+
        return true;
 }