This allows it to be used by other parts of the codebase without fear of a circular include dependency being introduced. Signed-off-by: Joshua Ashton <joshua@xxxxxxxxx> --- include/drm/drm_sched_priority.h | 41 ++++++++++++++++++++++++++++++++ include/drm/gpu_scheduler.h | 15 +----------- 2 files changed, 42 insertions(+), 14 deletions(-) create mode 100644 include/drm/drm_sched_priority.h diff --git a/include/drm/drm_sched_priority.h b/include/drm/drm_sched_priority.h new file mode 100644 index 000000000000..85a7bb011e27 --- /dev/null +++ b/include/drm/drm_sched_priority.h @@ -0,0 +1,41 @@ +/* + * Copyright 2015 Advanced Micro Devices, Inc. + * + * Permission is hereby granted, free of charge, to any person obtaining a + * copy of this software and associated documentation files (the "Software"), + * to deal in the Software without restriction, including without limitation + * the rights to use, copy, modify, merge, publish, distribute, sublicense, + * and/or sell copies of the Software, and to permit persons to whom the + * Software is furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in + * all copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL + * THE COPYRIGHT HOLDER(S) OR AUTHOR(S) BE LIABLE FOR ANY CLAIM, DAMAGES OR + * OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, + * ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR + * OTHER DEALINGS IN THE SOFTWARE. + * + */ + +#ifndef _DRM_SCHED_PRIORITY_H_ +#define _DRM_SCHED_PRIORITY_H_ + +/* These are often used as an (initial) index + * to an array, and as such should start at 0. + */ +enum drm_sched_priority { + DRM_SCHED_PRIORITY_MIN, + DRM_SCHED_PRIORITY_NORMAL, + DRM_SCHED_PRIORITY_HIGH, + DRM_SCHED_PRIORITY_VERY_HIGH, + DRM_SCHED_PRIORITY_KERNEL, + + DRM_SCHED_PRIORITY_COUNT, + DRM_SCHED_PRIORITY_UNSET = -2 +}; + +#endif diff --git a/include/drm/gpu_scheduler.h b/include/drm/gpu_scheduler.h index a62071660602..9228ff0d515e 100644 --- a/include/drm/gpu_scheduler.h +++ b/include/drm/gpu_scheduler.h @@ -29,6 +29,7 @@ #include <linux/completion.h> #include <linux/xarray.h> #include <linux/workqueue.h> +#include <drm/drm_sched_priority.h> #define MAX_WAIT_SCHED_ENTITY_Q_EMPTY msecs_to_jiffies(1000) @@ -48,20 +49,6 @@ struct drm_gem_object; struct drm_gpu_scheduler; struct drm_sched_rq; -/* These are often used as an (initial) index - * to an array, and as such should start at 0. - */ -enum drm_sched_priority { - DRM_SCHED_PRIORITY_MIN, - DRM_SCHED_PRIORITY_NORMAL, - DRM_SCHED_PRIORITY_HIGH, - DRM_SCHED_PRIORITY_VERY_HIGH, - DRM_SCHED_PRIORITY_KERNEL, - - DRM_SCHED_PRIORITY_COUNT, - DRM_SCHED_PRIORITY_UNSET = -2 -}; - /* Used to chose between FIFO and RR jobs scheduling */ extern int drm_sched_policy; -- 2.40.0