[Intel-gfx] [PATCH] drm/i915: Use drm official vblnk_no_hw_counter callback.

Ville Syrjälä ville.syrjala at linux.intel.com
Wed Aug 3 18:32:51 UTC 2016


On Wed, Aug 03, 2016 at 10:00:56AM -0700, Rodrigo Vivi wrote:
> No functional change. Instead of defining a new empty function
> let's use what is available on drm.
> 
> It gets cleaner, and easy to read, and understand.
> 
> Signed-off-by: Rodrigo Vivi <rodrigo.vivi at intel.com>

Reviewed-by: Ville Syrjälä <ville.syrjala at linux.intel.com>

> ---
>  drivers/gpu/drm/i915/i915_irq.c | 9 ++-------
>  1 file changed, 2 insertions(+), 7 deletions(-)
> 
> diff --git a/drivers/gpu/drm/i915/i915_irq.c b/drivers/gpu/drm/i915/i915_irq.c
> index f5bf4f9..6030797 100644
> --- a/drivers/gpu/drm/i915/i915_irq.c
> +++ b/drivers/gpu/drm/i915/i915_irq.c
> @@ -656,12 +656,6 @@ static void i915_enable_asle_pipestat(struct drm_i915_private *dev_priv)
>   *   of horizontal active on the first line of vertical active
>   */
>  
> -static u32 i8xx_get_vblank_counter(struct drm_device *dev, unsigned int pipe)
> -{
> -	/* Gen2 doesn't have a hardware frame counter */
> -	return 0;
> -}
> -
>  /* Called from drm generic code, passed a 'crtc', which
>   * we use as a pipe index
>   */
> @@ -4545,8 +4539,9 @@ void intel_irq_init(struct drm_i915_private *dev_priv)
>  			  i915_hangcheck_elapsed);
>  
>  	if (IS_GEN2(dev_priv)) {
> +		/* Gen2 doesn't have a hardware frame counter */
>  		dev->max_vblank_count = 0;
> -		dev->driver->get_vblank_counter = i8xx_get_vblank_counter;
> +		dev->driver->get_vblank_counter = drm_vblank_no_hw_counter;
>  	} else if (IS_G4X(dev_priv) || INTEL_INFO(dev_priv)->gen >= 5) {
>  		dev->max_vblank_count = 0xffffffff; /* full 32 bit counter */
>  		dev->driver->get_vblank_counter = g4x_get_vblank_counter;
> -- 
> 2.5.5
> 
> _______________________________________________
> Intel-gfx mailing list
> Intel-gfx at lists.freedesktop.org
> https://lists.freedesktop.org/mailman/listinfo/intel-gfx

-- 
Ville Syrjälä
Intel OTC


More information about the Intel-gfx mailing list