drm/i915: Fix logical inversion for gen4 quirking
authorChris Wilson <chris@chris-wilson.co.uk>
Sun, 21 May 2017 12:40:14 +0000 (13:40 +0100)
committerJani Nikula <jani.nikula@intel.com>
Wed, 7 Jun 2017 13:31:34 +0000 (16:31 +0300)
commit5857dbfabc15ae9e17fd5a355c4920b46295ff1f
tree5f8907b3131a7f0b4fa8bfccbfdb49c377e68609
parentd90c98905afd00c15d5d255d845b646a37173ce9
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: 2c3a3f44dc13 ("drm/i915: Fix pages pin counting around swizzle quirk")
Fixes: 957870f93412 ("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 20bb377106af69d16269b1837e9a945b9f508a2e)
Signed-off-by: Jani Nikula <jani.nikula@intel.com>
drivers/gpu/drm/i915/i915_gem_tiling.c