Re: [RFC PATCH 03/12] drm/i915/dsi: move wait_for_dsi_fifo_empty to intel_dsi.c

[Shobhit Kumar <shobhit.kumar@linux.intel.com>]

On 01/16/2015 05:57 PM, Jani Nikula wrote:
> wait_for_dsi_fifo_empty can be static in intel_dsi.c. No functional
> changes.
>
> Signed-off-by: Jani Nikula <jani.nikula@intel.com>

Reviewed-By: Shobhit Kumar <shobhit.kumar@intel.com>

> ---
>   drivers/gpu/drm/i915/intel_dsi.c     | 16 ++++++++++++++++
>   drivers/gpu/drm/i915/intel_dsi_cmd.c | 16 ----------------
>   drivers/gpu/drm/i915/intel_dsi_cmd.h |  1 -
>   3 files changed, 16 insertions(+), 17 deletions(-)
>
> diff --git a/drivers/gpu/drm/i915/intel_dsi.c b/drivers/gpu/drm/i915/intel_dsi.c
> index 49e186bc080f..e82cf5f65c9a 100644
> --- a/drivers/gpu/drm/i915/intel_dsi.c
> +++ b/drivers/gpu/drm/i915/intel_dsi.c
> @@ -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);
> diff --git a/drivers/gpu/drm/i915/intel_dsi_cmd.c b/drivers/gpu/drm/i915/intel_dsi_cmd.c
> index 5f63c807acea..17b892a365ee 100644
> --- a/drivers/gpu/drm/i915/intel_dsi_cmd.c
> +++ b/drivers/gpu/drm/i915/intel_dsi_cmd.c
> @@ -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");
> -}
> diff --git a/drivers/gpu/drm/i915/intel_dsi_cmd.h b/drivers/gpu/drm/i915/intel_dsi_cmd.h
> index 1d1a716e473a..70f24666a1f9 100644
> --- a/drivers/gpu/drm/i915/intel_dsi_cmd.h
> +++ b/drivers/gpu/drm/i915/intel_dsi_cmd.h
> @@ -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,
>
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/intel-gfx