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

Commit 4194c088 authored by Rodrigo Vivi's avatar Rodrigo Vivi
Browse files

drm/i915: Use drm official vblank_no_hw_counter callback. 



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: default avatarRodrigo Vivi <rodrigo.vivi@intel.com>
Reviewed-by: default avatarVille Syrjälä <ville.syrjala@linux.intel.com>
parent 4e9121e6

drivers/gpu/drm/i915/i915_irq.c

+2 −7
Original line number Diff line number Diff line
@@ -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

 */
@@ -4538,8 +4532,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;