From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 258CD1D7992; Sun, 26 Jan 2025 14:56:45 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1737903406; cv=none; b=sHlAAJBKQhZW+us1SKhgH1t6EsoiQlWY+UYG+OfecpAVKwi+K5NJ3BZfTosmuAWVZYMpu4fznKhuBVDjbbR6Z8ArRaGVcmynHyMYBteAqEloXtC3K9jwo8ENAullJsvoX+SGCz4UHopikYdS3cdISeH4r4HF/TaPCApDDHfj3bI= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1737903406; c=relaxed/simple; bh=UZ8459HmkuMhgo1blcVQdVifKkQYI1uDk5uHg8M+L7c=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=fBh846MHHmqnbRsH/SS0/UJtivJp6F2afIRzUPafBB14JjWvwwDxhsXUdJgstboOX3t7ndtErwIZOzRcATp+dFNoa3vveEk3bS23s1H/7/No5Yue7qp2LicqIEuaQ7xMKBMKLqQR1H2P4ZEVSryQ0pUxFRGadd59j7CDqpyCitc= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=nEGI8TSy; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="nEGI8TSy" Received: by smtp.kernel.org (Postfix) with ESMTPSA id CF694C4CED3; Sun, 26 Jan 2025 14:56:43 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1737903405; bh=UZ8459HmkuMhgo1blcVQdVifKkQYI1uDk5uHg8M+L7c=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=nEGI8TSy6Ppr9XS9oWEejHPouHs9Rzi4zI7Ik2nZg53uqTJZ3iVxa6DxzKGKCjH4A bs2p5P55HnsdBgzQtjotc3vMS4Lf/zKKtpw3elppyC/V5SgQgI3qjV5j4tKxFOol6o I2XF5PbOFPA+klVweN1gS4Or5VL2z/Axy+xgd202TsT7TCKuYIl6/h5nuUpFLZ6sdG KgU85r3/SrMaGn3x/AnLJN8zjaovhDCBldVHCg70EH/dMAnlPLk2BwjIUHWcMAGL45 o7EvR9c1LV1WH6R+p0UQDxLvPGayE4VYguUHmPzSS9Xxp5XgQSGbYKoTMgPYoX01tl KseztRTQh6ddg== From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Hermes Wu , AngeloGioacchino Del Regno , Dmitry Baryshkov , Sasha Levin , andrzej.hajda@intel.com, neil.armstrong@linaro.org, rfoss@kernel.org, maarten.lankhorst@linux.intel.com, mripard@kernel.org, tzimmermann@suse.de, airlied@gmail.com, simona@ffwll.ch, dri-devel@lists.freedesktop.org Subject: [PATCH AUTOSEL 6.6 14/17] drm/bridge: it6505: fix HDCP encryption when R0 ready Date: Sun, 26 Jan 2025 09:56:09 -0500 Message-Id: <20250126145612.937679-14-sashal@kernel.org> X-Mailer: git-send-email 2.39.5 In-Reply-To: <20250126145612.937679-1-sashal@kernel.org> References: <20250126145612.937679-1-sashal@kernel.org> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore X-stable-base: Linux 6.6.74 Content-Transfer-Encoding: 8bit From: Hermes Wu [ Upstream commit 8c01b0bae2f9e58f2fee0e811cb90d8331986554 ] When starting HDCP authentication, HDCP encryption should be enabled when R0'is checked. Change encryption enables time at R0' ready. The hardware HDCP engine trigger is changed and the repeater KSV fails will restart HDCP. Signed-off-by: Hermes Wu Reviewed-by: AngeloGioacchino Del Regno Signed-off-by: Dmitry Baryshkov Link: https://patchwork.freedesktop.org/patch/msgid/20241230-v7-upstream-v7-6-e0fdd4844703@ite.corp-partner.google.com Signed-off-by: Sasha Levin --- drivers/gpu/drm/bridge/ite-it6505.c | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/drivers/gpu/drm/bridge/ite-it6505.c b/drivers/gpu/drm/bridge/ite-it6505.c index 0eb831686a6ea..a1ad9a1a59a62 100644 --- a/drivers/gpu/drm/bridge/ite-it6505.c +++ b/drivers/gpu/drm/bridge/ite-it6505.c @@ -2078,15 +2078,12 @@ static void it6505_hdcp_wait_ksv_list(struct work_struct *work) ksv_list_check = it6505_hdcp_part2_ksvlist_check(it6505); DRM_DEV_DEBUG_DRIVER(dev, "ksv list ready, ksv list check %s", ksv_list_check ? "pass" : "fail"); - if (ksv_list_check) { - it6505_set_bits(it6505, REG_HDCP_TRIGGER, - HDCP_TRIGGER_KSV_DONE, HDCP_TRIGGER_KSV_DONE); + + if (ksv_list_check) return; - } + timeout: - it6505_set_bits(it6505, REG_HDCP_TRIGGER, - HDCP_TRIGGER_KSV_DONE | HDCP_TRIGGER_KSV_FAIL, - HDCP_TRIGGER_KSV_DONE | HDCP_TRIGGER_KSV_FAIL); + it6505_start_hdcp(it6505); } static void it6505_hdcp_work(struct work_struct *work) @@ -2459,7 +2456,11 @@ static void it6505_irq_hdcp_ksv_check(struct it6505 *it6505) { struct device *dev = it6505->dev; - DRM_DEV_DEBUG_DRIVER(dev, "HDCP event Interrupt"); + DRM_DEV_DEBUG_DRIVER(dev, "HDCP repeater R0 event Interrupt"); + /* 1B01 HDCP encription should start when R0 is ready*/ + it6505_set_bits(it6505, REG_HDCP_TRIGGER, + HDCP_TRIGGER_KSV_DONE, HDCP_TRIGGER_KSV_DONE); + schedule_work(&it6505->hdcp_wait_ksv_list); } -- 2.39.5