git.samba.org
/
sfrench
/
cifs-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge remote-tracking branch 'asoc/fix/intel' into asoc-linus
[sfrench/cifs-2.6.git]
/
drivers
/
gpu
/
drm
/
i915
/
i915_debugfs.c
diff --git
a/drivers/gpu/drm/i915/i915_debugfs.c
b/drivers/gpu/drm/i915/i915_debugfs.c
index 3f44076ec8a0dbb8db76afcc2507f81c9916ba7e..00d8967c8512048f5fb46f629c9c76ace1161bbf 100644
(file)
--- a/
drivers/gpu/drm/i915/i915_debugfs.c
+++ b/
drivers/gpu/drm/i915/i915_debugfs.c
@@
-3087,7
+3087,7
@@
static void intel_connector_info(struct seq_file *m,
connector->display_info.cea_rev);
}
- if (!intel_encoder
|| intel_encoder->type == INTEL_OUTPUT_DP_MST
)
+ if (!intel_encoder)
return;
switch (connector->connector_type) {