]> git.proxmox.com Git - mirror_ubuntu-kernels.git/commit
drm/i915: Always call fence-lost prior to removing the fence
authorChris Wilson <chris@chris-wilson.co.uk>
Tue, 26 Mar 2013 11:29:27 +0000 (11:29 +0000)
committerDaniel Vetter <daniel.vetter@ffwll.ch>
Tue, 26 Mar 2013 19:16:18 +0000 (20:16 +0100)
commitf9c513e9d6d25fec3404a97c9b0f03b2eb858315
tree25babd6bc934f1a2c2d6f6c08e9915e9f9ac0f55
parent92bd1bf089762dfee9fe34437068714a881c8bc0
drm/i915: Always call fence-lost prior to removing the fence

There is a minute window for a race between put-fence removing the fence
and for a new transaction by an external party on the GTT mmap. That is
we must zap the mmap prior to removing the fence and not afterwards.

Fixes regression from
commit 61050808bb019ebea966b7b5bfd357aaf219fb51
Author: Chris Wilson <chris@chris-wilson.co.uk>
Date:   Tue Apr 17 15:31:31 2012 +0100

    drm/i915: Refactor put_fence() to use the common fence writing routine

v2: Remember the fence to remove with a local variable (gcc)

Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
Cc: Daniel Vetter <daniel.vetter@ffwll.ch>
Reviewed-by: Imre Deak <imre.deak@intel.com>
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
drivers/gpu/drm/i915/i915_gem.c