| commit | eafbc20701243d21989c9c9aff5e5d9488e1890a | [log] [tgz] |
|---|---|---|
| author | Jani Nikula <jani.nikula@intel.com> | Tue Jul 11 12:52:14 2017 +0300 |
| committer | Jani Nikula <jani.nikula@intel.com> | Tue Jul 11 12:52:14 2017 +0300 |
| tree | cff44fb461f8adbab3c6daab533bf3ead3d5d094 | |
| parent | 50740024bc393b608f7e391ac35e70f33938dd24 [diff] | |
| parent | 0cf5ec41839d82ee7f8fbb47f137b7afc562b9f1 [diff] |
Merge tag 'gvt-fixes-2017-07-11' of https://github.com/01org/gvt-linux into drm-intel-next-fixes gvt-fixes-2017-07-11 - Revert "drm/i915/gvt: Fix possible recursive locking issue" (Chuanxiao), which is incomplete fix and it's actually VFIO issue, so revert. - remove unneeded scheduler mutex for performance fix (Weinan) - other misc error handling fix and cmd address audit Signed-off-by: Jani Nikula <jani.nikula@intel.com> Link: http://patchwork.freedesktop.org/patch/msgid/20170711055333.jhrmvx6ilvg2qlnn@zhen-hp.sh.intel.com
diff --git a/drivers/gpu/drm/i915/i915_debugfs.c b/drivers/gpu/drm/i915/i915_debugfs.c index 4577b0a..23cd865 100644 --- a/drivers/gpu/drm/i915/i915_debugfs.c +++ b/drivers/gpu/drm/i915/i915_debugfs.c
@@ -3083,7 +3083,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) {