Message ID | 20191204180549.1267-8-ville.syrjala@linux.intel.com (mailing list archive) |
---|---|
State | New, archived |
Headers | show |
Series | drm/i915: Cleanups around intel_attached_encoder() & co. | expand |
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> > > 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) > ...> > } > > Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com> > --- > drivers/gpu/drm/i915/display/intel_display.c | 2 +- > .../gpu/drm/i915/display/intel_dp_aux_backlight.c | 12 ++++++------ > drivers/gpu/drm/i915/i915_debugfs.c | 8 ++++---- > 3 files changed, 11 insertions(+), 11 deletions(-) > > diff --git a/drivers/gpu/drm/i915/display/intel_display.c b/drivers/gpu/drm/i915/display/intel_display.c > index df1b80387106..ec292ccb6eaf 100644 > --- a/drivers/gpu/drm/i915/display/intel_display.c > +++ b/drivers/gpu/drm/i915/display/intel_display.c > @@ -14505,7 +14505,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); > } > > 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 771e22a0b2a4..1e69c5bbe65b 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(intel_attached_encoder(connector)); > + struct intel_dp *intel_dp = intel_attached_dp(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(intel_attached_encoder(connector)); > + struct intel_dp *intel_dp = intel_attached_dp(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(intel_attached_encoder(connector)); > + struct intel_dp *intel_dp = intel_attached_dp(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(intel_attached_encoder(connector)); > + struct intel_dp *intel_dp = intel_attached_dp(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(intel_attached_encoder(connector)); > + struct intel_dp *intel_dp = intel_attached_dp(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(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 > diff --git a/drivers/gpu/drm/i915/i915_debugfs.c b/drivers/gpu/drm/i915/i915_debugfs.c > index d8c2fa2672b5..5de5dacef394 100644 > --- a/drivers/gpu/drm/i915/i915_debugfs.c > +++ b/drivers/gpu/drm/i915/i915_debugfs.c > @@ -2020,7 +2020,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)) { > @@ -4396,7 +4396,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; > @@ -4431,7 +4431,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; > @@ -4509,7 +4509,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)); >
diff --git a/drivers/gpu/drm/i915/display/intel_display.c b/drivers/gpu/drm/i915/display/intel_display.c index df1b80387106..ec292ccb6eaf 100644 --- a/drivers/gpu/drm/i915/display/intel_display.c +++ b/drivers/gpu/drm/i915/display/intel_display.c @@ -14505,7 +14505,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); } 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 771e22a0b2a4..1e69c5bbe65b 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(intel_attached_encoder(connector)); + struct intel_dp *intel_dp = intel_attached_dp(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(intel_attached_encoder(connector)); + struct intel_dp *intel_dp = intel_attached_dp(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(intel_attached_encoder(connector)); + struct intel_dp *intel_dp = intel_attached_dp(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(intel_attached_encoder(connector)); + struct intel_dp *intel_dp = intel_attached_dp(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(intel_attached_encoder(connector)); + struct intel_dp *intel_dp = intel_attached_dp(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(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 diff --git a/drivers/gpu/drm/i915/i915_debugfs.c b/drivers/gpu/drm/i915/i915_debugfs.c index d8c2fa2672b5..5de5dacef394 100644 --- a/drivers/gpu/drm/i915/i915_debugfs.c +++ b/drivers/gpu/drm/i915/i915_debugfs.c @@ -2020,7 +2020,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)) { @@ -4396,7 +4396,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; @@ -4431,7 +4431,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; @@ -4509,7 +4509,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));