Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 4b6ed685 authored by Vandana Kannan's avatar Vandana Kannan Committed by Daniel Vetter
Browse files

drm/i915: Initialize downclock mode in panel init 



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

Signed-off-by: default avatarVandana Kannan <vandana.kannan@intel.com>
Signed-off-by: default avatarPradeep Bhat <pradeep.bhat@intel.com>
Reviewed-by: default avatarJani Nikula <jani.nikula@intel.com>
Signed-off-by: default avatarDaniel Vetter <daniel.vetter@ffwll.ch>
parent 53f5e3ca

drivers/gpu/drm/i915/intel_dp.c

+1 −1
Original line number Diff line number Diff line
@@ -3730,7 +3730,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;

drivers/gpu/drm/i915/intel_drv.h

+2 −1
Original line number Diff line number Diff line
@@ -823,7 +823,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);

drivers/gpu/drm/i915/intel_dsi.c

+1 −1
Original line number Diff line number Diff line
@@ -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;

drivers/gpu/drm/i915/intel_lvds.c

+5 −5
Original line number Diff line number Diff line
@@ -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 @@ void intel_lvds_init(struct drm_device *dev) 
	}

	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;

drivers/gpu/drm/i915/intel_panel.c

+3 −1
Original line number Diff line number Diff line
@@ -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;

}