diff options
| author |   Dave Airlie <airlied@redhat.com> | 2022-10-21 09:56:07 +1000 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2022-10-21 09:56:14 +1000 |
| commit | cbc543c59e8e7c8bc8604d6ac3e18a029e3d5118 (patch) | |
| tree | 1acc5f6dc68d4ff19d34e4a030456335e92b00aa /drivers/gpu/drm/scheduler/sched_entity.c | |
| parent | Merge tag 'amd-drm-fixes-6.1-2022-10-20' of https://gitlab.freedesktop.org/agd5f/linux into drm-fixes (diff) | |
| parent | drm/panfrost: replace endian-specific types with native ones (diff) | |
| download | wireguard-linux-cbc543c59e8e7c8bc8604d6ac3e18a029e3d5118.tar.xz wireguard-linux-cbc543c59e8e7c8bc8604d6ac3e18a029e3d5118.zip | |
Merge tag 'drm-misc-fixes-2022-10-20' of git://anongit.freedesktop.org/drm/drm-misc into drm-fixes
drm-misc-fixes for v6.1-rc2:
- Fix a buffer overflow in format_helper_test.
- Set DDC pointer in drmm_connector_init.
- Compiler fixes for panfrost.
Signed-off-by: Dave Airlie <airlied@redhat.com>
From: Maarten Lankhorst <maarten.lankhorst@linux.intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/c4d05683-8ebe-93b8-d24c-d1d2c68f12c4@linux.intel.com
Diffstat (limited to 'drivers/gpu/drm/scheduler/sched_entity.c')
| -rw-r--r-- | drivers/gpu/drm/scheduler/sched_entity.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/gpu/drm/scheduler/sched_entity.c b/drivers/gpu/drm/scheduler/sched_entity.c index 6b25b2f4f5a3..6137537aaea4 100644 --- a/drivers/gpu/drm/scheduler/sched_entity.c +++ b/drivers/gpu/drm/scheduler/sched_entity.c @@ -385,7 +385,8 @@ static bool drm_sched_entity_add_dependency_cb(struct drm_sched_entity *entity) } s_fence = to_drm_sched_fence(fence); - if (s_fence && s_fence->sched == sched) { + if (s_fence && s_fence->sched == sched && + !test_bit(DRM_SCHED_FENCE_DONT_PIPELINE, &fence->flags)) { /* * Fence is from the same scheduler, only need to wait for |