drm/i915: consider HAS_FLAT_CCS() in needs_ccs_pages
authorMatthew Auld <matthew.auld@intel.com>
Mon, 5 Sep 2022 10:53:29 +0000 (11:53 +0100)
committerRodrigo Vivi <rodrigo.vivi@intel.com>
Tue, 6 Sep 2022 18:51:49 +0000 (14:51 -0400)
commit151e0e0fdb4d6365305598af3b9072d44e896ef0
tree4f9e51fd698450f9341a9439e6b1fa3ac1c55e0f
parent672d6ca758651f0ec12cd0d59787067a5bde1c96
drm/i915: consider HAS_FLAT_CCS() in needs_ccs_pages

Just move the HAS_FLAT_CCS() check into needs_ccs_pages. This also then
fixes i915_ttm_memcpy_allowed() which was incorrectly reporting true on
DG1, even though it doesn't have small-BAR or flat-CCS.

References: https://gitlab.freedesktop.org/drm/intel/-/issues/6605
Fixes: efeb3caf4341 ("drm/i915/ttm: disallow CPU fallback mode for ccs pages")
Signed-off-by: Matthew Auld <matthew.auld@intel.com>
Cc: Nirmoy Das <nirmoy.das@intel.com>
Reviewed-by: Nirmoy Das <nirmoy.das@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20220905105329.41455-1-matthew.auld@intel.com
(cherry picked from commit 873fef8833ea794526b7f4179088e565078fe0e8)
Signed-off-by: Rodrigo Vivi <rodrigo.vivi@intel.com>
drivers/gpu/drm/i915/gem/i915_gem_object.c
drivers/gpu/drm/i915/gem/i915_gem_ttm.c