summaryrefslogtreecommitdiffstats
path: root/drivers/gpu/drm/i915/i915_gem_tiling.c
diff options
context:
space:
mode:
authorChris Wilson2014-08-09 18:37:24 +0200
committerDaniel Vetter2014-08-11 12:20:25 +0200
commit82b6b6d786466e705e7244cc676189ce47a9199a (patch)
tree419ed0e45084fe3cab2a373ee05123f9cc2546c7 /drivers/gpu/drm/i915/i915_gem_tiling.c
parentdrm/i915: Force CPU relocations if not GTT mapped (diff)
downloadkernel-qcow2-linux-82b6b6d786466e705e7244cc676189ce47a9199a.tar.gz
kernel-qcow2-linux-82b6b6d786466e705e7244cc676189ce47a9199a.tar.xz
kernel-qcow2-linux-82b6b6d786466e705e7244cc676189ce47a9199a.zip
drm/i915: Remove fenced_gpu_access and pending_fenced_gpu_access
This migrates the fence tracking onto the existing seqno infrastructure so that the later conversion to tracking via requests is simplified. Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk> Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
Diffstat (limited to 'drivers/gpu/drm/i915/i915_gem_tiling.c')
-rw-r--r--drivers/gpu/drm/i915/i915_gem_tiling.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/gpu/drm/i915/i915_gem_tiling.c b/drivers/gpu/drm/i915/i915_gem_tiling.c
index cb150e8b4336..7e623bf097a1 100644
--- a/drivers/gpu/drm/i915/i915_gem_tiling.c
+++ b/drivers/gpu/drm/i915/i915_gem_tiling.c
@@ -376,7 +376,7 @@ i915_gem_set_tiling(struct drm_device *dev, void *data,
if (ret == 0) {
obj->fence_dirty =
- obj->fenced_gpu_access ||
+ obj->last_fenced_seqno ||
obj->fence_reg != I915_FENCE_REG_NONE;
obj->tiling_mode = args->tiling_mode;