diff options
| author | Chris Wilson | 2017-03-01 16:41:28 +0100 |
|---|---|---|
| committer | Chris Wilson | 2017-03-01 18:57:17 +0100 |
| commit | dd689287b977597a46adf8c3de19d40212f0ea9f (patch) | |
| tree | 664a82cf91a448de269dd57939cbc40ad14ceb4f /drivers/gpu/drm/i915/i915_gem_shrinker.c | |
| parent | drm/i915: Fix all intel_framebuffer_init failures to take the error path (diff) | |
| download | kernel-qcow2-linux-dd689287b977597a46adf8c3de19d40212f0ea9f.tar.gz kernel-qcow2-linux-dd689287b977597a46adf8c3de19d40212f0ea9f.tar.xz kernel-qcow2-linux-dd689287b977597a46adf8c3de19d40212f0ea9f.zip | |
drm/i915: Prevent concurrent tiling/framebuffer modifications
Reintroduce a lock around tiling vs framebuffer creation to prevent
modification of the obj->tiling_and_stride whilst the framebuffer is
being created. Rather than use struct_mutex once again, use the
per-object lock - this will also be required in future to prevent
changing the tiling whilst submitting rendering.
Reported-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Fixes: 24dbf51a5517 ("drm/i915: struct_mutex is not required for allocating the framebuffer")
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
Cc: Ville Syrjälä <ville.syrjala@linux.intel.com>
Reviewed-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Link: http://patchwork.freedesktop.org/patch/msgid/20170301154128.2841-2-chris@chris-wilson.co.uk
Diffstat (limited to 'drivers/gpu/drm/i915/i915_gem_shrinker.c')
| -rw-r--r-- | drivers/gpu/drm/i915/i915_gem_shrinker.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/gpu/drm/i915/i915_gem_shrinker.c b/drivers/gpu/drm/i915/i915_gem_shrinker.c index 8bc515e8b2a2..006a8b908f77 100644 --- a/drivers/gpu/drm/i915/i915_gem_shrinker.c +++ b/drivers/gpu/drm/i915/i915_gem_shrinker.c @@ -207,7 +207,7 @@ i915_gem_shrink(struct drm_i915_private *dev_priv, if (!(flags & I915_SHRINK_ACTIVE) && (i915_gem_object_is_active(obj) || - atomic_read(&obj->framebuffer_references))) + i915_gem_object_is_framebuffer(obj))) continue; if (!can_release_pages(obj)) |