Commit 43a6d19c authored by Ville Syrjälä's avatar Ville Syrjälä
Browse files

drm/i915: Pass intel_connector to intel_attached_*() 



Life is usually easier when we pass around intel_ types instead
of drm_ types. In this case it might not be, but I think being
consistent is a good thing anyway. Also some of this might get
cleaned up a bit more later as we keep propagating the intel_
types further.

@find@
identifier F =~ "^intel_attached_.*";
identifier C;
@@
F(struct drm_connector *C)
{
...
}

@@
identifier find.F;
identifier find.C;
@@
F(
- struct drm_connector *C
+ struct intel_connector *connector
  )
{
<...
- C
+ &connector->base
...>
}

@@
identifier find.F;
expression C;
@@
- F(C)
+ F(to_intel_connector(C))

@@
expression C;
@@
- to_intel_connector(&C->base)
+ C

Signed-off-by: default avatarVille Syrjälä <ville.syrjala@linux.intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20191204180549.1267-3-ville.syrjala@linux.intel.com


Reviewed-by: default avatarMika Kahola <mika.kahola@intel.com>
parent d5848c44

drivers/gpu/drm/i915/display/intel_crt.c

+6 −6
Original line number Diff line number Diff line
@@ -65,7 +65,7 @@ static struct intel_crt *intel_encoder_to_crt(struct intel_encoder *encoder) 
	return container_of(encoder, struct intel_crt, base);

}



static struct intel_crt *intel_attached_crt(struct drm_connector *connector)

static struct intel_crt *intel_attached_crt(struct intel_connector *connector)

{

	return intel_encoder_to_crt(intel_attached_encoder(connector));

}
@@ -430,7 +430,7 @@ static int hsw_crt_compute_config(struct intel_encoder *encoder, 
static bool ilk_crt_detect_hotplug(struct drm_connector *connector)

{

	struct drm_device *dev = connector->dev;

	struct intel_crt *crt = intel_attached_crt(connector);

	struct intel_crt *crt = intel_attached_crt(to_intel_connector(connector));

	struct drm_i915_private *dev_priv = to_i915(dev);

	u32 adpa;

	bool ret;
@@ -477,7 +477,7 @@ static bool ilk_crt_detect_hotplug(struct drm_connector *connector) 
static bool valleyview_crt_detect_hotplug(struct drm_connector *connector)

{

	struct drm_device *dev = connector->dev;

	struct intel_crt *crt = intel_attached_crt(connector);

	struct intel_crt *crt = intel_attached_crt(to_intel_connector(connector));

	struct drm_i915_private *dev_priv = to_i915(dev);

	bool reenable_hpd;

	u32 adpa;
@@ -609,7 +609,7 @@ static int intel_crt_ddc_get_modes(struct drm_connector *connector, 


static bool intel_crt_detect_ddc(struct drm_connector *connector)

{

	struct intel_crt *crt = intel_attached_crt(connector);

	struct intel_crt *crt = intel_attached_crt(to_intel_connector(connector));

	struct drm_i915_private *dev_priv = to_i915(crt->base.base.dev);

	struct edid *edid;

	struct i2c_adapter *i2c;
@@ -795,7 +795,7 @@ intel_crt_detect(struct drm_connector *connector, 
		 bool force)

{

	struct drm_i915_private *dev_priv = to_i915(connector->dev);

	struct intel_crt *crt = intel_attached_crt(connector);

	struct intel_crt *crt = intel_attached_crt(to_intel_connector(connector));

	struct intel_encoder *intel_encoder = &crt->base;

	intel_wakeref_t wakeref;

	int status, ret;
@@ -886,7 +886,7 @@ static int intel_crt_get_modes(struct drm_connector *connector) 
{

	struct drm_device *dev = connector->dev;

	struct drm_i915_private *dev_priv = to_i915(dev);

	struct intel_crt *crt = intel_attached_crt(connector);

	struct intel_crt *crt = intel_attached_crt(to_intel_connector(connector));

	struct intel_encoder *intel_encoder = &crt->base;

	intel_wakeref_t wakeref;

	struct i2c_adapter *i2c;

drivers/gpu/drm/i915/display/intel_display.c

+4 −4
Original line number Diff line number Diff line
@@ -6547,7 +6547,7 @@ intel_connector_primary_encoder(struct intel_connector *connector) 
	if (connector->mst_port)

		return &dp_to_dig_port(connector->mst_port)->base;









	encoder = intel_attached_encoder(&connector->base);









	encoder = intel_attached_encoder(connector);









	WARN_ON(!encoder);

















	return encoder;








@@ -11688,7 +11688,7 @@ int intel_get_load_detect_pipe(struct drm_connector *connector,







{









	struct intel_crtc *intel_crtc;









	struct intel_encoder *intel_encoder =









		intel_attached_encoder(connector);









		intel_attached_encoder(to_intel_connector(connector));









	struct drm_crtc *possible_crtc;









	struct drm_encoder *encoder = &intel_encoder->base;









	struct drm_crtc *crtc = NULL;








@@ -11842,7 +11842,7 @@ void intel_release_load_detect_pipe(struct drm_connector *connector,







				    struct drm_modeset_acquire_ctx *ctx)









{









	struct intel_encoder *intel_encoder =









		intel_attached_encoder(connector);









		intel_attached_encoder(to_intel_connector(connector));









	struct drm_encoder *encoder = &intel_encoder->base;









	struct drm_atomic_state *state = old->restore_state;









	int ret;








@@ -15029,7 +15029,7 @@ static void intel_set_dp_tp_ctl_normal(struct intel_crtc *crtc,







		if (conn_state->crtc == &crtc->base)









			break;









	}









	intel_dp = enc_to_intel_dp(&intel_attached_encoder(conn)->base);









	intel_dp = enc_to_intel_dp(&intel_attached_encoder(to_intel_connector(conn))->base);









	intel_dp_stop_link_train(intel_dp);









}








































drivers/gpu/drm/i915/display/intel_display_types.h



+3
−3






























Original line number
Diff line number
Diff line







@@ -1438,9 +1438,9 @@ struct intel_load_detect_pipe {







};



















static inline struct intel_encoder *









intel_attached_encoder(struct drm_connector *connector)









intel_attached_encoder(struct intel_connector *connector)









{









	return to_intel_connector(connector)->encoder;









	return connector->encoder;









}



















static inline bool intel_encoder_is_dig_port(struct intel_encoder *encoder)








@@ -1471,7 +1471,7 @@ enc_to_dig_port(struct drm_encoder *encoder)







static inline struct intel_digital_port *









conn_to_dig_port(struct intel_connector *connector)









{









	return enc_to_dig_port(&intel_attached_encoder(&connector->base)->base);









	return enc_to_dig_port(&intel_attached_encoder(connector)->base);









}



















static inline struct intel_dp_mst_encoder *
































drivers/gpu/drm/i915/display/intel_dp.c



+8
−8






























Original line number
Diff line number
Diff line







@@ -146,7 +146,7 @@ bool intel_dp_is_edp(struct intel_dp *intel_dp)







	return intel_dig_port->base.type == INTEL_OUTPUT_EDP;









}



















static struct intel_dp *intel_attached_dp(struct drm_connector *connector)









static struct intel_dp *intel_attached_dp(struct intel_connector *connector)









{









	return enc_to_intel_dp(&intel_attached_encoder(connector)->base);









}








@@ -614,7 +614,7 @@ static enum drm_mode_status







intel_dp_mode_valid(struct drm_connector *connector,









		    struct drm_display_mode *mode)









{









	struct intel_dp *intel_dp = intel_attached_dp(connector);









	struct intel_dp *intel_dp = intel_attached_dp(to_intel_connector(connector));









	struct intel_connector *intel_connector = to_intel_connector(connector);









	struct drm_display_mode *fixed_mode = intel_connector->panel.fixed_mode;









	struct drm_i915_private *dev_priv = to_i915(connector->dev);








@@ -3036,7 +3036,7 @@ void intel_edp_backlight_off(const struct drm_connector_state *old_conn_state)







static void intel_edp_backlight_power(struct intel_connector *connector,









				      bool enable)









{









	struct intel_dp *intel_dp = intel_attached_dp(&connector->base);









	struct intel_dp *intel_dp = intel_attached_dp(connector);









	intel_wakeref_t wakeref;









	bool is_enabled;


















@@ -5651,7 +5651,7 @@ intel_dp_detect(struct drm_connector *connector,







		bool force)









{









	struct drm_i915_private *dev_priv = to_i915(connector->dev);









	struct intel_dp *intel_dp = intel_attached_dp(connector);









	struct intel_dp *intel_dp = intel_attached_dp(to_intel_connector(connector));









	struct intel_digital_port *dig_port = dp_to_dig_port(intel_dp);









	struct intel_encoder *encoder = &dig_port->base;









	enum drm_connector_status status;








@@ -5755,7 +5755,7 @@ intel_dp_detect(struct drm_connector *connector,







static void









intel_dp_force(struct drm_connector *connector)









{









	struct intel_dp *intel_dp = intel_attached_dp(connector);









	struct intel_dp *intel_dp = intel_attached_dp(to_intel_connector(connector));









	struct intel_digital_port *dig_port = dp_to_dig_port(intel_dp);









	struct intel_encoder *intel_encoder = &dig_port->base;









	struct drm_i915_private *dev_priv = to_i915(intel_encoder->base.dev);








@@ -5790,7 +5790,7 @@ static int intel_dp_get_modes(struct drm_connector *connector)







	}



















	/* if eDP has no EDID, fall back to fixed mode */









	if (intel_dp_is_edp(intel_attached_dp(connector)) &&









	if (intel_dp_is_edp(intel_attached_dp(to_intel_connector(connector))) &&









	    intel_connector->panel.fixed_mode) {









		struct drm_display_mode *mode;


















@@ -5808,7 +5808,7 @@ static int intel_dp_get_modes(struct drm_connector *connector)







static int









intel_dp_connector_register(struct drm_connector *connector)









{









	struct intel_dp *intel_dp = intel_attached_dp(connector);









	struct intel_dp *intel_dp = intel_attached_dp(to_intel_connector(connector));









	int ret;



















	ret = intel_connector_register(connector);








@@ -5830,7 +5830,7 @@ intel_dp_connector_register(struct drm_connector *connector)







static void









intel_dp_connector_unregister(struct drm_connector *connector)









{









	struct intel_dp *intel_dp = intel_attached_dp(connector);









	struct intel_dp *intel_dp = intel_attached_dp(to_intel_connector(connector));



















	drm_dp_cec_unregister_connector(&intel_dp->aux);









	drm_dp_aux_unregister(&intel_dp->aux);
































drivers/gpu/drm/i915/display/intel_dvo.c



+4
−4






























Original line number
Diff line number
Diff line







@@ -125,7 +125,7 @@ static struct intel_dvo *enc_to_dvo(struct intel_encoder *encoder)







	return container_of(encoder, struct intel_dvo, base);









}



















static struct intel_dvo *intel_attached_dvo(struct drm_connector *connector)









static struct intel_dvo *intel_attached_dvo(struct intel_connector *connector)









{









	return enc_to_dvo(intel_attached_encoder(connector));









}








@@ -134,7 +134,7 @@ static bool intel_dvo_connector_get_hw_state(struct intel_connector *connector)







{









	struct drm_device *dev = connector->base.dev;









	struct drm_i915_private *dev_priv = to_i915(dev);









	struct intel_dvo *intel_dvo = intel_attached_dvo(&connector->base);









	struct intel_dvo *intel_dvo = intel_attached_dvo(connector);









	u32 tmp;



















	tmp = I915_READ(intel_dvo->dev.dvo_reg);








@@ -220,7 +220,7 @@ static enum drm_mode_status







intel_dvo_mode_valid(struct drm_connector *connector,









		     struct drm_display_mode *mode)









{









	struct intel_dvo *intel_dvo = intel_attached_dvo(connector);









	struct intel_dvo *intel_dvo = intel_attached_dvo(to_intel_connector(connector));









	const struct drm_display_mode *fixed_mode =









		to_intel_connector(connector)->panel.fixed_mode;









	int max_dotclk = to_i915(connector->dev)->max_dotclk_freq;








@@ -311,7 +311,7 @@ static void intel_dvo_pre_enable(struct intel_encoder *encoder,







static enum drm_connector_status









intel_dvo_detect(struct drm_connector *connector, bool force)









{









	struct intel_dvo *intel_dvo = intel_attached_dvo(connector);









	struct intel_dvo *intel_dvo = intel_attached_dvo(to_intel_connector(connector));









	DRM_DEBUG_KMS("[CONNECTOR:%d:%s]\n",









		      connector->base.id, connector->name);









	return intel_dvo->dev.dev_ops->detect(&intel_dvo->dev);