From patchwork Thu Jan 21 17:26:09 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sean Paul X-Patchwork-Id: 12037245 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-16.6 required=3.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 83B00C433DB for ; Thu, 21 Jan 2021 17:26:29 +0000 (UTC) Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 391C723A58 for ; Thu, 21 Jan 2021 17:26:29 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 391C723A58 Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=poorly.run Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=intel-gfx-bounces@lists.freedesktop.org Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id A08206E914; Thu, 21 Jan 2021 17:26:28 +0000 (UTC) Received: from mail-qk1-x729.google.com (mail-qk1-x729.google.com [IPv6:2607:f8b0:4864:20::729]) by gabe.freedesktop.org (Postfix) with ESMTPS id 8FC9E6E914 for ; Thu, 21 Jan 2021 17:26:27 +0000 (UTC) Received: by mail-qk1-x729.google.com with SMTP id k193so2395577qke.6 for ; Thu, 21 Jan 2021 09:26:27 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=poorly.run; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=/hmJ6IMWFslp7KKucZjB7hkfqVhq/CL/eYPGubDfOkI=; b=Vg0+3PUCLYJncMyH9PxLS5lwKuDt0tnbfowU8f/Ij+jWgeG48ONWlJIfEl8CKByipU paDNdZnt4oZH/OTeqwPRVMcmki2O/HQxvjPFHP7SKMjpaXz8Km97W27Si0BxoB2P4mCA W31XzFcZGA1qi1F7S2rz61ldjYYzxwrK2Em8WaPssBXTTTiPAzeGPaxM2NI2A5YRZd4g 8Za61XdSBV96gMXEU0zS5uZ0KF6kuX/txmykwuJlzKyLDmnwLW9pU7ub9dhqWQ+HjH4W w4o5sukuY/tyFvv92mkzaTQ3AVOCqEvzsDh29chtLfVi9jbdyv/p1n7e6dew8zaByVgV 69PQ== 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:in-reply-to :references:mime-version:content-transfer-encoding; bh=/hmJ6IMWFslp7KKucZjB7hkfqVhq/CL/eYPGubDfOkI=; b=KeJDpgTLtNUIl+YA9bMxj60FJEHUvdQCNSkLhekw4BCmv4cLA9dD/eMgBRusKkQ45d kULfgLtrvXnI/opZTSLMzUOMElqxaazONMbxN86eANQmtDL8GGD0lX9qp79e3fzEiUPJ OVJCEzBiL6GNs2xqjnLP7HjYmOWUjyo+lzwcwM0+HajchQ9sqD/EBuakMtY9AhsBR/7a 1G8NjTT3IpKtnkmn7nXi/tT6Mz8wggSmoU2eC1uIcYshw/C3XWzgAawkpmFjDFW8F62/ yyNiXWqWkjzTSVx2Bg0zohiwKpuAxmozejcz+o+9vBKoCITxwImZV+z6xd6/ZIQOH3nm tV7g== X-Gm-Message-State: AOAM533be7vi8EML95aDFBc/6B7Y+5wX4HLfX/ZqEUMTcHHt27vTKBcp WNfgj7aX2tFKTluxuGtCFesVRw== X-Google-Smtp-Source: ABdhPJzX++v+oUlyBE6siUCp196ZdMRbYqIvUzbE9dqzvLShrC0i8zoODgLmA3Pgar3p2YmVxKJ/Zw== X-Received: by 2002:ae9:ed82:: with SMTP id c124mr756177qkg.399.1611249986682; Thu, 21 Jan 2021 09:26:26 -0800 (PST) Received: from localhost (197.sub-174-193-0.myvzw.com. [174.193.0.197]) by smtp.gmail.com with ESMTPSA id p11sm3913326qtb.62.2021.01.21.09.26.25 (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Thu, 21 Jan 2021 09:26:25 -0800 (PST) From: Sean Paul To: dri-devel@lists.freedesktop.org, intel-gfx@lists.freedesktop.org Date: Thu, 21 Jan 2021 12:26:09 -0500 Message-Id: <20210121172620.33066-1-sean@poorly.run> X-Mailer: git-send-email 2.28.0 In-Reply-To: <20210106223909.34476-1-sean@poorly.run> References: <20210106223909.34476-1-sean@poorly.run> MIME-Version: 1.0 Subject: [Intel-gfx] [PATCH v2] drm/i915/hdcp: Disable the QSES check for HDCP 1.4 over MST X-BeenThere: intel-gfx@lists.freedesktop.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Intel graphics driver community testing & development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Daniel Vetter , Sean Paul Errors-To: intel-gfx-bounces@lists.freedesktop.org Sender: "Intel-gfx" From: Sean Paul The HDCP 1.4 spec does not require the QUERY_STREAM_ENCRYPTION_STATUS check, it was always a nice-to-have. After deploying this across various devices, we've determined that some MST bridge chips do not properly support this call for HDCP 1.4 (namely Synaptics and Realtek). I had considered creating a quirk for this, but I think it's more prudent to just disable the check entirely since I don't have an idea how widespread support is. Acked-by: Daniel Vetter Reviewed-by: Anshuman Gupta Signed-off-by: Sean Paul Link: https://patchwork.freedesktop.org/patch/msgid/20210106223909.34476-1-sean@poorly.run #v1 Changes in v2: -Rebased on -tip --- drivers/gpu/drm/i915/display/intel_dp_hdcp.c | 12 +----------- 1 file changed, 1 insertion(+), 11 deletions(-) diff --git a/drivers/gpu/drm/i915/display/intel_dp_hdcp.c b/drivers/gpu/drm/i915/display/intel_dp_hdcp.c index f372e25edab4..4dba5bb15af5 100644 --- a/drivers/gpu/drm/i915/display/intel_dp_hdcp.c +++ b/drivers/gpu/drm/i915/display/intel_dp_hdcp.c @@ -722,16 +722,6 @@ static bool intel_dp_mst_get_qses_status(struct intel_digital_port *dig_port, return reply.auth_completed && reply.encryption_enabled; } -static -bool intel_dp_mst_hdcp_check_link(struct intel_digital_port *dig_port, - struct intel_connector *connector) -{ - if (!intel_dp_hdcp_check_link(dig_port, connector)) - return false; - - return intel_dp_mst_get_qses_status(dig_port, connector); -} - static int intel_dp_mst_hdcp2_stream_encryption(struct intel_connector *connector, bool enable) @@ -805,7 +795,7 @@ static const struct intel_hdcp_shim intel_dp_mst_hdcp_shim = { .read_v_prime_part = intel_dp_hdcp_read_v_prime_part, .toggle_signalling = intel_dp_hdcp_toggle_signalling, .stream_encryption = intel_dp_mst_hdcp_stream_encryption, - .check_link = intel_dp_mst_hdcp_check_link, + .check_link = intel_dp_hdcp_check_link, .hdcp_capable = intel_dp_hdcp_capable, .write_2_2_msg = intel_dp_hdcp2_write_msg, .read_2_2_msg = intel_dp_hdcp2_read_msg,