From patchwork Fri Nov 5 03:04:17 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sean Paul X-Patchwork-Id: 12604017 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id D8852C433F5 for ; Fri, 5 Nov 2021 03:04:44 +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 98BBB60EB8 for ; Fri, 5 Nov 2021 03:04:44 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.4.1 mail.kernel.org 98BBB60EB8 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 218BB6E4D7; Fri, 5 Nov 2021 03:04:38 +0000 (UTC) Received: from mail-qv1-xf29.google.com (mail-qv1-xf29.google.com [IPv6:2607:f8b0:4864:20::f29]) by gabe.freedesktop.org (Postfix) with ESMTPS id CF7D76E4CF for ; Fri, 5 Nov 2021 03:04:36 +0000 (UTC) Received: by mail-qv1-xf29.google.com with SMTP id a24so6607460qvb.5 for ; Thu, 04 Nov 2021 20:04:36 -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=uAU6dnnEYD9i5S7gP/jLUoVaoIHqY4uwtn3zb5N7wrY=; b=I1z5iypCF7aJY/+07bJmHEIQYJ2afl5l/Pgr51Ndmbq2KiywF0/Zgxg4m2Lf+9GR7e JvHhaRCyfT2PrPB1r/W05MUI7RAs6kw7+FHsnc5L87j2unop7gqwW19y4QmBVdXTptYd mk+M87DZ9h1Vj5jTddKiQ+LNBI8JbTMvR0OIBz95nPKpAKzvHTRIcVde3tP60qVA15ca T29CEC9sWGaC51HkYnC3MFmCC/oYMxsQ/EFlE5GRzyhPtM/mnWxM538wgSubvpqUUJLR grSR+i6k487DbfQk1eVtBJPDHxHHUn9iIPHXbO9UWUlQ/GAzDpk1Ll/+JfPYhRbvpdiz JCtw== 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=uAU6dnnEYD9i5S7gP/jLUoVaoIHqY4uwtn3zb5N7wrY=; b=R//A8j76K8sUHY3OQQaVbAm2mmiPhYK0uFNNCsMHq5HyoAaeCV3rk9Q/9E2m+sf24K IT1NM4zGCvHkcS6CKX5Naq5+JaQ9Tg+UyFTOPdCDrQLEwvxCAXUYOPXwWs5VwyERzOyj 2Q7cjNh2+jTd/urqO8DjnnuhZs+uZO5gb8QaEF5YUOA5DsTHBWSwSzrYV1BtuDdcj9O7 FyXaU6zhFiPaz+1vQTVMeygsP90mRFwy9O1E9TC0no8FwvtvNXkISTwSm3rWP8KNtNYV S9Ar9Xlgw8YJolvytdY2lW2qoWmhpNmtcLYrlx/wUZV++YwK4i+7PDVKzf/rLaf5hzkE uShA== X-Gm-Message-State: AOAM530YHKJ7035aJDpdketNzJJoX1cd+lIqD/ZP5cNMQfGGteedIDMS FZhnxXKyPsyI9W8GHpOwNSS14Q== X-Google-Smtp-Source: ABdhPJxhU8Uiixiiz5ovWl8R3t2XSQDyZmRO1/dg4+89s7y0G/5FQ13ZItb6GMsmRNFjCAi5AZSEQg== X-Received: by 2002:a05:6214:20e3:: with SMTP id 3mr2464753qvk.47.1636081475815; Thu, 04 Nov 2021 20:04:35 -0700 (PDT) Received: from localhost ([167.100.64.199]) by smtp.gmail.com with ESMTPSA id d23sm2309986qkj.96.2021.11.04.20.04.35 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 04 Nov 2021 20:04:35 -0700 (PDT) From: Sean Paul To: dri-devel@lists.freedesktop.org, intel-gfx@lists.freedesktop.org, freedreno@lists.freedesktop.org Date: Thu, 4 Nov 2021 23:04:17 -0400 Message-Id: <20211105030434.2828845-1-sean@poorly.run> X-Mailer: git-send-email 2.33.1 MIME-Version: 1.0 Subject: [Intel-gfx] [PATCH v4 00/14] drm/hdcp: Pull HDCP auth/exchange/check into helpers 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: jani.nikula@intel.com, swboyd@chromium.org, Sean Paul , abhinavk@codeaurora.org, bjorn.andersson@linaro.org Errors-To: intel-gfx-bounces@lists.freedesktop.org Sender: "Intel-gfx" From: Sean Paul Just me with another revision of HDCP support for msm. This v4 patch series is mostly a retread of v3 with the following changes: - rebased on Bjorn's displayport-controller register refactor - another change to the dt bindings to remove the compatible string added in v3 - updated review tags I'm missing reviews on the core, i915 patches, and the final patch. It would be fantastic to get some feedback on these before the set once again drifts too far from -tip and I need a painful rebase :-) Thank you to the reviewers for their feedback thus far! Please take a look, Sean Link: https://patchwork.freedesktop.org/series/94623/ #v1 Link: https://patchwork.freedesktop.org/series/94713/ #v2 Link: https://patchwork.freedesktop.org/series/94712/ #v3 Sean Paul (14): 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 arm64: dts: qcom: sc7180: Add support for HDCP in dp-controller drm/msm: Implement HDCP 1.x using the new drm HDCP helpers .../bindings/display/msm/dp-controller.yaml | 8 +- arch/arm64/boot/dts/qcom/sc7180.dtsi | 8 +- 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 | 36 +- 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 | 46 +- drivers/gpu/drm/msm/dp/dp_debug.h | 6 +- drivers/gpu/drm/msm/dp/dp_display.c | 48 +- 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 | 462 +++++++ drivers/gpu/drm/msm/dp/dp_hdcp.h | 27 + drivers/gpu/drm/msm/dp/dp_parser.c | 20 +- drivers/gpu/drm/msm/dp/dp_parser.h | 4 + drivers/gpu/drm/msm/dp/dp_reg.h | 32 +- drivers/gpu/drm/msm/msm_atomic.c | 15 + include/drm/drm_hdcp.h | 194 +++ 30 files changed, 2592 insertions(+), 1377 deletions(-) create mode 100644 drivers/gpu/drm/msm/dp/dp_hdcp.c create mode 100644 drivers/gpu/drm/msm/dp/dp_hdcp.h