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 AE597C2D0BF for ; Fri, 13 Dec 2019 10:29:54 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 888572067C for ; Fri, 13 Dec 2019 10:29:54 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1725989AbfLMK3y (ORCPT ); Fri, 13 Dec 2019 05:29:54 -0500 Received: from mga02.intel.com ([134.134.136.20]:33117 "EHLO mga02.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1725747AbfLMK3y (ORCPT ); Fri, 13 Dec 2019 05:29:54 -0500 X-Amp-Result: UNKNOWN X-Amp-Original-Verdict: FILE UNKNOWN X-Amp-File-Uploaded: False Received: from fmsmga002.fm.intel.com ([10.253.24.26]) by orsmga101.jf.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 13 Dec 2019 02:29:53 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.69,309,1571727600"; d="scan'208";a="246083915" Received: from ramaling-i9x.iind.intel.com (HELO intel.com) ([10.99.66.154]) by fmsmga002.fm.intel.com with ESMTP; 13 Dec 2019 02:29:50 -0800 Date: Fri, 13 Dec 2019 15:59:02 +0530 From: Ramalingam C To: Sean Paul Cc: dri-devel@lists.freedesktop.org, intel-gfx@lists.freedesktop.org, ville.syrjala@linux.intel.com, jani.nikula@linux.intel.com, joonas.lahtinen@linux.intel.com, rodrigo.vivi@intel.com, daniel.vetter@ffwll.ch, Sean Paul , Chris Wilson , stable@vger.kernel.org Subject: Re: [PATCH v2 02/12] drm/i915: Clear the repeater bit on HDCP disable Message-ID: <20191213102902.GB3829@intel.com> References: <20191212190230.188505-1-sean@poorly.run> <20191212190230.188505-3-sean@poorly.run> MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Disposition: inline In-Reply-To: <20191212190230.188505-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 2019-12-12 at 14:02:20 -0500, 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+ > Signed-off-by: Sean Paul > > Changes in v2: > -Added to the set > --- > drivers/gpu/drm/i915/display/intel_hdcp.c | 5 +++++ > 1 file changed, 5 insertions(+) > > diff --git a/drivers/gpu/drm/i915/display/intel_hdcp.c b/drivers/gpu/drm/i915/display/intel_hdcp.c > index eaab9008feef..c4394c8e10eb 100644 > --- a/drivers/gpu/drm/i915/display/intel_hdcp.c > +++ b/drivers/gpu/drm/i915/display/intel_hdcp.c > @@ -773,6 +773,7 @@ static int _intel_hdcp_disable(struct intel_connector *connector) > struct intel_digital_port *intel_dig_port = conn_to_dig_port(connector); > enum port port = intel_dig_port->base.port; > enum transcoder cpu_transcoder = hdcp->cpu_transcoder; > + u32 repeater_ctl; > int ret; > > DRM_DEBUG_KMS("[%s:%d] HDCP is being disabled...\n", > @@ -787,6 +788,10 @@ static int _intel_hdcp_disable(struct intel_connector *connector) > return -ETIMEDOUT; > } > > + repeater_ctl = intel_hdcp_get_repeater_ctl(dev_priv, cpu_transcoder, > + port); > + I915_WRITE(HDCP_REP_CTL, I915_READ(HDCP_REP_CTL) & ~repeater_ctl); Do you think it will help to (double) clear HDCP_REP_CTL when detect a sink which is non repeater!? But yes disable will be executed on all HDCP exits. > + LGTM Reviewed-by: Ramalingam C > ret = hdcp->shim->toggle_signalling(intel_dig_port, false); > if (ret) { > DRM_ERROR("Failed to disable HDCP signalling\n"); > -- > Sean Paul, Software Engineer, Google / Chromium OS >