From patchwork Tue Aug 18 15:38:48 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sean Paul X-Patchwork-Id: 11721699 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id AF744722 for ; Tue, 18 Aug 2020 15:39:23 +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 8E32820786 for ; Tue, 18 Aug 2020 15:39:23 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=fail reason="signature verification failed" (2048-bit key) header.d=poorly.run header.i=@poorly.run header.b="djzI6hlB" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 8E32820786 Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=poorly.run Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=dri-devel-bounces@lists.freedesktop.org Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id EEAE989C3B; Tue, 18 Aug 2020 15:39:18 +0000 (UTC) X-Original-To: dri-devel@lists.freedesktop.org Delivered-To: dri-devel@lists.freedesktop.org Received: from mail-qk1-x741.google.com (mail-qk1-x741.google.com [IPv6:2607:f8b0:4864:20::741]) by gabe.freedesktop.org (Postfix) with ESMTPS id 4990389C29 for ; Tue, 18 Aug 2020 15:39:17 +0000 (UTC) Received: by mail-qk1-x741.google.com with SMTP id p4so18669172qkf.0 for ; Tue, 18 Aug 2020 08:39:17 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=poorly.run; s=google; h=from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=Jj+Pt1Kndc8K3oV8V7OdxLwRSJ43hPu4IwkadMCPt48=; b=djzI6hlBOee7T3E1xxZ/VpCSWZszXEBW0z53cUhsCURGZ2aXfRj2Xn5vJefhsr5ApU pZaBSZIKab8jkufOaSdOZzAvQFtODTqfpad2KWvFI6ardAwxJ6a3UwJ2oviBzHILKznm ZzLMg1rAyinPqkXKCg0rXaMRKJ3Pqq95sQFfkWGiBTU5Pk5d0r7DBnmODzEWPdSC7PbY 0ogmgHnAzmXQwhjwKG9fdDH8L9+hlw7R3IkiiWutPc6Ve1LsD3YwDAiWvsNRm9NDzxIk UjsBq8Ichm+D1iV0A40H9dbVm9252A8yTyumubUsUkkMrhsXiJFjaxe7XnW1vMurrUhz mdmQ== 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:mime-version :content-transfer-encoding; bh=Jj+Pt1Kndc8K3oV8V7OdxLwRSJ43hPu4IwkadMCPt48=; b=NbCuEwHv7b2oixe/euGgSqvo+vbAjZH+oKRqtvELid/YfZ7WyHhiXaTTCV7td40H80 XQs4fG1MmHXJS7putV6oJoq6D4FIPRzVFf5gxuGL5WcGKWC7Y50uBVtmZhenEUlFJDo/ decuQHnrh2NsQ10iOuZwbtKKpd6SC4AhQ4iWul8PQGs44uCR5Ko9Up/MRsqtwsdZc15p h0+nuJNuwopzvi14IUKFnu9qTjAQuccsmKmY6X0FmC+lkcAFVENsWIZLkW3/WXoGquKO xezVFiGQn4Z2Lh17pB3vifUhoDpRX0zOzu976zM8WSaP9cSs3s30wWycJdBCUrpVvicF ulvg== X-Gm-Message-State: AOAM5307qKQm1CIXVWG09F7oYvrEO3rlMgwTdKK/t6rfuRbkwE+/sOyo fn4gLO2V3irxOVdnT7U2Qh3gG3+ZEN9L6g== X-Google-Smtp-Source: ABdhPJwTYt2995pMFaPFqyOUjqKnNzRVB8PuHMYzdNimx+oTU3eo4vpT4mhKeu7qtvYcVPzojJBPNQ== X-Received: by 2002:a05:620a:234:: with SMTP id u20mr17081823qkm.54.1597765156155; Tue, 18 Aug 2020 08:39:16 -0700 (PDT) Received: from localhost (mobile-166-170-57-144.mycingular.net. [166.170.57.144]) by smtp.gmail.com with ESMTPSA id t83sm20338566qke.133.2020.08.18.08.39.15 (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Tue, 18 Aug 2020 08:39:15 -0700 (PDT) From: Sean Paul To: dri-devel@lists.freedesktop.org, intel-gfx@lists.freedesktop.org, juston.li@intel.com, jani.nikula@linux.intel.com, joonas.lahtinen@linux.intel.com, rodrigo.vivi@intel.com, anshuman.gupta@intel.com Subject: [PATCH v8 00/17] drm/i915: Add support for HDCP 1.4 over MST Date: Tue, 18 Aug 2020 11:38:48 -0400 Message-Id: <20200818153910.27894-1-sean@poorly.run> X-Mailer: git-send-email 2.17.1 MIME-Version: 1.0 X-BeenThere: dri-devel@lists.freedesktop.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Direct Rendering Infrastructure - Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: daniel.vetter@ffwll.ch, Sean Paul Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" From: Sean Paul Only one functional change, reversed the hdcp_1x/2x_present bits in the QUERY_STREAM_ENCRYPTION_STATUS parsing with a comment explaining my confusion. Other than that, lots of rebasing, the most notable being the s/intel_dig_port/dig_port/ rename. Every patch now has a Reviewed-by tag now, I've done build tests on each patch and tested the set as a whole. Hopefully we can get this landed. Sean Sean Paul (17): drm/i915: Fix sha_text population code drm/i915: Clear the repeater bit on HDCP disable drm/i915: WARN if HDCP signalling is enabled upon disable drm/i915: Intercept Aksv writes in the aux hooks drm/i915: Use the cpu_transcoder in intel_hdcp to toggle HDCP signalling drm/i915: Factor out hdcp->value assignments drm/i915: Protect workers against disappearing connectors drm/i915: Clean up intel_hdcp_disable drm/i915: Don't fully disable HDCP on a port if multiple pipes are using it drm/i915: Support DP MST in enc_to_dig_port() function drm/i915: Use ddi_update_pipe in intel_dp_mst drm/i915: Factor out HDCP shim functions from dp for use by dp_mst drm/i915: Plumb port through hdcp init drm/i915: Add connector to hdcp_shim->check_link() drm/mst: Add support for QUERY_STREAM_ENCRYPTION_STATUS MST sideband message drm/i915: Print HDCP version info for all connectors drm/i915: Add HDCP 1.4 support for MST connectors drivers/gpu/drm/drm_dp_mst_topology.c | 150 ++++ drivers/gpu/drm/i915/Makefile | 1 + drivers/gpu/drm/i915/display/intel_ddi.c | 29 +- drivers/gpu/drm/i915/display/intel_ddi.h | 2 + .../drm/i915/display/intel_display_debugfs.c | 21 +- .../drm/i915/display/intel_display_types.h | 30 +- drivers/gpu/drm/i915/display/intel_dp.c | 646 +--------------- drivers/gpu/drm/i915/display/intel_dp.h | 9 + drivers/gpu/drm/i915/display/intel_dp_hdcp.c | 703 ++++++++++++++++++ drivers/gpu/drm/i915/display/intel_dp_mst.c | 19 + drivers/gpu/drm/i915/display/intel_hdcp.c | 217 ++++-- drivers/gpu/drm/i915/display/intel_hdcp.h | 2 +- drivers/gpu/drm/i915/display/intel_hdmi.c | 30 +- .../drm/selftests/test-drm_dp_mst_helper.c | 17 + include/drm/drm_dp_helper.h | 3 + include/drm/drm_dp_mst_helper.h | 44 ++ include/drm/drm_hdcp.h | 3 + 17 files changed, 1202 insertions(+), 724 deletions(-) create mode 100644 drivers/gpu/drm/i915/display/intel_dp_hdcp.c