Re: [PATCH v2 09/24] drm/i915: Keep vblank interrupts enabled while enabling/disabling planes

Paulo Zanoni
2014-04-28T21:42:51Z

2014-04-28 9:58 GMT-03:00 <ville.syrjala@linux.intel.com>:
> From: Ville Syrjälä <ville.syrjala@linux.intel.com>
>
> Becasue of the upcoming vblank interrupt driven watermark update

BecaUSe.

Reviewed-by: Paulo Zanoni <paulo.r.zanoni@intel.com>

> mechanism we will have use for vblank interrupts during plane
> enabling/disabling. So don't call drm_vblank_off() until planes
> are off, and call drm_vblank_on() just before we start to enable
> the planes.
>
> v2: Pimp commit message (Paulo)
>
> Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
> ---
> drivers/gpu/drm/i915/intel_display.c | 7 ++++---
> 1 file changed, 4 insertions(+), 3 deletions(-)
>
> diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c
> index 88df4ea..8d2a31e 100644
> --- a/drivers/gpu/drm/i915/intel_display.c
> +++ b/drivers/gpu/drm/i915/intel_display.c
> @@ -3547,6 +3547,8 @@ static void ilk_crtc_enable_planes(struct drm_crtc *crtc)
> int pipe = intel_crtc->pipe;
> int plane = intel_crtc->plane;
>
> + drm_vblank_on(dev, pipe);
> +
> intel_enable_primary_plane(dev_priv, plane, pipe);
> intel_enable_planes(crtc);
> intel_crtc_update_cursor(crtc, true);
> @@ -3557,8 +3559,6 @@ static void ilk_crtc_enable_planes(struct drm_crtc *crtc)
> mutex_lock(&dev->struct_mutex);
> intel_update_fbc(dev);
> mutex_unlock(&dev->struct_mutex);
> -
> - drm_vblank_on(dev, pipe);
> }
>
> static void ilk_crtc_disable_planes(struct drm_crtc *crtc)
> @@ -3570,7 +3570,6 @@ static void ilk_crtc_disable_planes(struct drm_crtc *crtc)
> int plane = intel_crtc->plane;
>
> intel_crtc_wait_for_pending_flips(crtc);
> - drm_vblank_off(dev, pipe);
>
> if (dev_priv->fbc.plane == plane)
> intel_disable_fbc(dev);
> @@ -3581,6 +3580,8 @@ static void ilk_crtc_disable_planes(struct drm_crtc *crtc)
> intel_disable_planes(crtc);
> intel_disable_primary_plane(dev_priv, plane, pipe);
> intel_wait_for_vblank(dev, pipe);
> +
> + drm_vblank_off(dev, pipe);
> }
>
> static void ironlake_crtc_enable(struct drm_crtc *crtc)
> --
> 1.8.3.2
>

--
Paulo Zanoni