Skip to content

Commit 4b7320b

Browse files
Tvrtko UrsulinPhilipp Stanner
authored andcommitted
drm/sched: Move drm_sched_entity_is_ready to internal header
Helper is for scheduler internal use so lets hide it from DRM drivers completely. At the same time we change the method of checking whethere there is anything in the queue from peeking to looking at the node count. Signed-off-by: Tvrtko Ursulin <[email protected]> Cc: Christian König <[email protected]> Cc: Danilo Krummrich <[email protected]> Cc: Matthew Brost <[email protected]> Cc: Philipp Stanner <[email protected]> Signed-off-by: Philipp Stanner <[email protected]> Link: https://patchwork.freedesktop.org/patch/msgid/[email protected]
1 parent b76f146 commit 4b7320b

File tree

3 files changed

+13
-13
lines changed

3 files changed

+13
-13
lines changed

drivers/gpu/drm/scheduler/sched_entity.c

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -151,18 +151,6 @@ static bool drm_sched_entity_is_idle(struct drm_sched_entity *entity)
151151
return false;
152152
}
153153

154-
/* Return true if entity could provide a job. */
155-
bool drm_sched_entity_is_ready(struct drm_sched_entity *entity)
156-
{
157-
if (spsc_queue_peek(&entity->job_queue) == NULL)
158-
return false;
159-
160-
if (READ_ONCE(entity->dependency))
161-
return false;
162-
163-
return true;
164-
}
165-
166154
/**
167155
* drm_sched_entity_error - return error of last scheduled job
168156
* @entity: scheduler entity to check

drivers/gpu/drm/scheduler/sched_internal.h

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -45,4 +45,17 @@ drm_sched_entity_queue_peek(struct drm_sched_entity *entity)
4545
return container_of(node, struct drm_sched_job, queue_node);
4646
}
4747

48+
/* Return true if entity could provide a job. */
49+
static inline bool
50+
drm_sched_entity_is_ready(struct drm_sched_entity *entity)
51+
{
52+
if (!spsc_queue_count(&entity->job_queue))
53+
return false;
54+
55+
if (READ_ONCE(entity->dependency))
56+
return false;
57+
58+
return true;
59+
}
60+
4861
#endif

include/drm/gpu_scheduler.h

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -632,7 +632,6 @@ struct drm_sched_job *drm_sched_entity_pop_job(struct drm_sched_entity *entity);
632632
void drm_sched_entity_push_job(struct drm_sched_job *sched_job);
633633
void drm_sched_entity_set_priority(struct drm_sched_entity *entity,
634634
enum drm_sched_priority priority);
635-
bool drm_sched_entity_is_ready(struct drm_sched_entity *entity);
636635
int drm_sched_entity_error(struct drm_sched_entity *entity);
637636

638637
struct drm_sched_fence *drm_sched_fence_alloc(

0 commit comments

Comments
 (0)