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

drm/i915: Use intel_attached_dp() instead of hand rolling it 



Replace the hand rolled intel_attached_dp() with the real thing.

@@
identifier F !~ "^intel_attached_dp$";
expression C;
@@
F(...)
{
<...
- enc_to_intel_dp(intel_attached_encoder(C))
+ intel_attached_dp(C)
...>
}

v2: Regenerated

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


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

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

+1 −1
Original line number Diff line number Diff line
@@ -15010,7 +15010,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(to_intel_connector(conn)));

	intel_dp = intel_attached_dp(to_intel_connector(conn));

	intel_dp_stop_link_train(intel_dp);

}

































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(intel_attached_encoder(connector));













	struct intel_dp *intel_dp = intel_attached_dp(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(intel_attached_encoder(connector));













	struct intel_dp *intel_dp = intel_attached_dp(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(intel_attached_encoder(connector));













	struct intel_dp *intel_dp = intel_attached_dp(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(intel_attached_encoder(connector));













	struct intel_dp *intel_dp = intel_attached_dp(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(intel_attached_encoder(connector));













	struct intel_dp *intel_dp = intel_attached_dp(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(intel_attached_encoder(connector));













	struct intel_dp *intel_dp = intel_attached_dp(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/i915_debugfs.c



+4
−4






























Original line number
Diff line number
Diff line








@@ -1980,7 +1980,7 @@ static int i915_psr_sink_status_show(struct seq_file *m, void *data)













	struct drm_connector *connector = m->private;















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















	struct intel_dp *intel_dp =













		enc_to_intel_dp(intel_attached_encoder(to_intel_connector(connector)));













		intel_attached_dp(to_intel_connector(connector));















	int ret;































	if (!CAN_PSR(dev_priv)) {










@@ -4357,7 +4357,7 @@ static int i915_dpcd_show(struct seq_file *m, void *data)













{















	struct drm_connector *connector = m->private;















	struct intel_dp *intel_dp =













		enc_to_intel_dp(intel_attached_encoder(to_intel_connector(connector)));













		intel_attached_dp(to_intel_connector(connector));















	u8 buf[16];















	ssize_t err;















	int i;










@@ -4392,7 +4392,7 @@ static int i915_panel_show(struct seq_file *m, void *data)













{















	struct drm_connector *connector = m->private;















	struct intel_dp *intel_dp =













		enc_to_intel_dp(intel_attached_encoder(to_intel_connector(connector)));













		intel_attached_dp(to_intel_connector(connector));































	if (connector->status != connector_status_connected)















		return -ENODEV;










@@ -4470,7 +4470,7 @@ static int i915_dsc_fec_support_show(struct seq_file *m, void *data)













		} else if (ret) {















			break;















		}













		intel_dp = enc_to_intel_dp(intel_attached_encoder(to_intel_connector(connector)));













		intel_dp = intel_attached_dp(to_intel_connector(connector));















		crtc_state = to_intel_crtc_state(crtc->state);















		seq_printf(m, "DSC_Enabled: %s\n",















			   yesno(crtc_state->dsc.compression_enable));



































































CRA Git | Maintained and supported by SUSTech CRA and CCSE