public inbox for intel-gfx@lists.freedesktop.org
 help / color / mirror / Atom feed
From: Juha-Pekka Heikkila <juhapekka.heikkila@gmail.com>
To: Ville Syrjala <ville.syrjala@linux.intel.com>,
	intel-gfx@lists.freedesktop.org
Subject: Re: [Intel-gfx] [PATCH 5/9] drm/i915: Use intel_attached_encoder()
Date: Tue, 21 Jan 2020 17:49:47 +0200	[thread overview]
Message-ID: <921b3d5a-7a07-9eca-1e63-9d5bec3491e2@gmail.com> (raw)
In-Reply-To: <20191204180549.1267-6-ville.syrjala@linux.intel.com>

Reviewed-by: Juha-Pekka Heikkila <juhapekka.heikkila@gmail.com>

On 4.12.2019 20.05, Ville Syrjala wrote:
> From: Ville Syrjälä <ville.syrjala@linux.intel.com>
> 
> It's easy to confuse the drm_connector->encoder (legacy state
> adjusted during modeset) and intel_connector->encoder (the statically
> (sans. MST) attached encoder of the connector). For the latter
> let's use intel_attached_encoder() consistently.
> 
> @@
> identifier F !~ "^intel_attached_encoder$";
> struct intel_connector *C;
> expression E;
> @@
> F(...)
> {
> <...
> (
>    C->encoder = E
> |
> - C->encoder
> + intel_attached_encoder(C)
> )
> ...>
> }
> 
> @@
> identifier F !~ "^intel_attached_encoder$";
> struct drm_connector *C;
> expression E;
> @@
> F(...)
> {
> <...
> (
>    to_intel_connector(C)->encoder = E
> |
> - to_intel_connector(C)->encoder
> + intel_attached_encoder(to_intel_connector(C))
> )
> ...>
> }
> 
> Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
> ---
>   drivers/gpu/drm/i915/display/intel_connector.c       |  2 +-
>   drivers/gpu/drm/i915/display/intel_ddi.c             |  2 +-
>   drivers/gpu/drm/i915/display/intel_display.c         |  4 ++--
>   .../gpu/drm/i915/display/intel_dp_aux_backlight.c    | 12 ++++++------
>   drivers/gpu/drm/i915/display/intel_dp_mst.c          |  4 ++--
>   .../gpu/drm/i915/display/intel_dsi_dcs_backlight.c   |  4 ++--
>   drivers/gpu/drm/i915/display/intel_hdcp.c            |  8 ++++----
>   drivers/gpu/drm/i915/display/intel_hotplug.c         | 10 +++++-----
>   drivers/gpu/drm/i915/display/vlv_dsi.c               |  2 +-
>   drivers/gpu/drm/i915/i915_debugfs.c                  |  6 +++---
>   10 files changed, 27 insertions(+), 27 deletions(-)
> 
> diff --git a/drivers/gpu/drm/i915/display/intel_connector.c b/drivers/gpu/drm/i915/display/intel_connector.c
> index 1133c4e97bb4..54891a4ed2f3 100644
> --- a/drivers/gpu/drm/i915/display/intel_connector.c
> +++ b/drivers/gpu/drm/i915/display/intel_connector.c
> @@ -153,7 +153,7 @@ void intel_connector_attach_encoder(struct intel_connector *connector,
>   bool intel_connector_get_hw_state(struct intel_connector *connector)
>   {
>   	enum pipe pipe = 0;
> -	struct intel_encoder *encoder = connector->encoder;
> +	struct intel_encoder *encoder = intel_attached_encoder(connector);
>   
>   	return encoder->get_hw_state(encoder, &pipe);
>   }
> diff --git a/drivers/gpu/drm/i915/display/intel_ddi.c b/drivers/gpu/drm/i915/display/intel_ddi.c
> index 52d187db320f..3e46017150b4 100644
> --- a/drivers/gpu/drm/i915/display/intel_ddi.c
> +++ b/drivers/gpu/drm/i915/display/intel_ddi.c
> @@ -2003,7 +2003,7 @@ bool intel_ddi_connector_get_hw_state(struct intel_connector *intel_connector)
>   {
>   	struct drm_device *dev = intel_connector->base.dev;
>   	struct drm_i915_private *dev_priv = to_i915(dev);
> -	struct intel_encoder *encoder = intel_connector->encoder;
> +	struct intel_encoder *encoder = intel_attached_encoder(intel_connector);
>   	int type = intel_connector->base.connector_type;
>   	enum port port = encoder->port;
>   	enum transcoder cpu_transcoder;
> diff --git a/drivers/gpu/drm/i915/display/intel_display.c b/drivers/gpu/drm/i915/display/intel_display.c
> index 45568a7c6579..df1b80387106 100644
> --- a/drivers/gpu/drm/i915/display/intel_display.c
> +++ b/drivers/gpu/drm/i915/display/intel_display.c
> @@ -7279,7 +7279,7 @@ static void intel_connector_verify_state(struct intel_crtc_state *crtc_state,
>   		      connector->base.name);
>   
>   	if (connector->get_hw_state(connector)) {
> -		struct intel_encoder *encoder = connector->encoder;
> +		struct intel_encoder *encoder = intel_attached_encoder(connector);
>   
>   		I915_STATE_WARN(!crtc_state,
>   			 "connector enabled without attached crtc\n");
> @@ -17529,7 +17529,7 @@ static void intel_modeset_readout_hw_state(struct drm_device *dev)
>   
>   			connector->base.dpms = DRM_MODE_DPMS_ON;
>   
> -			encoder = connector->encoder;
> +			encoder = intel_attached_encoder(connector);
>   			connector->base.encoder = &encoder->base;
>   
>   			crtc = to_intel_crtc(encoder->base.crtc);
> diff --git a/drivers/gpu/drm/i915/display/intel_dp_aux_backlight.c b/drivers/gpu/drm/i915/display/intel_dp_aux_backlight.c
> index 7c653f8c307f..771e22a0b2a4 100644
> --- a/drivers/gpu/drm/i915/display/intel_dp_aux_backlight.c
> +++ b/drivers/gpu/drm/i915/display/intel_dp_aux_backlight.c
> @@ -57,7 +57,7 @@ static void set_aux_backlight_enable(struct intel_dp *intel_dp, bool enable)
>    */
>   static u32 intel_dp_aux_get_backlight(struct intel_connector *connector)
>   {
> -	struct intel_dp *intel_dp = enc_to_intel_dp(connector->encoder);
> +	struct intel_dp *intel_dp = enc_to_intel_dp(intel_attached_encoder(connector));
>   	u8 read_val[2] = { 0x0 };
>   	u16 level = 0;
>   
> @@ -82,7 +82,7 @@ static void
>   intel_dp_aux_set_backlight(const struct drm_connector_state *conn_state, u32 level)
>   {
>   	struct intel_connector *connector = to_intel_connector(conn_state->connector);
> -	struct intel_dp *intel_dp = enc_to_intel_dp(connector->encoder);
> +	struct intel_dp *intel_dp = enc_to_intel_dp(intel_attached_encoder(connector));
>   	u8 vals[2] = { 0x0 };
>   
>   	vals[0] = level;
> @@ -110,7 +110,7 @@ intel_dp_aux_set_backlight(const struct drm_connector_state *conn_state, u32 lev
>   static bool intel_dp_aux_set_pwm_freq(struct intel_connector *connector)
>   {
>   	struct drm_i915_private *dev_priv = to_i915(connector->base.dev);
> -	struct intel_dp *intel_dp = enc_to_intel_dp(connector->encoder);
> +	struct intel_dp *intel_dp = enc_to_intel_dp(intel_attached_encoder(connector));
>   	int freq, fxp, fxp_min, fxp_max, fxp_actual, f = 1;
>   	u8 pn, pn_min, pn_max;
>   
> @@ -178,7 +178,7 @@ static void intel_dp_aux_enable_backlight(const struct intel_crtc_state *crtc_st
>   					  const struct drm_connector_state *conn_state)
>   {
>   	struct intel_connector *connector = to_intel_connector(conn_state->connector);
> -	struct intel_dp *intel_dp = enc_to_intel_dp(connector->encoder);
> +	struct intel_dp *intel_dp = enc_to_intel_dp(intel_attached_encoder(connector));
>   	u8 dpcd_buf, new_dpcd_buf, edp_backlight_mode;
>   
>   	if (drm_dp_dpcd_readb(&intel_dp->aux,
> @@ -229,7 +229,7 @@ static void intel_dp_aux_disable_backlight(const struct drm_connector_state *old
>   static int intel_dp_aux_setup_backlight(struct intel_connector *connector,
>   					enum pipe pipe)
>   {
> -	struct intel_dp *intel_dp = enc_to_intel_dp(connector->encoder);
> +	struct intel_dp *intel_dp = enc_to_intel_dp(intel_attached_encoder(connector));
>   	struct intel_panel *panel = &connector->panel;
>   
>   	if (intel_dp->edp_dpcd[2] & DP_EDP_BACKLIGHT_BRIGHTNESS_BYTE_COUNT)
> @@ -248,7 +248,7 @@ static int intel_dp_aux_setup_backlight(struct intel_connector *connector,
>   static bool
>   intel_dp_aux_display_control_capable(struct intel_connector *connector)
>   {
> -	struct intel_dp *intel_dp = enc_to_intel_dp(connector->encoder);
> +	struct intel_dp *intel_dp = enc_to_intel_dp(intel_attached_encoder(connector));
>   
>   	/* Check the eDP Display control capabilities registers to determine if
>   	 * the panel can support backlight control over the aux channel
> diff --git a/drivers/gpu/drm/i915/display/intel_dp_mst.c b/drivers/gpu/drm/i915/display/intel_dp_mst.c
> index af7f6d670e07..1a7d69843c12 100644
> --- a/drivers/gpu/drm/i915/display/intel_dp_mst.c
> +++ b/drivers/gpu/drm/i915/display/intel_dp_mst.c
> @@ -503,9 +503,9 @@ static const struct drm_encoder_funcs intel_dp_mst_enc_funcs = {
>   
>   static bool intel_dp_mst_get_hw_state(struct intel_connector *connector)
>   {
> -	if (connector->encoder && connector->base.state->crtc) {
> +	if (intel_attached_encoder(connector) && connector->base.state->crtc) {
>   		enum pipe pipe;
> -		if (!connector->encoder->get_hw_state(connector->encoder, &pipe))
> +		if (!intel_attached_encoder(connector)->get_hw_state(intel_attached_encoder(connector), &pipe))
>   			return false;
>   		return true;
>   	}
> diff --git a/drivers/gpu/drm/i915/display/intel_dsi_dcs_backlight.c b/drivers/gpu/drm/i915/display/intel_dsi_dcs_backlight.c
> index c87838843d0b..ac3eff26df12 100644
> --- a/drivers/gpu/drm/i915/display/intel_dsi_dcs_backlight.c
> +++ b/drivers/gpu/drm/i915/display/intel_dsi_dcs_backlight.c
> @@ -45,7 +45,7 @@
>   
>   static u32 dcs_get_backlight(struct intel_connector *connector)
>   {
> -	struct intel_encoder *encoder = connector->encoder;
> +	struct intel_encoder *encoder = intel_attached_encoder(connector);
>   	struct intel_dsi *intel_dsi = enc_to_intel_dsi(encoder);
>   	struct mipi_dsi_device *dsi_device;
>   	u8 data = 0;
> @@ -160,7 +160,7 @@ int intel_dsi_dcs_init_backlight_funcs(struct intel_connector *intel_connector)
>   {
>   	struct drm_device *dev = intel_connector->base.dev;
>   	struct drm_i915_private *dev_priv = to_i915(dev);
> -	struct intel_encoder *encoder = intel_connector->encoder;
> +	struct intel_encoder *encoder = intel_attached_encoder(intel_connector);
>   	struct intel_panel *panel = &intel_connector->panel;
>   
>   	if (dev_priv->vbt.backlight.type != INTEL_BACKLIGHT_DSI_DCS)
> diff --git a/drivers/gpu/drm/i915/display/intel_hdcp.c b/drivers/gpu/drm/i915/display/intel_hdcp.c
> index 0fdbd39f6641..2859230671ae 100644
> --- a/drivers/gpu/drm/i915/display/intel_hdcp.c
> +++ b/drivers/gpu/drm/i915/display/intel_hdcp.c
> @@ -1527,7 +1527,7 @@ static int hdcp2_enable_encryption(struct intel_connector *connector)
>   	struct intel_digital_port *intel_dig_port = conn_to_dig_port(connector);
>   	struct drm_i915_private *dev_priv = to_i915(connector->base.dev);
>   	struct intel_hdcp *hdcp = &connector->hdcp;
> -	enum port port = connector->encoder->port;
> +	enum port port = intel_attached_encoder(connector)->port;
>   	enum transcoder cpu_transcoder = hdcp->cpu_transcoder;
>   	int ret;
>   
> @@ -1565,7 +1565,7 @@ static int hdcp2_disable_encryption(struct intel_connector *connector)
>   	struct intel_digital_port *intel_dig_port = conn_to_dig_port(connector);
>   	struct drm_i915_private *dev_priv = to_i915(connector->base.dev);
>   	struct intel_hdcp *hdcp = &connector->hdcp;
> -	enum port port = connector->encoder->port;
> +	enum port port = intel_attached_encoder(connector)->port;
>   	enum transcoder cpu_transcoder = hdcp->cpu_transcoder;
>   	int ret;
>   
> @@ -1676,7 +1676,7 @@ static int intel_hdcp2_check_link(struct intel_connector *connector)
>   	struct intel_digital_port *intel_dig_port = conn_to_dig_port(connector);
>   	struct drm_i915_private *dev_priv = to_i915(connector->base.dev);
>   	struct intel_hdcp *hdcp = &connector->hdcp;
> -	enum port port = connector->encoder->port;
> +	enum port port = intel_attached_encoder(connector)->port;
>   	enum transcoder cpu_transcoder;
>   	int ret = 0;
>   
> @@ -1830,7 +1830,7 @@ static inline int initialize_hdcp_port_data(struct intel_connector *connector,
>   
>   	if (INTEL_GEN(dev_priv) < 12)
>   		data->fw_ddi =
> -			intel_get_mei_fw_ddi_index(connector->encoder->port);
> +			intel_get_mei_fw_ddi_index(intel_attached_encoder(connector)->port);
>   	else
>   		/*
>   		 * As per ME FW API expectation, for GEN 12+, fw_ddi is filled
> diff --git a/drivers/gpu/drm/i915/display/intel_hotplug.c b/drivers/gpu/drm/i915/display/intel_hotplug.c
> index 99d3a3c7989e..c3a48af35997 100644
> --- a/drivers/gpu/drm/i915/display/intel_hotplug.c
> +++ b/drivers/gpu/drm/i915/display/intel_hotplug.c
> @@ -200,7 +200,7 @@ intel_hpd_irq_storm_switch_to_polling(struct drm_i915_private *dev_priv)
>   			continue;
>   
>   		intel_connector = to_intel_connector(connector);
> -		intel_encoder = intel_connector->encoder;
> +		intel_encoder = intel_attached_encoder(intel_connector);
>   		if (!intel_encoder)
>   			continue;
>   
> @@ -255,7 +255,7 @@ static void intel_hpd_irq_storm_reenable_work(struct work_struct *work)
>   
>   			/* Don't check MST ports, they don't have pins */
>   			if (!intel_connector->mst_port &&
> -			    intel_connector->encoder->hpd_pin == pin) {
> +			    intel_attached_encoder(intel_connector)->hpd_pin == pin) {
>   				if (connector->polled != intel_connector->polled)
>   					DRM_DEBUG_DRIVER("Reenabling HPD on connector %s\n",
>   							 connector->name);
> @@ -389,9 +389,9 @@ static void i915_hotplug_work_func(struct work_struct *work)
>   		u32 hpd_bit;
>   
>   		intel_connector = to_intel_connector(connector);
> -		if (!intel_connector->encoder)
> +		if (!intel_attached_encoder(intel_connector))
>   			continue;
> -		intel_encoder = intel_connector->encoder;
> +		intel_encoder = intel_attached_encoder(intel_connector);
>   		hpd_bit = BIT(intel_encoder->hpd_pin);
>   		if ((hpd_event_bits | hpd_retry_bits) & hpd_bit) {
>   			DRM_DEBUG_KMS("Connector %s (pin %i) received hotplug event.\n",
> @@ -621,7 +621,7 @@ static void i915_hpd_poll_init_work(struct work_struct *work)
>   			continue;
>   
>   		if (!connector->polled && I915_HAS_HOTPLUG(dev_priv) &&
> -		    intel_connector->encoder->hpd_pin > HPD_NONE) {
> +		    intel_attached_encoder(intel_connector)->hpd_pin > HPD_NONE) {
>   			connector->polled = enabled ?
>   				DRM_CONNECTOR_POLL_CONNECT |
>   				DRM_CONNECTOR_POLL_DISCONNECT :
> diff --git a/drivers/gpu/drm/i915/display/vlv_dsi.c b/drivers/gpu/drm/i915/display/vlv_dsi.c
> index 0c19064e42e0..535b332b067d 100644
> --- a/drivers/gpu/drm/i915/display/vlv_dsi.c
> +++ b/drivers/gpu/drm/i915/display/vlv_dsi.c
> @@ -1567,7 +1567,7 @@ static enum drm_panel_orientation
>   vlv_dsi_get_hw_panel_orientation(struct intel_connector *connector)
>   {
>   	struct drm_i915_private *dev_priv = to_i915(connector->base.dev);
> -	struct intel_encoder *encoder = connector->encoder;
> +	struct intel_encoder *encoder = intel_attached_encoder(connector);
>   	enum intel_display_power_domain power_domain;
>   	enum drm_panel_orientation orientation;
>   	struct intel_plane *plane;
> diff --git a/drivers/gpu/drm/i915/i915_debugfs.c b/drivers/gpu/drm/i915/i915_debugfs.c
> index 3bc8d5c0e88a..d8c2fa2672b5 100644
> --- a/drivers/gpu/drm/i915/i915_debugfs.c
> +++ b/drivers/gpu/drm/i915/i915_debugfs.c
> @@ -2431,7 +2431,7 @@ static void intel_hdcp_info(struct seq_file *m,
>   static void intel_dp_info(struct seq_file *m,
>   			  struct intel_connector *intel_connector)
>   {
> -	struct intel_encoder *intel_encoder = intel_connector->encoder;
> +	struct intel_encoder *intel_encoder = intel_attached_encoder(intel_connector);
>   	struct intel_dp *intel_dp = enc_to_intel_dp(intel_encoder);
>   
>   	seq_printf(m, "\tDPCD rev: %x\n", intel_dp->dpcd[DP_DPCD_REV]);
> @@ -2450,7 +2450,7 @@ static void intel_dp_info(struct seq_file *m,
>   static void intel_dp_mst_info(struct seq_file *m,
>   			  struct intel_connector *intel_connector)
>   {
> -	struct intel_encoder *intel_encoder = intel_connector->encoder;
> +	struct intel_encoder *intel_encoder = intel_attached_encoder(intel_connector);
>   	struct intel_dp_mst_encoder *intel_mst =
>   		enc_to_mst(intel_encoder);
>   	struct intel_digital_port *intel_dig_port = intel_mst->primary;
> @@ -2464,7 +2464,7 @@ static void intel_dp_mst_info(struct seq_file *m,
>   static void intel_hdmi_info(struct seq_file *m,
>   			    struct intel_connector *intel_connector)
>   {
> -	struct intel_encoder *intel_encoder = intel_connector->encoder;
> +	struct intel_encoder *intel_encoder = intel_attached_encoder(intel_connector);
>   	struct intel_hdmi *intel_hdmi = enc_to_intel_hdmi(intel_encoder);
>   
>   	seq_printf(m, "\taudio support: %s\n", yesno(intel_hdmi->has_audio));
> 

_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

  parent reply	other threads:[~2020-01-21 15:49 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 [this message]
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
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=921b3d5a-7a07-9eca-1e63-9d5bec3491e2@gmail.com \
    --to=juhapekka.heikkila@gmail.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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox