Skip to content

Commit

Permalink
drm/i915: Make next_seqno debugs entry to use i915_gem_set_seqno
Browse files Browse the repository at this point in the history
This debugs entry can be used to set arbitrary value to next_seqno.
Use i915_gem_set_seqno instead of poking next_seqno.

v2: nasty details of next_seqno and last_seqno handling
moved inside i915_gem_set_seqno as suggested by Chris Wilson.

Signed-off-by: Mika Kuoppala <mika.kuoppala@intel.com>
Reviewed-by: Chris Wilson <chris@chris-wilson.co.uk>
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
  • Loading branch information
Mika Kuoppala authored and Daniel Vetter committed Dec 19, 2012
1 parent fca26bb commit e94fbaa
Showing 1 changed file with 1 addition and 10 deletions.
11 changes: 1 addition & 10 deletions drivers/gpu/drm/i915/i915_debugfs.c
Original file line number Diff line number Diff line change
Expand Up @@ -878,7 +878,6 @@ i915_next_seqno_write(struct file *filp,
loff_t *ppos)
{
struct drm_device *dev = filp->private_data;
drm_i915_private_t *dev_priv = dev->dev_private;
char buf[20];
u32 val = 1;
int ret;
Expand All @@ -896,19 +895,11 @@ i915_next_seqno_write(struct file *filp,
return ret;
}

if (val == 0)
return -EINVAL;

ret = mutex_lock_interruptible(&dev->struct_mutex);
if (ret)
return ret;

if (i915_seqno_passed(val, dev_priv->next_seqno)) {
dev_priv->next_seqno = val;
DRM_DEBUG_DRIVER("Advancing seqno to %u\n", val);
} else {
ret = -EINVAL;
}
ret = i915_gem_set_seqno(dev, val);

mutex_unlock(&dev->struct_mutex);

Expand Down

0 comments on commit e94fbaa

Please sign in to comment.