aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/gpu/drm/i915/intel_dp.c
diff options
context:
space:
mode:
authorDamien Lespiau <damien.lespiau@intel.com>2014-01-21 08:37:15 -0500
committerDaniel Vetter <daniel.vetter@ffwll.ch>2014-01-24 11:22:58 -0500
commit153b110038f3f611c19472f5c9a35827c5f7b72b (patch)
tree9eb08a6fc9b8cf1a6b2add4627bf0007d5b06956 /drivers/gpu/drm/i915/intel_dp.c
parent788d4433dc38549d80c3f7f3ca1982383157a65a (diff)
drm/i915: Introduce a get_aux_send_ctl() vfunc
We need a bit more flexibility here in the future, bits get shuffled around. v2: more descriptive commit message (Jani Nikula) Reviewed-by: Jani Nikula <jani.nikula@intel.com> Signed-off-by: Damien Lespiau <damien.lespiau@intel.com> Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
Diffstat (limited to 'drivers/gpu/drm/i915/intel_dp.c')
-rw-r--r--drivers/gpu/drm/i915/intel_dp.c10
1 files changed, 6 insertions, 4 deletions
diff --git a/drivers/gpu/drm/i915/intel_dp.c b/drivers/gpu/drm/i915/intel_dp.c
index cc4b85bb2a97..e37c7a037538 100644
--- a/drivers/gpu/drm/i915/intel_dp.c
+++ b/drivers/gpu/drm/i915/intel_dp.c
@@ -493,10 +493,10 @@ intel_dp_aux_ch(struct intel_dp *intel_dp,
493 } 493 }
494 494
495 while ((aux_clock_divider = intel_dp->get_aux_clock_divider(intel_dp, clock++))) { 495 while ((aux_clock_divider = intel_dp->get_aux_clock_divider(intel_dp, clock++))) {
496 u32 send_ctl = i9xx_get_aux_send_ctl(intel_dp, 496 u32 send_ctl = intel_dp->get_aux_send_ctl(intel_dp,
497 has_aux_irq, 497 has_aux_irq,
498 send_bytes, 498 send_bytes,
499 aux_clock_divider); 499 aux_clock_divider);
500 500
501 /* Must try at least 3 times according to DP spec */ 501 /* Must try at least 3 times according to DP spec */
502 for (try = 0; try < 5; try++) { 502 for (try = 0; try < 5; try++) {
@@ -3724,6 +3724,8 @@ intel_dp_init_connector(struct intel_digital_port *intel_dig_port,
3724 else 3724 else
3725 intel_dp->get_aux_clock_divider = i9xx_get_aux_clock_divider; 3725 intel_dp->get_aux_clock_divider = i9xx_get_aux_clock_divider;
3726 3726
3727 intel_dp->get_aux_send_ctl = i9xx_get_aux_send_ctl;
3728
3727 /* Preserve the current hw state. */ 3729 /* Preserve the current hw state. */
3728 intel_dp->DP = I915_READ(intel_dp->output_reg); 3730 intel_dp->DP = I915_READ(intel_dp->output_reg);
3729 intel_dp->attached_connector = intel_connector; 3731 intel_dp->attached_connector = intel_connector;