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=-5.2 required=3.0 tests=HEADER_FROM_DIFFERENT_DOMAINS, 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 2E805C433DF for ; Wed, 8 Jul 2020 10:04:32 +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 0E29820772 for ; Wed, 8 Jul 2020 10:04:31 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 0E29820772 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 8BD0C89D1D; Wed, 8 Jul 2020 10:04:31 +0000 (UTC) Received: from mga04.intel.com (mga04.intel.com [192.55.52.120]) by gabe.freedesktop.org (Postfix) with ESMTPS id 6326689D1D for ; Wed, 8 Jul 2020 10:04:30 +0000 (UTC) IronPort-SDR: JFi2YbHTkx3AjkgnbxQfcfXScNpuVCP9Kv4SVBs7UaRzv7+kxFhj63+XEIPqvOXKCS9NvxjsPX EDMd8Z5VRFfg== X-IronPort-AV: E=McAfee;i="6000,8403,9675"; a="145269974" X-IronPort-AV: E=Sophos;i="5.75,327,1589266800"; d="scan'208";a="145269974" X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from orsmga008.jf.intel.com ([10.7.209.65]) by fmsmga104.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 08 Jul 2020 03:04:29 -0700 IronPort-SDR: saaoCuoj80M8xG434TFMB9Bm5SQUOIoRcjOsLSAUZA8c4fx4en/+A/IAXJ6jg/s7ey1iFJfgjX Mm/E0VJ8mPzA== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.75,327,1589266800"; d="scan'208";a="314596778" Received: from ramaling-i9x.iind.intel.com (HELO intel.com) ([10.99.66.154]) by orsmga008.jf.intel.com with ESMTP; 08 Jul 2020 03:04:28 -0700 Date: Wed, 8 Jul 2020 15:28:48 +0530 From: Ramalingam C To: Anshuman Gupta Message-ID: <20200708095848.GA12493@intel.com> References: <20200630082048.22308-1-anshuman.gupta@intel.com> <87d05gna9w.fsf@intel.com> <20200708082515.GN15183@intel.com> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: <20200708082515.GN15183@intel.com> User-Agent: Mutt/1.10.1 (2018-07-13) Subject: Re: [Intel-gfx] [PATCH v3] drm/i915/hdcp: Update CP as per the kernel internal state 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: "Nikula, Jani" , "intel-gfx@lists.freedesktop.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-07-08 at 13:55:16 +0530, Anshuman Gupta wrote: > On 2020-07-01 at 13:31:18 +0530, Shankar, Uma wrote: > > > > -----Original Message----- > > > > From: Jani Nikula > > > > Sent: Tuesday, June 30, 2020 3:30 PM > > > > To: Gupta, Anshuman ; intel- > > > > gfx@lists.freedesktop.org > > > > Cc: Shankar, Uma > > > > Subject: Re: [Intel-gfx] [PATCH v3] drm/i915/hdcp: Update CP as per > > > > the kernel internal state > > > > > > > > > > > > Uma, is the R-b still valid? It's been a while. > > > > > > Yeah Jani, the changes look good. Will need a rebase and fresh CI results though. > > > > Seems the CI results are already out and we are clean. > Hi Ram , > CI results are clean for this rebase patch, > Could you please help with merging, Pushed into dinq. Thanks for the change. -Ram > I belive your RB's are valid either-way wrt to your comment. > Thanks, > Anshuman Gupta. > > > > > > Regards, > > > Uma Shankar > > > > > > > BR, > > > > Jani. > > > > > > > > > > > > On Tue, 30 Jun 2020, Anshuman Gupta wrote: > > > > > Content Protection property should be updated as per the kernel > > > > > internal state. Let's say if Content protection is disabled by > > > > > userspace, CP property should be set to UNDESIRED so that > > > > > reauthentication will not happen until userspace request it again, > > > > > but when kernel disables the HDCP due to any DDI disabling sequences > > > > > like modeset/DPMS operation, kernel should set the property to > > > > > DESIRED, so that when opportunity arises, kernel will start the HDCP > > > > > authentication on its own. > > > > > > > > > > Somewhere in the line, state machine to set content protection to > > > > > DESIRED from kernel was broken and IGT coverage was missing for it. > > > > > This patch fixes it. > > > > > > > > > > v2: > > > > > - Fixing hdcp CP state in connector atomic check function > > > > > intel_hdcp_atomic_check(). [Maarten] > > > > > This will require to check hdcp->value in intel_hdcp_update_pipe() > > > > > in order to avoid enabling hdcp, if it was already enabled. > > > > > > > > > > v3: > > > > > - Rebased. > > > > > > > > > > Cc: Ramalingam C > > > > > Cc: Maarten Lankhorst > > > > > Reviewed-by: Uma Shankar > > > > > Signed-off-by: Anshuman Gupta > > > > > Link: > > > > > https://patchwork.freedesktop.org/patch/350962/?series=72664&rev=2 > > > > > #v1 > > > > > Link: > > > > > https://patchwork.freedesktop.org/patch/359396/?series=72251&rev=3 > > > > > #v2 > > > > > --- > > > > > drivers/gpu/drm/i915/display/intel_hdcp.c | 27 > > > > > +++++++++++++++++++---- > > > > > 1 file changed, 23 insertions(+), 4 deletions(-) > > > > > > > > > > diff --git a/drivers/gpu/drm/i915/display/intel_hdcp.c > > > > > b/drivers/gpu/drm/i915/display/intel_hdcp.c > > > > > index 815b054bb167..0d410652e194 100644 > > > > > --- a/drivers/gpu/drm/i915/display/intel_hdcp.c > > > > > +++ b/drivers/gpu/drm/i915/display/intel_hdcp.c > > > > > @@ -2086,6 +2086,7 @@ void intel_hdcp_update_pipe(struct > > > > intel_atomic_state *state, > > > > > (conn_state->hdcp_content_type != hdcp->content_type && > > > > > conn_state->content_protection != > > > > > DRM_MODE_CONTENT_PROTECTION_UNDESIRED); > > > > > + bool desired_and_not_enabled = false; > > > > > > > > > > /* > > > > > * During the HDCP encryption session if Type change is requested, > > > > > @@ -2108,8 +2109,15 @@ void intel_hdcp_update_pipe(struct > > > > intel_atomic_state *state, > > > > > } > > > > > > > > > > if (conn_state->content_protection == > > > > > - DRM_MODE_CONTENT_PROTECTION_DESIRED || > > > > > - content_protection_type_changed) > > > > > + DRM_MODE_CONTENT_PROTECTION_DESIRED) { > > > > > + mutex_lock(&hdcp->mutex); > > > > > + /* Avoid enabling hdcp, if it already ENABLED */ > > > > > + desired_and_not_enabled = > > > > > + hdcp->value != > > > > DRM_MODE_CONTENT_PROTECTION_ENABLED; > > > > > + mutex_unlock(&hdcp->mutex); > > > > > + } > > > > > + > > > > > + if (desired_and_not_enabled || content_protection_type_changed) > > > > > intel_hdcp_enable(connector, > > > > > crtc_state->cpu_transcoder, > > > > > (u8)conn_state->hdcp_content_type); > > > > > @@ -2158,6 +2166,19 @@ void intel_hdcp_atomic_check(struct > > > > drm_connector *connector, > > > > > return; > > > > > } > > > > > > > > > > + crtc_state = drm_atomic_get_new_crtc_state(new_state->state, > > > > > + new_state->crtc); > > > > > + /* > > > > > + * Fix the HDCP uapi content protection state in case of modeset. > > > > > + * FIXME: As per HDCP content protection property uapi doc, an uevent() > > > > > + * need to be sent if there is transition from ENABLED->DESIRED. > > > > > + */ > > > > > + if (drm_atomic_crtc_needs_modeset(crtc_state) && > > > > > + (old_cp == DRM_MODE_CONTENT_PROTECTION_ENABLED && > > > > > + new_cp != DRM_MODE_CONTENT_PROTECTION_UNDESIRED)) > > > > > + new_state->content_protection = > > > > > + DRM_MODE_CONTENT_PROTECTION_DESIRED; > > > > > + > > > > > /* > > > > > * Nothing to do if the state didn't change, or HDCP was activated since > > > > > * the last commit. And also no change in hdcp content type. > > > > > @@ -2170,8 +2191,6 @@ void intel_hdcp_atomic_check(struct > > > > > drm_connector > > > > *connector, > > > > > return; > > > > > } > > > > > > > > > > - crtc_state = drm_atomic_get_new_crtc_state(new_state->state, > > > > > - new_state->crtc); > > > > > crtc_state->mode_changed = true; > > > > > } > > > > > > > > -- > > > > Jani Nikula, Intel Open Source Graphics Center > > > _______________________________________________ > > > Intel-gfx mailing list > > > Intel-gfx@lists.freedesktop.org > > > https://lists.freedesktop.org/mailman/listinfo/intel-gfx _______________________________________________ Intel-gfx mailing list Intel-gfx@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/intel-gfx