All of lore.kernel.org
 help / color / mirror / Atom feed
From: Ramalingam C <ramalingam.c@intel.com>
To: Ville Syrjala <ville.syrjala@linux.intel.com>
Cc: intel-gfx@lists.freedesktop.org
Subject: Re: [Intel-gfx] [PATCH 9/9] drm/i915/hdcp: Clean up local variables
Date: Thu, 5 Dec 2019 15:52:41 +0530	[thread overview]
Message-ID: <20191205102241.GB25793@intel.com> (raw)
In-Reply-To: <20191204180549.1267-10-ville.syrjala@linux.intel.com>

On 2019-12-04 at 20:05:49 +0200, Ville Syrjala wrote:
> From: Ville Syrjälä <ville.syrjala@linux.intel.com>
> 
> Eliminate the inconsistencies in the hdcp code local variables:
> - use dev_priv over dev
> - use to_i915() instead of dev->dev_private
> - initialize variables when declaring them
> - a bit of declaration suffling to make appease ocd
> 
> Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>

Reviewed-by: Ramalingam C <ramalingam.c@intel.com>

> ---
>  drivers/gpu/drm/i915/display/intel_hdcp.c | 54 +++++++++++------------
>  1 file changed, 25 insertions(+), 29 deletions(-)
> 
> diff --git a/drivers/gpu/drm/i915/display/intel_hdcp.c b/drivers/gpu/drm/i915/display/intel_hdcp.c
> index 4b73227644f0..3454a913dca8 100644
> --- a/drivers/gpu/drm/i915/display/intel_hdcp.c
> +++ b/drivers/gpu/drm/i915/display/intel_hdcp.c
> @@ -85,8 +85,8 @@ bool intel_hdcp_capable(struct intel_connector *connector)
>  /* Is HDCP2.2 capable on Platform and Sink */
>  bool intel_hdcp2_capable(struct intel_connector *connector)
>  {
> -	struct drm_i915_private *dev_priv = to_i915(connector->base.dev);
>  	struct intel_digital_port *intel_dig_port = intel_attached_dig_port(connector);
> +	struct drm_i915_private *dev_priv = to_i915(connector->base.dev);
>  	struct intel_hdcp *hdcp = &connector->hdcp;
>  	bool capable = false;
>  
> @@ -298,14 +298,12 @@ int intel_hdcp_validate_v_prime(struct intel_connector *connector,
>  				u8 *ksv_fifo, u8 num_downstream, u8 *bstatus)
>  {
>  	struct intel_digital_port *intel_dig_port = intel_attached_dig_port(connector);
> -	struct drm_i915_private *dev_priv;
> +	struct drm_i915_private *dev_priv = to_i915(connector->base.dev);
>  	enum transcoder cpu_transcoder = connector->hdcp.cpu_transcoder;
>  	enum port port = intel_dig_port->base.port;
>  	u32 vprime, sha_text, sha_leftovers, rep_ctl;
>  	int ret, i, j, sha_idx;
>  
> -	dev_priv = intel_dig_port->base.base.dev->dev_private;
> -
>  	/* Process V' values from the receiver */
>  	for (i = 0; i < DRM_HDCP_V_PRIME_NUM_PARTS; i++) {
>  		ret = shim->read_v_prime_part(intel_dig_port, i, &vprime);
> @@ -514,8 +512,8 @@ static
>  int intel_hdcp_auth_downstream(struct intel_connector *connector)
>  {
>  	struct intel_digital_port *intel_dig_port = intel_attached_dig_port(connector);
> +	struct drm_i915_private *dev_priv = to_i915(connector->base.dev);
>  	const struct intel_hdcp_shim *shim = connector->hdcp.shim;
> -	struct drm_device *dev = connector->base.dev;
>  	u8 bstatus[2], num_downstream, *ksv_fifo;
>  	int ret, i, tries = 3;
>  
> @@ -558,7 +556,8 @@ int intel_hdcp_auth_downstream(struct intel_connector *connector)
>  	if (ret)
>  		goto err;
>  
> -	if (drm_hdcp_check_ksvs_revoked(dev, ksv_fifo, num_downstream)) {
> +	if (drm_hdcp_check_ksvs_revoked(&dev_priv->drm, ksv_fifo,
> +					num_downstream)) {
>  		DRM_ERROR("Revoked Ksv(s) in ksv_fifo\n");
>  		ret = -EPERM;
>  		goto err;
> @@ -593,12 +592,11 @@ int intel_hdcp_auth_downstream(struct intel_connector *connector)
>  static int intel_hdcp_auth(struct intel_connector *connector)
>  {
>  	struct intel_digital_port *intel_dig_port = intel_attached_dig_port(connector);
> +	struct drm_i915_private *dev_priv = to_i915(connector->base.dev);
>  	struct intel_hdcp *hdcp = &connector->hdcp;
> -	struct drm_device *dev = connector->base.dev;
>  	const struct intel_hdcp_shim *shim = hdcp->shim;
> -	struct drm_i915_private *dev_priv;
>  	enum transcoder cpu_transcoder = connector->hdcp.cpu_transcoder;
> -	enum port port;
> +	enum port port = intel_dig_port->base.port;
>  	unsigned long r0_prime_gen_start;
>  	int ret, i, tries = 2;
>  	union {
> @@ -615,10 +613,6 @@ static int intel_hdcp_auth(struct intel_connector *connector)
>  	} ri;
>  	bool repeater_present, hdcp_capable;
>  
> -	dev_priv = intel_dig_port->base.base.dev->dev_private;
> -
> -	port = intel_dig_port->base.port;
> -
>  	/*
>  	 * Detects whether the display is HDCP capable. Although we check for
>  	 * valid Bksv below, the HDCP over DP spec requires that we check
> @@ -664,7 +658,7 @@ static int intel_hdcp_auth(struct intel_connector *connector)
>  	if (ret < 0)
>  		return ret;
>  
> -	if (drm_hdcp_check_ksvs_revoked(dev, bksv.shim, 1)) {
> +	if (drm_hdcp_check_ksvs_revoked(&dev_priv->drm, bksv.shim, 1)) {
>  		DRM_ERROR("BKSV is revoked\n");
>  		return -EPERM;
>  	}
> @@ -755,9 +749,9 @@ static int intel_hdcp_auth(struct intel_connector *connector)
>  
>  static int _intel_hdcp_disable(struct intel_connector *connector)
>  {
> -	struct intel_hdcp *hdcp = &connector->hdcp;
> -	struct drm_i915_private *dev_priv = connector->base.dev->dev_private;
>  	struct intel_digital_port *intel_dig_port = intel_attached_dig_port(connector);
> +	struct drm_i915_private *dev_priv = to_i915(connector->base.dev);
> +	struct intel_hdcp *hdcp = &connector->hdcp;
>  	enum port port = intel_dig_port->base.port;
>  	enum transcoder cpu_transcoder = hdcp->cpu_transcoder;
>  	int ret;
> @@ -786,8 +780,8 @@ static int _intel_hdcp_disable(struct intel_connector *connector)
>  
>  static int _intel_hdcp_enable(struct intel_connector *connector)
>  {
> +	struct drm_i915_private *dev_priv = to_i915(connector->base.dev);
>  	struct intel_hdcp *hdcp = &connector->hdcp;
> -	struct drm_i915_private *dev_priv = connector->base.dev->dev_private;
>  	int i, ret, tries = 3;
>  
>  	DRM_DEBUG_KMS("[%s:%d] HDCP is being enabled...\n",
> @@ -836,9 +830,9 @@ struct intel_connector *intel_hdcp_to_connector(struct intel_hdcp *hdcp)
>  /* Implements Part 3 of the HDCP authorization procedure */
>  static int intel_hdcp_check_link(struct intel_connector *connector)
>  {
> -	struct intel_hdcp *hdcp = &connector->hdcp;
> -	struct drm_i915_private *dev_priv = connector->base.dev->dev_private;
>  	struct intel_digital_port *intel_dig_port = intel_attached_dig_port(connector);
> +	struct drm_i915_private *dev_priv = to_i915(connector->base.dev);
> +	struct intel_hdcp *hdcp = &connector->hdcp;
>  	enum port port = intel_dig_port->base.port;
>  	enum transcoder cpu_transcoder;
>  	int ret = 0;
> @@ -901,9 +895,9 @@ static void intel_hdcp_prop_work(struct work_struct *work)
>  	struct intel_hdcp *hdcp = container_of(work, struct intel_hdcp,
>  					       prop_work);
>  	struct intel_connector *connector = intel_hdcp_to_connector(hdcp);
> -	struct drm_device *dev = connector->base.dev;
> +	struct drm_i915_private *dev_priv = to_i915(connector->base.dev);
>  
> -	drm_modeset_lock(&dev->mode_config.connection_mutex, NULL);
> +	drm_modeset_lock(&dev_priv->drm.mode_config.connection_mutex, NULL);
>  	mutex_lock(&hdcp->mutex);
>  
>  	/*
> @@ -916,7 +910,7 @@ static void intel_hdcp_prop_work(struct work_struct *work)
>  						   hdcp->value);
>  
>  	mutex_unlock(&hdcp->mutex);
> -	drm_modeset_unlock(&dev->mode_config.connection_mutex);
> +	drm_modeset_unlock(&dev_priv->drm.mode_config.connection_mutex);
>  }
>  
>  bool is_hdcp_supported(struct drm_i915_private *dev_priv, enum port port)
> @@ -1210,8 +1204,8 @@ static int hdcp2_deauthenticate_port(struct intel_connector *connector)
>  static int hdcp2_authentication_key_exchange(struct intel_connector *connector)
>  {
>  	struct intel_digital_port *intel_dig_port = intel_attached_dig_port(connector);
> +	struct drm_i915_private *dev_priv = to_i915(connector->base.dev);
>  	struct intel_hdcp *hdcp = &connector->hdcp;
> -	struct drm_device *dev = connector->base.dev;
>  	union {
>  		struct hdcp2_ake_init ake_init;
>  		struct hdcp2_ake_send_cert send_cert;
> @@ -1248,7 +1242,8 @@ static int hdcp2_authentication_key_exchange(struct intel_connector *connector)
>  
>  	hdcp->is_repeater = HDCP_2_2_RX_REPEATER(msgs.send_cert.rx_caps[2]);
>  
> -	if (drm_hdcp_check_ksvs_revoked(dev, msgs.send_cert.cert_rx.receiver_id,
> +	if (drm_hdcp_check_ksvs_revoked(&dev_priv->drm,
> +					msgs.send_cert.cert_rx.receiver_id,
>  					1)) {
>  		DRM_ERROR("Receiver ID is revoked\n");
>  		return -EPERM;
> @@ -1405,8 +1400,8 @@ static
>  int hdcp2_authenticate_repeater_topology(struct intel_connector *connector)
>  {
>  	struct intel_digital_port *intel_dig_port = intel_attached_dig_port(connector);
> +	struct drm_i915_private *dev_priv = to_i915(connector->base.dev);
>  	struct intel_hdcp *hdcp = &connector->hdcp;
> -	struct drm_device *dev = connector->base.dev;
>  	union {
>  		struct hdcp2_rep_send_receiverid_list recvid_list;
>  		struct hdcp2_rep_send_ack rep_ack;
> @@ -1441,7 +1436,8 @@ int hdcp2_authenticate_repeater_topology(struct intel_connector *connector)
>  
>  	device_cnt = (HDCP_2_2_DEV_COUNT_HI(rx_info[0]) << 4 |
>  		      HDCP_2_2_DEV_COUNT_LO(rx_info[1]));
> -	if (drm_hdcp_check_ksvs_revoked(dev, msgs.recvid_list.receiver_ids,
> +	if (drm_hdcp_check_ksvs_revoked(&dev_priv->drm,
> +					msgs.recvid_list.receiver_ids,
>  					device_cnt)) {
>  		DRM_ERROR("Revoked receiver ID(s) is in list\n");
>  		return -EPERM;
> @@ -1527,7 +1523,7 @@ static int hdcp2_enable_encryption(struct intel_connector *connector)
>  	struct intel_digital_port *intel_dig_port = intel_attached_dig_port(connector);
>  	struct drm_i915_private *dev_priv = to_i915(connector->base.dev);
>  	struct intel_hdcp *hdcp = &connector->hdcp;
> -	enum port port = intel_attached_encoder(connector)->port;
> +	enum port port = intel_dig_port->base.port;
>  	enum transcoder cpu_transcoder = hdcp->cpu_transcoder;
>  	int ret;
>  
> @@ -1565,7 +1561,7 @@ static int hdcp2_disable_encryption(struct intel_connector *connector)
>  	struct intel_digital_port *intel_dig_port = intel_attached_dig_port(connector);
>  	struct drm_i915_private *dev_priv = to_i915(connector->base.dev);
>  	struct intel_hdcp *hdcp = &connector->hdcp;
> -	enum port port = intel_attached_encoder(connector)->port;
> +	enum port port = intel_dig_port->base.port;
>  	enum transcoder cpu_transcoder = hdcp->cpu_transcoder;
>  	int ret;
>  
> @@ -1676,7 +1672,7 @@ static int intel_hdcp2_check_link(struct intel_connector *connector)
>  	struct intel_digital_port *intel_dig_port = intel_attached_dig_port(connector);
>  	struct drm_i915_private *dev_priv = to_i915(connector->base.dev);
>  	struct intel_hdcp *hdcp = &connector->hdcp;
> -	enum port port = intel_attached_encoder(connector)->port;
> +	enum port port = intel_dig_port->base.port;
>  	enum transcoder cpu_transcoder;
>  	int ret = 0;
>  
> -- 
> 2.23.0
> 
> _______________________________________________
> 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

  reply	other threads:[~2019-12-05 10:23 UTC|newest]

Thread overview: 27+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2019-12-04 18:05 [Intel-gfx] [PATCH 0/9] drm/i915: Cleanups around intel_attached_encoder() & co Ville Syrjala
2019-12-04 18:05 ` [Intel-gfx] [PATCH 1/9] drm/i915/hdcp: Nuke intel_hdcp_transcoder_config() Ville Syrjala
2019-12-05  9:33   ` Ramalingam C
2019-12-04 18:05 ` [Intel-gfx] [PATCH 2/9] drm/i915: Pass intel_connector to intel_attached_*() Ville Syrjala
2020-01-09  7:28   ` Kahola, Mika
2019-12-04 18:05 ` [Intel-gfx] [PATCH 3/9] drm/i915: Pass intel_encoder to enc_to_*() Ville Syrjala
2019-12-18 20:41   ` Juha-Pekka Heikkila
2019-12-04 18:05 ` [Intel-gfx] [PATCH 4/9] drm/i915: Use the passed in encoder Ville Syrjala
2019-12-05 10:24   ` Ramalingam C
2019-12-04 18:05 ` [Intel-gfx] [PATCH 5/9] drm/i915: Use intel_attached_encoder() Ville Syrjala
2019-12-05 10:59   ` Ramalingam C
2019-12-05 11:04     ` Ramalingam C
2019-12-09 15:52     ` Ville Syrjälä
2020-01-21 15:49   ` Juha-Pekka Heikkila
2019-12-04 18:05 ` [Intel-gfx] [PATCH 6/9] drm/i915: Relocate intel_attached_dp() Ville Syrjala
2020-01-13 13:53   ` Kahola, Mika
2019-12-04 18:05 ` [Intel-gfx] [PATCH 7/9] drm/i915: Use intel_attached_dp() instead of hand rolling it Ville Syrjala
2020-01-21 14:46   ` Juha-Pekka Heikkila
2019-12-04 18:05 ` [Intel-gfx] [PATCH 8/9] drm/i915: Rename conn_to_dig_port() to intel_attached_dig_port() Ville Syrjala
2020-01-21 14:46   ` Juha-Pekka Heikkila
2019-12-04 18:05 ` [Intel-gfx] [PATCH 9/9] drm/i915/hdcp: Clean up local variables Ville Syrjala
2019-12-05 10:22   ` Ramalingam C [this message]
2019-12-04 23:48 ` [Intel-gfx] ✗ Fi.CI.CHECKPATCH: warning for drm/i915: Cleanups around intel_attached_encoder() & co Patchwork
2019-12-05  0:15 ` [Intel-gfx] ✗ Fi.CI.BAT: failure " Patchwork
2019-12-05 11:58 ` [Intel-gfx] ✗ Fi.CI.CHECKPATCH: warning for drm/i915: Cleanups around intel_attached_encoder() & co. (rev2) Patchwork
2019-12-05 12:19 ` [Intel-gfx] ✓ Fi.CI.BAT: success " Patchwork
2019-12-05 15:06 ` [Intel-gfx] ✗ Fi.CI.IGT: failure " Patchwork

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20191205102241.GB25793@intel.com \
    --to=ramalingam.c@intel.com \
    --cc=intel-gfx@lists.freedesktop.org \
    --cc=ville.syrjala@linux.intel.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body. 
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.