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 X-Spam-Level: X-Spam-Status: No, score=-8.2 required=3.0 tests=HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS, USER_AGENT_SANE_1 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 80351C43331 for ; Sun, 29 Mar 2020 14:17:33 +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 5E3E1206DB for ; Sun, 29 Mar 2020 14:17:33 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 5E3E1206DB Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=intel.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 CEC116E14F; Sun, 29 Mar 2020 14:17:32 +0000 (UTC) Received: from mga11.intel.com (mga11.intel.com [192.55.52.93]) by gabe.freedesktop.org (Postfix) with ESMTPS id 932A66E14F for ; Sun, 29 Mar 2020 14:17:31 +0000 (UTC) IronPort-SDR: tz0Hxr6ZBYYs/xbserVwGc7US1QixzE2YEcIxPr6WpAuq0DLBBP4I46JSQdLYzsYsAnizg0GzK QqYc3vGrXExQ== X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from orsmga005.jf.intel.com ([10.7.209.41]) by fmsmga102.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 29 Mar 2020 07:17:31 -0700 IronPort-SDR: /XZq2tIM/pOb4CADyexJJ4BHmRLplPkZL9Fa60eYQ3jU7tmFFYugQW9Unq5CZvQiNv2KClS5L+ +e9mHWOjn3bQ== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.72,320,1580803200"; d="scan'208";a="421659573" Received: from ramaling-i9x.iind.intel.com (HELO intel.com) ([10.99.66.154]) by orsmga005.jf.intel.com with ESMTP; 29 Mar 2020 07:17:27 -0700 Date: Sun, 29 Mar 2020 19:47:38 +0530 From: Ramalingam C To: Oliver Barta Message-ID: <20200329141738.GA20693@intel.com> References: <20200328104100.12162-1-oliver.barta@aptiv.com> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: <20200328104100.12162-1-oliver.barta@aptiv.com> User-Agent: Mutt/1.10.1 (2018-07-13) Subject: Re: [Intel-gfx] [PATCH v2] 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: , Cc: Daniel Vetter , intel-gfx@lists.freedesktop.org, Sean Paul , Oliver Barta , Ravisankar Madasamy Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: intel-gfx-bounces@lists.freedesktop.org Sender: "Intel-gfx" On 2020-03-28 at 11:41:00 +0100, Oliver Barta wrote: > From: Oliver Barta > > 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. > Looks good to me: Reviewed-by: Ramalingam C > Signed-off-by: Oliver Barta > Fixes: 2320175feb74 ("drm/i915: Implement HDCP for HDMI") > --- > [v2] rebased on top of latest changes > > 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 0076abc63851..51a69f330588 100644 > --- a/drivers/gpu/drm/i915/display/intel_hdmi.c > +++ b/drivers/gpu/drm/i915/display/intel_hdmi.c > @@ -1561,7 +1561,8 @@ bool intel_hdmi_hdcp_check_link(struct intel_digital_port *intel_dig_port) > intel_de_write(i915, HDCP_RPRIME(i915, cpu_transcoder, port), ri.reg); > > /* Wait for Ri prime match */ > - if (wait_for(intel_de_read(i915, HDCP_STATUS(i915, cpu_transcoder, port)) & > + if (wait_for((intel_de_read(i915, HDCP_STATUS(i915, cpu_transcoder, > + port)) & (HDCP_STATUS_RI_MATCH | HDCP_STATUS_ENC)) == > (HDCP_STATUS_RI_MATCH | HDCP_STATUS_ENC), 1)) { > drm_err(&i915->drm, > "Ri' mismatch detected, link check failed (%x)\n", > -- > 2.20.1 > _______________________________________________ Intel-gfx mailing list Intel-gfx@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/intel-gfx