From mboxrd@z Thu Jan 1 00:00:00 1970 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 vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 376C1C6FD20 for ; Fri, 24 Mar 2023 19:56:24 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231925AbjCXT4W (ORCPT ); Fri, 24 Mar 2023 15:56:22 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:33764 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231854AbjCXT4Q (ORCPT ); Fri, 24 Mar 2023 15:56:16 -0400 Received: from mail-yb1-xb33.google.com (mail-yb1-xb33.google.com [IPv6:2607:f8b0:4864:20::b33]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 3FC241BDA for ; Fri, 24 Mar 2023 12:56:15 -0700 (PDT) Received: by mail-yb1-xb33.google.com with SMTP id i6so3631182ybu.8 for ; Fri, 24 Mar 2023 12:56:15 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; t=1679687774; 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=Exj6+hryfx7clb9QaiGo28Nm0qDVjYvxkFoG4ObE4LU=; b=Itk0mEBGQcSZu/lEObn1S5oL69NVwNY7kuzHdLdrH73z6L85h+jJN53bAhnCJl/neV rDV1PdZ+ylZcZitfLTxWPX4e/i0cq0vz82NIXpiIOAMdsNauJN889a93mCbtNmrHTn7C Zs3iSM8bRGHPTIs2EHxSl05UOq5kNJS9WQFPc= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; t=1679687774; 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=Exj6+hryfx7clb9QaiGo28Nm0qDVjYvxkFoG4ObE4LU=; b=YiX+PGZyEPXbUdMpXWRyxxsLvxJoVpkq1qwkBxQBJu60ZkhOQgsASBYcE5rfLuUAZi xh1w5ggQGLt+cPyi+29CokR7KVL4XNmjT20p7eosIXiy38a8ImPV/s84AxAqreQ3M5xu 0Q5SiSC6ovMVX6xEpFVvuOdXpLCY+MeAoGIuCkcI+QZ+n3WLBzWpqzRXR26gXpMbUgAa TV/OzFaPvD4d2V0yeubO44OKal3HYYMpsz5wGH7TxXrZk86dQBJV24wrGZ6XJFUD0KN5 b2p5diMvaKqs51C+k8L36sgRJxXmpTIz/LIXbQGODdXikpltA7RZOmNK+W14T5c1J5s5 mRGg== X-Gm-Message-State: AAQBX9fUZ6CtzLxGur3K6uDAaZ+7YV2UO1SV/s6MnmpYA8k+v1yhjjF9 NhdZE8KVp9j/rtl7Jpqk9QlSYw== X-Google-Smtp-Source: AKy350bYDearu3uaqHzaZkCJUVsH07SVwD+GHpt9LS3WdsEcD37RRqivaV96uWaAorCDYdkTpZCMmQ== X-Received: by 2002:a25:f808:0:b0:b11:b75d:fcdc with SMTP id u8-20020a25f808000000b00b11b75dfcdcmr3371770ybd.22.1679687774457; Fri, 24 Mar 2023 12:56:14 -0700 (PDT) Received: from localhost ([2620:0:1035:15:5509:ec45:2b32:b39f]) by smtp.gmail.com with UTF8SMTPSA id 198-20020a250bcf000000b00b7767ca746asm638235ybl.7.2023.03.24.12.56.13 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Fri, 24 Mar 2023 12:56:14 -0700 (PDT) From: Mark Yacoub X-Google-Original-From: Mark Yacoub To: David Airlie , Daniel Vetter Cc: seanpaul@chromium.org, suraj.kandpal@intel.com, dianders@chromium.org, dri-devel@lists.freedesktop.org, freedreno@lists.freedesktop.org, intel-gfx@lists.freedesktop.org, Jani Nikula , Rodrigo Vivi , Mark Yacoub , linux-kernel@vger.kernel.org Subject: [PATCH v7 03/10] drm/hdcp: Update property value on content type and user changes Date: Fri, 24 Mar 2023 15:55:47 -0400 Message-Id: <20230324195555.3921170-4-markyacoub@google.com> X-Mailer: git-send-email 2.40.0.348.gf938b09366-goog In-Reply-To: <20230324195555.3921170-1-markyacoub@google.com> References: <20230324195555.3921170-1-markyacoub@google.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Sean Paul Update 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: Rodrigo Vivi Signed-off-by: Sean Paul Signed-off-by: Mark Yacoub --- Changes in v2: -None Changes in v3: -Fixed indentation issue identified by 0-day Changes in v4: -None Changes in v5: -None Changes in v6: -Rebased: modifications in drm_hdcp_helper.c instead of drm_hdcp.c Changes in v7: -Rebased as function name has changed. drivers/gpu/drm/display/drm_hdcp_helper.c | 29 +++++++++++++++-------- 1 file changed, 19 insertions(+), 10 deletions(-) diff --git a/drivers/gpu/drm/display/drm_hdcp_helper.c b/drivers/gpu/drm/display/drm_hdcp_helper.c index 34baf2b97cd87..3ee1a6ae26c53 100644 --- a/drivers/gpu/drm/display/drm_hdcp_helper.c +++ b/drivers/gpu/drm/display/drm_hdcp_helper.c @@ -480,21 +480,30 @@ bool drm_hdcp_has_changed(struct drm_connector *connector, return true; /* - * Nothing to do if content type is unchanged and one of: - * - state didn't change - * - HDCP was activated since the last commit - * - attempting to set to desired while already enabled + * Content type changes require an HDCP disable/enable cycle. */ - if (old_hdcp == new_hdcp || - (old_hdcp == DRM_MODE_CONTENT_PROTECTION_DESIRED && + 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 + */ + 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_has_changed); -- 2.40.0.348.gf938b09366-goog