On Tue, 11 Feb 2014, Vandana Kannan <vandana.kan...@intel.com> wrote:
> Instead of modifying intel_panel in lvds_init_connector/dsi_init/
> edp_init_connector, making changes to move intel_panel->downclock_mode
> initialization to intel_panel_init()
>
> v2: Jani's review comments incorporated
> Removed downclock_mode local variable in dsi_init and
> edp_init_connector
Reviewed-by: Jani Nikula <jani.nik...@intel.com>
>
> Signed-off-by: Vandana Kannan <vandana.kan...@intel.com>
> Signed-off-by: Pradeep Bhat <pradeep.b...@intel.com>
> ---
> drivers/gpu/drm/i915/intel_dp.c | 2 +-
> drivers/gpu/drm/i915/intel_drv.h | 3 ++-
> drivers/gpu/drm/i915/intel_dsi.c | 2 +-
> drivers/gpu/drm/i915/intel_lvds.c | 10 +++++-----
> drivers/gpu/drm/i915/intel_panel.c | 4 +++-
> 5 files changed, 12 insertions(+), 9 deletions(-)
>
> diff --git a/drivers/gpu/drm/i915/intel_dp.c b/drivers/gpu/drm/i915/intel_dp.c
> index f1ef3d4..88cc9d3 100644
> --- a/drivers/gpu/drm/i915/intel_dp.c
> +++ b/drivers/gpu/drm/i915/intel_dp.c
> @@ -3732,7 +3732,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, NULL);
> 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..6bffbdf 100644
> --- a/drivers/gpu/drm/i915/intel_dsi.c
> +++ b/drivers/gpu/drm/i915/intel_dsi.c
> @@ -624,7 +624,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, NULL);
>
> 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
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/intel-gfx
