diff options
| author | Daniel Vetter <daniel.vetter@ffwll.ch> | 2023-01-24 19:36:29 +0300 |
|---|---|---|
| committer | Daniel Vetter <daniel.vetter@ffwll.ch> | 2023-01-24 19:36:29 +0300 |
| commit | b8f55f24bc82ed7064645cc7f6675430609314a5 (patch) | |
| tree | d1c17e0362d982e2e8c22fe9bde76179c4ebc641 /drivers/gpu/drm/vmwgfx | |
| parent | 045e8d102f44ad75dca0b0ec9eede15ea89da673 (diff) | |
| parent | bd43a9844bc6f78e00fdc91db47f6969d10c5ac5 (diff) | |
| download | linux-b8f55f24bc82ed7064645cc7f6675430609314a5.tar.xz | |
Merge tag 'drm-misc-next-2023-01-19' of git://anongit.freedesktop.org/drm/drm-misc into drm-next
drm-misc-next for $kernel-version:
UAPI Changes:
Cross-subsystem Changes:
Core Changes:
* Cleanup unneeded include statements wrt <linux/fb.h>, <drm/drm_fb_helper.h>
and <drm/drm_crtc_helper.h>
* Remove unused helper DRM_DEBUG_KMS_RATELIMITED()
* fbdev: Remove obsolete aperture field from struct fb_device, plus
driver cleanups; Remove unused flag FBINFO_MISC_FIRMWARE
* MIPI-DSI: Fix brightness, plus rsp. driver updates
* scheduler: Deprecate drm_sched_resubmit_jobs()
* ttm: Fix MIPS build; Remove ttm_bo_wait(); Documentation fixes
Driver Changes:
* Remove obsolete drivers for userspace modesetting i810, mga, r128,
savage, sis, tdfx, via
* bridge: Support CDNS DSI J721E, plus DT bindings; lt9611: Various
fixes and improvements; sil902x: Various fixes; Fixes
* nouveau: Removed support for legacy ioctls; Replace zero-size array;
Cleanups
* panel: Fixes
* radeon: Use new DRM logging helpers
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
From: Thomas Zimmermann <tzimmermann@suse.de>
Link: https://patchwork.freedesktop.org/patch/msgid/Y8kDk5YX7Yz3eRhM@linux-uq9g
Diffstat (limited to 'drivers/gpu/drm/vmwgfx')
| -rw-r--r-- | drivers/gpu/drm/vmwgfx/ttm_object.h | 11 |
1 files changed, 11 insertions, 0 deletions
diff --git a/drivers/gpu/drm/vmwgfx/ttm_object.h b/drivers/gpu/drm/vmwgfx/ttm_object.h index f0ebbe340ad6..95a9679f9d39 100644 --- a/drivers/gpu/drm/vmwgfx/ttm_object.h +++ b/drivers/gpu/drm/vmwgfx/ttm_object.h @@ -42,6 +42,8 @@ #include <linux/list.h> #include <linux/rcupdate.h> +#include <drm/ttm/ttm_bo.h> + /** * enum ttm_object_type * @@ -321,4 +323,13 @@ static inline void ttm_base_object_noref_release(void) __acquire(RCU); rcu_read_unlock(); } + +static inline int ttm_bo_wait(struct ttm_buffer_object *bo, bool intr, + bool no_wait) +{ + struct ttm_operation_ctx ctx = { intr, no_wait }; + + return ttm_bo_wait_ctx(bo, &ctx); +} + #endif |