diff options
| author |   Chris Wilson <chris@chris-wilson.co.uk> | 2019-09-13 07:42:00 +0100 |
|---|---|---|
| committer | Chris Wilson <chris@chris-wilson.co.uk> | 2019-09-13 08:25:04 +0100 |
| commit | c8185520aed6faab58b310f573790badfca27981 (patch) | |
| tree | 2cc9288580098d22ae8ec5aa10c1b33943b733f5 /drivers/gpu/drm/i915/i915_gem_gtt.h | |
| parent | drm/i915/selftests: Keep the engine awake while we keep for preemption (diff) | |
| download | linux-dev-c8185520aed6faab58b310f573790badfca27981.tar.xz linux-dev-c8185520aed6faab58b310f573790badfca27981.zip | |
drm/i915/gtt: Make sure the gen6 ppgtt is bound before first use
As we remove the struct_mutex protection from around the vma pinning,
counters need to be atomic and aware that there may be multiple threads
simultaneously active.
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
Reviewed-by: Matthew Auld <matthew.auld@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20190913064200.24297-1-chris@chris-wilson.co.uk
Diffstat (limited to 'drivers/gpu/drm/i915/i915_gem_gtt.h')
| -rw-r--r-- | drivers/gpu/drm/i915/i915_gem_gtt.h | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/drivers/gpu/drm/i915/i915_gem_gtt.h b/drivers/gpu/drm/i915/i915_gem_gtt.h index 201788126a89..8fd2234ba0bf 100644 --- a/drivers/gpu/drm/i915/i915_gem_gtt.h +++ b/drivers/gpu/drm/i915/i915_gem_gtt.h @@ -437,7 +437,9 @@ struct gen6_ppgtt { struct i915_vma *vma; gen6_pte_t __iomem *pd_addr; - unsigned int pin_count; + atomic_t pin_count; + struct mutex pin_mutex; + bool scan_for_unused_pt; }; |