From patchwork Mon Apr 11 20:47:32 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sean Paul X-Patchwork-Id: 12809640 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 17ADBC433FE for ; Mon, 11 Apr 2022 20:48:02 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 89BEC10F5CD; Mon, 11 Apr 2022 20:47:59 +0000 (UTC) Received: from mail-qv1-xf2d.google.com (mail-qv1-xf2d.google.com [IPv6:2607:f8b0:4864:20::f2d]) by gabe.freedesktop.org (Postfix) with ESMTPS id 1B98610F5CC for ; Mon, 11 Apr 2022 20:47:56 +0000 (UTC) Received: by mail-qv1-xf2d.google.com with SMTP id d9so4931753qvm.4 for ; Mon, 11 Apr 2022 13:47:56 -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:in-reply-to:references :mime-version:content-transfer-encoding; bh=eZTFgk2PlOb2uX5DBLkodsIU99rGYqliJsfWbZUnqrI=; b=feOSLuohBZPid21skzUboSH9MUJO3gzoRRROo05qdqfQmiia/8S9eRrtRtif8w7MYo p/bmtN7Yd/xypOYREnKt4rj48ZAqgGGINF6wV3LW5URZAbw4VUWS2PJ4mvlhgWY45Na6 3bZugjsS+6zE4AKwiz8RcXaB8jLdKNF53kMedejl4y6KuqR16nNNESeHmgMGhuJDl+Hf IUrAYtDtn2LvPvCwOf39cHHo/6b6oWFkx5HNZ6TSLIMlC/j8qZ0fNwa9MG6XjtgpU+0/ mPkQe0xOOFWiQJQTTBL4z/daHOgGZ/95QmOMUuJFeO2fidd3ia4TgxBrK0JpgTZQCs8s XAGg== 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:in-reply-to :references:mime-version:content-transfer-encoding; bh=eZTFgk2PlOb2uX5DBLkodsIU99rGYqliJsfWbZUnqrI=; b=Qu3oVOOv/iYAW89wpxCyHNT7NnglQ7i3ifUySXSsQuyeNU5mkXV9FMtdVY2cV+rzef GghqcIcjM3xVK1o8GNyjKO9KLTBxmb1i5U8rfhbMczNCpV7EsE774ptAIewc50oZsXhg GjuNSn61OJwfD5izkN4dMTfUFTBOF9jflA7+/IjaWZ73j3o29D58xJFKdDLC5/xIaKjZ kqvp+ZxuIUNmHZ75heca/1ic5IgdksgJU22GbDwflE5VwMOZCCDpKbHodKre/od6FMmH Xw2Dl5ky1HAhFWAZFhAa9buLmKtPWqfabV0kCPs7Q8Sqe2Wd+YQ6RrPHXAc/jzP6ubqr nrDQ== X-Gm-Message-State: AOAM532oa+FSPxBUmM/86QccZuanuHrvgbxqPEhpLEHuaPeSitV/eb0n LJLCRavzEMMQlFBLr56BGDNjTo3sLfDOpA== X-Google-Smtp-Source: ABdhPJyJqqU9Utf/ym7pO8+eXG3CRvVhOBx+aDqhfrPobdZzfUtHf7vSW4trtdvw2W+FtAIdMe03mw== X-Received: by 2002:ad4:5968:0:b0:444:1749:a6f4 with SMTP id eq8-20020ad45968000000b004441749a6f4mr951719qvb.43.1649710075136; Mon, 11 Apr 2022 13:47:55 -0700 (PDT) Received: from localhost (115.25.199.35.bc.googleusercontent.com. [35.199.25.115]) by smtp.gmail.com with ESMTPSA id r19-20020a05620a299300b0069c39a56b19sm577319qkp.129.2022.04.11.13.47.54 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 11 Apr 2022 13:47:54 -0700 (PDT) From: Sean Paul To: dri-devel@lists.freedesktop.org, jani.nikula@intel.com, intel-gfx@lists.freedesktop.org, freedreno@lists.freedesktop.org, rodrigo.vivi@intel.com Subject: [PATCH v5 03/10] drm/hdcp: Update property value on content type and user changes Date: Mon, 11 Apr 2022 20:47:32 +0000 Message-Id: <20220411204741.1074308-4-sean@poorly.run> X-Mailer: git-send-email 2.35.1.1178.g4f1659d476-goog In-Reply-To: <20220411204741.1074308-1-sean@poorly.run> References: <20220411204741.1074308-1-sean@poorly.run> 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: David Airlie , markyacoub@chromium.org, abhinavk@codeaurora.org, swboyd@chromium.org, Sean Paul , Thomas Zimmermann , bjorn.andersson@linaro.org Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" From: Sean Paul This patch updates the connector's property value in 2 cases which were previously missed: 1- Content type changes. The value should revert back to DESIRED from ENABLED in case the driver must re-authenticate the link due to the new content type. 2- Userspace sets value to DESIRED while ENABLED. In this case, the value should be reset immediately to ENABLED since the link is actively being encrypted. To accommodate these changes, I've split up the conditionals to make things a bit more clear (as much as one can with this mess of state). Acked-by: Jani Nikula Reviewed-by: Abhinav Kumar Signed-off-by: Sean Paul Link: https://patchwork.freedesktop.org/patch/msgid/20210913175747.47456-4-sean@poorly.run #v1 Link: https://patchwork.freedesktop.org/patch/msgid/20210915203834.1439-4-sean@poorly.run #v2 Link: https://patchwork.freedesktop.org/patch/msgid/20211001151145.55916-4-sean@poorly.run #v3 Link: https://patchwork.freedesktop.org/patch/msgid/20211105030434.2828845-4-sean@poorly.run #v4 Changes in v2: -None Changes in v3: -Fixed indentation issue identified by 0-day Changes in v4: -None Changes in v5: -None Reviewed-by: Rodrigo Vivi --- drivers/gpu/drm/drm_hdcp.c | 26 +++++++++++++++++--------- 1 file changed, 17 insertions(+), 9 deletions(-) diff --git a/drivers/gpu/drm/drm_hdcp.c b/drivers/gpu/drm/drm_hdcp.c index dd8fa91c51d6..8c851d40cd45 100644 --- a/drivers/gpu/drm/drm_hdcp.c +++ b/drivers/gpu/drm/drm_hdcp.c @@ -487,21 +487,29 @@ bool drm_hdcp_atomic_check(struct drm_connector *connector, return true; /* - * Nothing to do if content type is unchanged and one of: - * - state didn't change + * Content type changes require an HDCP disable/enable cycle. + */ + if (new_conn_state->hdcp_content_type != old_conn_state->hdcp_content_type) { + new_conn_state->content_protection = + DRM_MODE_CONTENT_PROTECTION_DESIRED; + return true; + } + + /* + * Ignore meaningless state changes: * - HDCP was activated since the last commit - * - attempting to set to desired while already enabled + * - Attempting to set to desired while already enabled */ - if (old_hdcp == new_hdcp || - (old_hdcp == DRM_MODE_CONTENT_PROTECTION_DESIRED && + if ((old_hdcp == DRM_MODE_CONTENT_PROTECTION_DESIRED && new_hdcp == DRM_MODE_CONTENT_PROTECTION_ENABLED) || (old_hdcp == DRM_MODE_CONTENT_PROTECTION_ENABLED && new_hdcp == DRM_MODE_CONTENT_PROTECTION_DESIRED)) { - if (old_conn_state->hdcp_content_type == - new_conn_state->hdcp_content_type) - return false; + new_conn_state->content_protection = + DRM_MODE_CONTENT_PROTECTION_ENABLED; + return false; } - return true; + /* Finally, if state changes, we need action */ + return old_hdcp != new_hdcp; } EXPORT_SYMBOL(drm_hdcp_atomic_check);