diff options
| author |   Dave Airlie <airlied@redhat.com> | 2018-06-15 11:32:23 +1000 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2018-06-15 11:32:29 +1000 |
| commit | daf0678c2036c918f01e4aa6035629d2debc2f30 (patch) | |
| tree | 8a6ddd16c351bdf69487e5ca396333447796da8c /drivers/gpu/drm/scheduler/gpu_scheduler.c | |
| parent | Merge tag 'drm-intel-next-fixes-2018-06-08-2' of git://anongit.freedesktop.org/drm/drm-intel into drm-next (diff) | |
| parent | drm/amd/powerplay: Set higher SCLK&MCLK frequency than dpm7 in OD (v2) (diff) | |
| download | wireguard-linux-daf0678c2036c918f01e4aa6035629d2debc2f30.tar.xz wireguard-linux-daf0678c2036c918f01e4aa6035629d2debc2f30.zip | |
Merge branch 'drm-next-4.18' of git://people.freedesktop.org/~agd5f/linux into drm-next
Fixes for 4.18. Highlights:
- Fixes for gfxoff on Raven
- Remove an ATPX quirk now that the root cause is fixed
- Runtime PM fixes
- Vega20 register header update
- Wattman fixes
- Misc bug fixes
Signed-off-by: Dave Airlie <airlied@redhat.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20180614141428.2909-1-alexander.deucher@amd.com
Diffstat (limited to 'drivers/gpu/drm/scheduler/gpu_scheduler.c')
| -rw-r--r-- | drivers/gpu/drm/scheduler/gpu_scheduler.c | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/drivers/gpu/drm/scheduler/gpu_scheduler.c b/drivers/gpu/drm/scheduler/gpu_scheduler.c index df1578d6f42e..44d480768dfe 100644 --- a/drivers/gpu/drm/scheduler/gpu_scheduler.c +++ b/drivers/gpu/drm/scheduler/gpu_scheduler.c @@ -349,8 +349,13 @@ static bool drm_sched_entity_add_dependency_cb(struct drm_sched_entity *entity) struct dma_fence * fence = entity->dependency; struct drm_sched_fence *s_fence; - if (fence->context == entity->fence_context) { - /* We can ignore fences from ourself */ + if (fence->context == entity->fence_context || + fence->context == entity->fence_context + 1) { + /* + * Fence is a scheduled/finished fence from a job + * which belongs to the same entity, we can ignore + * fences from ourself + */ dma_fence_put(entity->dependency); return false; } |