All of lore.kernel.org
 help / color / mirror / Atom feed
From: Jani Nikula <jani.nikula@linux.intel.com>
To: Vandana Kannan <vandana.kannan@intel.com>,
	intel-gfx@lists.freedesktop.org
Subject: Re: [PATCH] drm/i915: Initialize downclock mode in panel init
Date: Tue, 11 Feb 2014 10:42:07 +0200	[thread overview]
Message-ID: <87sirqyra8.fsf@intel.com> (raw)
In-Reply-To: <1392100660-12279-1-git-send-email-vandana.kannan@intel.com>

On Tue, 11 Feb 2014, Vandana Kannan <vandana.kannan@intel.com> wrote:
> Instead of modifying intel_panel in lvds_init_connector/dsi_init_connector/
> edp_init_connector, making changes to move intel_panel->downclock_mode
> initialization to intel_panel_init()
>
> Signed-off-by: Vandana Kannan <vandana.kannan@intel.com>
> Signed-off-by: Pradeep Bhat <pradeep.bhat@intel.com>
> ---
>  drivers/gpu/drm/i915/intel_dp.c    |    3 ++-
>  drivers/gpu/drm/i915/intel_drv.h   |    3 ++-
>  drivers/gpu/drm/i915/intel_dsi.c   |    3 ++-
>  drivers/gpu/drm/i915/intel_lvds.c  |   10 +++++-----
>  drivers/gpu/drm/i915/intel_panel.c |    4 +++-
>  5 files changed, 14 insertions(+), 9 deletions(-)
>
> diff --git a/drivers/gpu/drm/i915/intel_dp.c b/drivers/gpu/drm/i915/intel_dp.c
> index f1ef3d4..404d0f0 100644
> --- a/drivers/gpu/drm/i915/intel_dp.c
> +++ b/drivers/gpu/drm/i915/intel_dp.c
> @@ -3675,6 +3675,7 @@ static bool intel_edp_init_connector(struct intel_dp *intel_dp,
>  	struct drm_device *dev = intel_dig_port->base.base.dev;
>  	struct drm_i915_private *dev_priv = dev->dev_private;
>  	struct drm_display_mode *fixed_mode = NULL;
> +	struct drm_display_mode *downclock_mode = NULL;

Please don't add extra local variables just to pass NULL to
intel_panel_init(). You can change this if/when we actually start using
the downclock_mode.

>  	bool has_dpcd;
>  	struct drm_display_mode *scan;
>  	struct edid *edid;
> @@ -3732,7 +3733,7 @@ static bool intel_edp_init_connector(struct intel_dp *intel_dp,
>  			fixed_mode->type |= DRM_MODE_TYPE_PREFERRED;
>  	}
>  
> -	intel_panel_init(&intel_connector->panel, fixed_mode);
> +	intel_panel_init(&intel_connector->panel, fixed_mode, downclock_mode);
>  	intel_panel_setup_backlight(connector);
>  
>  	return true;
> diff --git a/drivers/gpu/drm/i915/intel_drv.h b/drivers/gpu/drm/i915/intel_drv.h
> index 44067bc..6aa549a 100644
> --- a/drivers/gpu/drm/i915/intel_drv.h
> +++ b/drivers/gpu/drm/i915/intel_drv.h
> @@ -824,7 +824,8 @@ int intel_overlay_attrs(struct drm_device *dev, void *data,
>  
>  /* intel_panel.c */
>  int intel_panel_init(struct intel_panel *panel,
> -		     struct drm_display_mode *fixed_mode);
> +		     struct drm_display_mode *fixed_mode,
> +		     struct drm_display_mode *downclock_mode);
>  void intel_panel_fini(struct intel_panel *panel);
>  void intel_fixed_panel_mode(const struct drm_display_mode *fixed_mode,
>  			    struct drm_display_mode *adjusted_mode);
> diff --git a/drivers/gpu/drm/i915/intel_dsi.c b/drivers/gpu/drm/i915/intel_dsi.c
> index fabbf0d..73e6a44 100644
> --- a/drivers/gpu/drm/i915/intel_dsi.c
> +++ b/drivers/gpu/drm/i915/intel_dsi.c
> @@ -550,6 +550,7 @@ bool intel_dsi_init(struct drm_device *dev)
>  	struct intel_connector *intel_connector;
>  	struct drm_connector *connector;
>  	struct drm_display_mode *fixed_mode = NULL;
> +	struct drm_display_mode *downclock_mode = NULL;

Same here.

With those fixed,

Reviewed-by: Jani Nikula <jani.nikula@intel.com>


>  	const struct intel_dsi_device *dsi;
>  	unsigned int i;
>  
> @@ -624,7 +625,7 @@ bool intel_dsi_init(struct drm_device *dev)
>  	}
>  
>  	fixed_mode->type |= DRM_MODE_TYPE_PREFERRED;
> -	intel_panel_init(&intel_connector->panel, fixed_mode);
> +	intel_panel_init(&intel_connector->panel, fixed_mode, downclock_mode);
>  
>  	return true;
>  
> diff --git a/drivers/gpu/drm/i915/intel_lvds.c b/drivers/gpu/drm/i915/intel_lvds.c
> index 3f3043b..6341a88 100644
> --- a/drivers/gpu/drm/i915/intel_lvds.c
> +++ b/drivers/gpu/drm/i915/intel_lvds.c
> @@ -899,6 +899,7 @@ void intel_lvds_init(struct drm_device *dev)
>  	struct drm_encoder *encoder;
>  	struct drm_display_mode *scan; /* *modes, *bios_mode; */
>  	struct drm_display_mode *fixed_mode = NULL;
> +	struct drm_display_mode *downclock_mode = NULL;
>  	struct edid *edid;
>  	struct drm_crtc *crtc;
>  	u32 lvds;
> @@ -1032,15 +1033,14 @@ void intel_lvds_init(struct drm_device *dev)
>  
>  			fixed_mode = drm_mode_duplicate(dev, scan);
>  			if (fixed_mode) {
> -				intel_connector->panel.downclock_mode =
> +				downclock_mode =
>  					intel_find_panel_downclock(dev,
>  					fixed_mode, connector);
> -				if (intel_connector->panel.downclock_mode !=
> -					NULL &&	i915.lvds_downclock) {
> +				if (downclock_mode != NULL &&
> +					i915.lvds_downclock) {
>  					/* We found the downclock for LVDS. */
>  					dev_priv->lvds_downclock_avail = true;
>  					dev_priv->lvds_downclock =
> -						intel_connector->panel.
>  						downclock_mode->clock;
>  					DRM_DEBUG_KMS("LVDS downclock is found"
>  					" in EDID. Normal clock %dKhz, "
> @@ -1116,7 +1116,7 @@ out:
>  	}
>  	drm_sysfs_connector_add(connector);
>  
> -	intel_panel_init(&intel_connector->panel, fixed_mode);
> +	intel_panel_init(&intel_connector->panel, fixed_mode, downclock_mode);
>  	intel_panel_setup_backlight(connector);
>  
>  	return;
> diff --git a/drivers/gpu/drm/i915/intel_panel.c b/drivers/gpu/drm/i915/intel_panel.c
> index f1ee2c4..5bc3f6e 100644
> --- a/drivers/gpu/drm/i915/intel_panel.c
> +++ b/drivers/gpu/drm/i915/intel_panel.c
> @@ -1190,9 +1190,11 @@ void intel_panel_init_backlight_funcs(struct drm_device *dev)
>  }
>  
>  int intel_panel_init(struct intel_panel *panel,
> -		     struct drm_display_mode *fixed_mode)
> +		     struct drm_display_mode *fixed_mode,
> +		     struct drm_display_mode *downclock_mode)
>  {
>  	panel->fixed_mode = fixed_mode;
> +	panel->downclock_mode = downclock_mode;
>  
>  	return 0;
>  }
> -- 
> 1.7.9.5
>
> _______________________________________________
> Intel-gfx mailing list
> Intel-gfx@lists.freedesktop.org
> http://lists.freedesktop.org/mailman/listinfo/intel-gfx

-- 
Jani Nikula, Intel Open Source Technology Center

  reply	other threads:[~2014-02-11  8:39 UTC|newest]

Thread overview: 5+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2014-02-11  6:37 [PATCH] drm/i915: Initialize downclock mode in panel init Vandana Kannan
2014-02-11  8:42 ` Jani Nikula [this message]
  -- strict thread matches above, loose matches on Subject: below --
2014-02-11  8:56 Vandana Kannan
2014-02-11  9:55 ` Jani Nikula
2014-02-11 12:01   ` Daniel Vetter

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=87sirqyra8.fsf@intel.com \
    --to=jani.nikula@linux.intel.com \
    --cc=intel-gfx@lists.freedesktop.org \
    --cc=vandana.kannan@intel.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body. 
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.