diff options
| author | Thomas Hellstrom <thomas-at-tungstengraphics-dot-com> | 2007-02-14 13:31:35 +0100 |
|---|---|---|
| committer | Thomas Hellstrom <thomas-at-tungstengraphics-dot-com> | 2007-02-14 13:31:35 +0100 |
| commit | 5c9a7b0f9499b94856916facd110059223d243dc (patch) | |
| tree | 6b0596648ae9210d0fb2013a960e81b5d3d04ba5 /linux-core/drmP.h | |
| parent | 04760563b88c8e94f3ae448710d1ab8b350c2e5f (diff) | |
Remove an intel-specific hack and replace it with a fence driver callback.
Diffstat (limited to 'linux-core/drmP.h')
| -rw-r--r-- | linux-core/drmP.h | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/linux-core/drmP.h b/linux-core/drmP.h index e070c073..e0afc508 100644 --- a/linux-core/drmP.h +++ b/linux-core/drmP.h @@ -793,10 +793,11 @@ typedef struct drm_fence_driver{ uint32_t flush_diff; uint32_t sequence_mask; int lazy_capable; - int (*emit) (struct drm_device *dev, uint32_t flags, + int (*has_irq) (struct drm_device *dev, uint32_t class, uint32_t flags); + int (*emit) (struct drm_device *dev, uint32_t class, uint32_t flags, uint32_t *breadcrumb, uint32_t *native_type); - void (*poke_flush) (struct drm_device *dev); + void (*poke_flush) (struct drm_device *dev, uint32_t class); } drm_fence_driver_t; #define _DRM_FENCE_TYPE_EXE 0x00 @@ -1464,7 +1465,8 @@ extern int drm_user_object_unref(drm_file_t *priv, uint32_t user_token, drm_obje * fence objects (drm_fence.c) */ -extern void drm_fence_handler(drm_device_t *dev, uint32_t breadcrumb, uint32_t type); +extern void drm_fence_handler(drm_device_t *dev, uint32_t class, + uint32_t sequence, uint32_t type); extern void drm_fence_manager_init(drm_device_t *dev); extern void drm_fence_manager_takedown(drm_device_t *dev); extern void drm_fence_flush_old(drm_device_t *dev, uint32_t sequence); |