diff options
| author | Dave Airlie <airlied@redhat.com> | 2021-04-10 05:27:11 +1000 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2021-04-10 05:46:35 +1000 |
| commit | c103b850721e4a79ff9578f131888129c37a4679 (patch) | |
| tree | 6a3da2fa8a7366d19f4f6df999e0188538fe289a /include/linux | |
| parent | 9c0fed84d5750e1eea6c664e073ffa2534a17743 (diff) | |
| parent | e8b8b0df8694e39ea6bbbdb9e2fcfa78a61e2e42 (diff) | |
Merge tag 'drm-misc-next-2021-04-09' of git://anongit.freedesktop.org/drm/drm-misc into drm-next
drm-misc-next for 5.13:
UAPI Changes:
Cross-subsystem Changes:
Core Changes:
- bridge: Fix Kconfig dependency
- cmdline: Refuse zero width/height mode
- ttm: Ignore signaled move fences, ioremap buffer according to mem
caching settins
Driver Changes:
- Conversions to sysfs_emit
- tegra: Don't register DP AUX channels before connectors
- zynqmp: Fix for an out-of-bound (but within struct padding) memset
Signed-off-by: Dave Airlie <airlied@redhat.com>
From: Maxime Ripard <maxime@cerno.tech>
Link: https://patchwork.freedesktop.org/patch/msgid/20210409090020.jroa2d4p4qansrpa@gilmour
Diffstat (limited to 'include/linux')
| -rw-r--r-- | include/linux/dma-fence.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/include/linux/dma-fence.h b/include/linux/dma-fence.h index 9f12efaaa93a..6ffb4b2c6371 100644 --- a/include/linux/dma-fence.h +++ b/include/linux/dma-fence.h @@ -587,6 +587,7 @@ static inline signed long dma_fence_wait(struct dma_fence *fence, bool intr) } struct dma_fence *dma_fence_get_stub(void); +struct dma_fence *dma_fence_allocate_private_stub(void); u64 dma_fence_context_alloc(unsigned num); #define DMA_FENCE_TRACE(f, fmt, args...) \ |