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

drm/i915: rename and move intel_get_pipe_from_connector()

Rename intel_get_pipe_from_connector() to intel_connector_get_pipe() and
move it near its connector function friends in intel_connector.c. No
functional changes.

Reviewed-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Signed-off-by: Jani Nikula <jani.nikula@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20181016145044.3924-1-jani.nikula@intel.com

+14 -15
+12
drivers/gpu/drm/i915/intel_connector.c
··· 147 147 return encoder->get_hw_state(encoder, &pipe); 148 148 } 149 149 150 + enum pipe intel_connector_get_pipe(struct intel_connector *connector) 151 + { 152 + struct drm_device *dev = connector->base.dev; 153 + 154 + WARN_ON(!drm_modeset_is_locked(&dev->mode_config.connection_mutex)); 155 + 156 + if (!connector->base.state->crtc) 157 + return INVALID_PIPE; 158 + 159 + return to_intel_crtc(connector->base.state->crtc)->pipe; 160 + } 161 + 150 162 /** 151 163 * intel_connector_update_modes - update connector from edid 152 164 * @connector: DRM connector device to use
-12
drivers/gpu/drm/i915/intel_display.c
··· 13898 13898 return ret; 13899 13899 } 13900 13900 13901 - enum pipe intel_get_pipe_from_connector(struct intel_connector *connector) 13902 - { 13903 - struct drm_device *dev = connector->base.dev; 13904 - 13905 - WARN_ON(!drm_modeset_is_locked(&dev->mode_config.connection_mutex)); 13906 - 13907 - if (!connector->base.state->crtc) 13908 - return INVALID_PIPE; 13909 - 13910 - return to_intel_crtc(connector->base.state->crtc)->pipe; 13911 - } 13912 - 13913 13901 int intel_get_pipe_from_crtc_id_ioctl(struct drm_device *dev, void *data, 13914 13902 struct drm_file *file) 13915 13903 {
+1 -2
drivers/gpu/drm/i915/intel_drv.h
··· 1535 1535 bool intel_port_is_tc(struct drm_i915_private *dev_priv, enum port port); 1536 1536 enum tc_port intel_port_to_tc(struct drm_i915_private *dev_priv, 1537 1537 enum port port); 1538 - 1539 - enum pipe intel_get_pipe_from_connector(struct intel_connector *connector); 1540 1538 int intel_get_pipe_from_crtc_id_ioctl(struct drm_device *dev, void *data, 1541 1539 struct drm_file *file_priv); 1542 1540 enum transcoder intel_pipe_to_cpu_transcoder(struct drm_i915_private *dev_priv, ··· 1693 1695 void intel_connector_attach_encoder(struct intel_connector *connector, 1694 1696 struct intel_encoder *encoder); 1695 1697 bool intel_connector_get_hw_state(struct intel_connector *connector); 1698 + enum pipe intel_connector_get_pipe(struct intel_connector *connector); 1696 1699 int intel_connector_update_modes(struct drm_connector *connector, 1697 1700 struct edid *edid); 1698 1701 int intel_ddc_get_modes(struct drm_connector *c, struct i2c_adapter *adapter);
+1 -1
drivers/gpu/drm/i915/intel_panel.c
··· 505 505 static u32 vlv_get_backlight(struct intel_connector *connector) 506 506 { 507 507 struct drm_i915_private *dev_priv = to_i915(connector->base.dev); 508 - enum pipe pipe = intel_get_pipe_from_connector(connector); 508 + enum pipe pipe = intel_connector_get_pipe(connector); 509 509 510 510 return _vlv_get_backlight(dev_priv, pipe); 511 511 }