Skip to contentSkip to conversation

Splitting intel-gtt calls for non-x86 platforms

PATCH Superseded Casey Bowman 3 participants 5 messages Mar 29, 2022 – Mar 30, 2022

Subsystems (2)

v2 of 5 Superseded Latest is v5 →

lore
Share & tools
lore
#0 lore raw

v2 cover Splitting intel-gtt calls for non-x86 platforms

The intel-gtt module defines some functions used by i915, but they are only supported by x86 platforms. In order to bring i915 to a more arch-neutral state, we split out these functions and provide stubs in the case of non-x86 builds.

There may be a better filename choice for the files used in splitting the calls, it's very much open to discussion.

v2: Refactored to move gmch functions, renamed exported functions

Casey Bowman (2):
drm/i915/gt: Split intel-gtt functions by arch
drm/i915: Require INTEL_GTT to depend on X86

 drivers/gpu/drm/i915/Kconfig            |   2 +-
 drivers/gpu/drm/i915/Makefile           |   2 +
 drivers/gpu/drm/i915/gt/intel_ggtt.c    | 663 +-----------------------
 drivers/gpu/drm/i915/gt/intel_gt.c      |   4 +-
 drivers/gpu/drm/i915/gt/intel_gt.h      |   9 +
 drivers/gpu/drm/i915/gt/intel_gt_gmch.c | 653 +++++++++++++++++++++++
 drivers/gpu/drm/i915/gt/intel_gt_gmch.h |  46 ++
 drivers/gpu/drm/i915/gt/intel_gtt.h     |   9 +
 8 files changed, 736 insertions(+), 652 deletions(-)
 create mode 100644 drivers/gpu/drm/i915/gt/intel_gt_gmch.c
 create mode 100644 drivers/gpu/drm/i915/gt/intel_gt_gmch.h
Signature · 1 line
2.25.1
#1 lore raw

PATCH v2 1/2 drm/i915/gt: Split intel-gtt functions by arch

Some functions defined in the intel-gtt module are used in several areas, but is only supported on x86 platforms.

By separating these calls and their static underlying functions to another area, we are able to compile out these functions for non-x86 builds and provide stubs for the non-x86 implementations.

In addition to the problematic calls, we are moving the gmch-related functions to the new area.

---
 drivers/gpu/drm/i915/Makefile           |   2 +
 drivers/gpu/drm/i915/gt/intel_ggtt.c    | 663 +-----------------------
 drivers/gpu/drm/i915/gt/intel_gt.c      |   4 +-
 drivers/gpu/drm/i915/gt/intel_gt.h      |   9 +
 drivers/gpu/drm/i915/gt/intel_gt_gmch.c | 653 +++++++++++++++++++++++
 drivers/gpu/drm/i915/gt/intel_gt_gmch.h |  46 ++
 drivers/gpu/drm/i915/gt/intel_gtt.h     |   9 +
 7 files changed, 735 insertions(+), 651 deletions(-)
 create mode 100644 drivers/gpu/drm/i915/gt/intel_gt_gmch.c
 create mode 100644 drivers/gpu/drm/i915/gt/intel_gt_gmch.h
drivers/gpu/drm/i915/Makefile +2 -0
index c837a29ffac8..b7bdaec99118 100644
@@ -126,6 +126,8 @@ gt-y += \
 	gt/intel_workarounds.o \
 	gt/shmem_utils.o \
 	gt/sysfs_engines.o
+# x86 intel-gtt module support
+gt-$(CONFIG_X86) += gt/intel_gt_gmch.o
 # autogenerated null render state
 gt-y += \
 	gt/gen6_renderstate.o \
drivers/gpu/drm/i915/gt/intel_ggtt.c +14 -649

746 lines not on this page · raw message

drivers/gpu/drm/i915/gt/intel_gt.c +2 -2
index 5001a6168d56..f0014c5072c9 100644
@@ -4,7 +4,6 @@
  */
 
 #include <drm/drm_managed.h>
-#include <drm/intel-gtt.h>
 
 #include "gem/i915_gem_internal.h"
 #include "gem/i915_gem_lmem.h"
@@ -17,6 +16,7 @@
 #include "intel_gt_buffer_pool.h"
 #include "intel_gt_clock_utils.h"
 #include "intel_gt_debugfs.h"
+#include "intel_gt_gmch.h"
 #include "intel_gt_pm.h"
 #include "intel_gt_regs.h"
 #include "intel_gt_requests.h"
@@ -451,7 +451,7 @@ void intel_gt_chipset_flush(struct intel_gt *gt)
 {
 	wmb();
 	if (GRAPHICS_VER(gt->i915) < 6)
-		intel_gtt_chipset_flush();
+		intel_gt_gmch_gen5_chipset_flush(gt);
 }
 
 void intel_gt_driver_register(struct intel_gt *gt)
drivers/gpu/drm/i915/gt/intel_gt.h +9 -0
index e76168e10a21..8956dfc5afe0 100644
@@ -13,6 +13,13 @@
 struct drm_i915_private;
 struct drm_printer;
 
+struct insert_entries {
+	struct i915_address_space *vm;
+	struct i915_vma_resource *vma_res;
+	enum i915_cache_level level;
+	u32 flags;
+};
+
 #define GT_TRACE(gt, fmt, ...) do {					\
 	const struct intel_gt *gt__ __maybe_unused = (gt);		\
 	GEM_TRACE("%s " fmt, dev_name(gt__->i915->drm.dev),		\
@@ -113,4 +120,6 @@ void intel_gt_watchdog_work(struct work_struct *work);
 
 void intel_gt_invalidate_tlbs(struct intel_gt *gt);
 
+struct resource pci_resource(struct pci_dev *pdev, int bar);
+
 #endif /* __INTEL_GT_H__ */
drivers/gpu/drm/i915/gt/intel_gt_gmch.c new file +653 -0

653 lines not on this page · raw message

drivers/gpu/drm/i915/gt/intel_gt_gmch.h new file +46 -0

46 lines not on this page · raw message

drivers/gpu/drm/i915/gt/intel_gtt.h +9 -0
index 4529b5e9f6e6..b4b9cc5a8ff6 100644
@@ -547,6 +547,14 @@ i915_page_dir_dma_addr(const struct i915_ppgtt *ppgtt, const unsigned int n)
 void ppgtt_init(struct i915_ppgtt *ppgtt, struct intel_gt *gt,
 		unsigned long lmem_pt_obj_flags);
 
+void intel_ggtt_bind_vma(struct i915_address_space *vm,
+			  struct i915_vm_pt_stash *stash,
+			  struct i915_vma_resource *vma_res,
+			  enum i915_cache_level cache_level,
+			  u32 flags);
+void intel_ggtt_unbind_vma(struct i915_address_space *vm,
+			    struct i915_vma_resource *vma_res);
+
 int i915_ggtt_probe_hw(struct drm_i915_private *i915);
 int i915_ggtt_init_hw(struct drm_i915_private *i915);
 int i915_ggtt_enable_hw(struct drm_i915_private *i915);
@@ -617,6 +625,7 @@ release_pd_entry(struct i915_page_directory * const pd,
 		 struct i915_page_table * const pt,
 		 const struct drm_i915_gem_object * const scratch);
 void gen6_ggtt_invalidate(struct i915_ggtt *ggtt);
+void gen8_ggtt_invalidate(struct i915_ggtt *ggtt);
 
 void ppgtt_bind_vma(struct i915_address_space *vm,
 		    struct i915_vm_pt_stash *stash,
Signature · 1 line
2.25.1
#2 lore raw

Re: [Intel-gfx] [PATCH v2 1/2] drm/i915/gt: Split intel-gtt functions by arch

drivers/gpu/drm/i915/gt/intel_ggtt.c static int ggtt_probe_hw(struct i915_ggtt *ggtt, struct intel_gt *gt) · line 579

Quoted 6 lines · Casey Bowman
drivers/gpu/drm/i915/gt/intel_ggtt.c +1 -1
@@ -1208,11 +576,11 @@ static int ggtt_probe_hw(struct i915_ggtt *ggtt, struct intel_gt *gt)
 	dma_resv_init(&ggtt->vm._resv);
 
 	if (GRAPHICS_VER(i915) <= 5)
-		ret = i915_gmch_probe(ggtt);
+		ret = intel_gt_gmch_gen5_probe(ggtt);

s/gen5/gen2/ to conform to the standard "name things based on the oldest thing" doctrine.

Also s/intel_gt_gmch/intel_ggtt/ for all of these might be a good idea to actually convey what they do.

Quoted 9 lines
drivers/gpu/drm/i915/gt/intel_ggtt.c +2 -2
 	else if (GRAPHICS_VER(i915) < 8)
-		ret = gen6_gmch_probe(ggtt);
+		ret = intel_gt_gmch_gen6_probe(ggtt);
 	else
-		ret = gen8_gmch_probe(ggtt);
+		ret = intel_gt_gmch_gen8_probe(ggtt);
 	if (ret) {
 		dma_resv_fini(&ggtt->vm._resv);
 		return ret;

<snip>

Quoted 8 lines
drivers/gpu/drm/i915/gt/intel_gt_gmch.c new file +8 -0
+/*
+ * Certain Gen5 chipsets require idling the GPU before
+ * unmapping anything from the GTT when VT-d is enabled.
+ */
+static bool needs_idle_maps(struct drm_i915_private *i915)
+{
+	/*
+	 * Query intel_iommu to see if we need the workaround. Presumably that

drivers/gpu/drm/i915/gt/intel_gt_gmch.c line 394

Quoted 10 lines
drivers/gpu/drm/i915/gt/intel_gt_gmch.c new file +10 -0
+	 * was loaded first.
+	 */
+	if (!intel_vtd_active(i915))
+		return false;
+
+	if (GRAPHICS_VER(i915) == 5 && IS_MOBILE(i915))
+		return true;
+
+	if (GRAPHICS_VER(i915) == 12)
+		return true; /* XXX DMAR fault reason 7 */

This gen12 part is still dead code. Should just nuke it most likely, but someone should actually figure out where it came from, what it was supposed to fix, and did it ever actually work.

Signature · 2 lines
Ville Syrjälä
Intel
#3 lore raw

PATCH v2 2/2 drm/i915: Require INTEL_GTT to depend on X86

In reply to Casey Bowman

The intel-gtt module is not used on other, non-x86 platforms, so we will restrict it to x86 platforms only.

---
 drivers/gpu/drm/i915/Kconfig | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/gpu/drm/i915/Kconfig +1 -1
index 63db8bcf03bf..b381e14863a6 100644
@@ -4,7 +4,7 @@ config DRM_I915
 	depends on DRM
 	depends on X86 && PCI
 	depends on !PREEMPT_RT
-	select INTEL_GTT
+	select INTEL_GTT if X86
 	select INTERVAL_TREE
 	# we need shmfs for the swappable backing store, and in particular
 	# the shmem_readpage() which depends upon tmpfs
Signature · 1 line
2.25.1
#4 lore raw

[Intel-gfx] ✗ Fi.CI.BUILD: failure for Splitting intel-gtt calls for non-x86 platforms (rev2)

In reply to Casey Bowman
== Series Details ==

== Series Details ==

Series: Splitting intel-gtt calls for non-x86 platforms (rev2)
URL : https://patchwork.freedesktop.org/series/101552/
State : failure

== Summary ==

CALL scripts/checksyscalls.sh
CALL scripts/atomic/check-atomics.sh
DESCEND objtool
CHK include/generated/compile.h
CC [M] drivers/gpu/drm/i915/gt/intel_gt_gmch.o
drivers/gpu/drm/i915/gt/intel_gt_gmch.c: In function ‘gen6_get_total_gtt_size’:
drivers/gpu/drm/i915/gt/intel_gt_gmch.c:411:19: error: ‘SNB_GMCH_GGMS_SHIFT’ undeclared (first use in this function); did you mean ‘SHM_HUGE_SHIFT’?

  snb_gmch_ctl >>= SNB_GMCH_GGMS_SHIFT;
                   ^~~~~~~~~~~~~~~~~~~
                   SHM_HUGE_SHIFT
drivers/gpu/drm/i915/gt/intel_gt_gmch.c:411:19: note: each undeclared identifier is reported only once for each function it appears in
drivers/gpu/drm/i915/gt/intel_gt_gmch.c:412:18: error: ‘SNB_GMCH_GGMS_MASK’ undeclared (first use in this function); did you mean ‘SHM_HUGE_MASK’?
  snb_gmch_ctl &= SNB_GMCH_GGMS_MASK;
                  ^~~~~~~~~~~~~~~~~~
                  SHM_HUGE_MASK
drivers/gpu/drm/i915/gt/intel_gt_gmch.c: In function ‘gen8_get_total_gtt_size’:
drivers/gpu/drm/i915/gt/intel_gt_gmch.c:418:19: error: ‘BDW_GMCH_GGMS_SHIFT’ undeclared (first use in this function); did you mean ‘HSW_CAGF_SHIFT’?
  bdw_gmch_ctl >>= BDW_GMCH_GGMS_SHIFT;
                   ^~~~~~~~~~~~~~~~~~~
                   HSW_CAGF_SHIFT
drivers/gpu/drm/i915/gt/intel_gt_gmch.c:419:18: error: ‘BDW_GMCH_GGMS_MASK’ undeclared (first use in this function); did you mean ‘BITMAP_MEM_MASK’?
  bdw_gmch_ctl &= BDW_GMCH_GGMS_MASK;
                  ^~~~~~~~~~~~~~~~~~
                  BITMAP_MEM_MASK
drivers/gpu/drm/i915/gt/intel_gt_gmch.c: In function ‘intel_gt_gmch_gen6_probe’:
drivers/gpu/drm/i915/gt/intel_gt_gmch.c:547:29: error: ‘SNB_GMCH_CTRL’ undeclared (first use in this function); did you mean ‘VDBX_MOD_CTRL’?
  pci_read_config_word(pdev, SNB_GMCH_CTRL, &snb_gmch_ctl);
                             ^~~~~~~~~~~~~
                             VDBX_MOD_CTRL
drivers/gpu/drm/i915/gt/intel_gt_gmch.c: In function ‘chv_get_total_gtt_size’:
drivers/gpu/drm/i915/gt/intel_gt_gmch.c:583:16: error: ‘SNB_GMCH_GGMS_SHIFT’ undeclared (first use in this function); did you mean ‘SHM_HUGE_SHIFT’?
  gmch_ctrl >>= SNB_GMCH_GGMS_SHIFT;
                ^~~~~~~~~~~~~~~~~~~
                SHM_HUGE_SHIFT
drivers/gpu/drm/i915/gt/intel_gt_gmch.c:584:15: error: ‘SNB_GMCH_GGMS_MASK’ undeclared (first use in this function); did you mean ‘SHM_HUGE_MASK’?
  gmch_ctrl &= SNB_GMCH_GGMS_MASK;
               ^~~~~~~~~~~~~~~~~~
               SHM_HUGE_MASK
drivers/gpu/drm/i915/gt/intel_gt_gmch.c: In function ‘intel_gt_gmch_gen8_probe’:
drivers/gpu/drm/i915/gt/intel_gt_gmch.c:605:29: error: ‘SNB_GMCH_CTRL’ undeclared (first use in this function); did you mean ‘VDBX_MOD_CTRL’?
  pci_read_config_word(pdev, SNB_GMCH_CTRL, &snb_gmch_ctl);
                             ^~~~~~~~~~~~~
                             VDBX_MOD_CTRL

scripts/Makefile.build:288: recipe for target 'drivers/gpu/drm/i915/gt/intel_gt_gmch.o' failed make[4]: *** [drivers/gpu/drm/i915/gt/intel_gt_gmch.o] Error 1 scripts/Makefile.build:550: recipe for target 'drivers/gpu/drm/i915' failed make[3]: *** [drivers/gpu/drm/i915] Error 2
scripts/Makefile.build:550: recipe for target 'drivers/gpu/drm' failed
make[2]: *** [drivers/gpu/drm] Error 2
scripts/Makefile.build:550: recipe for target 'drivers/gpu' failed
make[1]: *** [drivers/gpu] Error 2
Makefile:1831: recipe for target 'drivers' failed
make: *** [drivers] Error 2