drm/i915: Move intel_gt initialization to a separate file

As it will grow in a following patch make a new home for it.

v2:
 * Convert mock_gem_device as well. (Chris)

v3:
 * Rename to intel_gt_init_early and move call site to i915_drv.c. (Chris)

v4:
 * Adjust SPDX tags.
 * No need to gt/ path when including intel_gt_types.h. (Chris)

Signed-off-by: Tvrtko Ursulin <tvrtko.ursulin@intel.com>
Reviewed-by: Rodrigo Vivi <rodrigo.vivi@intel.com>
Reviewed-by: Chris Wilson <chris@chris-wilson.co.uk>
Link: https://patchwork.freedesktop.org/patch/msgid/20190621070811.7006-3-tvrtko.ursulin@linux.intel.com

diff --git a/drivers/gpu/drm/i915/Makefile b/drivers/gpu/drm/i915/Makefile
index 91355c2ea8a509fb29e57859d4ed29d182dfd447..19f8b67457725f1fa467070e1733b5b596ddc20d 100644 (file)
--- a/drivers/gpu/drm/i915/Makefile
+++ b/drivers/gpu/drm/i915/Makefile
@@ -74,6 +74,7 @@ gt-y += \
        gt/intel_context.o \
        gt/intel_engine_cs.o \
        gt/intel_engine_pm.o \
+       gt/intel_gt.o \
        gt/intel_gt_pm.o \
        gt/intel_hangcheck.o \
        gt/intel_lrc.o \

diff --git a/drivers/gpu/drm/i915/gt/intel_gt.c b/drivers/gpu/drm/i915/gt/intel_gt.c
new file mode 100644 (file)
index 0000000..10adee1
--- /dev/null
+++ b/drivers/gpu/drm/i915/gt/intel_gt.c
@@ -0,0 +1,14 @@
+// SPDX-License-Identifier: MIT
+/*
+ * Copyright © 2019 Intel Corporation
+ */
+
+#include "intel_gt.h"
+
+void intel_gt_init_early(struct intel_gt *gt)
+{
+       INIT_LIST_HEAD(&gt->active_rings);
+       INIT_LIST_HEAD(&gt->closed_vma);
+
+       spin_lock_init(&gt->closed_lock);
+}

diff --git a/drivers/gpu/drm/i915/gt/intel_gt.h b/drivers/gpu/drm/i915/gt/intel_gt.h
new file mode 100644 (file)
index 0000000..63284ca
--- /dev/null
+++ b/drivers/gpu/drm/i915/gt/intel_gt.h
@@ -0,0 +1,13 @@
+/* SPDX-License-Identifier: MIT */
+/*
+ * Copyright © 2019 Intel Corporation
+ */
+
+#ifndef __INTEL_GT__
+#define __INTEL_GT__
+
+#include "intel_gt_types.h"
+
+void intel_gt_init_early(struct intel_gt *gt);
+
+#endif /* __INTEL_GT_H__ */

diff --git a/drivers/gpu/drm/i915/i915_drv.c b/drivers/gpu/drm/i915/i915_drv.c
index 8f84ed26e972106a0e276d4153499fd3ad2605c1..961f76d3efa4106e3848a8ec9baf51dc5b36b4b9 100644 (file)
--- a/drivers/gpu/drm/i915/i915_drv.c
+++ b/drivers/gpu/drm/i915/i915_drv.c
@@ -61,6 +61,7 @@
 
 #include "gem/i915_gem_context.h"
 #include "gem/i915_gem_ioctls.h"
+#include "gt/intel_gt.h"
 #include "gt/intel_gt_pm.h"
 #include "gt/intel_reset.h"
 #include "gt/intel_workarounds.h"
@@ -922,6 +923,8 @@ static int i915_driver_init_early(struct drm_i915_private *dev_priv)
        if (ret < 0)
                goto err_engines;
 
+       intel_gt_init_early(&dev_priv->gt);
+
        ret = i915_gem_init_early(dev_priv);
        if (ret < 0)
                goto err_workqueues;

diff --git a/drivers/gpu/drm/i915/i915_gem.c b/drivers/gpu/drm/i915/i915_gem.c
index 190ad54fb072dedf5b44cdd0fd18f0fbe006d8b0..fc8fd41dd32e71bedda11e5f5b463f54165521b0 100644 (file)
--- a/drivers/gpu/drm/i915/i915_gem.c
+++ b/drivers/gpu/drm/i915/i915_gem.c
@@ -1748,10 +1748,6 @@ int i915_gem_init_early(struct drm_i915_private *dev_priv)
 
        intel_gt_pm_init(dev_priv);
 
-       INIT_LIST_HEAD(&dev_priv->gt.active_rings);
-       INIT_LIST_HEAD(&dev_priv->gt.closed_vma);
-       spin_lock_init(&dev_priv->gt.closed_lock);
-
        i915_gem_init__mm(dev_priv);
        i915_gem_init__pm(dev_priv);
 

diff --git a/drivers/gpu/drm/i915/selftests/mock_gem_device.c b/drivers/gpu/drm/i915/selftests/mock_gem_device.c
index 64bc51400ae75bcdfff798d0f36117c2c83fc1d0..8dc9296892e623d7cf34654a86ef48af54d14b92 100644 (file)
--- a/drivers/gpu/drm/i915/selftests/mock_gem_device.c
+++ b/drivers/gpu/drm/i915/selftests/mock_gem_device.c
@@ -25,6 +25,7 @@
 #include <linux/pm_domain.h>
 #include <linux/pm_runtime.h>
 
+#include "gt/intel_gt.h"
 #include "gt/mock_engine.h"
 
 #include "mock_request.h"
@@ -179,6 +180,7 @@ struct drm_i915_private *mock_gem_device(void)
 
        mock_uncore_init(&i915->uncore);
        i915_gem_init__mm(i915);
+       intel_gt_init_early(&i915->gt);
        intel_gt_pm_init(i915);
        atomic_inc(&i915->gt.wakeref.count); /* disable; no hw support */
 
@@ -200,10 +202,6 @@ struct drm_i915_private *mock_gem_device(void)
 
        i915_timelines_init(i915);
 
-       INIT_LIST_HEAD(&i915->gt.active_rings);
-       INIT_LIST_HEAD(&i915->gt.closed_vma);
-       spin_lock_init(&i915->gt.closed_lock);
-
        mutex_lock(&i915->drm.struct_mutex);
 
        mock_init_ggtt(i915, &i915->ggtt);