aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAnder Conselvan de Oliveira <ander.conselvan.de.oliveira@intel.com>2016-10-06 12:22:16 -0400
committerAnder Conselvan de Oliveira <ander.conselvan.de.oliveira@intel.com>2016-10-28 05:23:53 -0400
commitb284eedaf74bdbd262f71a7937ca78f45354173f (patch)
tree8cf6bffa77b8c6031561e026b3e57595f7568ef2
parent362624c9ba3f6bff2df6304068a45b355d4ab13b (diff)
drm/i915: Pass lane count to bxt_ddi_phy_calc_lane_optmin_mask()
Pass lane count to bxt_ddi_phy_calc_lane_optmin_mask() instead of having it extract that number from a pipe_config to decouple the phy code from intel_crtc_state. Signed-off-by: Ander Conselvan de Oliveira <ander.conselvan.de.oliveira@intel.com> Reviewed-by: Imre Deak <imre.deak@intel.com> Link: http://patchwork.freedesktop.org/patch/msgid/a4977e0207e594953c4f9d1b5f2ef972a8679e74.1475770848.git-series.ander.conselvan.de.oliveira@intel.com
-rw-r--r--drivers/gpu/drm/i915/intel_ddi.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/gpu/drm/i915/intel_ddi.c b/drivers/gpu/drm/i915/intel_ddi.c
index fb18d699ce10..1de0276eecdd 100644
--- a/drivers/gpu/drm/i915/intel_ddi.c
+++ b/drivers/gpu/drm/i915/intel_ddi.c
@@ -2190,9 +2190,9 @@ bool bxt_ddi_phy_verify_state(struct drm_i915_private *dev_priv,
2190 2190
2191static uint8_t 2191static uint8_t
2192bxt_ddi_phy_calc_lane_lat_optim_mask(struct intel_encoder *encoder, 2192bxt_ddi_phy_calc_lane_lat_optim_mask(struct intel_encoder *encoder,
2193 struct intel_crtc_state *pipe_config) 2193 uint8_t lane_count)
2194{ 2194{
2195 switch (pipe_config->lane_count) { 2195 switch (lane_count) {
2196 case 1: 2196 case 1:
2197 return 0; 2197 return 0;
2198 case 2: 2198 case 2:
@@ -2200,7 +2200,7 @@ bxt_ddi_phy_calc_lane_lat_optim_mask(struct intel_encoder *encoder,
2200 case 4: 2200 case 4:
2201 return BIT(3) | BIT(2) | BIT(0); 2201 return BIT(3) | BIT(2) | BIT(0);
2202 default: 2202 default:
2203 MISSING_CASE(pipe_config->lane_count); 2203 MISSING_CASE(lane_count);
2204 2204
2205 return 0; 2205 return 0;
2206 } 2206 }
@@ -2417,7 +2417,7 @@ static bool intel_ddi_compute_config(struct intel_encoder *encoder,
2417 if (IS_BROXTON(dev_priv) && ret) 2417 if (IS_BROXTON(dev_priv) && ret)
2418 pipe_config->lane_lat_optim_mask = 2418 pipe_config->lane_lat_optim_mask =
2419 bxt_ddi_phy_calc_lane_lat_optim_mask(encoder, 2419 bxt_ddi_phy_calc_lane_lat_optim_mask(encoder,
2420 pipe_config); 2420 pipe_config->lane_count);
2421 2421
2422 return ret; 2422 return ret;
2423 2423