diff options
author | Dave Airlie <airlied@linux.ie> | 2007-04-26 15:56:21 +1000 |
---|---|---|
committer | Dave Airlie <airlied@linux.ie> | 2007-04-26 15:56:21 +1000 |
commit | b589b846e73bfe6235cd702bb8ae89701c85eaab (patch) | |
tree | c54ddc23cfba3b5d9fafb86477d20fde4c36a52a /linux-core/drm_objects.h | |
parent | 34be91fe4e9f0ad73b7c4354aea0c8ce10f45f68 (diff) | |
parent | 5c8561aae22138880673503d930af7f1b361d071 (diff) |
Merge branch 'origin' into modesetting-101
Diffstat (limited to 'linux-core/drm_objects.h')
-rw-r--r-- | linux-core/drm_objects.h | 13 |
1 files changed, 9 insertions, 4 deletions
diff --git a/linux-core/drm_objects.h b/linux-core/drm_objects.h index 1cdf6964..8a70c734 100644 --- a/linux-core/drm_objects.h +++ b/linux-core/drm_objects.h @@ -234,10 +234,8 @@ extern int drm_fence_ioctl(DRM_IOCTL_ARGS); #define DRM_BE_FLAG_NEEDS_FREE 0x00000001 #define DRM_BE_FLAG_BOUND_CACHED 0x00000002 -typedef struct drm_ttm_backend { - void *private; - uint32_t flags; - uint32_t drm_map_type; +struct drm_ttm_backend; +typedef struct drm_ttm_backend_func { int (*needs_ub_cache_adjust) (struct drm_ttm_backend * backend); int (*populate) (struct drm_ttm_backend * backend, unsigned long num_pages, struct page ** pages); @@ -246,6 +244,13 @@ typedef struct drm_ttm_backend { unsigned long offset, int cached); int (*unbind) (struct drm_ttm_backend * backend); void (*destroy) (struct drm_ttm_backend * backend); +} drm_ttm_backend_func_t; + + +typedef struct drm_ttm_backend { + uint32_t flags; + int mem_type; + drm_ttm_backend_func_t *func; } drm_ttm_backend_t; typedef struct drm_ttm { |