Commit 8b74594a authored by Chris Wilson's avatar Chris Wilson
Browse files

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: default avatarChris Wilson <chris@chris-wilson.co.uk>
Link: https://patchwork.freedesktop.org/patch/msgid/20190401162641.10963-2-chris@chris-wilson.co.uk


Reviewed-by: default avatarTvrtko Ursulin <tvrtko.ursulin@intel.com>
parent 3a891a62

drivers/gpu/drm/i915/Makefile

+1 −0
Original line number Diff line number Diff line
@@ -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 \

drivers/gpu/drm/i915/i915_priolist_types.h

0 → 100644
+42 −0
Original line number Diff line number Diff line 
/*

 * 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_ */

drivers/gpu/drm/i915/i915_scheduler_types.h

+1 −29
Original line number Diff line number Diff line
@@ -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_ */

drivers/gpu/drm/i915/intel_engine_types.h

+1 −1
Original line number Diff line number Diff line
@@ -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"

drivers/gpu/drm/i915/test_i915_priolist_types_standalone.c

0 → 100644
+7 −0
Original line number Diff line number Diff line 
/*

 * SPDX-License-Identifier: MIT

 *

 * Copyright © 2019 Intel Corporation

 */



#include "i915_priolist_types.h"