diff options
| author | Ville Syrjälä | 2016-06-22 20:57:04 +0200 |
|---|---|---|
| committer | Ville Syrjälä | 2016-07-07 12:10:07 +0200 |
| commit | 37a5650b5bd645d74f082f2cffd22e4db7f4b238 (patch) | |
| tree | 5b85827faed44cd45539ec0a439ef8b5c11e5305 /drivers/gpu/drm/i915/intel_ddi.c | |
| parent | drm/i915: Replace manual lvds and sdvo/hdmi counting with intel_crtc_has_type() (diff) | |
| download | kernel-qcow2-linux-37a5650b5bd645d74f082f2cffd22e4db7f4b238.tar.gz kernel-qcow2-linux-37a5650b5bd645d74f082f2cffd22e4db7f4b238.tar.xz kernel-qcow2-linux-37a5650b5bd645d74f082f2cffd22e4db7f4b238.zip | |
drm/i915: Kill has_dp_encoder from pipe_config
Use the new output_types bitmask instead of has_dp_encoder.
To make it less oainlful provide a small helper
(intel_crtc_has_dp_encoder()) to do the bitsy stuff.
v2: Rebase
Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Reviewed-by: Maarten Lankhorst <maarten.lankhorst@linux.intel.com>
Link: http://patchwork.freedesktop.org/patch/msgid/1466621833-5054-7-git-send-email-ville.syrjala@linux.intel.com
Diffstat (limited to 'drivers/gpu/drm/i915/intel_ddi.c')
| -rw-r--r-- | drivers/gpu/drm/i915/intel_ddi.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/gpu/drm/i915/intel_ddi.c b/drivers/gpu/drm/i915/intel_ddi.c index d6efe8bf813b..aa12d0e9bb93 100644 --- a/drivers/gpu/drm/i915/intel_ddi.c +++ b/drivers/gpu/drm/i915/intel_ddi.c @@ -834,7 +834,7 @@ static void ddi_dotclock_get(struct intel_crtc_state *pipe_config) if (pipe_config->has_pch_encoder) dotclock = intel_dotclock_calculate(pipe_config->port_clock, &pipe_config->fdi_m_n); - else if (pipe_config->has_dp_encoder) + else if (intel_crtc_has_dp_encoder(pipe_config)) dotclock = intel_dotclock_calculate(pipe_config->port_clock, &pipe_config->dp_m_n); else if (pipe_config->has_hdmi_sink && pipe_config->pipe_bpp == 36) @@ -2211,7 +2211,6 @@ void intel_ddi_get_config(struct intel_encoder *encoder, break; case TRANS_DDI_MODE_SELECT_DP_SST: case TRANS_DDI_MODE_SELECT_DP_MST: - pipe_config->has_dp_encoder = true; pipe_config->lane_count = ((temp & DDI_PORT_WIDTH_MASK) >> DDI_PORT_WIDTH_SHIFT) + 1; intel_dp_get_m_n(intel_crtc, pipe_config); |