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

Commit 3870b89a authored by Hans de Goede's avatar Hans de Goede Committed by Jani Nikula
Browse files

drm/i915/dsi: Move calling of wait_for_dsi_fifo_empty to mipi_exec_send_packet 



Instead of calling wait_for_dsi_fifo_empty on all dsi ports after calling
a drm_panel_foo helper which calls VBT sequences, move it to the VBT
mipi_exec_send_packet helper, which is the one VBT instruction which
actually puts data in the fifo.

This results in a nice cleanup making it clearer what all the steps on
intel_dsi_enable / disable are and this also makes the VBT code properly
wait till a command has actually been send before executing the next
steps (typically a delay) in the VBT sequence.

Signed-off-by: default avatarHans de Goede <hdegoede@redhat.com>
Reviewed-by: default avatarBob Paauwe <bob.j.paauwe@intel.com>
Acked-by: default avatarJani Nikula <jani.nikula@intel.com>
Signed-off-by: default avatarJani Nikula <jani.nikula@intel.com>
Link: http://patchwork.freedesktop.org/patch/msgid/289977b5699e252fea5c211d1d1645f9e79cca79.1488273823.git.jani.nikula@intel.com
parent 80166e40

drivers/gpu/drm/i915/intel_dsi.c

+1 −11
Original line number Diff line number Diff line
@@ -80,7 +80,7 @@ enum mipi_dsi_pixel_format pixel_format_from_register_bits(u32 fmt) 
	}

}



static void wait_for_dsi_fifo_empty(struct intel_dsi *intel_dsi, enum port port)

void wait_for_dsi_fifo_empty(struct intel_dsi *intel_dsi, enum port port)

{

	struct drm_encoder *encoder = &intel_dsi->base.base;

	struct drm_device *dev = encoder->dev;
@@ -525,9 +525,6 @@ static void intel_dsi_enable(struct intel_encoder *encoder) 


		drm_panel_enable(intel_dsi->panel);



		for_each_dsi_port(port, intel_dsi->ports)

			wait_for_dsi_fifo_empty(intel_dsi, port);



		intel_dsi_port_enable(encoder);

	}
@@ -543,7 +540,6 @@ static void intel_dsi_pre_enable(struct intel_encoder *encoder, 
{

	struct drm_i915_private *dev_priv = to_i915(encoder->base.dev);

	struct intel_dsi *intel_dsi = enc_to_intel_dsi(&encoder->base);

	enum port port;

	u32 val;



	DRM_DEBUG_KMS("\n");
@@ -588,9 +584,6 @@ static void intel_dsi_pre_enable(struct intel_encoder *encoder, 


	drm_panel_prepare(intel_dsi->panel);



	for_each_dsi_port(port, intel_dsi->ports)

		wait_for_dsi_fifo_empty(intel_dsi, port);



	/* Enable port in pre-enable phase itself because as per hw team

	 * recommendation, port should be enabled befor plane & pipe */

	intel_dsi_enable(encoder);
@@ -672,9 +665,6 @@ static void intel_dsi_disable(struct intel_encoder *encoder) 
	/* if disable packets are sent before sending shutdown packet then in

	 * some next enable sequence send turn on packet error is observed */

	drm_panel_disable(intel_dsi->panel);



	for_each_dsi_port(port, intel_dsi->ports)

		wait_for_dsi_fifo_empty(intel_dsi, port);

}



static void intel_dsi_clear_device_ready(struct intel_encoder *encoder)

drivers/gpu/drm/i915/intel_dsi.h

+2 −0
Original line number Diff line number Diff line
@@ -130,6 +130,8 @@ static inline struct intel_dsi *enc_to_intel_dsi(struct drm_encoder *encoder) 
	return container_of(encoder, struct intel_dsi, base.base);

}



void wait_for_dsi_fifo_empty(struct intel_dsi *intel_dsi, enum port port);



bool intel_dsi_pll_is_enabled(struct drm_i915_private *dev_priv);

int intel_compute_dsi_pll(struct intel_encoder *encoder,

			  struct intel_crtc_state *config);

drivers/gpu/drm/i915/intel_dsi_panel_vbt.c

+2 −0
Original line number Diff line number Diff line
@@ -192,6 +192,8 @@ static const u8 *mipi_exec_send_packet(struct intel_dsi *intel_dsi, 
		break;

	}



	wait_for_dsi_fifo_empty(intel_dsi, port);



out:

	data += len;