diff options
| author | Maxime Ripard <maxime@cerno.tech> | 2021-05-27 15:32:13 +0300 |
|---|---|---|
| committer | Maxime Ripard <maxime@cerno.tech> | 2021-05-27 15:32:13 +0300 |
| commit | ffa52910faff64f2070af42c22d782c4572d889e (patch) | |
| tree | 18c103f25a1467d02af1ebf27d7f0a8b177f5825 /drivers/gpu/drm/i915/gem | |
| parent | 5ccbb2ee039f0bd81e2b34b670718186753a4e17 (diff) | |
| parent | 5522e9f7b0fbe2a0cb89c199b574523becc8c3ab (diff) | |
| download | linux-ffa52910faff64f2070af42c22d782c4572d889e.tar.xz | |
Merge drm/drm-next into drm-misc-next
i915 is broken without -rc3, let's bring that tag in to fix it.
Signed-off-by: Maxime Ripard <maxime@cerno.tech>
Diffstat (limited to 'drivers/gpu/drm/i915/gem')
| -rw-r--r-- | drivers/gpu/drm/i915/gem/i915_gem_pages.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/gpu/drm/i915/gem/i915_gem_pages.c b/drivers/gpu/drm/i915/gem/i915_gem_pages.c index aed8a37ccdc9..7361971c177d 100644 --- a/drivers/gpu/drm/i915/gem/i915_gem_pages.c +++ b/drivers/gpu/drm/i915/gem/i915_gem_pages.c @@ -63,6 +63,8 @@ void __i915_gem_object_set_pages(struct drm_i915_gem_object *obj, i915->quirks & QUIRK_PIN_SWIZZLED_PAGES) { GEM_BUG_ON(i915_gem_object_has_tiling_quirk(obj)); i915_gem_object_set_tiling_quirk(obj); + GEM_BUG_ON(!list_empty(&obj->mm.link)); + atomic_inc(&obj->mm.shrink_pin); shrinkable = false; } |