diff options
| author | Daniel Vetter <daniel.vetter@ffwll.ch> | 2023-01-24 17:36:29 +0100 |
|---|---|---|
| committer | Daniel Vetter <daniel.vetter@ffwll.ch> | 2023-01-24 17:36:29 +0100 |
| commit | b8f55f24bc82ed7064645cc7f6675430609314a5 (patch) | |
| tree | d1c17e0362d982e2e8c22fe9bde76179c4ebc641 /include/drm/ttm/ttm_bo.h | |
| parent | 045e8d102f44ad75dca0b0ec9eede15ea89da673 (diff) | |
| parent | bd43a9844bc6f78e00fdc91db47f6969d10c5ac5 (diff) | |
| download | linux-b8f55f24bc82ed7064645cc7f6675430609314a5.tar.gz | |
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 'include/drm/ttm/ttm_bo.h')
| -rw-r--r-- | include/drm/ttm/ttm_bo.h | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/include/drm/ttm/ttm_bo.h b/include/drm/ttm/ttm_bo.h index d87232472435..8b113c384236 100644 --- a/include/drm/ttm/ttm_bo.h +++ b/include/drm/ttm/ttm_bo.h @@ -347,7 +347,6 @@ static inline void *ttm_kmap_obj_virtual(struct ttm_bo_kmap_obj *map, return map->virtual; } -int ttm_bo_wait(struct ttm_buffer_object *bo, bool interruptible, bool no_wait); int ttm_bo_wait_ctx(struct ttm_buffer_object *bo, struct ttm_operation_ctx *ctx); int ttm_bo_validate(struct ttm_buffer_object *bo, |