[28/33] drm/i915: Store ggtt pointer in intel_gt
diff mbox series

Message ID 20190619132459.25351-29-tvrtko.ursulin@linux.intel.com
State New
Headers show
Series
  • Implicit dev_priv removal and GT compartmentalization
Related show

Commit Message

Tvrtko Ursulin June 19, 2019, 1:24 p.m. UTC
From: Tvrtko Ursulin <tvrtko.ursulin@intel.com>

This will become useful in the following patch.

v2:
 * Assign the pointer through a helper on the top level to work around
   the layering violation. (Chris)

v3:
 * Handle selftests.

Signed-off-by: Tvrtko Ursulin <tvrtko.ursulin@intel.com>
Reviewed-by: Rodrigo Vivi <rodrigo.vivi@intel.com> # v2
---
 drivers/gpu/drm/i915/gt/intel_gt.c               | 5 +++++
 drivers/gpu/drm/i915/gt/intel_gt.h               | 1 +
 drivers/gpu/drm/i915/gt/intel_gt_types.h         | 2 ++
 drivers/gpu/drm/i915/i915_drv.c                  | 2 ++
 drivers/gpu/drm/i915/selftests/i915_gem_gtt.c    | 1 +
 drivers/gpu/drm/i915/selftests/i915_vma.c        | 1 +
 drivers/gpu/drm/i915/selftests/mock_gem_device.c | 2 ++
 7 files changed, 14 insertions(+)

Comments

Chris Wilson June 19, 2019, 1:29 p.m. UTC | #1
Quoting Tvrtko Ursulin (2019-06-19 14:24:54)
> diff --git a/drivers/gpu/drm/i915/selftests/i915_gem_gtt.c b/drivers/gpu/drm/i915/selftests/i915_gem_gtt.c
> index d9531cb5f235..db20a259de67 100644
> --- a/drivers/gpu/drm/i915/selftests/i915_gem_gtt.c
> +++ b/drivers/gpu/drm/i915/selftests/i915_gem_gtt.c
> @@ -1690,6 +1690,7 @@ int i915_gem_gtt_mock_selftests(void)
>                 goto out_put;
>         }
>         mock_init_ggtt(i915, ggtt);
> +       intel_gt_init_hw(i915);

Push the call into mock_init_ggtt() ? Later regrets are a futureself
problem.
-Chris

Patch
diff mbox series

diff --git a/drivers/gpu/drm/i915/gt/intel_gt.c b/drivers/gpu/drm/i915/gt/intel_gt.c
index d25bcc4ae2c9..204e7039ca32 100644
--- a/drivers/gpu/drm/i915/gt/intel_gt.c
+++ b/drivers/gpu/drm/i915/gt/intel_gt.c
@@ -23,6 +23,11 @@  void intel_gt_init_early(struct intel_gt *gt, struct drm_i915_private *i915)
 	intel_gt_pm_init_early(gt);
 }
 
+void intel_gt_init_hw(struct drm_i915_private *i915)
+{
+	i915->gt.ggtt = &i915->ggtt;
+}
+
 static void rmw_set(struct intel_uncore *uncore, i915_reg_t reg, u32 set)
 {
 	intel_uncore_rmw(uncore, reg, 0, set);
diff --git a/drivers/gpu/drm/i915/gt/intel_gt.h b/drivers/gpu/drm/i915/gt/intel_gt.h
index ffdc3014486f..091ded4deead 100644
--- a/drivers/gpu/drm/i915/gt/intel_gt.h
+++ b/drivers/gpu/drm/i915/gt/intel_gt.h
@@ -13,6 +13,7 @@ 
 struct drm_i915_private;
 
 void intel_gt_init_early(struct intel_gt *gt, struct drm_i915_private *i915);
+void intel_gt_init_hw(struct drm_i915_private *i915);
 
 void intel_gt_check_and_clear_faults(struct intel_gt *gt);
 void intel_gt_clear_error_registers(struct intel_gt *gt,
diff --git a/drivers/gpu/drm/i915/gt/intel_gt_types.h b/drivers/gpu/drm/i915/gt/intel_gt_types.h
index d96df4f68741..233f73316a43 100644
--- a/drivers/gpu/drm/i915/gt/intel_gt_types.h
+++ b/drivers/gpu/drm/i915/gt/intel_gt_types.h
@@ -18,11 +18,13 @@ 
 #include "intel_wakeref.h"
 
 struct drm_i915_private;
+struct i915_ggtt;
 struct intel_uncore;
 
 struct intel_gt {
 	struct drm_i915_private *i915;
 	struct intel_uncore *uncore;
+	struct i915_ggtt *ggtt;
 
 	struct i915_gt_timelines {
 		struct mutex mutex; /* protects list, tainted by GPU */
diff --git a/drivers/gpu/drm/i915/i915_drv.c b/drivers/gpu/drm/i915/i915_drv.c
index c5dc6a672f7c..68d8a19caaf5 100644
--- a/drivers/gpu/drm/i915/i915_drv.c
+++ b/drivers/gpu/drm/i915/i915_drv.c
@@ -1593,6 +1593,8 @@  static int i915_driver_init_hw(struct drm_i915_private *dev_priv)
 	if (ret)
 		goto err_ggtt;
 
+	intel_gt_init_hw(dev_priv);
+
 	ret = i915_ggtt_enable_hw(dev_priv);
 	if (ret) {
 		DRM_ERROR("failed to enable GGTT\n");
diff --git a/drivers/gpu/drm/i915/selftests/i915_gem_gtt.c b/drivers/gpu/drm/i915/selftests/i915_gem_gtt.c
index d9531cb5f235..db20a259de67 100644
--- a/drivers/gpu/drm/i915/selftests/i915_gem_gtt.c
+++ b/drivers/gpu/drm/i915/selftests/i915_gem_gtt.c
@@ -1690,6 +1690,7 @@  int i915_gem_gtt_mock_selftests(void)
 		goto out_put;
 	}
 	mock_init_ggtt(i915, ggtt);
+	intel_gt_init_hw(i915);
 
 	mutex_lock(&i915->drm.struct_mutex);
 	err = i915_subtests(tests, ggtt);
diff --git a/drivers/gpu/drm/i915/selftests/i915_vma.c b/drivers/gpu/drm/i915/selftests/i915_vma.c
index fbc79b14823a..0cca54b1e43a 100644
--- a/drivers/gpu/drm/i915/selftests/i915_vma.c
+++ b/drivers/gpu/drm/i915/selftests/i915_vma.c
@@ -822,6 +822,7 @@  int i915_vma_mock_selftests(void)
 		goto out_put;
 	}
 	mock_init_ggtt(i915, ggtt);
+	intel_gt_init_hw(i915);
 
 	mutex_lock(&i915->drm.struct_mutex);
 	err = i915_subtests(tests, ggtt);
diff --git a/drivers/gpu/drm/i915/selftests/mock_gem_device.c b/drivers/gpu/drm/i915/selftests/mock_gem_device.c
index 021ba42a3a00..cd334a019fd9 100644
--- a/drivers/gpu/drm/i915/selftests/mock_gem_device.c
+++ b/drivers/gpu/drm/i915/selftests/mock_gem_device.c
@@ -205,6 +205,8 @@  struct drm_i915_private *mock_gem_device(void)
 
 	mock_init_ggtt(i915, &i915->ggtt);
 
+	intel_gt_init_hw(i915);
+
 	mkwrite_device_info(i915)->engine_mask = BIT(0);
 
 	i915->engine[RCS0] = mock_engine(i915, "mock", RCS0);