diff options
| author |   Imre Deak <imre.deak@intel.com> | 2019-05-09 20:34:45 +0300 |
|---|---|---|
| committer | Imre Deak <imre.deak@intel.com> | 2019-05-14 14:06:30 +0300 |
| commit | b4c7ea6354750bbece1650813ada28310e94c92e (patch) | |
| tree | 1dc61e1a17436d045b8ca25041ef2ca377a03f24 /drivers/gpu/drm/i915/intel_dp.c | |
| parent | drm/i915: Replace use of PLLS power domain with DISPLAY_CORE domain (diff) | |
| download | linux-dev-b4c7ea6354750bbece1650813ada28310e94c92e.tar.xz linux-dev-b4c7ea6354750bbece1650813ada28310e94c92e.zip | |
drm/i915: Avoid taking the PPS lock for non-eDP/VLV/CHV
On ICL we have to make sure that we enable the AUX power domain in a
controlled way (corresponding to the port's actual TypeC mode). Since
the PPS lock - which takes an AUX power ref - is only needed on
eDP on all platforms and eDP/DP on VLV/CHV avoid taking it in all
other cases.
v2:
- Clarify commit log about the condition for taking the PPS lock.
(Ville)
Cc: Ville Syrjala <ville.syrjala@linux.intel.com>
Signed-off-by: Imre Deak <imre.deak@intel.com>
Reviewed-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20190509173446.31095-11-imre.deak@intel.com
Diffstat (limited to 'drivers/gpu/drm/i915/intel_dp.c')
| -rw-r--r-- | drivers/gpu/drm/i915/intel_dp.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/drivers/gpu/drm/i915/intel_dp.c b/drivers/gpu/drm/i915/intel_dp.c index 8a91b453b2e9..52452155250f 100644 --- a/drivers/gpu/drm/i915/intel_dp.c +++ b/drivers/gpu/drm/i915/intel_dp.c @@ -6259,6 +6259,10 @@ void intel_dp_encoder_reset(struct drm_encoder *encoder) intel_dp->reset_link_params = true; + if (!IS_VALLEYVIEW(dev_priv) && !IS_CHERRYVIEW(dev_priv) && + !intel_dp_is_edp(intel_dp)) + return; + with_pps_lock(intel_dp, wakeref) { if (IS_VALLEYVIEW(dev_priv) || IS_CHERRYVIEW(dev_priv)) intel_dp->active_pipe = vlv_active_pipe(intel_dp); |