On Tue, Oct 16, 2018 at 05:50:44PM +0300, Jani Nikula wrote:
> 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.
>
> Signed-off-by: Jani Nikula <jani.nikula@xxxxxxxxx>
> ---
> drivers/gpu/drm/i915/intel_connector.c | 12 ++++++++++++
> drivers/gpu/drm/i915/intel_display.c | 12 ------------
> drivers/gpu/drm/i915/intel_drv.h | 3 +--
> drivers/gpu/drm/i915/intel_panel.c | 2 +-
> 4 files changed, 14 insertions(+), 15 deletions(-)
>
> diff --git a/drivers/gpu/drm/i915/intel_connector.c b/drivers/gpu/drm/i915/intel_connector.c
> index 598d5cb9b657..18e370f607bc 100644
> --- a/drivers/gpu/drm/i915/intel_connector.c
> +++ b/drivers/gpu/drm/i915/intel_connector.c
> @@ -147,6 +147,18 @@ bool intel_connector_get_hw_state(struct intel_connector *connector)
> return encoder->get_hw_state(encoder, &pipe);
> }
>
> +enum pipe intel_connector_get_pipe(struct intel_connector *connector)
> +{
> + struct drm_device *dev = connector->base.dev;
> +
> + WARN_ON(!drm_modeset_is_locked(&dev->mode_config.connection_mutex));
> +
> + if (!connector->base.state->crtc)
> + return INVALID_PIPE;
> +
> + return to_intel_crtc(connector->base.state->crtc)->pipe;
> +}
This thing is a bit racy when it comes to nonblocking modesets.
Perhaps we should track the pipe internally alongside
backight.enabled?
Anyways, patch seems ok so
Reviewed-by: Ville Syrjälä <ville.syrjala@xxxxxxxxxxxxxxx>
> +
> /**
> * intel_connector_update_modes - update connector from edid
> * @connector: DRM connector device to use
> diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c
> index a2e729fa8d64..cbcd0760ffbc 100644
> --- a/drivers/gpu/drm/i915/intel_display.c
> +++ b/drivers/gpu/drm/i915/intel_display.c
> @@ -13900,18 +13900,6 @@ static int intel_crtc_init(struct drm_i915_private *dev_priv, enum pipe pipe)
> return ret;
> }
>
> -enum pipe intel_get_pipe_from_connector(struct intel_connector *connector)
> -{
> - struct drm_device *dev = connector->base.dev;
> -
> - WARN_ON(!drm_modeset_is_locked(&dev->mode_config.connection_mutex));
> -
> - if (!connector->base.state->crtc)
> - return INVALID_PIPE;
> -
> - return to_intel_crtc(connector->base.state->crtc)->pipe;
> -}
> -
> int intel_get_pipe_from_crtc_id_ioctl(struct drm_device *dev, void *data,
> struct drm_file *file)
> {
> diff --git a/drivers/gpu/drm/i915/intel_drv.h b/drivers/gpu/drm/i915/intel_drv.h
> index 7cc20e297eeb..5e63511a4ef8 100644
> --- a/drivers/gpu/drm/i915/intel_drv.h
> +++ b/drivers/gpu/drm/i915/intel_drv.h
> @@ -1534,8 +1534,6 @@ intel_encoder_current_mode(struct intel_encoder *encoder);
> bool intel_port_is_tc(struct drm_i915_private *dev_priv, enum port port);
> enum tc_port intel_port_to_tc(struct drm_i915_private *dev_priv,
> enum port port);
> -
> -enum pipe intel_get_pipe_from_connector(struct intel_connector *connector);
> int intel_get_pipe_from_crtc_id_ioctl(struct drm_device *dev, void *data,
> struct drm_file *file_priv);
> enum transcoder intel_pipe_to_cpu_transcoder(struct drm_i915_private *dev_priv,
> @@ -1694,6 +1692,7 @@ void intel_connector_unregister(struct drm_connector *connector);
> void intel_connector_attach_encoder(struct intel_connector *connector,
> struct intel_encoder *encoder);
> bool intel_connector_get_hw_state(struct intel_connector *connector);
> +enum pipe intel_connector_get_pipe(struct intel_connector *connector);
> int intel_connector_update_modes(struct drm_connector *connector,
> struct edid *edid);
> int intel_ddc_get_modes(struct drm_connector *c, struct i2c_adapter *adapter);
> diff --git a/drivers/gpu/drm/i915/intel_panel.c b/drivers/gpu/drm/i915/intel_panel.c
> index 20582cfed491..ad88008f8dd0 100644
> --- a/drivers/gpu/drm/i915/intel_panel.c
> +++ b/drivers/gpu/drm/i915/intel_panel.c
> @@ -505,7 +505,7 @@ static u32 _vlv_get_backlight(struct drm_i915_private *dev_priv, enum pipe pipe)
> static u32 vlv_get_backlight(struct intel_connector *connector)
> {
> struct drm_i915_private *dev_priv = to_i915(connector->base.dev);
> - enum pipe pipe = intel_get_pipe_from_connector(connector);
> + enum pipe pipe = intel_connector_get_pipe(connector);
>
> return _vlv_get_backlight(dev_priv, pipe);
> }
> --
> 2.11.0
>
> _______________________________________________
> Intel-gfx mailing list
> Intel-gfx@xxxxxxxxxxxxxxxxxxxxx
> https://lists.freedesktop.org/mailman/listinfo/intel-gfx
--
Ville Syrjälä
Intel
_______________________________________________
Intel-gfx mailing list
Intel-gfx@xxxxxxxxxxxxxxxxxxxxx
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
