diff options
| author | Sean Paul | 2018-01-09 19:53:51 +0100 |
|---|---|---|
| committer | Sean Paul | 2018-01-09 19:55:04 +0100 |
| commit | 2f4498a4ac2f77671587faa99e38c3342d666114 (patch) | |
| tree | 16bcfee822838c4e175c90ef64b2e42e604b6af9 /drivers/gpu/drm/i915/intel_hdmi.c | |
| parent | drm/i915: Implement HDCP for DisplayPort (diff) | |
| download | kernel-qcow2-linux-2f4498a4ac2f77671587faa99e38c3342d666114.tar.gz kernel-qcow2-linux-2f4498a4ac2f77671587faa99e38c3342d666114.tar.xz kernel-qcow2-linux-2f4498a4ac2f77671587faa99e38c3342d666114.zip | |
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
Diffstat (limited to 'drivers/gpu/drm/i915/intel_hdmi.c')
| -rw-r--r-- | drivers/gpu/drm/i915/intel_hdmi.c | 3 |
1 files changed, 2 insertions, 1 deletions
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) |