drm/i915: Fix logical inversion for gen4 quirking

The assertion that we want to make before disabling the pin of the pages
for the unknown swizzling quirk is that the quirk is indeed active, and
that the quirk is disabled before we do apply it to the pages.

Fixes: 2c3a3f44dc ("drm/i915: Fix pages pin counting around swizzle quirk")
Fixes: 957870f934 ("drm/i915: Split out i915_gem_object_set_tiling()")
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
Cc: Chris Wilson <chris@chris-wilson.co.uk>
Cc: Joonas Lahtinen <joonas.lahtinen@linux.intel.com>
Cc: Tvrtko Ursulin <tvrtko.ursulin@intel.com>
Link: http://patchwork.freedesktop.org/patch/msgid/20170521124014.27678-1-chris@chris-wilson.co.uk
Reviewed-bhy: Joonas Lahtinen <joonas.lahtinen@linux.intel.com>
(cherry picked from commit 20bb377106)
Signed-off-by: Jani Nikula <jani.nikula@intel.com>
This commit is contained in:
Chris Wilson 2017-05-21 13:40:14 +01:00 коммит произвёл Jani Nikula
Родитель d90c98905a
Коммит 5857dbfabc
1 изменённых файлов: 1 добавлений и 1 удалений

Просмотреть файл

@ -278,7 +278,7 @@ i915_gem_object_set_tiling(struct drm_i915_gem_object *obj,
obj->mm.quirked = false; obj->mm.quirked = false;
} }
if (!i915_gem_object_is_tiled(obj)) { if (!i915_gem_object_is_tiled(obj)) {
GEM_BUG_ON(!obj->mm.quirked); GEM_BUG_ON(obj->mm.quirked);
__i915_gem_object_pin_pages(obj); __i915_gem_object_pin_pages(obj);
obj->mm.quirked = true; obj->mm.quirked = true;
} }