From patchwork Tue Jan 9 18:53:51 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sean Paul X-Patchwork-Id: 10153057 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id D806F602CA for ; Tue, 9 Jan 2018 18:54:06 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id D2B6D2871A for ; Tue, 9 Jan 2018 18:54:06 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id C798628724; Tue, 9 Jan 2018 18:54:06 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-4.1 required=2.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_MED, T_DKIM_INVALID autolearn=unavailable version=3.3.1 Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) (using TLSv1.2 with cipher DHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 90DA22871A for ; Tue, 9 Jan 2018 18:54:06 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 21C7D89F89; Tue, 9 Jan 2018 18:54:05 +0000 (UTC) X-Original-To: intel-gfx@lists.freedesktop.org Delivered-To: intel-gfx@lists.freedesktop.org Received: from mail-yw0-x243.google.com (mail-yw0-x243.google.com [IPv6:2607:f8b0:4002:c05::243]) by gabe.freedesktop.org (Postfix) with ESMTPS id CFAED89F89 for ; Tue, 9 Jan 2018 18:54:03 +0000 (UTC) Received: by mail-yw0-x243.google.com with SMTP id b129so495307ywa.8 for ; Tue, 09 Jan 2018 10:54:03 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; h=from:to:cc:subject:date:message-id; bh=xQAbaQ7QboZizxWAT+5PQnUKAEkrNHAZWP+9c6V8JuQ=; b=INrf963anDbMJxMysOlcrI4K70upebsUQoghF2BG+KwQHK2b2wcFX+rGSHly3Q25Pe oGbDoXdJ0ZvAtSsbAr5fz9O9OqGczlYn9xOEwY6bCFkuV7ePsVYeaw+KTDVG2mOSAM+W 13oXVBanehRVaoHUnEvOHOhQg2p4+QPrRXGxg= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id; bh=xQAbaQ7QboZizxWAT+5PQnUKAEkrNHAZWP+9c6V8JuQ=; b=GLBkarZIKTWGcwr/suddKnxPx+iDuNMNYQ+mvKhA8/YPNw3OwAiMom8W9oUa8IyPE2 jAyMSaACeFF/eWesD0mSB4qwQx66/wCOA7ER4OPNYwPFkS4zgbQ/yuWZa77BW+3tGVh5 i/cb2fMqtOkAVdyuaobsjPGH4BV/toD4I6vYD+ELekXHXZZegPAiNeBlm1ptRew+qdtq 48M2dAF5bY5k9PMl2T6CkbTFYUOe8fvVx/trLBCtm6wPEXLxT734qSRvqqMqSKhs/cXq 7iZYoZ7VF6c4EcUffr0RqnF3W/i1Ou7os9ATGD+/fHc8c0uF1mMJk542S5caODrPshL1 9eYQ== X-Gm-Message-State: AKwxytezVMzXpF53YQ7GJSzLAoI6ZR/n7gHPfhFczzj3ZJgKUoTWbw3r RcJnmmfB2mlS0pwIqTpcrlcW1zKOi+w= X-Google-Smtp-Source: ACJfBos5+ESMmBu/af/8odwQTNksxdnS0UdAObE9Xclfr0tbjK7fZXnvmpraCMPikH1lwQy6o3Huhw== X-Received: by 10.129.110.194 with SMTP id j185mr2007863ywc.509.1515524042883; Tue, 09 Jan 2018 10:54:02 -0800 (PST) Received: from rosewood.cam.corp.google.com ([2620:0:1013:11:d3af:69ac:1964:28e8]) by smtp.gmail.com with ESMTPSA id q8sm6284641ywj.30.2018.01.09.10.54.02 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 09 Jan 2018 10:54:02 -0800 (PST) From: Sean Paul To: intel-gfx@lists.freedesktop.org, dri-devel@lists.freedesktop.org, seanpaul@google.com Date: Tue, 9 Jan 2018 13:53:51 -0500 Message-Id: <20180109185401.16911-1-seanpaul@chromium.org> X-Mailer: git-send-email 2.15.1.620.gb9897f4670-goog Subject: [Intel-gfx] [PATCH] drm/i915: Don't allow HDCP on PORT E/F X-BeenThere: intel-gfx@lists.freedesktop.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: Intel graphics driver community testing & development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: intel-gfx-bounces@lists.freedesktop.org Sender: "Intel-gfx" X-Virus-Scanned: ClamAV using ClamSMTP Port E doesn't have HDCP support, and Port F is disabled. Don't setup the hdcp shim on those. Reviewed-by: Daniel Vetter Signed-off-by: Sean Paul --- 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)