The drm/scheduler provides additional prioritization on top of that provided by however many number of ringbuffers (each with their own priority level) is supported on a given generation. Expose the additional levels of priority to userspace and map the userspace priority back to ring (first level of priority) and schedular priority (additional priority levels within the ring).
Showing the changes to include/uapi (1 of 5 files). Show all
Unified · Split
| @@ -73,11 +73,19 @@ struct drm_msm_timespec { · 72 unmodified lines | |||
| 73 | #define MSM_PARAM_MAX_FREQ 0x04 | 73 | #define MSM_PARAM_MAX_FREQ 0x04 |
| 74 | #define MSM_PARAM_TIMESTAMP 0x05 | 74 | #define MSM_PARAM_TIMESTAMP 0x05 |
| 75 | #define MSM_PARAM_GMEM_BASE 0x06 | 75 | #define MSM_PARAM_GMEM_BASE 0x06 |
| 76 | #define MSM_PARAM_NR_RINGS 0x07 | 76 | #define MSM_PARAM_PRIORITIES 0x07 /* The # of priority levels */ |
| 77 | #define MSM_PARAM_PP_PGTABLE 0x08 /* => 1 for per-process pagetables, else 0 */ | 77 | #define MSM_PARAM_PP_PGTABLE 0x08 /* => 1 for per-process pagetables, else 0 */ |
| 78 | #define MSM_PARAM_FAULTS 0x09 | 78 | #define MSM_PARAM_FAULTS 0x09 |
| 79 | #define MSM_PARAM_SUSPENDS 0x0a | 79 | #define MSM_PARAM_SUSPENDS 0x0a |
| 80 | 80 | ||
| 81 | /* For backwards compat. The original support for preemption was based on | ||
| 82 | * a single ring per priority level so # of priority levels equals the # | ||
| 83 | * of rings. With drm/scheduler providing additional levels of priority, | ||
| 84 | * the number of priorities is greater than the # of rings. The param is | ||
| 85 | * renamed to better reflect this. | ||
| 86 | */ | ||
| 87 | #define MSM_PARAM_NR_RINGS MSM_PARAM_PRIORITIES | ||
| 88 | |||
| 81 | struct drm_msm_param { | 89 | struct drm_msm_param { |
| 82 | __u32 pipe; /* in, MSM_PIPE_x */ | 90 | __u32 pipe; /* in, MSM_PIPE_x */ |
| 83 | __u32 param; /* in, MSM_PARAM_x */ | 91 | __u32 param; /* in, MSM_PARAM_x */ |
| @@ -304,6 +312,10 @@ struct drm_msm_gem_madvise { · 220 unmodified lines | |||
| 304 | 312 | ||
| 305 | #define MSM_SUBMITQUEUE_FLAGS (0) | 313 | #define MSM_SUBMITQUEUE_FLAGS (0) |
| 306 | 314 | ||
| 315 | /* | ||
| 316 | * The submitqueue priority should be between 0 and MSM_PARAM_PRIORITIES-1, | ||
| 317 | * a lower numeric value is higher priority. | ||
| 318 | */ | ||
| 307 | struct drm_msm_submitqueue { | 319 | struct drm_msm_submitqueue { |
| 308 | __u32 flags; /* in, MSM_SUBMITQUEUE_x */ | 320 | __u32 flags; /* in, MSM_SUBMITQUEUE_x */ |
| 309 | __u32 prio; /* in, Priority level */ | 321 | __u32 prio; /* in, Priority level */ |