diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2017-07-21 17:16:42 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2017-07-21 17:16:42 -0400 |
commit | 24a1635a41bccb5cc426eaef8b88c7e0961ef6bb (patch) | |
tree | eefc2f6d4a2bacd056d119d9331447e227bf5652 /include/linux/dma-fence.h | |
parent | f79ec886f994918de057dd224fa2dfdc162bb3c3 (diff) | |
parent | 5896ec77d70d33dd38a455b0aa5f3154aeecea09 (diff) |
Merge tag 'drm-fixes-for-v4.13-rc2' of git://people.freedesktop.org/~airlied/linux
Pull drm fixes from Dave Airlie:
"A bunch of fixes for rc2: two imx regressions, vc4 fix, dma-buf fix,
some displayport mst fixes, and an amdkfd fix.
Nothing too crazy, I assume we just haven't see much rc1 testing yet"
* tag 'drm-fixes-for-v4.13-rc2' of git://people.freedesktop.org/~airlied/linux:
drm/mst: Avoid processing partially received up/down message transactions
drm/mst: Avoid dereferencing a NULL mstb in drm_dp_mst_handle_up_req()
drm/mst: Fix error handling during MST sideband message reception
drm/imx: parallel-display: Accept drm_of_find_panel_or_bridge failure
drm/imx: fix typo in ipu_plane_formats[]
drm/vc4: Fix VBLANK handling in crtc->enable() path
dma-buf/fence: Avoid use of uninitialised timestamp
drm/amdgpu: Remove unused field kgd2kfd_shared_resources.num_mec
drm/radeon: Remove initialization of shared_resources.num_mec
drm/amdkfd: Remove unused references to shared_resources.num_mec
drm/amdgpu: Fix KFD oversubscription by tracking queues correctly
Diffstat (limited to 'include/linux/dma-fence.h')
-rw-r--r-- | include/linux/dma-fence.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/include/linux/dma-fence.h b/include/linux/dma-fence.h index a5195a7d6f77..0a186c4f3981 100644 --- a/include/linux/dma-fence.h +++ b/include/linux/dma-fence.h | |||
@@ -55,6 +55,7 @@ struct dma_fence_cb; | |||
55 | * of the time. | 55 | * of the time. |
56 | * | 56 | * |
57 | * DMA_FENCE_FLAG_SIGNALED_BIT - fence is already signaled | 57 | * DMA_FENCE_FLAG_SIGNALED_BIT - fence is already signaled |
58 | * DMA_FENCE_FLAG_TIMESTAMP_BIT - timestamp recorded for fence signaling | ||
58 | * DMA_FENCE_FLAG_ENABLE_SIGNAL_BIT - enable_signaling might have been called | 59 | * DMA_FENCE_FLAG_ENABLE_SIGNAL_BIT - enable_signaling might have been called |
59 | * DMA_FENCE_FLAG_USER_BITS - start of the unused bits, can be used by the | 60 | * DMA_FENCE_FLAG_USER_BITS - start of the unused bits, can be used by the |
60 | * implementer of the fence for its own purposes. Can be used in different | 61 | * implementer of the fence for its own purposes. Can be used in different |
@@ -84,6 +85,7 @@ struct dma_fence { | |||
84 | 85 | ||
85 | enum dma_fence_flag_bits { | 86 | enum dma_fence_flag_bits { |
86 | DMA_FENCE_FLAG_SIGNALED_BIT, | 87 | DMA_FENCE_FLAG_SIGNALED_BIT, |
88 | DMA_FENCE_FLAG_TIMESTAMP_BIT, | ||
87 | DMA_FENCE_FLAG_ENABLE_SIGNAL_BIT, | 89 | DMA_FENCE_FLAG_ENABLE_SIGNAL_BIT, |
88 | DMA_FENCE_FLAG_USER_BITS, /* must always be last member */ | 90 | DMA_FENCE_FLAG_USER_BITS, /* must always be last member */ |
89 | }; | 91 | }; |