From patchwork Wed Sep 15 20:38:19 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sean Paul X-Patchwork-Id: 12497461 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=-13.7 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT autolearn=unavailable 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 D0D76C433F5 for ; Wed, 15 Sep 2021 20:38:45 +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 880E260724 for ; Wed, 15 Sep 2021 20:38:45 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.4.1 mail.kernel.org 880E260724 Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=poorly.run Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=lists.freedesktop.org Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 5D74D6EA2C; Wed, 15 Sep 2021 20:38:42 +0000 (UTC) Received: from mail-qt1-x82d.google.com (mail-qt1-x82d.google.com [IPv6:2607:f8b0:4864:20::82d]) by gabe.freedesktop.org (Postfix) with ESMTPS id 85D1E6EA2A for ; Wed, 15 Sep 2021 20:38:40 +0000 (UTC) Received: by mail-qt1-x82d.google.com with SMTP id s32so3571989qtc.12 for ; Wed, 15 Sep 2021 13:38:40 -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=xeRLmgfKFXSNrBEqFH+XDGPxoP99dQXEItJsdczm5RY=; b=VZQiBzTZEdVgVXSsmOIfrfUILdxqFnEFuvX8dafusu4T89rZdldoiwI0yE0ymDMx72 mlDmWhVQWQ7EDJvU1YeRm8R5MhdoYgARcWfuy76wTva9al70sBQjb8+AmUopyyjPd9LD 9TNUXEgALKQIQaioRf8mz5+WD1/9M1bR9T6dbFFYgwQJAbqiwXngONr4t6u9iVaXQOTq +ae7TP4gVSYUogAH81KBZidLBq4ieZ8ctMEPdpleT15b3q+XAF5mt3ly+H/UFztvlC6k 0NFYSi/JL1TvfoqYgJBjgPCsob1KFkj4wz0RE2NWWbDUjaIO7LdOWNDRBvELGSv3BXpN RgCA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=xeRLmgfKFXSNrBEqFH+XDGPxoP99dQXEItJsdczm5RY=; b=EI2ylwyYf7MzccCIYvZy8LeKDkhLSdqwbhDheQ/6HjagFUFnVSS8ZaZHTrZA76DmOr QBQK4cMFKtrySvvKFC6SHINWKGanq8+d0Nhi6o4V9s6QwgkD1qTXnQy0EvL+mnUILNfd csPjOw+hs1y4H0noO0gSUV0h6LltnsdziA1orpzyGzZLc7b/IWyjdiWa8g5/8Fhhm6IV qyHf/d1Mq6BaW6Qr12wCWiovXs9h+uIMTKeYn836fMNX/5V4dRsl3H11ZgkPpvU5dd7N v4J0mmPnfln/m+BVVpGMELX3PzIdgZFXahYZA5YK2SP615MGZsgX8ZEUZdaxLlVWZuSH MwAA== X-Gm-Message-State: AOAM5324Lr/I1QySSBdpi2Jftbh3F5bO0i27T861RMnR+aXHnKL81FHG KkDlRWJTU9C0ZoGBK4z3Sw134+QxMyYDmQ== X-Google-Smtp-Source: ABdhPJyhYBe2sSzQKivDQaRBW5ncUqjFOL3+neOAsrVNmtqJMfZPWYpJtAb2qTIDvtX/TtzUhYf/og== X-Received: by 2002:ac8:c82:: with SMTP id n2mr1782692qti.207.1631738319454; Wed, 15 Sep 2021 13:38:39 -0700 (PDT) Received: from localhost ([167.100.64.199]) by smtp.gmail.com with ESMTPSA id h9sm833644qkl.4.2021.09.15.13.38.38 (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Wed, 15 Sep 2021 13:38:38 -0700 (PDT) From: Sean Paul To: dri-devel@lists.freedesktop.org, intel-gfx@lists.freedesktop.org, freedreno@lists.freedesktop.org Cc: swboyd@chromium.org, Sean Paul Subject: [PATCH v2 00/13] drm/hdcp: Pull HDCP auth/exchange/check into helpers Date: Wed, 15 Sep 2021 16:38:19 -0400 Message-Id: <20210915203834.1439-1-sean@poorly.run> X-Mailer: git-send-email 2.31.0 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: , Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" From: Sean Paul Hello again, This is the second version of the HDCP helper patchset. See version 1 here: https://patchwork.freedesktop.org/series/94623/ In this second version, I've fixed up the oopsies exposed by 0-day and yamllint and incorporated early review feedback from the dt/dts reviews. Please take a look, Sean Sean Paul (13): drm/hdcp: Add drm_hdcp_atomic_check() drm/hdcp: Avoid changing crtc state in hdcp atomic check drm/hdcp: Update property value on content type and user changes drm/hdcp: Expand HDCP helper library for enable/disable/check drm/i915/hdcp: Consolidate HDCP setup/state cache drm/i915/hdcp: Retain hdcp_capable return codes drm/i915/hdcp: Use HDCP helpers for i915 drm/msm/dpu_kms: Re-order dpu includes drm/msm/dpu: Remove useless checks in dpu_encoder drm/msm/dpu: Remove encoder->enable() hack drm/msm/dp: Re-order dp_audio_put in deinit_sub_modules dt-bindings: msm/dp: Add bindings for HDCP registers drm/msm: Implement HDCP 1.x using the new drm HDCP helpers .../bindings/display/msm/dp-controller.yaml | 7 +- arch/arm64/boot/dts/qcom/sc7180.dtsi | 4 +- drivers/gpu/drm/drm_hdcp.c | 1197 ++++++++++++++++- drivers/gpu/drm/i915/display/intel_atomic.c | 7 +- drivers/gpu/drm/i915/display/intel_ddi.c | 29 +- .../drm/i915/display/intel_display_debugfs.c | 11 +- .../drm/i915/display/intel_display_types.h | 58 +- drivers/gpu/drm/i915/display/intel_dp_hdcp.c | 345 ++--- drivers/gpu/drm/i915/display/intel_dp_mst.c | 17 +- drivers/gpu/drm/i915/display/intel_hdcp.c | 1011 +++----------- drivers/gpu/drm/i915/display/intel_hdcp.h | 35 +- drivers/gpu/drm/i915/display/intel_hdmi.c | 256 ++-- drivers/gpu/drm/msm/Makefile | 1 + drivers/gpu/drm/msm/disp/dpu1/dpu_encoder.c | 17 +- drivers/gpu/drm/msm/disp/dpu1/dpu_kms.c | 30 +- drivers/gpu/drm/msm/disp/dpu1/dpu_kms.h | 2 - drivers/gpu/drm/msm/disp/dpu1/dpu_trace.h | 4 - drivers/gpu/drm/msm/dp/dp_debug.c | 49 +- drivers/gpu/drm/msm/dp/dp_debug.h | 6 +- drivers/gpu/drm/msm/dp/dp_display.c | 47 +- drivers/gpu/drm/msm/dp/dp_display.h | 5 + drivers/gpu/drm/msm/dp/dp_drm.c | 68 +- drivers/gpu/drm/msm/dp/dp_drm.h | 5 + drivers/gpu/drm/msm/dp/dp_hdcp.c | 433 ++++++ drivers/gpu/drm/msm/dp/dp_hdcp.h | 27 + drivers/gpu/drm/msm/dp/dp_parser.c | 22 +- drivers/gpu/drm/msm/dp/dp_parser.h | 4 + drivers/gpu/drm/msm/dp/dp_reg.h | 44 +- drivers/gpu/drm/msm/msm_atomic.c | 15 + include/drm/drm_hdcp.h | 194 +++ 30 files changed, 2561 insertions(+), 1389 deletions(-) create mode 100644 drivers/gpu/drm/msm/dp/dp_hdcp.c create mode 100644 drivers/gpu/drm/msm/dp/dp_hdcp.h Acked-by: Jani Nikula