On Mon, Mar 18, 2019 at 10:26:52PM +0200, Ville Syrjala wrote:
> From: Ville Syrjälä <ville.syrjala@xxxxxxxxxxxxxxx>
>
> Pass dev_priv to intel_get_lvds_encoder() and polish the
> implementation a bit.
>
> Signed-off-by: Ville Syrjälä <ville.syrjala@xxxxxxxxxxxxxxx>
Reviewed-by: Rodrigo Vivi <rodrigo.vivi@xxxxxxxxx>
> ---
> drivers/gpu/drm/i915/intel_dp.c | 2 +-
> drivers/gpu/drm/i915/intel_drv.h | 2 +-
> drivers/gpu/drm/i915/intel_lvds.c | 13 +++++++------
> 3 files changed, 9 insertions(+), 8 deletions(-)
>
> diff --git a/drivers/gpu/drm/i915/intel_dp.c b/drivers/gpu/drm/i915/intel_dp.c
> index 35962a84b910..7c043e8f6298 100644
> --- a/drivers/gpu/drm/i915/intel_dp.c
> +++ b/drivers/gpu/drm/i915/intel_dp.c
> @@ -7073,7 +7073,7 @@ static bool intel_edp_init_connector(struct intel_dp *intel_dp,
> * eDP and LVDS bail out early in this case to prevent interfering
> * with an already powered-on LVDS power sequencer.
> */
> - if (intel_get_lvds_encoder(&dev_priv->drm)) {
> + if (intel_get_lvds_encoder(dev_priv)) {
> WARN_ON(!(HAS_PCH_IBX(dev_priv) || HAS_PCH_CPT(dev_priv)));
> DRM_INFO("LVDS was detected, not registering eDP\n");
>
> diff --git a/drivers/gpu/drm/i915/intel_drv.h b/drivers/gpu/drm/i915/intel_drv.h
> index d9f188ef21f4..ac8a67ba704d 100644
> --- a/drivers/gpu/drm/i915/intel_drv.h
> +++ b/drivers/gpu/drm/i915/intel_drv.h
> @@ -2117,7 +2117,7 @@ void intel_read_infoframe(struct intel_encoder *encoder,
> bool intel_lvds_port_enabled(struct drm_i915_private *dev_priv,
> i915_reg_t lvds_reg, enum pipe *pipe);
> void intel_lvds_init(struct drm_i915_private *dev_priv);
> -struct intel_encoder *intel_get_lvds_encoder(struct drm_device *dev);
> +struct intel_encoder *intel_get_lvds_encoder(struct drm_i915_private *dev_priv);
> bool intel_is_dual_link_lvds(struct drm_device *dev);
>
> /* intel_overlay.c */
> diff --git a/drivers/gpu/drm/i915/intel_lvds.c b/drivers/gpu/drm/i915/intel_lvds.c
> index 6e3cf1c4ad00..306bc321fdaa 100644
> --- a/drivers/gpu/drm/i915/intel_lvds.c
> +++ b/drivers/gpu/drm/i915/intel_lvds.c
> @@ -742,20 +742,21 @@ static const struct dmi_system_id intel_dual_link_lvds[] = {
> { } /* terminating entry */
> };
>
> -struct intel_encoder *intel_get_lvds_encoder(struct drm_device *dev)
> +struct intel_encoder *intel_get_lvds_encoder(struct drm_i915_private *dev_priv)
> {
> - struct intel_encoder *intel_encoder;
> + struct intel_encoder *encoder;
>
> - for_each_intel_encoder(dev, intel_encoder)
> - if (intel_encoder->type == INTEL_OUTPUT_LVDS)
> - return intel_encoder;
> + for_each_intel_encoder(&dev_priv->drm, encoder) {
> + if (encoder->type == INTEL_OUTPUT_LVDS)
> + return encoder;
> + }
>
> return NULL;
> }
>
> bool intel_is_dual_link_lvds(struct drm_device *dev)
> {
> - struct intel_encoder *encoder = intel_get_lvds_encoder(dev);
> + struct intel_encoder *encoder = intel_get_lvds_encoder(to_i915(dev));
>
> return encoder && to_lvds_encoder(&encoder->base)->is_dual_link;
> }
> --
> 2.19.2
>
> _______________________________________________
> Intel-gfx mailing list
> Intel-gfx@xxxxxxxxxxxxxxxxxxxxx
> https://lists.freedesktop.org/mailman/listinfo/intel-gfx
_______________________________________________
Intel-gfx mailing list
Intel-gfx@xxxxxxxxxxxxxxxxxxxxx
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
