From:   "Kandpal, Suraj" <suraj.kandpal@intel.com>
To:     Mark Yacoub <markyacoub@chromium.org>,
        "quic_khsieh@quicinc.com" <quic_khsieh@quicinc.com>,
        "linux-arm-msm@vger.kernel.org" <linux-arm-msm@vger.kernel.org>,
        "dri-devel@lists.freedesktop.org" <dri-devel@lists.freedesktop.org>,
        "freedreno@lists.freedesktop.org" <freedreno@lists.freedesktop.org>,
        "devicetree@vger.kernel.org" <devicetree@vger.kernel.org>,
        "linux-kernel@vger.kernel.org" <linux-kernel@vger.kernel.org>,
        "intel-gfx@lists.freedesktop.org" <intel-gfx@lists.freedesktop.org>
CC:     "quic_sbillaka@quicinc.com" <quic_sbillaka@quicinc.com>,
        "konrad.dybcio@somainline.org" <konrad.dybcio@somainline.org>,
        "bjorn.andersson@linaro.org" <bjorn.andersson@linaro.org>,
        "krzysztof.kozlowski+dt@linaro.org" 
        <krzysztof.kozlowski+dt@linaro.org>,
        "airlied@gmail.com" <airlied@gmail.com>,
        "hbh25y@gmail.com" <hbh25y@gmail.com>,
        "Vasut, Marek" <marex@denx.de>,
        "abhinavk@codeaurora.org" <abhinavk@codeaurora.org>,
        "javierm@redhat.com" <javierm@redhat.com>,
        "agross@kernel.org" <agross@kernel.org>,
        "quic_jesszhan@quicinc.com" <quic_jesszhan@quicinc.com>,
        "daniel@ffwll.ch" <daniel@ffwll.ch>,
        "Nikula, Jani" <jani.nikula@intel.com>,
        "De Marchi, Lucas" <lucas.demarchi@intel.com>,
        "quic_abhinavk@quicinc.com" <quic_abhinavk@quicinc.com>,
        "swboyd@chromium.org" <swboyd@chromium.org>,
        "robh+dt@kernel.org" <robh+dt@kernel.org>,
        "christophe.jaillet@wanadoo.fr" <christophe.jaillet@wanadoo.fr>,
        "maxime@cerno.tech" <maxime@cerno.tech>,
        "Vivi, Rodrigo" <rodrigo.vivi@intel.com>,
        "johan+linaro@kernel.org" <johan+linaro@kernel.org>,
        "andersson@kernel.org" <andersson@kernel.org>,
        "dianders@chromium.org" <dianders@chromium.org>,
        "tzimmermann@suse.de" <tzimmermann@suse.de>,
        "dmitry.baryshkov@linaro.org" <dmitry.baryshkov@linaro.org>,
        "seanpaul@chromium.org" <seanpaul@chromium.org>
Subject: RE: [Intel-gfx] [PATCH v6 01/10] drm/hdcp: Add
 drm_hdcp_atomic_check()
Thread-Topic: [Intel-gfx] [PATCH v6 01/10] drm/hdcp: Add
 drm_hdcp_atomic_check()
Thread-Index: AQHZK3Nc8Xe/S4vQ4UKsTUqMt/Bw1q7zylhw
Date:   Fri, 10 Mar 2023 05:30:19 +0000
Message-ID: <MWHPR11MB1741C74500B2A6FCE62D8B3FE3BA9@MWHPR11MB1741.namprd11.prod.outlook.com>
References: <20230118193015.911074-1-markyacoub@google.com>
 <20230118193015.911074-2-markyacoub@google.com>
In-Reply-To: <20230118193015.911074-2-markyacoub@google.com>
Accept-Language: en-US
Content-Language: en-US
x-ms-exchange-antispam-messagedata-chunkcount: 1
x-ms-exchange-antispam-messagedata-0: =?us-ascii?Q?I7b/rSplhzmxYdlNeVvioVPKGPDpnmldzlykk2jbQ/AWXNf1yPTFRAJjkQlZ?=
 =?us-ascii?Q?eX7OuW3sd5R8qlc3iYNTbxW3qIRYM84uTvfI67lj/zfeZgb7rzZa/FOmocgz?=
 =?us-ascii?Q?XmpqsQ0pjdWlBa24Gu6T2S1UiuRWETklPY4PI8uVw0LFb4SBbSC/pBp5STo/?=
 =?us-ascii?Q?r1S5GWc8pzKFUYwn41MO9Ta4B1kQ3RcQ8pqijlN8+ixuPpXfWjxVdgbTkuRF?=
 =?us-ascii?Q?SxCh1+c0kQAiS3O4x32JS2pn6P6e9zWYsp3CiChQSETLwjA7hWYeAXOCa3Rn?=
 =?us-ascii?Q?ocoQhlUT74CppdjRSYTPKUxDM7XpMwGRyQGZCVie49wjIP0kflF1dRWKzstA?=
 =?us-ascii?Q?1uzY1u8XbYCCPVhA1Kqu4lndB6R50BZ05eztfT4zdoyNMZdNSEzEdw+fJLgS?=
 =?us-ascii?Q?jPTWa7Q561LN3lPUDn+p3E/LcKHlBMs1C+i4C4mSvusN3JlpqF985+foZ4DQ?=
 =?us-ascii?Q?U8vo4vA1NVY5Bx0F3CUspN3ZpKYcaV2LuoR3lEZzGO5lR3+svTjV4d1MTo6S?=
 =?us-ascii?Q?0ZPL1Gmf++Yg4SGJpWvfJaGZ4hGGOsIMYBLRzLwPcsjbucljxMQWoPazOgB2?=
 =?us-ascii?Q?NdH6FBDp74VqinTV0U6oWzKgNz/CHasQhv5JiwUmgSL+ehsaGypo8Em65L2h?=
 =?us-ascii?Q?QkoC7PRK5mwPxatx+8pE7PxuB7NBL5IWJWfGyPTYbx3L/byLX3yI6gc1nOdC?=
 =?us-ascii?Q?quoB1e9rC4arFfiV5HZRKKWPjewbjbyT97WwSYdL2JewKs4vDYZjOq22FqES?=
 =?us-ascii?Q?T72npJsDUJlUb8SZMJ/ZrArZ0jiFRL3yKerdUxZ6xKwPX1lfd8mLhpHFHUVV?=
 =?us-ascii?Q?PNRtdWcCZd5fzEHrFlEIKAU/y1/Sgf4skslpXsNUbRofYX++7Lj9pmmkEGi1?=
 =?us-ascii?Q?U2dFg78UKmDdfmldM4Te57AwBVgl6fQF5qdwfvUfLHMmmvkbkzM6fJzXNRob?=
 =?us-ascii?Q?ZagRKHnzKlXTAupD3jnsOoKssG7tFN7FUQ37qzinsG6w1m2heIewzIQq9EgN?=
 =?us-ascii?Q?qbgOShrHmULSmaC1grPEvjMZVDOex8Lt8nvDmEgm/9oCJl36HBzoaeYf5nXl?=
 =?us-ascii?Q?PkIS2pDBCpBg9LicQBeDn9Vw/iYyidgxb9nLK0aH4TPm9dvjCDO1QkRXqqeV?=
 =?us-ascii?Q?GMi1vEq1mL5YD1Ssf6Hcvux3mf77MeMHEsnyxBZa1Yqm5mETIAfnydJ6ck6W?=
 =?us-ascii?Q?+OgkFd3bxvAcyJknhP0o4+3yBaEbogFPUJLzBBHeEHeycC3pDzdnR0jhRQWu?=
 =?us-ascii?Q?7t3zHcQcvEXikBmU3ScEBQWzzux28Ibyb3qbyYlXnli3mATK4ft/7Gxl7Bjg?=
 =?us-ascii?Q?BzzmKEW/5MutWwsootYDsL8L7yqT3ecqLOUsqZXL/8DvZcXZHj6QMQxa+Vf8?=
 =?us-ascii?Q?wJK9lOdp154Sky/RTxiiQcg7IFT4bfUyObUVeDq0gh84nIBoDYptWiMFXZBf?=
 =?us-ascii?Q?1L+91kYsGR8Yqxk1kxsBvBikZCpprtGHImnIJh+aPKYn65JUjMAv+U4Wj0HG?=
 =?us-ascii?Q?UMK0oA4V2RjKnv4j89xdfSgcp8zWCCo8ASjllW7eJAMQpXzXKkhX7PzR62MX?=
 =?us-ascii?Q?DzMGuEdYeqxSnA1XNTuLNMOHhVx+70bmWDIkHZFG?=
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: quoted-printable
MIME-Version: 1.0
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-AuthSource: MWHPR11MB1741.namprd11.prod.outlook.com
X-MS-Exchange-CrossTenant-Network-Message-Id: 21a561b8-6551-4247-e00f-08db21288966
X-MS-Exchange-CrossTenant-originalarrivaltime: 10 Mar 2023 05:30:19.0529
 (UTC)
X-MS-Exchange-CrossTenant-fromentityheader: Hosted
X-MS-Exchange-CrossTenant-id: 46c98d88-e344-4ed4-8496-4ed7712e255d
X-MS-Exchange-CrossTenant-mailboxtype: HOSTED
X-MS-Exchange-CrossTenant-userprincipalname: rD+d+Owz81REI4pfQL31f4i+9QwqE/7zJuP7Vt2DU0XLqR+E7AgUgGXF3Vay47cpJ0ZPCoMTPiRImOb4Z5nV1w==
X-MS-Exchange-Transport-CrossTenantHeadersStamped: IA1PR11MB6193
X-OriginatorOrg: intel.com
Precedence: bulk
List-ID: <linux-kernel.vger.kernel.org>
X-Mailing-List: linux-kernel@vger.kernel.org

>=20
> From: Sean Paul <seanpaul@chromium.org>
>=20
> This patch moves the hdcp atomic check from i915 to drm_hdcp so other
> drivers can use it. No functional changes, just cleaned up some of the co=
de
> when moving it over.
>=20
> Acked-by: Jani Nikula <jani.nikula@intel.com>
> Acked-by: Jani Nikula <jani.nikula@intel.com>
> Reviewed-by: Rodrigo Vivi <rodrigo.vivi@intel.com>
> Reviewed-by: Abhinav Kumar <abhinavk@codeaurora.org>
> Signed-off-by: Sean Paul <seanpaul@chromium.org>
> Signed-off-by: Mark Yacoub <markyacoub@chromium.org>
> Link:
> https://patchwork.freedesktop.org/patch/msgid/20210913175747.47456-2-
> sean@poorly.run #v1
> Link:
> https://patchwork.freedesktop.org/patch/msgid/20210915203834.1439-2-
> sean@poorly.run #v2
> Link:
> https://patchwork.freedesktop.org/patch/msgid/20211001151145.55916-2-
> sean@poorly.run #v3
> Link:
> https://patchwork.freedesktop.org/patch/msgid/20211105030434.2828845-
> 2-sean@poorly.run #v4
> Link:
> https://patchwork.freedesktop.org/patch/msgid/20220411204741.1074308-
> 2-sean@poorly.run #v5
>=20
> Changes in v2:
> -None
> Changes in v3:
> -None
> Changes in v4:
> -None
> Changes in v5:
> -None
> Changes in V6:
> -Rebase: move helper from drm_hdcp.c to drm_hdcp_helper.c
>=20
> ---
>  drivers/gpu/drm/display/drm_hdcp_helper.c   | 69
> +++++++++++++++++++++
>  drivers/gpu/drm/i915/display/intel_atomic.c |  4 +-
>  drivers/gpu/drm/i915/display/intel_hdcp.c   | 47 --------------
>  drivers/gpu/drm/i915/display/intel_hdcp.h   |  3 -
>  include/drm/display/drm_hdcp_helper.h       |  3 +
>  5 files changed, 74 insertions(+), 52 deletions(-)
>=20
> diff --git a/drivers/gpu/drm/display/drm_hdcp_helper.c
> b/drivers/gpu/drm/display/drm_hdcp_helper.c
> index e78999c72bd7..7d910523b05f 100644
> --- a/drivers/gpu/drm/display/drm_hdcp_helper.c
> +++ b/drivers/gpu/drm/display/drm_hdcp_helper.c
> @@ -20,6 +20,7 @@
>  #include <drm/drm_property.h>
>  #include <drm/drm_mode_object.h>
>  #include <drm/drm_connector.h>
> +#include <drm/drm_atomic.h>
>=20
>  static inline void drm_hdcp_print_ksv(const u8 *ksv)  { @@ -419,3 +420,7=
1
> @@ void drm_hdcp_update_content_protection(struct drm_connector
> *connector,
>  				 dev-
> >mode_config.content_protection_property);
>  }
>  EXPORT_SYMBOL(drm_hdcp_update_content_protection);
> +
> +/**
> + * drm_hdcp_atomic_check - Helper for drivers to call during
> +connector->atomic_check
> + *
> + * @state: pointer to the atomic state being checked
> + * @connector: drm_connector on which content protection state needs an
> +update
> + *
> + * This function can be used by display drivers to perform an atomic
> +check on the
> + * hdcp state elements. If hdcp state has changed, this function will
> +set
> + * mode_changed on the crtc driving the connector so it can update its
> +hardware
> + * to match the hdcp state.
> + */
> +void drm_hdcp_atomic_check(struct drm_connector *connector,
> +			   struct drm_atomic_state *state)
> +{
> +	struct drm_connector_state *new_conn_state, *old_conn_state;
> +	struct drm_crtc_state *new_crtc_state;
> +	u64 old_hdcp, new_hdcp;
> +
> +	old_conn_state =3D drm_atomic_get_old_connector_state(state,
> connector);
> +	old_hdcp =3D old_conn_state->content_protection;
> +
> +	new_conn_state =3D drm_atomic_get_new_connector_state(state,
> connector);
> +	new_hdcp =3D new_conn_state->content_protection;
> +
> +	if (!new_conn_state->crtc) {
> +		/*
> +		 * If the connector is being disabled with CP enabled, mark it
> +		 * desired so it's re-enabled when the connector is brought
> back
> +		 */
> +		if (old_hdcp =3D=3D
> DRM_MODE_CONTENT_PROTECTION_ENABLED)
> +			new_conn_state->content_protection =3D
> +
> 	DRM_MODE_CONTENT_PROTECTION_DESIRED;
> +		return;
> +	}
> +
> +	new_crtc_state =3D
> +		drm_atomic_get_new_crtc_state(state, new_conn_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.
> +	*/

Hi Mark,
Is the above comment needed here as drm_hdcp_update_content_protection is
used to change property which sends a uevent making the above comment misle=
ading

Regards,
Suraj Kandpal
> +	if (drm_atomic_crtc_needs_modeset(new_crtc_state) &&
> +	    (old_hdcp =3D=3D DRM_MODE_CONTENT_PROTECTION_ENABLED &&
> +	     new_hdcp !=3D DRM_MODE_CONTENT_PROTECTION_UNDESIRED))
> +		new_conn_state->content_protection =3D
> +			DRM_MODE_CONTENT_PROTECTION_DESIRED;
> +
> +	/*
> +	 * Nothing to do if content type is unchanged and one of:
> +	 *  - state didn't change
> +	 *  - HDCP was activated since the last commit
> +	 *  - attempting to set to desired while already enabled
> +	 */
> +	if (old_hdcp =3D=3D new_hdcp ||
> +	    (old_hdcp =3D=3D DRM_MODE_CONTENT_PROTECTION_DESIRED &&
> +	     new_hdcp =3D=3D DRM_MODE_CONTENT_PROTECTION_ENABLED) ||
> +	    (old_hdcp =3D=3D DRM_MODE_CONTENT_PROTECTION_ENABLED &&
> +	     new_hdcp =3D=3D DRM_MODE_CONTENT_PROTECTION_DESIRED)) {
> +		if (old_conn_state->hdcp_content_type =3D=3D
> +		    new_conn_state->hdcp_content_type)
> +			return;
> +	}
> +
> +	new_crtc_state->mode_changed =3D true;
> +}
> +EXPORT_SYMBOL(drm_hdcp_atomic_check);
> diff --git a/drivers/gpu/drm/i915/display/intel_atomic.c
> b/drivers/gpu/drm/i915/display/intel_atomic.c
> index 18f0a5ae3bac..8a473199c4bf 100644
> --- a/drivers/gpu/drm/i915/display/intel_atomic.c
> +++ b/drivers/gpu/drm/i915/display/intel_atomic.c
> @@ -32,6 +32,7 @@
>  #include <drm/drm_atomic.h>
>  #include <drm/drm_atomic_helper.h>
>  #include <drm/drm_fourcc.h>
> +#include <drm/display/drm_hdcp_helper.h>
>=20
>  #include "i915_drv.h"
>  #include "i915_reg.h"
> @@ -39,7 +40,6 @@
>  #include "intel_cdclk.h"
>  #include "intel_display_types.h"
>  #include "intel_global_state.h"
> -#include "intel_hdcp.h"
>  #include "intel_psr.h"
>  #include "skl_universal_plane.h"
>=20
> @@ -123,7 +123,7 @@ int intel_digital_connector_atomic_check(struct
> drm_connector *conn,
>  		to_intel_digital_connector_state(old_state);
>  	struct drm_crtc_state *crtc_state;
>=20
> -	intel_hdcp_atomic_check(conn, old_state, new_state);
> +	drm_hdcp_atomic_check(conn, state);
>=20
>  	if (!new_state->crtc)
>  		return 0;
> diff --git a/drivers/gpu/drm/i915/display/intel_hdcp.c
> b/drivers/gpu/drm/i915/display/intel_hdcp.c
> index 6406fd487ee5..396d2cef000a 100644
> --- a/drivers/gpu/drm/i915/display/intel_hdcp.c
> +++ b/drivers/gpu/drm/i915/display/intel_hdcp.c
> @@ -2524,53 +2524,6 @@ void intel_hdcp_cleanup(struct intel_connector
> *connector)
>  	mutex_unlock(&hdcp->mutex);
>  }
>=20
> -void intel_hdcp_atomic_check(struct drm_connector *connector,
> -			     struct drm_connector_state *old_state,
> -			     struct drm_connector_state *new_state)
> -{
> -	u64 old_cp =3D old_state->content_protection;
> -	u64 new_cp =3D new_state->content_protection;
> -	struct drm_crtc_state *crtc_state;
> -
> -	if (!new_state->crtc) {
> -		/*
> -		 * If the connector is being disabled with CP enabled, mark it
> -		 * desired so it's re-enabled when the connector is brought
> back
> -		 */
> -		if (old_cp =3D=3D
> DRM_MODE_CONTENT_PROTECTION_ENABLED)
> -			new_state->content_protection =3D
> -
> 	DRM_MODE_CONTENT_PROTECTION_DESIRED;
> -		return;
> -	}
> -
> -	crtc_state =3D 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 =3D=3D DRM_MODE_CONTENT_PROTECTION_ENABLED &&
> -	    new_cp !=3D DRM_MODE_CONTENT_PROTECTION_UNDESIRED))
> -		new_state->content_protection =3D
> -			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.
> -	 */
> -	if (old_cp =3D=3D new_cp ||
> -	    (old_cp =3D=3D DRM_MODE_CONTENT_PROTECTION_DESIRED &&
> -	     new_cp =3D=3D DRM_MODE_CONTENT_PROTECTION_ENABLED)) {
> -		if (old_state->hdcp_content_type =3D=3D
> -				new_state->hdcp_content_type)
> -			return;
> -	}
> -
> -	crtc_state->mode_changed =3D true;
> -}
> -
>  /* Handles the CP_IRQ raised from the DP HDCP sink */  void
> intel_hdcp_handle_cp_irq(struct intel_connector *connector)  { diff --git
> a/drivers/gpu/drm/i915/display/intel_hdcp.h
> b/drivers/gpu/drm/i915/display/intel_hdcp.h
> index 8f53b0c7fe5c..7c5fd84a7b65 100644
> --- a/drivers/gpu/drm/i915/display/intel_hdcp.h
> +++ b/drivers/gpu/drm/i915/display/intel_hdcp.h
> @@ -22,9 +22,6 @@ struct intel_digital_port;  enum port;  enum transcoder=
;
>=20
> -void intel_hdcp_atomic_check(struct drm_connector *connector,
> -			     struct drm_connector_state *old_state,
> -			     struct drm_connector_state *new_state);
>  int intel_hdcp_init(struct intel_connector *connector,
>  		    struct intel_digital_port *dig_port,
>  		    const struct intel_hdcp_shim *hdcp_shim); diff --git
> a/include/drm/display/drm_hdcp_helper.h
> b/include/drm/display/drm_hdcp_helper.h
> index 8aaf87bf2735..dd02b2e72a50 100644
> --- a/include/drm/display/drm_hdcp_helper.h
> +++ b/include/drm/display/drm_hdcp_helper.h
> @@ -11,6 +11,7 @@
>=20
>  #include <drm/display/drm_hdcp.h>
>=20
> +struct drm_atomic_state;
>  struct drm_device;
>  struct drm_connector;
>=20
> @@ -18,5 +19,7 @@ int drm_hdcp_check_ksvs_revoked(struct drm_device
> *dev, u8 *ksvs, u32 ksv_count)  int
> drm_connector_attach_content_protection_property(struct drm_connector
> *connector,
>  						     bool hdcp_content_type);
>  void drm_hdcp_update_content_protection(struct drm_connector
> *connector, u64 val);
> +void drm_hdcp_atomic_check(struct drm_connector *connector,
> +			   struct drm_atomic_state *state);
>=20
>  #endif
> --
> 2.39.0.246.g2a6d74b583-goog