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

Commit 3b1808bf authored by Jani Nikula's avatar Jani Nikula Committed by Daniel Vetter
Browse files

drm/i915/dsi: move wait_for_dsi_fifo_empty to intel_dsi.c 



wait_for_dsi_fifo_empty can be static in intel_dsi.c. No functional
changes.

Signed-off-by: default avatarJani Nikula <jani.nikula@intel.com>
Reviewed-By: default avatarShobhit Kumar <shobhit.kumar@intel.com>
Signed-off-by: default avatarDaniel Vetter <daniel.vetter@ffwll.ch>
parent 4934b656

drivers/gpu/drm/i915/intel_dsi.c

+16 −0
Original line number Diff line number Diff line
@@ -42,6 +42,22 @@ static const struct intel_dsi_device intel_dsi_devices[] = { 
	},

};



static void wait_for_dsi_fifo_empty(struct intel_dsi *intel_dsi)

{

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

	struct drm_device *dev = encoder->dev;

	struct drm_i915_private *dev_priv = dev->dev_private;

	struct intel_crtc *intel_crtc = to_intel_crtc(encoder->crtc);

	enum port port = intel_dsi_pipe_to_port(intel_crtc->pipe);

	u32 mask;



	mask = LP_CTRL_FIFO_EMPTY | HS_CTRL_FIFO_EMPTY |

		LP_DATA_FIFO_EMPTY | HS_DATA_FIFO_EMPTY;



	if (wait_for((I915_READ(MIPI_GEN_FIFO_STAT(port)) & mask) == mask, 100))

		DRM_ERROR("DPI FIFOs are not empty\n");

}



static void band_gap_reset(struct drm_i915_private *dev_priv)

{

	mutex_lock(&dev_priv->dpio_lock);

drivers/gpu/drm/i915/intel_dsi_cmd.c

+0 −16
Original line number Diff line number Diff line
@@ -408,19 +408,3 @@ int dpi_send_cmd(struct intel_dsi *intel_dsi, u32 cmd, bool hs, enum port port) 


	return 0;

}
 


void wait_for_dsi_fifo_empty(struct intel_dsi *intel_dsi)

{

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

	struct drm_device *dev = encoder->dev;

	struct drm_i915_private *dev_priv = dev->dev_private;

	struct intel_crtc *intel_crtc = to_intel_crtc(encoder->crtc);

	enum port port = intel_dsi_pipe_to_port(intel_crtc->pipe);

	u32 mask;



	mask = LP_CTRL_FIFO_EMPTY | HS_CTRL_FIFO_EMPTY |

		LP_DATA_FIFO_EMPTY | HS_DATA_FIFO_EMPTY;



	if (wait_for((I915_READ(MIPI_GEN_FIFO_STAT(port)) & mask) == mask, 100))

		DRM_ERROR("DPI FIFOs are not empty\n");

}

drivers/gpu/drm/i915/intel_dsi_cmd.h

+0 −1
Original line number Diff line number Diff line
@@ -52,7 +52,6 @@ int dsi_vc_generic_read(struct intel_dsi *intel_dsi, int channel, 
		u8 *reqdata, int reqlen, u8 *buf, int buflen, enum port port);



int dpi_send_cmd(struct intel_dsi *intel_dsi, u32 cmd, bool hs, enum port port);

void wait_for_dsi_fifo_empty(struct intel_dsi *intel_dsi);



/* XXX: questionable write helpers */

static inline int dsi_vc_dcs_write_0(struct intel_dsi *intel_dsi,