diff options
| author | Dave Airlie <airlied@redhat.com> | 2023-07-14 10:37:18 +1000 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2023-07-14 10:38:47 +1000 |
| commit | b7a57386b851aa28547c0d389644ec77d59cbc23 (patch) | |
| tree | bc9f2e8d9b422f7d5091aba345d38c956ef4e363 /include/linux | |
| parent | 06c2afb862f9da8dc5efa4b6076a0e48c3fbaaa5 (diff) | |
| parent | 835a65f51790e1f72b1ab106ec89db9ac15b47d6 (diff) | |
Merge tag 'drm-misc-fixes-2023-07-13' of ssh://git.freedesktop.org/git/drm/drm-misc into drm-fixes
A couple of nouveau patches addressing improving HDMI support and
firmware handling, a fix for TTM to skip pinned BO when evicting, and a
fix for the fbdev documentation.
Signed-off-by: Dave Airlie <airlied@redhat.com>
From: Maxime Ripard <mripard@redhat.com>
Link: https://patchwork.freedesktop.org/patch/msgid/nq3ke75juephbex5acfyi5t6bxv22nhmfcpfhru55haj2nv3us@gehrlmjbqgjk
Diffstat (limited to 'include/linux')
| -rw-r--r-- | include/linux/dma-fence.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/linux/dma-fence.h b/include/linux/dma-fence.h index d54b595a0fe0..0d678e9a7b24 100644 --- a/include/linux/dma-fence.h +++ b/include/linux/dma-fence.h @@ -606,7 +606,7 @@ static inline signed long dma_fence_wait(struct dma_fence *fence, bool intr) void dma_fence_set_deadline(struct dma_fence *fence, ktime_t deadline); struct dma_fence *dma_fence_get_stub(void); -struct dma_fence *dma_fence_allocate_private_stub(void); +struct dma_fence *dma_fence_allocate_private_stub(ktime_t timestamp); u64 dma_fence_context_alloc(unsigned num); extern const struct dma_fence_ops dma_fence_array_ops; |