Commit edbaae5a authored by Dave Airlie's avatar Dave Airlie
Browse files

Merge tag 'topic/vblank-rework-2014-09-12' of git://anongit.freedesktop.org/drm-intel into drm-next 

So updated vblank-rework pull request, now with the polish that Mario
requested applied (and reviewed by him). Also with backmerge like you've
requested for easier merging.

The neat thing this finally allows is to immediately disable the vblank
interrupt on the last drm_vblank_put if the hardware has perfectly
accurate vblank counter and timestamp readout support. On i915 that
required piles of small adjustements from Ville since depending upon the
platform and port the vblank happens at different scanout lines.

Of course this is fully opt-in and per-device (we need that since gen2
doesn't have a hw vblank counter).

* tag 'topic/vblank-rework-2014-09-12' of git://anongit.freedesktop.org/drm-intel: (22 commits)
  drm: Clarify vblank ts/scanoutpos sampling #defines
  drm: Simplify return value of drm_get_last_vbltimestamp
  drm: Only update final vblank count when precise ts is available
  drm: Really never disable vblank irqs for offdelay==0
  drm: Use vblank_disable_and_save in drm_vblank_cleanup()
  drm: Remove drm_vblank_cleanup from drm_vblank_init error path.
  drm: Store the vblank timestamp when adjusting the counter during disable
  drm: Fix confusing debug message in drm_update_vblank_count()
  drm/i915: Update scanline_offset only for active crtcs
  drm: Kick start vblank interrupts at drm_vblank_on()
  drm/i915: Opt out of vblank disable timer on >gen2
  drm: Add dev->vblank_disable_immediate flag
  drm: Disable vblank interrupt immediately when drm_vblank_offdelay<0
  drm: Fix race between drm_vblank_off() and drm_queue_vblank_event()
  drm: Fix deadlock between event_lock and vbl_lock/vblank_time_lock
  drm: Reduce the amount of dev->vblank[crtc] in the code
  drm: Avoid random vblank counter jumps if the hardware counter has been reset
  drm: Have the vblank counter account for the time between vblank irq disable and drm_vblank_off()
  drm: Move drm_update_vblank_count()
  drm: Don't clear vblank timestamps when vblank interrupt is disabled
  ...
parents a9d6dd25 336879b1

Documentation/DocBook/drm.tmpl

+7 −0
Original line number Diff line number Diff line
@@ -3385,6 +3385,13 @@ void (*disable_vblank) (struct drm_device *dev, int crtc);</synopsis> 
      by scheduling a timer. The delay is accessible through the vblankoffdelay

      module parameter or the <varname>drm_vblank_offdelay</varname> global

      variable and expressed in milliseconds. Its default value is 5000 ms.

      Zero means never disable, and a negative value means disable immediately.

      Drivers may override the behaviour by setting the

      <structname>drm_device</structname>

      <structfield>vblank_disable_immediate</structfield> flag, which when set

      causes vblank interrupts to be disabled immediately regardless of the

      drm_vblank_offdelay value. The flag should only be set if there's a

      properly working hardware vblank counter present.

    </para>

    <para>

      When a vertical blanking interrupt occurs drivers only need to call the

drivers/gpu/drm/drm_drv.c

+2 −2
Original line number Diff line number Diff line
@@ -39,7 +39,7 @@ 
unsigned int drm_debug = 0;	/* 1 to enable debug output */

EXPORT_SYMBOL(drm_debug);



unsigned int drm_vblank_offdelay = 5000;    /* Default to 5000 msecs. */

int drm_vblank_offdelay = 5000;    /* Default to 5000 msecs. */



unsigned int drm_timestamp_precision = 20;  /* Default to 20 usecs. */
@@ -53,7 +53,7 @@ MODULE_AUTHOR(CORE_AUTHOR); 
MODULE_DESCRIPTION(CORE_DESC);

MODULE_LICENSE("GPL and additional rights");

MODULE_PARM_DESC(debug, "Enable debug output");

MODULE_PARM_DESC(vblankoffdelay, "Delay until vblank irq auto-disable [msecs]");

MODULE_PARM_DESC(vblankoffdelay, "Delay until vblank irq auto-disable [msecs] (0: never disable, <0: disable immediately)");

MODULE_PARM_DESC(timestamp_precision_usec, "Max. error on timestamps [usecs]");

MODULE_PARM_DESC(timestamp_monotonic, "Use monotonic timestamps");

drivers/gpu/drm/drm_irq.c

+239 −140

File changed.

Preview size limit exceeded, changes collapsed.

drivers/gpu/drm/i915/i915_irq.c

+9 −1
Original line number Diff line number Diff line
@@ -1020,7 +1020,7 @@ static int i915_get_crtc_scanoutpos(struct drm_device *dev, int pipe, 


	/* In vblank? */

	if (in_vbl)

		ret |= DRM_SCANOUTPOS_INVBL;

		ret |= DRM_SCANOUTPOS_IN_VBLANK;



	return ret;

}
@@ -4701,6 +4701,14 @@ void intel_irq_init(struct drm_device *dev) 
		dev->max_vblank_count = 0xffffff; /* only 24 bits of frame count */

	}



	/*

	 * Opt out of the vblank disable timer on everything except gen2.

	 * Gen2 doesn't have a hardware frame counter and so depends on

	 * vblank interrupts to produce sane vblank seuquence numbers.

	 */

	if (!IS_GEN2(dev))

		dev->vblank_disable_immediate = true;



	if (drm_core_check_feature(dev, DRIVER_MODESET)) {

		dev->driver->get_vblank_timestamp = i915_get_vblank_timestamp;

		dev->driver->get_scanout_position = i915_get_crtc_scanoutpos;

drivers/gpu/drm/i915/intel_display.c

+13 −4
Original line number Diff line number Diff line
@@ -1342,6 +1342,12 @@ static void assert_sprites_disabled(struct drm_i915_private *dev_priv, 
	}

}



static void assert_vblank_disabled(struct drm_crtc *crtc)

{

	if (WARN_ON(drm_crtc_vblank_get(crtc) == 0))

		drm_crtc_vblank_put(crtc);

}



static void ibx_assert_pch_refclk_enabled(struct drm_i915_private *dev_priv)

{

	u32 val;
@@ -3891,6 +3897,8 @@ static void intel_crtc_enable_planes(struct drm_crtc *crtc) 
	struct intel_crtc *intel_crtc = to_intel_crtc(crtc);

	int pipe = intel_crtc->pipe;



	assert_vblank_disabled(crtc);



	drm_vblank_on(dev, pipe);



	intel_enable_primary_hw_plane(crtc->primary, crtc);
@@ -3940,6 +3948,8 @@ static void intel_crtc_disable_planes(struct drm_crtc *crtc) 
	intel_frontbuffer_flip(dev, INTEL_FRONTBUFFER_ALL_MASK(pipe));



	drm_vblank_off(dev, pipe);



	assert_vblank_disabled(crtc);

}



static void ironlake_crtc_enable(struct drm_crtc *crtc)
@@ -12766,9 +12776,10 @@ static void intel_sanitize_crtc(struct intel_crtc *crtc) 
	I915_WRITE(reg, I915_READ(reg) & ~PIPECONF_FRAME_START_DELAY_MASK);



	/* restore vblank interrupts to correct state */

	if (crtc->active)

	if (crtc->active) {

		update_scanline_offset(crtc);

		drm_vblank_on(dev, crtc->pipe);

	else

	} else

		drm_vblank_off(dev, crtc->pipe);



	/* We need to sanitize the plane -> pipe mapping first because this will
@@ -12867,8 +12878,6 @@ static void intel_sanitize_crtc(struct intel_crtc *crtc) 
		 */

		crtc->cpu_fifo_underrun_disabled = true;

		crtc->pch_fifo_underrun_disabled = true;



		update_scanline_offset(crtc);

	}

}

CRA Git | Maintained and supported by SUSTech CRA and CCSE