diff options
| author | Dave Airlie <airlied@redhat.com> | 2014-09-10 18:23:07 +1000 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2014-09-12 14:11:14 +1000 |
| commit | fd7e0d719260259f6e4e7711bd63a4175557d559 (patch) | |
| tree | c962b80f0ece6a61d2566c8596ebe68c8aeab4f5 /include/drm | |
| parent | 10d123b2f2b5bf54f59a884f12018d24a97d5a63 (diff) | |
| download | linux-fd7e0d719260259f6e4e7711bd63a4175557d559.tar.gz linux-fd7e0d719260259f6e4e7711bd63a4175557d559.tar.bz2 linux-fd7e0d719260259f6e4e7711bd63a4175557d559.zip | |
drm: split ati_pcigart.h out of drmP.h
Just move this into a separate header file, and make the
two users use it.
Reviewed-by: Daniel Vetter <daniel.vetter@ffwll.ch>
Reviewed-by: Alex Deucher <alexander.deucher@amd.com>
Signed-off-by: Dave Airlie <airlied@redhat.com>
Diffstat (limited to 'include/drm')
| -rw-r--r-- | include/drm/ati_pcigart.h | 28 | ||||
| -rw-r--r-- | include/drm/drmP.h | 23 |
2 files changed, 28 insertions, 23 deletions
diff --git a/include/drm/ati_pcigart.h b/include/drm/ati_pcigart.h new file mode 100644 index 000000000000..da4bfcd81a37 --- /dev/null +++ b/include/drm/ati_pcigart.h @@ -0,0 +1,28 @@ +#ifndef DRM_ATI_PCIGART_H +#define DRM_ATI_PCIGART_H + +/* location of GART table */ +#define DRM_ATI_GART_MAIN 1 +#define DRM_ATI_GART_FB 2 + +#define DRM_ATI_GART_PCI 1 +#define DRM_ATI_GART_PCIE 2 +#define DRM_ATI_GART_IGP 3 + +struct drm_ati_pcigart_info { + int gart_table_location; + int gart_reg_if; + void *addr; + dma_addr_t bus_addr; + dma_addr_t table_mask; + struct drm_dma_handle *table_handle; + struct drm_local_map mapping; + int table_size; +}; + +extern int drm_ati_pcigart_init(struct drm_device *dev, + struct drm_ati_pcigart_info * gart_info); +extern int drm_ati_pcigart_cleanup(struct drm_device *dev, + struct drm_ati_pcigart_info * gart_info); + +#endif diff --git a/include/drm/drmP.h b/include/drm/drmP.h index be1160fa5ebc..e4ba3de22601 100644 --- a/include/drm/drmP.h +++ b/include/drm/drmP.h @@ -461,24 +461,6 @@ struct drm_map_list { struct drm_master *master; }; -/* location of GART table */ -#define DRM_ATI_GART_MAIN 1 -#define DRM_ATI_GART_FB 2 - -#define DRM_ATI_GART_PCI 1 -#define DRM_ATI_GART_PCIE 2 -#define DRM_ATI_GART_IGP 3 - -struct drm_ati_pcigart_info { - int gart_table_location; - int gart_reg_if; - void *addr; - dma_addr_t bus_addr; - dma_addr_t table_mask; - struct drm_dma_handle *table_handle; - struct drm_local_map mapping; - int table_size; -}; /** * This structure defines the drm_mm memory object, which will be used by the @@ -1324,11 +1306,6 @@ extern int drm_sg_alloc(struct drm_device *dev, void *data, extern int drm_sg_free(struct drm_device *dev, void *data, struct drm_file *file_priv); - /* ATI PCIGART support (ati_pcigart.h) */ -extern int drm_ati_pcigart_init(struct drm_device *dev, - struct drm_ati_pcigart_info * gart_info); -extern int drm_ati_pcigart_cleanup(struct drm_device *dev, - struct drm_ati_pcigart_info * gart_info); extern drm_dma_handle_t *drm_pci_alloc(struct drm_device *dev, size_t size, size_t align); |