diff options
| author | Chris Wilson | 2016-08-02 23:50:39 +0200 |
|---|---|---|
| committer | Chris Wilson | 2016-08-02 23:58:32 +0200 |
| commit | ddf07be7a2aeb80aa159a7eeade01b7b5e1e3e43 (patch) | |
| tree | 1c9d8e202c79ca516e9c2ac31c7fe1d465d1eabf /drivers/gpu/drm/i915/i915_gem_request.c | |
| parent | drm/i915: Unify legacy/execlists submit_execbuf callbacks (diff) | |
| download | kernel-qcow2-linux-ddf07be7a2aeb80aa159a7eeade01b7b5e1e3e43.tar.gz kernel-qcow2-linux-ddf07be7a2aeb80aa159a7eeade01b7b5e1e3e43.tar.xz kernel-qcow2-linux-ddf07be7a2aeb80aa159a7eeade01b7b5e1e3e43.zip | |
drm/i915: Simplify calling engine->sync_to
Since requests can no longer be generated as a side-effect of
intel_ring_begin(), we know that the seqno will be unchanged during
ring-emission. This predicatablity then means we do not have to check
for the seqno wrapping around whilst emitting the semaphore for
engine->sync_to().
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
Reviewed-by: Joonas Lahtinen <joonas.lahtinen@linux.intel.com>
Link: http://patchwork.freedesktop.org/patch/msgid/1469432687-22756-31-git-send-email-chris@chris-wilson.co.uk
Link: http://patchwork.freedesktop.org/patch/msgid/1470174640-18242-22-git-send-email-chris@chris-wilson.co.uk
Diffstat (limited to 'drivers/gpu/drm/i915/i915_gem_request.c')
| -rw-r--r-- | drivers/gpu/drm/i915/i915_gem_request.c | 9 |
1 files changed, 1 insertions, 8 deletions
diff --git a/drivers/gpu/drm/i915/i915_gem_request.c b/drivers/gpu/drm/i915/i915_gem_request.c index e378eb61979b..11c19e7f82fa 100644 --- a/drivers/gpu/drm/i915/i915_gem_request.c +++ b/drivers/gpu/drm/i915/i915_gem_request.c @@ -264,14 +264,7 @@ int i915_gem_set_seqno(struct drm_device *dev, u32 seqno) if (ret) return ret; - /* Carefully set the last_seqno value so that wrap - * detection still works - */ dev_priv->next_seqno = seqno; - dev_priv->last_seqno = seqno - 1; - if (dev_priv->last_seqno == 0) - dev_priv->last_seqno--; - return 0; } @@ -288,7 +281,7 @@ static int i915_gem_get_seqno(struct drm_i915_private *dev_priv, u32 *seqno) dev_priv->next_seqno = 1; } - *seqno = dev_priv->last_seqno = dev_priv->next_seqno++; + *seqno = dev_priv->next_seqno++; return 0; } |