]> rtime.felk.cvut.cz Git - linux-imx.git/commitdiff
drm/i915: Make next_seqno debugs entry to use i915_gem_set_seqno
authorMika Kuoppala <mika.kuoppala@linux.intel.com>
Wed, 19 Dec 2012 09:13:09 +0000 (11:13 +0200)
committerDaniel Vetter <daniel.vetter@ffwll.ch>
Wed, 19 Dec 2012 10:25:31 +0000 (11:25 +0100)
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>
drivers/gpu/drm/i915/i915_debugfs.c

index 7047c4a9fb9e6c6d5624bbf2bcc931b41b2b5c84..882a7352b9b9f5d79c0936ababab139fdff6a812 100644 (file)
@@ -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);