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 --- drivers/gpu/drm/i915/intel_hdmi.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/drivers/gpu/drm/i915/intel_hdmi.c b/drivers/gpu/drm/i915/intel_hdmi.c index 22251ad48b3b..09b52d218fd4 100644 --- a/drivers/gpu/drm/i915/intel_hdmi.c +++ b/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);
- 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, &intel_hdmi_hdcp_shim); if (ret)