浏览代码

drm/i915: Don't allow HDCP on PORT E/F

Port E doesn't have HDCP support, and Port F is disabled. Don't setup
the hdcp shim on those.

Reviewed-by: Daniel Vetter <daniel@ffwll.ch>
Signed-off-by: Sean Paul <seanpaul@chromium.org>
Link: https://patchwork.freedesktop.org/patch/msgid/20180109185401.16911-1-seanpaul@chromium.org
Sean Paul 7 年之前
父节点
当前提交
2f4498a4ac
共有 1 个文件被更改,包括 2 次插入1 次删除
  1. 2 1
      drivers/gpu/drm/i915/intel_hdmi.c

+ 2 - 1
drivers/gpu/drm/i915/intel_hdmi.c

@@ -2296,7 +2296,8 @@ void intel_hdmi_init_connector(struct intel_digital_port *intel_dig_port,
 
 
 	intel_hdmi_add_properties(intel_hdmi, connector);
 	intel_hdmi_add_properties(intel_hdmi, connector);
 
 
-	if (INTEL_GEN(dev_priv) >= 9) {
+	/* PORT E doesn't have HDCP, and PORT F is disabled */
+	if (INTEL_GEN(dev_priv) >= 9 && port < PORT_E) {
 		int ret = intel_hdcp_init(intel_connector,
 		int ret = intel_hdcp_init(intel_connector,
 					  &intel_hdmi_hdcp_shim);
 					  &intel_hdmi_hdcp_shim);
 		if (ret)
 		if (ret)