tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
1
fork

Configure Feed

Select the types of activity you want to include in your feed.

drm/i915/dp: s/intel_encoder/encoder/

Use the contemporary naming convention of struct intel_encoder *encoder.

Reviewed-by: Luca Coelho <luciano.coelho@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/d1d3fb9254871d9a334e3f20b219bdf772426e66.1734083244.git.jani.nikula@intel.com
Signed-off-by: Jani Nikula <jani.nikula@intel.com>

Jani Nikula 595a19e5 805cc9fe

+16 -16
+16 -16
drivers/gpu/drm/i915/display/intel_dp.c
··· 5781 5781 struct intel_display *display = to_intel_display(connector->dev); 5782 5782 struct intel_dp *intel_dp = intel_attached_dp(to_intel_connector(connector)); 5783 5783 struct intel_digital_port *dig_port = dp_to_dig_port(intel_dp); 5784 - struct intel_encoder *intel_encoder = &dig_port->base; 5785 - struct drm_i915_private *dev_priv = to_i915(intel_encoder->base.dev); 5784 + struct intel_encoder *encoder = &dig_port->base; 5785 + struct drm_i915_private *dev_priv = to_i915(encoder->base.dev); 5786 5786 5787 5787 drm_dbg_kms(&dev_priv->drm, "[CONNECTOR:%d:%s]\n", 5788 5788 connector->base.id, connector->name); ··· 5912 5912 intel_dp_aux_fini(intel_dp); 5913 5913 } 5914 5914 5915 - void intel_dp_encoder_suspend(struct intel_encoder *intel_encoder) 5915 + void intel_dp_encoder_suspend(struct intel_encoder *encoder) 5916 5916 { 5917 - struct intel_dp *intel_dp = enc_to_intel_dp(intel_encoder); 5917 + struct intel_dp *intel_dp = enc_to_intel_dp(encoder); 5918 5918 5919 5919 intel_pps_vdd_off_sync(intel_dp); 5920 5920 5921 5921 intel_dp_tunnel_suspend(intel_dp); 5922 5922 } 5923 5923 5924 - void intel_dp_encoder_shutdown(struct intel_encoder *intel_encoder) 5924 + void intel_dp_encoder_shutdown(struct intel_encoder *encoder) 5925 5925 { 5926 - struct intel_dp *intel_dp = enc_to_intel_dp(intel_encoder); 5926 + struct intel_dp *intel_dp = enc_to_intel_dp(encoder); 5927 5927 5928 5928 intel_pps_wait_power_cycle(intel_dp); 5929 5929 } ··· 6496 6496 struct intel_display *display = to_intel_display(dig_port); 6497 6497 struct drm_connector *connector = &intel_connector->base; 6498 6498 struct intel_dp *intel_dp = &dig_port->dp; 6499 - struct intel_encoder *intel_encoder = &dig_port->base; 6500 - struct drm_device *dev = intel_encoder->base.dev; 6499 + struct intel_encoder *encoder = &dig_port->base; 6500 + struct drm_device *dev = encoder->base.dev; 6501 6501 struct drm_i915_private *dev_priv = to_i915(dev); 6502 - enum port port = intel_encoder->port; 6502 + enum port port = encoder->port; 6503 6503 int type; 6504 6504 6505 6505 /* Initialize the work for modeset in case of link train failure */ ··· 6507 6507 6508 6508 if (drm_WARN(dev, dig_port->max_lanes < 1, 6509 6509 "Not enough lanes (%d) for DP on [ENCODER:%d:%s]\n", 6510 - dig_port->max_lanes, intel_encoder->base.base.id, 6511 - intel_encoder->base.name)) 6510 + dig_port->max_lanes, encoder->base.base.id, 6511 + encoder->base.name)) 6512 6512 return false; 6513 6513 6514 6514 intel_dp->reset_link_params = true; ··· 6517 6517 intel_dp->DP = intel_de_read(dev_priv, intel_dp->output_reg); 6518 6518 intel_dp->attached_connector = intel_connector; 6519 6519 6520 - if (_intel_dp_is_port_edp(dev_priv, intel_encoder->devdata, port)) { 6520 + if (_intel_dp_is_port_edp(dev_priv, encoder->devdata, port)) { 6521 6521 /* 6522 6522 * Currently we don't support eDP on TypeC ports for DISPLAY_VER < 30, 6523 6523 * although in theory it could work on TypeC legacy ports. 6524 6524 */ 6525 - drm_WARN_ON(dev, intel_encoder_is_tc(intel_encoder) && 6525 + drm_WARN_ON(dev, intel_encoder_is_tc(encoder) && 6526 6526 DISPLAY_VER(dev_priv) < 30); 6527 6527 type = DRM_MODE_CONNECTOR_eDP; 6528 - intel_encoder->type = INTEL_OUTPUT_EDP; 6528 + encoder->type = INTEL_OUTPUT_EDP; 6529 6529 6530 6530 /* eDP only on port B and/or C on vlv/chv */ 6531 6531 if (drm_WARN_ON(dev, (IS_VALLEYVIEW(dev_priv) || ··· 6548 6548 drm_dbg_kms(&dev_priv->drm, 6549 6549 "Adding %s connector on [ENCODER:%d:%s]\n", 6550 6550 type == DRM_MODE_CONNECTOR_eDP ? "eDP" : "DP", 6551 - intel_encoder->base.base.id, intel_encoder->base.name); 6551 + encoder->base.base.id, encoder->base.name); 6552 6552 6553 6553 drm_connector_init_with_ddc(dev, connector, &intel_dp_connector_funcs, 6554 6554 type, &intel_dp->aux.ddc); ··· 6561 6561 intel_connector->polled = DRM_CONNECTOR_POLL_HPD; 6562 6562 intel_connector->base.polled = intel_connector->polled; 6563 6563 6564 - intel_connector_attach_encoder(intel_connector, intel_encoder); 6564 + intel_connector_attach_encoder(intel_connector, encoder); 6565 6565 6566 6566 if (HAS_DDI(dev_priv)) 6567 6567 intel_connector->get_hw_state = intel_ddi_connector_get_hw_state;