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/drmP.h | |
| parent | 34be91fe4e9f0ad73b7c4354aea0c8ce10f45f68 (diff) | |
| parent | 5c8561aae22138880673503d930af7f1b361d071 (diff) | |
Merge branch 'origin' into modesetting-101
Diffstat (limited to 'linux-core/drmP.h')
| -rw-r--r-- | linux-core/drmP.h | 11 |
1 files changed, 4 insertions, 7 deletions
diff --git a/linux-core/drmP.h b/linux-core/drmP.h index 326565cb..377f447a 100644 --- a/linux-core/drmP.h +++ b/linux-core/drmP.h @@ -841,14 +841,12 @@ typedef struct drm_device { } drm_device_t; #if __OS_HAS_AGP -typedef struct drm_agp_ttm_priv { +typedef struct drm_agp_ttm_backend { + drm_ttm_backend_t backend; DRM_AGP_MEM *mem; struct agp_bridge_data *bridge; - unsigned alloc_type; - unsigned cached_type; - unsigned uncached_type; int populated; -} drm_agp_ttm_priv; +} drm_agp_ttm_backend_t; #endif @@ -1125,8 +1123,7 @@ extern DRM_AGP_MEM *drm_agp_allocate_memory(struct agp_bridge_data *bridge, size extern int drm_agp_free_memory(DRM_AGP_MEM * handle); extern int drm_agp_bind_memory(DRM_AGP_MEM * handle, off_t start); extern int drm_agp_unbind_memory(DRM_AGP_MEM * handle); -extern drm_ttm_backend_t *drm_agp_init_ttm(struct drm_device *dev, - drm_ttm_backend_t *backend); +extern drm_ttm_backend_t *drm_agp_init_ttm(struct drm_device *dev); /* Stub support (drm_stub.h) */ extern int drm_get_dev(struct pci_dev *pdev, const struct pci_device_id *ent, struct drm_driver *driver); |