Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-9.5 required=3.0 tests=DKIM_ADSP_CUSTOM_MED, DKIM_INVALID,DKIM_SIGNED,FREEMAIL_FORGED_FROMDOMAIN,FREEMAIL_FROM, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id DCE83C4BA18 for ; Wed, 26 Feb 2020 16:44:17 +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 B141B24670 for ; Wed, 26 Feb 2020 16:44:17 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=fail reason="signature verification failed" (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="UkyTfy4p" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org B141B24670 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=gmail.com Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=intel-gfx-bounces@lists.freedesktop.org Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 1047D6EAE4; Wed, 26 Feb 2020 16:44:14 +0000 (UTC) Received: from mail-wm1-x344.google.com (mail-wm1-x344.google.com [IPv6:2a00:1450:4864:20::344]) by gabe.freedesktop.org (Postfix) with ESMTPS id 3B3CF6E141 for ; Wed, 26 Feb 2020 08:07:31 +0000 (UTC) Received: by mail-wm1-x344.google.com with SMTP id q9so1852837wmj.5 for ; Wed, 26 Feb 2020 00:07:31 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:reply-to:mime-version :content-transfer-encoding; bh=eWNe5H5elDplr9dzRmr+X+FDgyg6zJaEW0r6NO3ufz4=; b=UkyTfy4pzaeXVg/bTBo0d358BZhrHAfT1WrClwCW4qlcQB6lYA3LMazWhUNwwnBKK2 uTInHH2xO9sdbe7ahXV9krWJbdQdbsS2Y80lBlKe0dlXzfYNvGED7HxIMGGVTA0ip6pT neLWuFFtycbzFg7Nxzsfx/Kf0K27IpTnj5ib7g+ZfSU5mfo+WXDbtW2PiHX1PvCr4EGc AJJhxiYR7dgw1FYyg2Y/NaAVl+JScD5LmjAoC+30UtyTkOd5XYZQyzwoVa4wdjc2EeCt JpP2KrZOBM9G9J/V/Vz4finTc7a4L60LgyXJDpMfu9vZoM+6o+VXhpuOI5boAOZqGzI7 NbyA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:reply-to :mime-version:content-transfer-encoding; bh=eWNe5H5elDplr9dzRmr+X+FDgyg6zJaEW0r6NO3ufz4=; b=JjhRvQ/0DyZ3lzKyI/1gf82xgATuoo0owoGCTPirS7kc6CtfL60P2aIHVcn/A3tE/N O6iK6rXMwPH5oWCECPNjvDd0Ifxe3ckcErx0HxgiJ5Rb3YHwpiMmAA3PuHe9gPKXj1j7 kEm5eybn1k9PM2RRVdyzPbQnFNAZmJs6lVHuDXRYQApRkq+zRfLsE/JUIvcNjX4hyz9h Bqt9Tu7LH/9LlfDuH3MCjXbtJnqZtxWfdB/tnSwWhh/ilUJf7xoI0igqcNAQDw6wtJ/x 1yTSDDa2vJkAxsisblDaHULaEJdqxooykSadJMyAxRbJ/Q0Pd4ia89yZOtTR9mL/fKfu c7Lw== X-Gm-Message-State: APjAAAUJl0FjJMf+c7FV8BbizxZ0w0Kpx5wSiTst+nnvplOU5WKmB0HQ 1yh4TS+RmDVNKCldxC4wMMyIiRGC8n8= X-Google-Smtp-Source: APXvYqwb+p5rEO1k0ooEN4qo53ZEenm7JO9aJM8dtxWDyYL0UNpZVdGjnTiadXKEcCmVi0BoXbbS3A== X-Received: by 2002:a7b:cf12:: with SMTP id l18mr4153309wmg.66.1582704449670; Wed, 26 Feb 2020 00:07:29 -0800 (PST) Received: from xyz-CELSIUS-H720.fritz.box (x4d001122.dyn.telefonica.de. [77.0.17.34]) by smtp.gmail.com with ESMTPSA id t3sm2147494wrx.38.2020.02.26.00.07.26 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 26 Feb 2020 00:07:29 -0800 (PST) From: Oliver Barta X-Google-Original-From: Oliver Barta To: intel-gfx@lists.freedesktop.org, Jani Nikula , Joonas Lahtinen Date: Wed, 26 Feb 2020 09:06:43 +0100 Message-Id: <20200226080645.7421-1-oliver.barta@aptiv.com> X-Mailer: git-send-email 2.20.1 MIME-Version: 1.0 X-Mailman-Approved-At: Wed, 26 Feb 2020 16:44:12 +0000 Subject: [Intel-gfx] [PATCH 1/3] drm/i915: HDCP: fix Ri prime check done during link check 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: , Reply-To: Oliver Barta Cc: Daniel Vetter , Ravisankar Madasamy , Sean Paul , Oliver Barta Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: intel-gfx-bounces@lists.freedesktop.org Sender: "Intel-gfx" The check was always succeeding even in case of a mismatch due to the HDCP_STATUS_ENC bit being set. Make sure both bits are actually set. Signed-off-by: Oliver Barta Fixes: 2320175feb74 ("drm/i915: Implement HDCP for HDMI") --- drivers/gpu/drm/i915/display/intel_hdmi.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/drivers/gpu/drm/i915/display/intel_hdmi.c b/drivers/gpu/drm/i915/display/intel_hdmi.c index 93ac0f296852..14912daad7ff 100644 --- a/drivers/gpu/drm/i915/display/intel_hdmi.c +++ b/drivers/gpu/drm/i915/display/intel_hdmi.c @@ -1526,7 +1526,8 @@ bool intel_hdmi_hdcp_check_link(struct intel_digital_port *intel_dig_port) I915_WRITE(HDCP_RPRIME(dev_priv, cpu_transcoder, port), ri.reg); /* Wait for Ri prime match */ - if (wait_for(I915_READ(HDCP_STATUS(dev_priv, cpu_transcoder, port)) & + if (wait_for((I915_READ(HDCP_STATUS(dev_priv, cpu_transcoder, port)) & + (HDCP_STATUS_RI_MATCH | HDCP_STATUS_ENC)) == (HDCP_STATUS_RI_MATCH | HDCP_STATUS_ENC), 1)) { DRM_ERROR("Ri' mismatch detected, link check failed (%x)\n", I915_READ(HDCP_STATUS(dev_priv, cpu_transcoder, -- 2.20.1 _______________________________________________ Intel-gfx mailing list Intel-gfx@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/intel-gfx