diff options
| author | Ville Syrjälä <ville.syrjala@linux.intel.com> | 2015-11-11 20:34:10 +0200 |
|---|---|---|
| committer | Ville Syrjälä <ville.syrjala@linux.intel.com> | 2015-11-16 15:59:37 +0200 |
| commit | f3c6a3a70d6768038fb005cb8d745e21b4511ca9 (patch) | |
| tree | 206c8b787dfd1f4e1d3e1aa823a8053ec7c0e5d7 /drivers/gpu/drm/i915/intel_dp.c | |
| parent | d1c0a0019aed692020da523d5fa9f2ebb49a018a (diff) | |
| download | op-kernel-dev-f3c6a3a70d6768038fb005cb8d745e21b4511ca9.zip op-kernel-dev-f3c6a3a70d6768038fb005cb8d745e21b4511ca9.tar.gz | |
drm/i915: Replace aux_ch_ctl_reg check with port check
Instead of checking what aux_ch_ctl_reg is, we can simply check the port
when determining the right timeout value to program.
v2: Reorder patches to reduce churn (Chris)
Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Reviewed-by: Chris Wilson <chris@chris-wilson.co.uk> (v1)
Link: http://patchwork.freedesktop.org/patch/msgid/1447266856-30249-2-git-send-email-ville.syrjala@linux.intel.com
Diffstat (limited to 'drivers/gpu/drm/i915/intel_dp.c')
| -rw-r--r-- | drivers/gpu/drm/i915/intel_dp.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/gpu/drm/i915/intel_dp.c b/drivers/gpu/drm/i915/intel_dp.c index 99b7f1d..891a7f8 100644 --- a/drivers/gpu/drm/i915/intel_dp.c +++ b/drivers/gpu/drm/i915/intel_dp.c @@ -750,7 +750,7 @@ static uint32_t i9xx_get_aux_send_ctl(struct intel_dp *intel_dp, else precharge = 5; - if (IS_BROADWELL(dev) && intel_dp->aux_ch_ctl_reg == DPA_AUX_CH_CTL) + if (IS_BROADWELL(dev) && intel_dig_port->port == PORT_A) timeout = DP_AUX_CH_CTL_TIME_OUT_600us; else timeout = DP_AUX_CH_CTL_TIME_OUT_400us; |
