summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMika Kuoppala <mika.kuoppala@linux.intel.com>2012-12-19 11:13:09 +0200
committerDaniel Vetter <daniel.vetter@ffwll.ch>2012-12-19 11:25:31 +0100
commite94fbaa8750a8f20c14718633764fba2e6755825 (patch)
treeed7ff549aedd0af11b25b99d8aded964dba60487
parentfca26bb45375266d9d9b8b4b57fee905ac38fe3c (diff)
drm/i915: Make next_seqno debugs entry to use i915_gem_set_seqno
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>
-rw-r--r--drivers/gpu/drm/i915/i915_debugfs.c11
1 files changed, 1 insertions, 10 deletions
diff --git a/drivers/gpu/drm/i915/i915_debugfs.c b/drivers/gpu/drm/i915/i915_debugfs.c
index 7047c4a9fb9..882a7352b9b 100644
--- a/drivers/gpu/drm/i915/i915_debugfs.c
+++ b/drivers/gpu/drm/i915/i915_debugfs.c
@@ -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;
@@ -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);