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, URIBL_BLOCKED,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 1B240C28CBC for ; Wed, 6 May 2020 14:02:24 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id F12192073A for ; Wed, 6 May 2020 14:02:23 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728058AbgEFOCX (ORCPT ); Wed, 6 May 2020 10:02:23 -0400 Received: from mga04.intel.com ([192.55.52.120]:17689 "EHLO mga04.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1725915AbgEFOCX (ORCPT ); Wed, 6 May 2020 10:02:23 -0400 IronPort-SDR: r8FKbcOU9c10COcRjFY7xpraBZD4Z1d18EUw98eYdc2iZUBlNjxi7MjbEQGrJCzYkorQsXthni jlXSV5Md2gOw== X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from orsmga003.jf.intel.com ([10.7.209.27]) by fmsmga104.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 06 May 2020 07:02:22 -0700 IronPort-SDR: El6wGhhDJiHY+SNSR/D01hxc1kOwTL+wY64WY4oERWXKIEfiBpd+0TQLckku8kAW6I4zIoz01J zQ4HKBx3s8mQ== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.73,359,1583222400"; d="scan'208";a="260113709" Received: from ramaling-i9x.iind.intel.com (HELO intel.com) ([10.99.66.154]) by orsmga003.jf.intel.com with ESMTP; 06 May 2020 07:02:16 -0700 Date: Wed, 6 May 2020 19:32:09 +0530 From: Ramalingam C To: Sean Paul Cc: dri-devel@lists.freedesktop.org, intel-gfx@lists.freedesktop.org, juston.li@intel.com, ville.syrjala@linux.intel.com, jani.nikula@linux.intel.com, joonas.lahtinen@linux.intel.com, rodrigo.vivi@intel.com, daniel.vetter@ffwll.ch, seanpaul@chromium.org, Chris Wilson , stable@vger.kernel.org Subject: Re: [PATCH v6 02/16] drm/i915: Clear the repeater bit on HDCP disable Message-ID: <20200506140209.GB30925@intel.com> References: <20200429195502.39919-1-sean@poorly.run> <20200429195502.39919-3-sean@poorly.run> MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Disposition: inline In-Reply-To: <20200429195502.39919-3-sean@poorly.run> User-Agent: Mutt/1.10.1 (2018-07-13) Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org On 2020-04-29 at 15:54:48 -0400, Sean Paul wrote: > From: Sean Paul > > On HDCP disable, clear the repeater bit. This ensures if we connect a > non-repeater sink after a repeater, the bit is in the state we expect. > > Fixes: ee5e5e7a5e0f (drm/i915: Add HDCP framework + base implementation) > Cc: Chris Wilson > Cc: Ramalingam C > Cc: Daniel Vetter > Cc: Sean Paul > Cc: Jani Nikula > Cc: Joonas Lahtinen > Cc: Rodrigo Vivi > Cc: intel-gfx@lists.freedesktop.org > Cc: # v4.17+ > Reviewed-by: Ramalingam C Just reconfirming my R-b here. Reviewed-by: Ramalingam C > Signed-off-by: Sean Paul > Link: https://patchwork.freedesktop.org/patch/msgid/20191212190230.188505-3-sean@poorly.run #v2 > Link: https://patchwork.freedesktop.org/patch/msgid/20200117193103.156821-3-sean@poorly.run #v3 > Link: https://patchwork.freedesktop.org/patch/msgid/20200218220242.107265-3-sean@poorly.run #v4 > Link: https://patchwork.freedesktop.org/patch/msgid/20200305201236.152307-3-sean@poorly.run #v5 > > Changes in v2: > -Added to the set > Changes in v3: > -None > I had previously agreed that clearing the rep_ctl bits on enable would > also be a good idea. However when I committed that idea to code, it > didn't look right. So let's rely on enables and disables being paired > and everything outside of that will be considered a bug > Changes in v4: > -s/I915_(READ|WRITE)/intel_de_(read|write)/ > Changes in v5: > -None > Changes in v6: > -None > --- > drivers/gpu/drm/i915/display/intel_hdcp.c | 6 ++++++ > 1 file changed, 6 insertions(+) > > diff --git a/drivers/gpu/drm/i915/display/intel_hdcp.c b/drivers/gpu/drm/i915/display/intel_hdcp.c > index 525658fd201f..20175a53643d 100644 > --- a/drivers/gpu/drm/i915/display/intel_hdcp.c > +++ b/drivers/gpu/drm/i915/display/intel_hdcp.c > @@ -795,6 +795,7 @@ static int _intel_hdcp_disable(struct intel_connector *connector) > struct intel_hdcp *hdcp = &connector->hdcp; > enum port port = intel_dig_port->base.port; > enum transcoder cpu_transcoder = hdcp->cpu_transcoder; > + u32 repeater_ctl; > int ret; > > drm_dbg_kms(&dev_priv->drm, "[%s:%d] HDCP is being disabled...\n", > @@ -810,6 +811,11 @@ static int _intel_hdcp_disable(struct intel_connector *connector) > return -ETIMEDOUT; > } > > + repeater_ctl = intel_hdcp_get_repeater_ctl(dev_priv, cpu_transcoder, > + port); > + intel_de_write(dev_priv, HDCP_REP_CTL, > + intel_de_read(dev_priv, HDCP_REP_CTL) & ~repeater_ctl); > + > ret = hdcp->shim->toggle_signalling(intel_dig_port, false); > if (ret) { > drm_err(&dev_priv->drm, "Failed to disable HDCP signalling\n"); > -- > Sean Paul, Software Engineer, Google / Chromium OS > 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, URIBL_BLOCKED,USER_AGENT_SANE_1 autolearn=unavailable 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 A6843C38A2A for ; Wed, 6 May 2020 14:02:26 +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 835AB2073A for ; Wed, 6 May 2020 14:02:26 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 835AB2073A Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=intel.com Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=dri-devel-bounces@lists.freedesktop.org Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id D262789C1C; Wed, 6 May 2020 14:02:25 +0000 (UTC) Received: from mga18.intel.com (mga18.intel.com [134.134.136.126]) by gabe.freedesktop.org (Postfix) with ESMTPS id B594D89C1C; Wed, 6 May 2020 14:02:24 +0000 (UTC) IronPort-SDR: Ii4YDgKPwvYAutFciYydHIOCKZtYvwgwEzYk4mcBBM21tevovMdF/i7+72CkMJR4fefM5LryHi hTBE5+RmUltQ== X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from orsmga003.jf.intel.com ([10.7.209.27]) by orsmga106.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 06 May 2020 07:02:21 -0700 IronPort-SDR: El6wGhhDJiHY+SNSR/D01hxc1kOwTL+wY64WY4oERWXKIEfiBpd+0TQLckku8kAW6I4zIoz01J zQ4HKBx3s8mQ== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.73,359,1583222400"; d="scan'208";a="260113709" Received: from ramaling-i9x.iind.intel.com (HELO intel.com) ([10.99.66.154]) by orsmga003.jf.intel.com with ESMTP; 06 May 2020 07:02:16 -0700 Date: Wed, 6 May 2020 19:32:09 +0530 From: Ramalingam C To: Sean Paul Subject: Re: [PATCH v6 02/16] drm/i915: Clear the repeater bit on HDCP disable Message-ID: <20200506140209.GB30925@intel.com> References: <20200429195502.39919-1-sean@poorly.run> <20200429195502.39919-3-sean@poorly.run> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: <20200429195502.39919-3-sean@poorly.run> User-Agent: Mutt/1.10.1 (2018-07-13) X-BeenThere: dri-devel@lists.freedesktop.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Direct Rendering Infrastructure - Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: dri-devel@lists.freedesktop.org, daniel.vetter@ffwll.ch, intel-gfx@lists.freedesktop.org, Chris Wilson , seanpaul@chromium.org, juston.li@intel.com, rodrigo.vivi@intel.com, stable@vger.kernel.org Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" On 2020-04-29 at 15:54:48 -0400, Sean Paul wrote: > From: Sean Paul > > On HDCP disable, clear the repeater bit. This ensures if we connect a > non-repeater sink after a repeater, the bit is in the state we expect. > > Fixes: ee5e5e7a5e0f (drm/i915: Add HDCP framework + base implementation) > Cc: Chris Wilson > Cc: Ramalingam C > Cc: Daniel Vetter > Cc: Sean Paul > Cc: Jani Nikula > Cc: Joonas Lahtinen > Cc: Rodrigo Vivi > Cc: intel-gfx@lists.freedesktop.org > Cc: # v4.17+ > Reviewed-by: Ramalingam C Just reconfirming my R-b here. Reviewed-by: Ramalingam C > Signed-off-by: Sean Paul > Link: https://patchwork.freedesktop.org/patch/msgid/20191212190230.188505-3-sean@poorly.run #v2 > Link: https://patchwork.freedesktop.org/patch/msgid/20200117193103.156821-3-sean@poorly.run #v3 > Link: https://patchwork.freedesktop.org/patch/msgid/20200218220242.107265-3-sean@poorly.run #v4 > Link: https://patchwork.freedesktop.org/patch/msgid/20200305201236.152307-3-sean@poorly.run #v5 > > Changes in v2: > -Added to the set > Changes in v3: > -None > I had previously agreed that clearing the rep_ctl bits on enable would > also be a good idea. However when I committed that idea to code, it > didn't look right. So let's rely on enables and disables being paired > and everything outside of that will be considered a bug > Changes in v4: > -s/I915_(READ|WRITE)/intel_de_(read|write)/ > Changes in v5: > -None > Changes in v6: > -None > --- > drivers/gpu/drm/i915/display/intel_hdcp.c | 6 ++++++ > 1 file changed, 6 insertions(+) > > diff --git a/drivers/gpu/drm/i915/display/intel_hdcp.c b/drivers/gpu/drm/i915/display/intel_hdcp.c > index 525658fd201f..20175a53643d 100644 > --- a/drivers/gpu/drm/i915/display/intel_hdcp.c > +++ b/drivers/gpu/drm/i915/display/intel_hdcp.c > @@ -795,6 +795,7 @@ static int _intel_hdcp_disable(struct intel_connector *connector) > struct intel_hdcp *hdcp = &connector->hdcp; > enum port port = intel_dig_port->base.port; > enum transcoder cpu_transcoder = hdcp->cpu_transcoder; > + u32 repeater_ctl; > int ret; > > drm_dbg_kms(&dev_priv->drm, "[%s:%d] HDCP is being disabled...\n", > @@ -810,6 +811,11 @@ static int _intel_hdcp_disable(struct intel_connector *connector) > return -ETIMEDOUT; > } > > + repeater_ctl = intel_hdcp_get_repeater_ctl(dev_priv, cpu_transcoder, > + port); > + intel_de_write(dev_priv, HDCP_REP_CTL, > + intel_de_read(dev_priv, HDCP_REP_CTL) & ~repeater_ctl); > + > ret = hdcp->shim->toggle_signalling(intel_dig_port, false); > if (ret) { > drm_err(&dev_priv->drm, "Failed to disable HDCP signalling\n"); > -- > Sean Paul, Software Engineer, Google / Chromium OS > _______________________________________________ dri-devel mailing list dri-devel@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/dri-devel 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, URIBL_BLOCKED,USER_AGENT_SANE_1 autolearn=unavailable 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 9BAD2C28CBC for ; Wed, 6 May 2020 14:02:28 +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 7AE4220746 for ; Wed, 6 May 2020 14:02:28 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 7AE4220746 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 3CD716E2B8; Wed, 6 May 2020 14:02:26 +0000 (UTC) Received: from mga18.intel.com (mga18.intel.com [134.134.136.126]) by gabe.freedesktop.org (Postfix) with ESMTPS id B594D89C1C; Wed, 6 May 2020 14:02:24 +0000 (UTC) IronPort-SDR: Ii4YDgKPwvYAutFciYydHIOCKZtYvwgwEzYk4mcBBM21tevovMdF/i7+72CkMJR4fefM5LryHi hTBE5+RmUltQ== X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from orsmga003.jf.intel.com ([10.7.209.27]) by orsmga106.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 06 May 2020 07:02:21 -0700 IronPort-SDR: El6wGhhDJiHY+SNSR/D01hxc1kOwTL+wY64WY4oERWXKIEfiBpd+0TQLckku8kAW6I4zIoz01J zQ4HKBx3s8mQ== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.73,359,1583222400"; d="scan'208";a="260113709" Received: from ramaling-i9x.iind.intel.com (HELO intel.com) ([10.99.66.154]) by orsmga003.jf.intel.com with ESMTP; 06 May 2020 07:02:16 -0700 Date: Wed, 6 May 2020 19:32:09 +0530 From: Ramalingam C To: Sean Paul Message-ID: <20200506140209.GB30925@intel.com> References: <20200429195502.39919-1-sean@poorly.run> <20200429195502.39919-3-sean@poorly.run> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: <20200429195502.39919-3-sean@poorly.run> User-Agent: Mutt/1.10.1 (2018-07-13) Subject: Re: [Intel-gfx] [PATCH v6 02/16] drm/i915: Clear the repeater bit on HDCP disable 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: dri-devel@lists.freedesktop.org, daniel.vetter@ffwll.ch, intel-gfx@lists.freedesktop.org, Chris Wilson , seanpaul@chromium.org, stable@vger.kernel.org Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: intel-gfx-bounces@lists.freedesktop.org Sender: "Intel-gfx" On 2020-04-29 at 15:54:48 -0400, Sean Paul wrote: > From: Sean Paul > > On HDCP disable, clear the repeater bit. This ensures if we connect a > non-repeater sink after a repeater, the bit is in the state we expect. > > Fixes: ee5e5e7a5e0f (drm/i915: Add HDCP framework + base implementation) > Cc: Chris Wilson > Cc: Ramalingam C > Cc: Daniel Vetter > Cc: Sean Paul > Cc: Jani Nikula > Cc: Joonas Lahtinen > Cc: Rodrigo Vivi > Cc: intel-gfx@lists.freedesktop.org > Cc: # v4.17+ > Reviewed-by: Ramalingam C Just reconfirming my R-b here. Reviewed-by: Ramalingam C > Signed-off-by: Sean Paul > Link: https://patchwork.freedesktop.org/patch/msgid/20191212190230.188505-3-sean@poorly.run #v2 > Link: https://patchwork.freedesktop.org/patch/msgid/20200117193103.156821-3-sean@poorly.run #v3 > Link: https://patchwork.freedesktop.org/patch/msgid/20200218220242.107265-3-sean@poorly.run #v4 > Link: https://patchwork.freedesktop.org/patch/msgid/20200305201236.152307-3-sean@poorly.run #v5 > > Changes in v2: > -Added to the set > Changes in v3: > -None > I had previously agreed that clearing the rep_ctl bits on enable would > also be a good idea. However when I committed that idea to code, it > didn't look right. So let's rely on enables and disables being paired > and everything outside of that will be considered a bug > Changes in v4: > -s/I915_(READ|WRITE)/intel_de_(read|write)/ > Changes in v5: > -None > Changes in v6: > -None > --- > drivers/gpu/drm/i915/display/intel_hdcp.c | 6 ++++++ > 1 file changed, 6 insertions(+) > > diff --git a/drivers/gpu/drm/i915/display/intel_hdcp.c b/drivers/gpu/drm/i915/display/intel_hdcp.c > index 525658fd201f..20175a53643d 100644 > --- a/drivers/gpu/drm/i915/display/intel_hdcp.c > +++ b/drivers/gpu/drm/i915/display/intel_hdcp.c > @@ -795,6 +795,7 @@ static int _intel_hdcp_disable(struct intel_connector *connector) > struct intel_hdcp *hdcp = &connector->hdcp; > enum port port = intel_dig_port->base.port; > enum transcoder cpu_transcoder = hdcp->cpu_transcoder; > + u32 repeater_ctl; > int ret; > > drm_dbg_kms(&dev_priv->drm, "[%s:%d] HDCP is being disabled...\n", > @@ -810,6 +811,11 @@ static int _intel_hdcp_disable(struct intel_connector *connector) > return -ETIMEDOUT; > } > > + repeater_ctl = intel_hdcp_get_repeater_ctl(dev_priv, cpu_transcoder, > + port); > + intel_de_write(dev_priv, HDCP_REP_CTL, > + intel_de_read(dev_priv, HDCP_REP_CTL) & ~repeater_ctl); > + > ret = hdcp->shim->toggle_signalling(intel_dig_port, false); > if (ret) { > drm_err(&dev_priv->drm, "Failed to disable HDCP signalling\n"); > -- > Sean Paul, Software Engineer, Google / Chromium OS > _______________________________________________ Intel-gfx mailing list Intel-gfx@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/intel-gfx