Commit dee2370c authored by Ville Syrjälä's avatar Ville Syrjälä
Browse files

drm/i915: Adjust DSI fixed mode handling 



DSI has its own convoluted way of grabbing the fixed mode from
the VBT. Change it to follow the path laid out by LVDS/eDP.

Signed-off-by: default avatarVille Syrjälä <ville.syrjala@linux.intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20190321132446.22394-4-ville.syrjala@linux.intel.com


Reviewed-by: default avatarChris Wilson <chris@chris-wilson.co.uk>
Acked-by: default avatarJani Nikula <jani.nikula@intel.com>
parent 325710d3

drivers/gpu/drm/i915/icl_dsi.c

+2 −12
Original line number Diff line number Diff line
@@ -1361,7 +1361,7 @@ void icl_dsi_init(struct drm_i915_private *dev_priv) 
	struct intel_encoder *encoder;

	struct intel_connector *intel_connector;

	struct drm_connector *connector;

	struct drm_display_mode *scan, *fixed_mode = NULL;

	struct drm_display_mode *fixed_mode;

	enum port port;



	if (!intel_bios_is_dsi_present(dev_priv, &port))
@@ -1411,15 +1411,8 @@ void icl_dsi_init(struct drm_i915_private *dev_priv) 
	/* attach connector to encoder */

	intel_connector_attach_encoder(intel_connector, encoder);



	/* fill mode info from VBT */

	mutex_lock(&dev->mode_config.mutex);

	intel_dsi_vbt_get_modes(intel_dsi);

	list_for_each_entry(scan, &connector->probed_modes, head) {

		if (scan->type & DRM_MODE_TYPE_PREFERRED) {

			fixed_mode = drm_mode_duplicate(dev, scan);

			break;

		}

	}

	fixed_mode = intel_panel_vbt_fixed_mode(intel_connector);

	mutex_unlock(&dev->mode_config.mutex);



	if (!fixed_mode) {
@@ -1427,12 +1420,9 @@ void icl_dsi_init(struct drm_i915_private *dev_priv) 
		goto err;

	}



	connector->display_info.width_mm = fixed_mode->width_mm;

	connector->display_info.height_mm = fixed_mode->height_mm;

	intel_panel_init(&intel_connector->panel, fixed_mode, NULL);

	intel_panel_setup_backlight(connector, INVALID_PIPE);





	if (dev_priv->vbt.dsi.config->dual_link)

		intel_dsi->ports = BIT(PORT_A) | BIT(PORT_B);

	else

drivers/gpu/drm/i915/intel_dsi.h

+0 −1
Original line number Diff line number Diff line
@@ -189,7 +189,6 @@ void bxt_dsi_reset_clocks(struct intel_encoder *encoder, enum port port); 


/* intel_dsi_vbt.c */

bool intel_dsi_vbt_init(struct intel_dsi *intel_dsi, u16 panel_id);

int intel_dsi_vbt_get_modes(struct intel_dsi *intel_dsi);

void intel_dsi_vbt_exec_sequence(struct intel_dsi *intel_dsi,

				 enum mipi_seq seq_id);

void intel_dsi_msleep(struct intel_dsi *intel_dsi, int msec);

drivers/gpu/drm/i915/intel_dsi_vbt.c

+0 −18
Original line number Diff line number Diff line
@@ -532,24 +532,6 @@ void intel_dsi_msleep(struct intel_dsi *intel_dsi, int msec) 
	msleep(msec);

}



int intel_dsi_vbt_get_modes(struct intel_dsi *intel_dsi)

{

	struct intel_connector *connector = intel_dsi->attached_connector;

	struct drm_device *dev = intel_dsi->base.base.dev;

	struct drm_i915_private *dev_priv = to_i915(dev);

	struct drm_display_mode *mode;



	mode = drm_mode_duplicate(dev, dev_priv->vbt.lfp_lvds_vbt_mode);

	if (!mode)

		return 0;



	mode->type |= DRM_MODE_TYPE_PREFERRED;



	drm_mode_probed_add(&connector->base, mode);



	return 1;

}



#define ICL_PREPARE_CNT_MAX	0x7

#define ICL_CLK_ZERO_CNT_MAX	0xf

#define ICL_TRAIL_CNT_MAX	0x7

drivers/gpu/drm/i915/vlv_dsi.c

+2 −11
Original line number Diff line number Diff line
@@ -1658,7 +1658,7 @@ void vlv_dsi_init(struct drm_i915_private *dev_priv) 
	struct drm_encoder *encoder;

	struct intel_connector *intel_connector;

	struct drm_connector *connector;

	struct drm_display_mode *scan, *fixed_mode = NULL;

	struct drm_display_mode *fixed_mode;

	enum port port;



	DRM_DEBUG_KMS("\n");
@@ -1769,13 +1769,7 @@ void vlv_dsi_init(struct drm_i915_private *dev_priv) 
	intel_connector_attach_encoder(intel_connector, intel_encoder);



	mutex_lock(&dev->mode_config.mutex);

	intel_dsi_vbt_get_modes(intel_dsi);

	list_for_each_entry(scan, &connector->probed_modes, head) {

		if ((scan->type & DRM_MODE_TYPE_PREFERRED)) {

			fixed_mode = drm_mode_duplicate(dev, scan);

			break;

		}

	}

	fixed_mode = intel_panel_vbt_fixed_mode(intel_connector);

	mutex_unlock(&dev->mode_config.mutex);



	if (!fixed_mode) {
@@ -1783,9 +1777,6 @@ void vlv_dsi_init(struct drm_i915_private *dev_priv) 
		goto err;

	}



	connector->display_info.width_mm = fixed_mode->width_mm;

	connector->display_info.height_mm = fixed_mode->height_mm;



	intel_panel_init(&intel_connector->panel, fixed_mode, NULL);

	intel_panel_setup_backlight(connector, INVALID_PIPE);

CRA Git | Maintained and supported by SUSTech CRA and CCSE