drm/i915: Split out i915_priolist_types into its own header

For more intel_engine_mask_t detangling. This time so that we can use
intel_engine_mask_t inside the scheduling structs.

Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
Link: https://patchwork.freedesktop.org/patch/msgid/20190401162641.10963-2-chris@chris-wilson.co.uk
Reviewed-by: Tvrtko Ursulin <tvrtko.ursulin@intel.com>

diff --git a/drivers/gpu/drm/i915/Makefile b/drivers/gpu/drm/i915/Makefile
index 1f3e8b145fc0a1227921a9dd96a618a3a15c34b1..30bf3301ea2405b3a3a8b81802e1aec4db605c5c 100644 (file)
--- a/drivers/gpu/drm/i915/Makefile
+++ b/drivers/gpu/drm/i915/Makefile
@@ -61,6 +61,7 @@ i915-$(CONFIG_PERF_EVENTS) += i915_pmu.o
 i915-$(CONFIG_DRM_I915_WERROR) += \
        test_i915_active_types_standalone.o \
        test_i915_gem_context_types_standalone.o \
+       test_i915_priolist_types_standalone.o \
        test_i915_scheduler_types_standalone.o \
        test_i915_timeline_types_standalone.o \
        test_intel_context_types_standalone.o \

diff --git a/drivers/gpu/drm/i915/i915_priolist_types.h b/drivers/gpu/drm/i915/i915_priolist_types.h
new file mode 100644 (file)
index 0000000..cc44ebd
--- /dev/null
+++ b/drivers/gpu/drm/i915/i915_priolist_types.h
@@ -0,0 +1,42 @@
+/*
+ * SPDX-License-Identifier: MIT
+ *
+ * Copyright © 2018 Intel Corporation
+ */
+
+#ifndef _I915_PRIOLIST_TYPES_H_
+#define _I915_PRIOLIST_TYPES_H_
+
+#include <linux/list.h>
+#include <linux/rbtree.h>
+
+#include <uapi/drm/i915_drm.h>
+
+enum {
+       I915_PRIORITY_MIN = I915_CONTEXT_MIN_USER_PRIORITY - 1,
+       I915_PRIORITY_NORMAL = I915_CONTEXT_DEFAULT_PRIORITY,
+       I915_PRIORITY_MAX = I915_CONTEXT_MAX_USER_PRIORITY + 1,
+
+       I915_PRIORITY_INVALID = INT_MIN
+};
+
+#define I915_USER_PRIORITY_SHIFT 3
+#define I915_USER_PRIORITY(x) ((x) << I915_USER_PRIORITY_SHIFT)
+
+#define I915_PRIORITY_COUNT BIT(I915_USER_PRIORITY_SHIFT)
+#define I915_PRIORITY_MASK (I915_PRIORITY_COUNT - 1)
+
+#define I915_PRIORITY_WAIT             ((u8)BIT(0))
+#define I915_PRIORITY_NEWCLIENT                ((u8)BIT(1))
+#define I915_PRIORITY_NOSEMAPHORE      ((u8)BIT(2))
+
+#define __NO_PREEMPTION (I915_PRIORITY_WAIT)
+
+struct i915_priolist {
+       struct list_head requests[I915_PRIORITY_COUNT];
+       struct rb_node node;
+       unsigned long used;
+       int priority;
+};
+
+#endif /* _I915_PRIOLIST_TYPES_H_ */

diff --git a/drivers/gpu/drm/i915/i915_scheduler_types.h b/drivers/gpu/drm/i915/i915_scheduler_types.h
index 5c94b3eb5c8131bf51bdb3d829d72a163fa31562..76a004a17b2e8d8c9e1cb2f766e751f3b3774d7b 100644 (file)
--- a/drivers/gpu/drm/i915/i915_scheduler_types.h
+++ b/drivers/gpu/drm/i915/i915_scheduler_types.h
@@ -8,34 +8,13 @@
 #define _I915_SCHEDULER_TYPES_H_
 
 #include <linux/list.h>
-#include <linux/rbtree.h>
 
-#include <uapi/drm/i915_drm.h>
+#include "i915_priolist_types.h"
 
 struct drm_i915_private;
 struct i915_request;
 struct intel_engine_cs;
 
-enum {
-       I915_PRIORITY_MIN = I915_CONTEXT_MIN_USER_PRIORITY - 1,
-       I915_PRIORITY_NORMAL = I915_CONTEXT_DEFAULT_PRIORITY,
-       I915_PRIORITY_MAX = I915_CONTEXT_MAX_USER_PRIORITY + 1,
-
-       I915_PRIORITY_INVALID = INT_MIN
-};
-
-#define I915_USER_PRIORITY_SHIFT 3
-#define I915_USER_PRIORITY(x) ((x) << I915_USER_PRIORITY_SHIFT)
-
-#define I915_PRIORITY_COUNT BIT(I915_USER_PRIORITY_SHIFT)
-#define I915_PRIORITY_MASK (I915_PRIORITY_COUNT - 1)
-
-#define I915_PRIORITY_WAIT             ((u8)BIT(0))
-#define I915_PRIORITY_NEWCLIENT                ((u8)BIT(1))
-#define I915_PRIORITY_NOSEMAPHORE      ((u8)BIT(2))
-
-#define __NO_PREEMPTION (I915_PRIORITY_WAIT)
-
 struct i915_sched_attr {
        /**
         * @priority: execution and service priority
@@ -88,11 +67,4 @@ struct i915_dependency {
 #define I915_DEPENDENCY_ALLOC BIT(0)
 };
 
-struct i915_priolist {
-       struct list_head requests[I915_PRIORITY_COUNT];
-       struct rb_node node;
-       unsigned long used;
-       int priority;
-};
-
 #endif /* _I915_SCHEDULER_TYPES_H_ */

diff --git a/drivers/gpu/drm/i915/intel_engine_types.h b/drivers/gpu/drm/i915/intel_engine_types.h
index 232e37c1f312974965885ae4f08c457003cf177c..14ad5263ea1e9b21cbe9cccf19f55401c7d8328d 100644 (file)
--- a/drivers/gpu/drm/i915/intel_engine_types.h
+++ b/drivers/gpu/drm/i915/intel_engine_types.h
@@ -14,7 +14,7 @@
 #include <linux/types.h>
 
 #include "i915_gem.h"
-#include "i915_scheduler_types.h"
+#include "i915_priolist_types.h"
 #include "i915_selftest.h"
 #include "i915_timeline_types.h"
 #include "intel_workarounds_types.h"

diff --git a/drivers/gpu/drm/i915/test_i915_priolist_types_standalone.c b/drivers/gpu/drm/i915/test_i915_priolist_types_standalone.c
new file mode 100644 (file)
index 0000000..f465eb9
--- /dev/null
+++ b/drivers/gpu/drm/i915/test_i915_priolist_types_standalone.c
@@ -0,0 +1,7 @@
+/*
+ * SPDX-License-Identifier: MIT
+ *
+ * Copyright © 2019 Intel Corporation
+ */
+
+#include "i915_priolist_types.h"