git.samba.org
/
sfrench
/
cifs-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge v6.5-rc1 into drm-misc-fixes
[sfrench/cifs-2.6.git]
/
drivers
/
gpu
/
drm
/
scheduler
/
sched_main.c
diff --git
a/drivers/gpu/drm/scheduler/sched_main.c
b/drivers/gpu/drm/scheduler/sched_main.c
index 7b2bfc10c1a54c497020451841a5ffafef512399..506371c427451a07f8b57662f33a5115b09bc062 100644
(file)
--- a/
drivers/gpu/drm/scheduler/sched_main.c
+++ b/
drivers/gpu/drm/scheduler/sched_main.c
@@
-1043,10
+1043,9
@@
static int drm_sched_main(void *param)
trace_drm_run_job(sched_job, entity);
fence = sched->ops->run_job(sched_job);
complete_all(&entity->entity_idle);
trace_drm_run_job(sched_job, entity);
fence = sched->ops->run_job(sched_job);
complete_all(&entity->entity_idle);
- drm_sched_fence_scheduled(s_fence);
+ drm_sched_fence_scheduled(s_fence
, fence
);
if (!IS_ERR_OR_NULL(fence)) {
if (!IS_ERR_OR_NULL(fence)) {
- drm_sched_fence_set_parent(s_fence, fence);
/* Drop for original kref_init of the fence */
dma_fence_put(fence);
/* Drop for original kref_init of the fence */
dma_fence_put(fence);