drm/i915/debugfs: Increment return value of gt.next_seqno
authorChris Wilson <chris@chris-wilson.co.uk>
Thu, 24 Nov 2016 09:47:52 +0000 (09:47 +0000)
committerJani Nikula <jani.nikula@intel.com>
Mon, 5 Dec 2016 09:00:31 +0000 (11:00 +0200)
The i915_next_seqno read value is to be the next seqno used by the
kernel. However, in the conversion to atomics ops for gt.next_seqno, in
commit 28176ef4cfa5 ("drm/i915: Reserve space in the global seqno during
request allocation"), this was changed from a post-increment to a
pre-increment. This increment was missed from the value reported by
debugfs, so in effect it was reporting the current seqno (last
assigned), not the next seqno.

Fixes: 28176ef4cfa5 ("drm/i915: Reserve space in the global seqno during request allocation")
Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=81209
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
Cc: Joonas Lahtinen <joonas.lahtinen@linux.intel.com>
Link: http://patchwork.freedesktop.org/patch/msgid/20161124094752.19129-1-chris@chris-wilson.co.uk
Reviewed-by: Joonas Lahtinen <joonas.lahtinen@linux.intel.com>
(cherry picked from commit 9607ae79710afb453173b90d5bf564788a6e09b1)
Signed-off-by: Jani Nikula <jani.nikula@intel.com>
drivers/gpu/drm/i915/i915_debugfs.c

index 673fcba26fe2e88f896a16ed943795dabaaff23c..7dcdf04a8b2b4487dfb1ceb0b9689af2e4e57787 100644 (file)
@@ -1026,7 +1026,7 @@ i915_next_seqno_get(void *data, u64 *val)
 {
        struct drm_i915_private *dev_priv = data;
 
-       *val = atomic_read(&dev_priv->gt.global_timeline.next_seqno);
+       *val = 1 + atomic_read(&dev_priv->gt.global_timeline.next_seqno);
        return 0;
 }