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 B0C73C3F2CD for ; Thu, 5 Mar 2020 13:55:47 +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 7D12F2073B for ; Thu, 5 Mar 2020 13:55:47 +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="Ia/rGrlg" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 7D12F2073B 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 2C3EC6E32D; Thu, 5 Mar 2020 13:55:47 +0000 (UTC) Received: from mail-wm1-x342.google.com (mail-wm1-x342.google.com [IPv6:2a00:1450:4864:20::342]) by gabe.freedesktop.org (Postfix) with ESMTPS id AB75A6E075 for ; Thu, 5 Mar 2020 07:44:08 +0000 (UTC) Received: by mail-wm1-x342.google.com with SMTP id g134so5023282wme.3 for ; Wed, 04 Mar 2020 23:44:08 -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:mime-version :content-transfer-encoding; bh=7BWJjqgFrWmDb6Qj/EjoiAeH7kkf/sLUiPpqqMVSVWo=; b=Ia/rGrlg+EZ0nT35kqz9357T/RnU7GbQlgZs6pzlM/HyecFYnDDdvRvAVC+H72xtPU ouRECFhAOiCKSMgTwzbNUAv9UlMCQBe8AsT7O629TTng/BlTDSSg4SU4JrcI5NjL+ccx sRV8DHKTuzRt1w7kKaMnpfqKP2UVyTL2n6dvxO9X9IBkoo4GYGeNkOhSZtpx6YuEfPTu i9uYkPaUhpccAX/PN0SAFzPX39JGcC7Tc9aN4pUw1XLXMBe4AuYrK6FPZreTSLtdAvrA Qa7Ybgt2R0X7EpeaRIR8g8tL13QZyz6qHBkmHGE9KfjvtJyBdkt816qw8BTuRMb+Ruy3 e1yw== 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:mime-version :content-transfer-encoding; bh=7BWJjqgFrWmDb6Qj/EjoiAeH7kkf/sLUiPpqqMVSVWo=; b=rONBW7bNu9Xu4zqTXNYC0Wu2bDzWl84CVhyNusHTTz5j3MbyPm2BTrbWAFN5pYPVre J1yqS7EQqLVib6yMm4ZgfXtaPnvQ56Kn5OrR0R9LZy0oShNFWqiOwcpgBwt+C0oftipn Ai8D6wndRpvLUJHbu9oUJbtRTKYXYINZTC54YJHH5fZMupIczVxHjQYEJtw/thn9YxKE cC9Wq3sgiZhi7L6ICQ2CRvyN2cjvnCwFUb3mJWBEr6Tk9BALPq9ItunpTi0uk+IveBJk VVPjS6dF6ak6OlczXltNGL3dR6KSb8dfdztZZAQJASKt4SF4PjFG4GIj5tpy/8Krv30z ij5A== X-Gm-Message-State: ANhLgQ1Tt1/mQT3H6HJTjm8g1NV1pmy/WEc2524H3bJUKwbrjMLkyoiN priykIOIJRJx4pV78P1VVq0miNT6QMM= X-Google-Smtp-Source: ADFU+vu3QlSR8Y0A70VwEjPIe4zStV5XYfacCpVn84m18I0G7t6pVyGdoZp3JDpVHbMLMEv7VGF3lA== X-Received: by 2002:a1c:4b0f:: with SMTP id y15mr7963614wma.87.1583394247295; Wed, 04 Mar 2020 23:44:07 -0800 (PST) Received: from xyz-CELSIUS-H720.fritz.box (x5f70385c.dyn.telefonica.de. [95.112.56.92]) by smtp.gmail.com with ESMTPSA id y10sm7750129wma.26.2020.03.04.23.44.06 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 04 Mar 2020 23:44:06 -0800 (PST) From: Oliver Barta X-Google-Original-From: Oliver Barta To: Ramalingam C , intel-gfx@lists.freedesktop.org, Jani Nikula , Joonas Lahtinen Date: Thu, 5 Mar 2020 08:43:56 +0100 Message-Id: <20200305074356.3777-1-oliver.barta@aptiv.com> X-Mailer: git-send-email 2.20.1 MIME-Version: 1.0 X-Mailman-Approved-At: Thu, 05 Mar 2020 13:55:46 +0000 Subject: [Intel-gfx] [PATCH v2] drm/i915: HDCP: fix Ri prime and R0 checks during auth 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: Daniel Vetter , Oliver Barta , Ravisankar Madasamy , Sean Paul Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: intel-gfx-bounces@lists.freedesktop.org Sender: "Intel-gfx" From: Oliver Barta Including HDCP_STATUS_ENC bit in the checks is pointless. It is simply not set at this point. Signed-off-by: Oliver Barta Fixes: ee5e5e7a5e0f ("drm/i915: Add HDCP framework + base implementation") --- [v2] rebased on top of latest changes drivers/gpu/drm/i915/display/intel_hdcp.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/gpu/drm/i915/display/intel_hdcp.c b/drivers/gpu/drm/i915/display/intel_hdcp.c index ee0f27ea2810..78dddbaa61d3 100644 --- a/drivers/gpu/drm/i915/display/intel_hdcp.c +++ b/drivers/gpu/drm/i915/display/intel_hdcp.c @@ -710,7 +710,7 @@ static int intel_hdcp_auth(struct intel_connector *connector) /* Wait for R0 ready */ if (wait_for(intel_de_read(dev_priv, HDCP_STATUS(dev_priv, cpu_transcoder, port)) & - (HDCP_STATUS_R0_READY | HDCP_STATUS_ENC), 1)) { + HDCP_STATUS_R0_READY, 1)) { drm_err(&dev_priv->drm, "Timed out waiting for R0 ready\n"); return -ETIMEDOUT; } @@ -743,7 +743,7 @@ static int intel_hdcp_auth(struct intel_connector *connector) /* Wait for Ri prime match */ if (!wait_for(intel_de_read(dev_priv, HDCP_STATUS(dev_priv, cpu_transcoder, port)) & - (HDCP_STATUS_RI_MATCH | HDCP_STATUS_ENC), 1)) + HDCP_STATUS_RI_MATCH, 1)) break; } -- 2.20.1 _______________________________________________ Intel-gfx mailing list Intel-gfx@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/intel-gfx