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

drm/i915: Use intel_attached_encoder() 



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))
)
...>
}

v2: Regenerated

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


Reviewed-by: default avatarJuha-Pekka Heikkila <juhapekka.heikkila@gmail.com>
parent 6fe20299

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

+1 −1
Original line number Diff line number Diff line
@@ -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);

}

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

+1 −1
Original line number Diff line number Diff line
@@ -2046,7 +2046,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;

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

+2 −2
Original line number Diff line number Diff line
@@ -7581,7 +7581,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");










@@ -18073,7 +18073,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);

































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



+6
−6






























Original line number
Diff line number
Diff line








@@ -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 };















	u8 mode_reg;















	u16 level = 0;










@@ -99,7 +99,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;










@@ -127,7 +127,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));















	const u8 pn = connector->panel.backlight.pwmgen_bit_count;















	int freq, fxp, f, fxp_actual, fxp_min, fxp_max;


























@@ -162,7 +162,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));















	struct intel_panel *panel = &connector->panel;















	u8 dpcd_buf, new_dpcd_buf, edp_backlight_mode;


























@@ -221,7 +221,7 @@ static void intel_dp_aux_disable_backlight(const struct drm_connector_state *old













static u32 intel_dp_aux_calc_max_backlight(struct intel_connector *connector)















{















	struct drm_i915_private *i915 = 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));















	struct intel_panel *panel = &connector->panel;















	u32 max_backlight = 0;















	int freq, fxp, fxp_min, fxp_max, fxp_actual, f = 1;










@@ -311,7 +311,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

































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



+2
−2






























Original line number
Diff line number
Diff line








@@ -631,9 +631,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;















	}









































































CRA Git | Maintained and supported by SUSTech CRA and CCSE