diff options
| author | Imre Deak <imre.deak@intel.com> | 2019-05-09 20:34:41 +0300 |
|---|---|---|
| committer | Imre Deak <imre.deak@intel.com> | 2019-05-14 14:06:30 +0300 |
| commit | ad5125d6ef2de22212de82debd0baaecdaa7e7cd (patch) | |
| tree | 2e2250c5627d16be3f1c723a175678be48c45428 /drivers/gpu/drm/i915/intel_dp.c | |
| parent | f39194a7a8b903923c83f563cbe5a651fd00dd93 (diff) | |
| download | linux-ad5125d6ef2de22212de82debd0baaecdaa7e7cd.tar.gz linux-ad5125d6ef2de22212de82debd0baaecdaa7e7cd.tar.bz2 linux-ad5125d6ef2de22212de82debd0baaecdaa7e7cd.zip | |
drm/i915: WARN for eDP encoders in intel_dp_detect_dpcd()
We are not calling this function for eDP, so add an early assert about
this for clarity.
Cc: Ville Syrjälä <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-7-imre.deak@intel.com
Diffstat (limited to 'drivers/gpu/drm/i915/intel_dp.c')
| -rw-r--r-- | drivers/gpu/drm/i915/intel_dp.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/gpu/drm/i915/intel_dp.c b/drivers/gpu/drm/i915/intel_dp.c index 700ceacb82e6..1e011998e9d5 100644 --- a/drivers/gpu/drm/i915/intel_dp.c +++ b/drivers/gpu/drm/i915/intel_dp.c @@ -4844,15 +4844,15 @@ intel_dp_detect_dpcd(struct intel_dp *intel_dp) u8 *dpcd = intel_dp->dpcd; u8 type; + if (WARN_ON(intel_dp_is_edp(intel_dp))) + return connector_status_connected; + if (lspcon->active) lspcon_resume(lspcon); if (!intel_dp_get_dpcd(intel_dp)) return connector_status_disconnected; - if (intel_dp_is_edp(intel_dp)) - return connector_status_connected; - /* if there's no downstream port, we're done */ if (!drm_dp_is_branch(dpcd)) return connector_status_connected; |