Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
1
fork

Configure Feed

Select the types of activity you want to include in your feed.

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>

+32 -23
+2
drivers/gpu/drm/ati_pcigart.c
··· 34 34 #include <linux/export.h> 35 35 #include <drm/drmP.h> 36 36 37 + #include <drm/ati_pcigart.h> 38 + 37 39 # define ATI_PCIGART_PAGE_SIZE 4096 /**< PCI GART page size */ 38 40 39 41 static int drm_ati_alloc_pcigart_table(struct drm_device *dev,
+1
drivers/gpu/drm/r128/r128_drv.h
··· 35 35 #ifndef __R128_DRV_H__ 36 36 #define __R128_DRV_H__ 37 37 38 + #include <drm/ati_pcigart.h> 38 39 /* General customization: 39 40 */ 40 41 #define DRIVER_AUTHOR "Gareth Hughes, VA Linux Systems Inc."
+1
drivers/gpu/drm/radeon/radeon_drv.h
··· 34 34 #include <linux/firmware.h> 35 35 #include <linux/platform_device.h> 36 36 37 + #include <drm/ati_pcigart.h> 37 38 #include "radeon_family.h" 38 39 39 40 /* General customization:
+28
include/drm/ati_pcigart.h
··· 1 + #ifndef DRM_ATI_PCIGART_H 2 + #define DRM_ATI_PCIGART_H 3 + 4 + /* location of GART table */ 5 + #define DRM_ATI_GART_MAIN 1 6 + #define DRM_ATI_GART_FB 2 7 + 8 + #define DRM_ATI_GART_PCI 1 9 + #define DRM_ATI_GART_PCIE 2 10 + #define DRM_ATI_GART_IGP 3 11 + 12 + struct drm_ati_pcigart_info { 13 + int gart_table_location; 14 + int gart_reg_if; 15 + void *addr; 16 + dma_addr_t bus_addr; 17 + dma_addr_t table_mask; 18 + struct drm_dma_handle *table_handle; 19 + struct drm_local_map mapping; 20 + int table_size; 21 + }; 22 + 23 + extern int drm_ati_pcigart_init(struct drm_device *dev, 24 + struct drm_ati_pcigart_info * gart_info); 25 + extern int drm_ati_pcigart_cleanup(struct drm_device *dev, 26 + struct drm_ati_pcigart_info * gart_info); 27 + 28 + #endif
-23
include/drm/drmP.h
··· 461 461 struct drm_master *master; 462 462 }; 463 463 464 - /* location of GART table */ 465 - #define DRM_ATI_GART_MAIN 1 466 - #define DRM_ATI_GART_FB 2 467 - 468 - #define DRM_ATI_GART_PCI 1 469 - #define DRM_ATI_GART_PCIE 2 470 - #define DRM_ATI_GART_IGP 3 471 - 472 - struct drm_ati_pcigart_info { 473 - int gart_table_location; 474 - int gart_reg_if; 475 - void *addr; 476 - dma_addr_t bus_addr; 477 - dma_addr_t table_mask; 478 - struct drm_dma_handle *table_handle; 479 - struct drm_local_map mapping; 480 - int table_size; 481 - }; 482 464 483 465 /** 484 466 * This structure defines the drm_mm memory object, which will be used by the ··· 1306 1324 extern int drm_sg_free(struct drm_device *dev, void *data, 1307 1325 struct drm_file *file_priv); 1308 1326 1309 - /* ATI PCIGART support (ati_pcigart.h) */ 1310 - extern int drm_ati_pcigart_init(struct drm_device *dev, 1311 - struct drm_ati_pcigart_info * gart_info); 1312 - extern int drm_ati_pcigart_cleanup(struct drm_device *dev, 1313 - struct drm_ati_pcigart_info * gart_info); 1314 1327 1315 1328 extern drm_dma_handle_t *drm_pci_alloc(struct drm_device *dev, size_t size, 1316 1329 size_t align);