Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

drm/i915/xehpsdv: set min page-size to 64K

Conditionally allocate LMEM with 64K granularity, since 4K page support
for LMEM will be dropped on some platforms when using the PPGTT.

v2:
updated commit msg [Thomas]

Signed-off-by: Matthew Auld <matthew.auld@intel.com>
Signed-off-by: Stuart Summers <stuart.summers@intel.com>
Signed-off-by: Ramalingam C <ramalingam.c@intel.com>
Cc: Joonas Lahtinen <joonas.lahtinen@linux.intel.com>
Cc: Rodrigo Vivi <rodrigo.vivi@intel.com>
Reviewed-by: Lucas De Marchi <lucas.demarchi@intel.com>
Reviewed-by: Thomas Hellstrom <thomas.hellstrom@linux.intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20211208154854.28037-1-ramalingam.c@intel.com

authored by

Matthew Auld and committed by
Ramalingam C
ca921624 c83125bb

+9 -2
+5 -1
drivers/gpu/drm/i915/gem/i915_gem_stolen.c
··· 780 780 struct intel_uncore *uncore = &i915->uncore; 781 781 struct pci_dev *pdev = to_pci_dev(i915->drm.dev); 782 782 struct intel_memory_region *mem; 783 + resource_size_t min_page_size; 783 784 resource_size_t io_start; 784 785 resource_size_t lmem_size; 785 786 u64 lmem_base; ··· 792 791 lmem_size = pci_resource_len(pdev, 2) - lmem_base; 793 792 io_start = pci_resource_start(pdev, 2) + lmem_base; 794 793 794 + min_page_size = HAS_64K_PAGES(i915) ? I915_GTT_PAGE_SIZE_64K : 795 + I915_GTT_PAGE_SIZE_4K; 796 + 795 797 mem = intel_memory_region_create(i915, lmem_base, lmem_size, 796 - I915_GTT_PAGE_SIZE_4K, io_start, 798 + min_page_size, io_start, 797 799 type, instance, 798 800 &i915_region_stolen_lmem_ops); 799 801 if (IS_ERR(mem))
+4 -1
drivers/gpu/drm/i915/gt/intel_region_lmem.c
··· 197 197 struct intel_uncore *uncore = gt->uncore; 198 198 struct pci_dev *pdev = to_pci_dev(i915->drm.dev); 199 199 struct intel_memory_region *mem; 200 + resource_size_t min_page_size; 200 201 resource_size_t io_start; 201 202 resource_size_t lmem_size; 202 203 int err; ··· 212 211 if (GEM_WARN_ON(lmem_size > pci_resource_len(pdev, 2))) 213 212 return ERR_PTR(-ENODEV); 214 213 214 + min_page_size = HAS_64K_PAGES(i915) ? I915_GTT_PAGE_SIZE_64K : 215 + I915_GTT_PAGE_SIZE_4K; 215 216 mem = intel_memory_region_create(i915, 216 217 0, 217 218 lmem_size, 218 - I915_GTT_PAGE_SIZE_4K, 219 + min_page_size, 219 220 io_start, 220 221 INTEL_MEMORY_LOCAL, 221 222 0,