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=-11.2 required=3.0 tests=BAYES_00, 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 19655C00A89 for ; Thu, 5 Nov 2020 13:17: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 7D7BC206FA for ; Thu, 5 Nov 2020 13:17:25 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 7D7BC206FA 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 9FBB26E0FB; Thu, 5 Nov 2020 13:17:24 +0000 (UTC) Received: from mga12.intel.com (mga12.intel.com [192.55.52.136]) by gabe.freedesktop.org (Postfix) with ESMTPS id 8CF6A6E0FB; Thu, 5 Nov 2020 13:17:23 +0000 (UTC) IronPort-SDR: WhOp64pF2ZmboMtlndiHj09lKZJXnimWg6Qd9ax88EyS9EDoULJjpSXS5ok2UHL2Z4tzDBkt/e DwE0O25EOvCA== X-IronPort-AV: E=McAfee;i="6000,8403,9795"; a="148658040" X-IronPort-AV: E=Sophos;i="5.77,453,1596524400"; d="scan'208";a="148658040" X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from orsmga005.jf.intel.com ([10.7.209.41]) by fmsmga106.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 05 Nov 2020 05:17:22 -0800 IronPort-SDR: RUIEHoR6t6TDPz86zBN3w7l8t3pGtLY42yO7HIo/6QUu02bBZDUbldB85Yw7xZgd3R2n7nO4pb tFYtxoN9hZxA== X-IronPort-AV: E=Sophos;i="5.77,453,1596524400"; d="scan'208";a="539395183" Received: from unknown (HELO intel.com) ([10.99.66.154]) by orsmga005-auth.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 05 Nov 2020 05:17:20 -0800 Date: Thu, 5 Nov 2020 18:48:02 +0530 From: Ramalingam C To: Anshuman Gupta Message-ID: <20201105131801.GA3242@intel.com> References: <20201027164208.10026-1-anshuman.gupta@intel.com> <20201027164208.10026-2-anshuman.gupta@intel.com> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: <20201027164208.10026-2-anshuman.gupta@intel.com> User-Agent: Mutt/1.10.1 (2018-07-13) Subject: Re: [Intel-gfx] [PATCH v4 01/16] drm/i915/hdcp: Update CP property in update_pipe 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: jani.nikula@intel.com, intel-gfx@lists.freedesktop.org, dri-devel@lists.freedesktop.org, seanpaul@chromium.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-10-27 at 22:11:53 +0530, Anshuman Gupta wrote: > When crtc state need_modeset is true it is not necessary > it is going to be a real modeset, it can turns to be a > fastset instead of modeset. > This turns content protection property to be DESIRED and hdcp > update_pipe left with property to be in DESIRED state but > actual hdcp->value was ENABLED. > > This issue is caught with DP MST setup, where we have multiple > connector in same DP_MST topology. When disabling HDCP on one of > DP MST connector leads to set the crtc state need_modeset to true > for all other crtc driving the other DP-MST topology connectors. > This turns up other DP MST connectors CP property to be DESIRED > despite the actual hdcp->value is ENABLED. > Above scenario fails the DP MST HDCP IGT test, disabling HDCP on > one MST stream should not cause to disable HDCP on another MST > stream on same DP MST topology. > > v2: > Fix WARN_ON(connector->base.registration_state == DRM_CONNECTOR_REGISTERED) > v3: > Commit log improvement. [Uma] > Added a comment before scheduling prop_work. [Uma] > > Fixes: 33f9a623bfc6 ("drm/i915/hdcp: Update CP as per the kernel internal state") > Cc: Ramalingam C > Signed-off-by: Anshuman Gupta > --- > drivers/gpu/drm/i915/display/intel_hdcp.c | 8 ++++++++ > 1 file changed, 8 insertions(+) > > diff --git a/drivers/gpu/drm/i915/display/intel_hdcp.c b/drivers/gpu/drm/i915/display/intel_hdcp.c > index b2a4bbcfdcd2..eee8263405b9 100644 > --- a/drivers/gpu/drm/i915/display/intel_hdcp.c > +++ b/drivers/gpu/drm/i915/display/intel_hdcp.c > @@ -2221,6 +2221,14 @@ void intel_hdcp_update_pipe(struct intel_atomic_state *state, > desired_and_not_enabled = > hdcp->value != DRM_MODE_CONTENT_PROTECTION_ENABLED; > mutex_unlock(&hdcp->mutex); > + /* > + * If HDCP already ENABLED and CP property is DESIRED, schedule > + * prop_work to update correct CP property to user space. > + */ > + if (!desired_and_not_enabled && !content_protection_type_changed) { > + drm_connector_get(&connector->base); Sorry for late review. why do we need this? and where do we release the connector ref? -Ram > + schedule_work(&hdcp->prop_work); > + } > } > > if (desired_and_not_enabled || content_protection_type_changed) > -- > 2.26.2 > _______________________________________________ Intel-gfx mailing list Intel-gfx@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/intel-gfx