From patchwork Wed Apr 19 15:43:15 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mark Yacoub X-Patchwork-Id: 13217077 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 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 smtp.lore.kernel.org (Postfix) with ESMTPS id A83AEC77B73 for ; Wed, 19 Apr 2023 15:43:54 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 5D23D10EA1A; Wed, 19 Apr 2023 15:43:43 +0000 (UTC) Received: from mail-yw1-x112e.google.com (mail-yw1-x112e.google.com [IPv6:2607:f8b0:4864:20::112e]) by gabe.freedesktop.org (Postfix) with ESMTPS id D324C10EA0F for ; Wed, 19 Apr 2023 15:43:36 +0000 (UTC) Received: by mail-yw1-x112e.google.com with SMTP id 00721157ae682-552ae3e2cbeso3704597b3.13 for ; Wed, 19 Apr 2023 08:43:36 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; t=1681919016; x=1684511016; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=3rbNDIEnicTo7tDhLykbW0onsLUTFtSKKNeiVomT8Zk=; b=lqGKv9rsoLivhOEKsIR4drSBrR1Q/DiHB/0eB7TBOu9TRoEDuZbNMaORCUV7ZTpDSZ xl3wGw0eOxO6v4QsGJb/wDfqSz4t0pTgp5pV510SxIPxNYoBYn9OWqD4YFzDeWJRu+nW dU0q824Yc6qNEN+PdK7ddn7C/oMH0vaHOr1UY= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1681919016; x=1684511016; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=3rbNDIEnicTo7tDhLykbW0onsLUTFtSKKNeiVomT8Zk=; b=Ap+osZd4MjZ20/cTnSBO+heed6ey8jCX+s1/tduEkvAyW/hPjCHzCUFTGmbEAjjjLx y9aY1ry9xhao4LL25YhGThi/YUcG9ZQ2CYAQowglsAaPfxozITBgo0vJsSIfuvyJS7ir JrmOPKT/WpyZEx7CQH3qddhM01Yz6vguMVcnf8U6kabIUarrREDeMx16r6AiEUEP0cNd Pkr3FNlhIdkrS9c/bXzJniBlHhMlFqAfm/KLBjQhcC5VXWfKt4L8mUygZX/m6qLMbh05 zZVDY4AM9sDsBVtTMdlE/HLGNcGQwgzdKz1BK/YJMcw9eQ283LhMEG0O69Ah88tAJOU5 namQ== X-Gm-Message-State: AAQBX9f8tezaYKwEqgij6ENqznH0baHb2GZJyIi168dvqN3isxgPtOhw sJWzCsjYIlHzz7veyRxxhWIseg== X-Google-Smtp-Source: AKy350YXIboby0BiQ680djcN4zWnyqp+qDLhEvsYJGHk2MJKrU+2g5WP3UUvwFNaUfN9CCkVZYj1LQ== X-Received: by 2002:a0d:f104:0:b0:54f:bb34:1a5 with SMTP id a4-20020a0df104000000b0054fbb3401a5mr3291360ywf.48.1681919016509; Wed, 19 Apr 2023 08:43:36 -0700 (PDT) Received: from localhost ([2620:0:1035:15:55c6:7cf1:a68:79b0]) by smtp.gmail.com with UTF8SMTPSA id f69-20020a25cf48000000b00b7767ca7473sm4457616ybg.16.2023.04.19.08.43.35 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Wed, 19 Apr 2023 08:43:36 -0700 (PDT) From: Mark Yacoub X-Google-Original-From: Mark Yacoub To: Jani Nikula , Joonas Lahtinen , Rodrigo Vivi , Tvrtko Ursulin , David Airlie , Daniel Vetter Date: Wed, 19 Apr 2023 11:43:15 -0400 Message-ID: <20230419154321.1993419-6-markyacoub@google.com> X-Mailer: git-send-email 2.40.0.634.g4ca3ef3211-goog In-Reply-To: <20230419154321.1993419-1-markyacoub@google.com> References: <20230419154321.1993419-1-markyacoub@google.com> MIME-Version: 1.0 Subject: [Intel-gfx] [PATCH v10 05/10] drm/i915/hdcp: Consolidate HDCP setup/state cache 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-gfx@lists.freedesktop.org, dianders@chromium.org, dri-devel@lists.freedesktop.org, linux-kernel@vger.kernel.org, seanpaul@chromium.org, dmitry.baryshkov@linaro.org, freedreno@lists.freedesktop.org Errors-To: intel-gfx-bounces@lists.freedesktop.org Sender: "Intel-gfx" From: Sean Paul Stick all of the setup for HDCP into a dedicated function. No functional change, but this will facilitate moving HDCP logic into helpers. Acked-by: Jani Nikula Reviewed-by: Rodrigo Vivi Signed-off-by: Sean Paul --- Changes in v2: -None Changes in v3: -None Changes in v4: -None Changes in v5: -None Changes in v6: -None Changes in v7: - None drivers/gpu/drm/i915/display/intel_hdcp.c | 52 +++++++++++++++-------- 1 file changed, 35 insertions(+), 17 deletions(-) diff --git a/drivers/gpu/drm/i915/display/intel_hdcp.c b/drivers/gpu/drm/i915/display/intel_hdcp.c index 396d2cef000aa..0a20bc41be55d 100644 --- a/drivers/gpu/drm/i915/display/intel_hdcp.c +++ b/drivers/gpu/drm/i915/display/intel_hdcp.c @@ -2190,6 +2190,37 @@ static enum mei_fw_tc intel_get_mei_fw_tc(enum transcoder cpu_transcoder) } } +static int +_intel_hdcp_setup(struct intel_connector *connector, + const struct intel_crtc_state *pipe_config, u8 content_type) +{ + struct drm_i915_private *dev_priv = to_i915(connector->base.dev); + struct intel_digital_port *dig_port = intel_attached_dig_port(connector); + struct intel_hdcp *hdcp = &connector->hdcp; + int ret = 0; + + if (!connector->encoder) { + drm_err(&dev_priv->drm, "[%s:%d] encoder is not initialized\n", + connector->base.name, connector->base.base.id); + return -ENODEV; + } + + hdcp->content_type = content_type; + + if (intel_crtc_has_type(pipe_config, INTEL_OUTPUT_DP_MST)) { + hdcp->cpu_transcoder = pipe_config->mst_master_transcoder; + hdcp->stream_transcoder = pipe_config->cpu_transcoder; + } else { + hdcp->cpu_transcoder = pipe_config->cpu_transcoder; + hdcp->stream_transcoder = INVALID_TRANSCODER; + } + + if (DISPLAY_VER(dev_priv) >= 12) + dig_port->hdcp_port_data.fw_tc = intel_get_mei_fw_tc(hdcp->cpu_transcoder); + + return ret; +} + static int initialize_hdcp_port_data(struct intel_connector *connector, struct intel_digital_port *dig_port, const struct intel_hdcp_shim *shim) @@ -2329,28 +2360,14 @@ int intel_hdcp_enable(struct intel_connector *connector, if (!hdcp->shim) return -ENOENT; - if (!connector->encoder) { - drm_err(&dev_priv->drm, "[%s:%d] encoder is not initialized\n", - connector->base.name, connector->base.base.id); - return -ENODEV; - } - mutex_lock(&hdcp->mutex); mutex_lock(&dig_port->hdcp_mutex); drm_WARN_ON(&dev_priv->drm, hdcp->value == DRM_MODE_CONTENT_PROTECTION_ENABLED); - hdcp->content_type = content_type; - - if (intel_crtc_has_type(pipe_config, INTEL_OUTPUT_DP_MST)) { - hdcp->cpu_transcoder = pipe_config->mst_master_transcoder; - hdcp->stream_transcoder = pipe_config->cpu_transcoder; - } else { - hdcp->cpu_transcoder = pipe_config->cpu_transcoder; - hdcp->stream_transcoder = INVALID_TRANSCODER; - } - if (DISPLAY_VER(dev_priv) >= 12) - dig_port->hdcp_port_data.fw_tc = intel_get_mei_fw_tc(hdcp->cpu_transcoder); + ret = _intel_hdcp_setup(connector, pipe_config, content_type); + if (ret) + goto out; /* * Considering that HDCP2.2 is more secure than HDCP1.4, If the setup @@ -2378,6 +2395,7 @@ int intel_hdcp_enable(struct intel_connector *connector, true); } +out: mutex_unlock(&dig_port->hdcp_mutex); mutex_unlock(&hdcp->mutex); return ret;