OSDN Git Service
(root)
/
android-x86
/
kernel.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
f39194a
)
drm/i915: WARN for eDP encoders in intel_dp_detect_dpcd()
author
Imre Deak
<imre.deak@intel.com>
Thu, 9 May 2019 17:34:41 +0000
(20:34 +0300)
committer
Imre Deak
<imre.deak@intel.com>
Tue, 14 May 2019 11:06:30 +0000
(14:06 +0300)
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
drivers/gpu/drm/i915/intel_dp.c
patch
|
blob
|
history
diff --git
a/drivers/gpu/drm/i915/intel_dp.c
b/drivers/gpu/drm/i915/intel_dp.c
index
700ceac
..
1e01199
100644
(file)
--- 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;