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

drm/i915/dsi: Respect power cycle delay on icl+ 



Handle the DSI panel power cycle delay on icl+.

Reviewed-by: default avatarJani Nikula <jani.nikula@intel.com>
Signed-off-by: default avatarVille Syrjälä <ville.syrjala@linux.intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20230608203057.23759-7-ville.syrjala@linux.intel.com
parent a43d9281

drivers/gpu/drm/i915/display/icl_dsi.c

+6 −0
Original line number Diff line number Diff line
@@ -1166,6 +1166,8 @@ static void gen11_dsi_pre_pll_enable(struct intel_atomic_state *state, 
{

	struct intel_dsi *intel_dsi = enc_to_intel_dsi(encoder);



	intel_dsi_wait_panel_power_cycle(intel_dsi);



	intel_dsi_vbt_exec_sequence(intel_dsi, MIPI_SEQ_POWER_ON);

	msleep(intel_dsi->panel_on_delay);

	intel_dsi_vbt_exec_sequence(intel_dsi, MIPI_SEQ_DEASSERT_RESET);
@@ -1292,6 +1294,8 @@ static void gen11_dsi_powerdown_panel(struct intel_encoder *encoder) 
	intel_dsi_vbt_exec_sequence(intel_dsi, MIPI_SEQ_ASSERT_RESET);

	intel_dsi_vbt_exec_sequence(intel_dsi, MIPI_SEQ_POWER_OFF);



	intel_dsi->panel_power_off_time = ktime_get_boottime();



	/* ensure cmds dispatched to panel */

	wait_for_cmds_dispatched_to_panel(encoder);

}
@@ -1986,6 +1990,8 @@ void icl_dsi_init(struct drm_i915_private *dev_priv) 
	/* attach connector to encoder */

	intel_connector_attach_encoder(intel_connector, encoder);



	intel_dsi->panel_power_off_time = ktime_get_boottime();



	encoder->devdata = intel_bios_encoder_data_lookup(dev_priv, port);

	intel_bios_init_panel_late(dev_priv, &intel_connector->panel, encoder->devdata, NULL);

drivers/gpu/drm/i915/display/intel_dsi.c

+13 −0
Original line number Diff line number Diff line
@@ -9,6 +9,19 @@ 
#include "intel_dsi.h"

#include "intel_panel.h"



void intel_dsi_wait_panel_power_cycle(struct intel_dsi *intel_dsi)

{

	ktime_t panel_power_on_time;

	s64 panel_power_off_duration;



	panel_power_on_time = ktime_get_boottime();

	panel_power_off_duration = ktime_ms_delta(panel_power_on_time,

						  intel_dsi->panel_power_off_time);



	if (panel_power_off_duration < (s64)intel_dsi->panel_pwr_cycle_delay)

		msleep(intel_dsi->panel_pwr_cycle_delay - panel_power_off_duration);

}



int intel_dsi_bitrate(const struct intel_dsi *intel_dsi)

{

	int bpp = mipi_dsi_pixel_format_to_bpp(intel_dsi->pixel_format);

drivers/gpu/drm/i915/display/intel_dsi.h

+1 −0
Original line number Diff line number Diff line
@@ -173,5 +173,6 @@ enum drm_mode_status intel_dsi_mode_valid(struct drm_connector *connector, 
struct intel_dsi_host *intel_dsi_host_init(struct intel_dsi *intel_dsi,

					   const struct mipi_dsi_host_ops *funcs,

					   enum port port);

void intel_dsi_wait_panel_power_cycle(struct intel_dsi *intel_dsi);



#endif /* _INTEL_DSI_H */

drivers/gpu/drm/i915/display/vlv_dsi.c

+0 −14
Original line number Diff line number Diff line
@@ -671,20 +671,6 @@ static void intel_dsi_port_disable(struct intel_encoder *encoder) 
		intel_de_posting_read(dev_priv, port_ctrl);

	}

}



static void intel_dsi_wait_panel_power_cycle(struct intel_dsi *intel_dsi)

{

	ktime_t panel_power_on_time;

	s64 panel_power_off_duration;



	panel_power_on_time = ktime_get_boottime();

	panel_power_off_duration = ktime_ms_delta(panel_power_on_time,

						  intel_dsi->panel_power_off_time);



	if (panel_power_off_duration < (s64)intel_dsi->panel_pwr_cycle_delay)

		msleep(intel_dsi->panel_pwr_cycle_delay - panel_power_off_duration);

}



static void intel_dsi_prepare(struct intel_encoder *intel_encoder,

			      const struct intel_crtc_state *pipe_config);

static void intel_dsi_unprepare(struct intel_encoder *encoder);