drm: split ati_pcigart.h out of drmP.h
Subsystems (3)
Dave Airlie
maintainerPATCH 1/1 drm: split ati_pcigart.h out of drmP.h
From: Dave Airlie <[email protected]>
Just move this into a separate header file, and make the two users use it.
Signed-off-by Dave Airlie <[email protected]>
--- drivers/gpu/drm/ati_pcigart.c | 2 ++ drivers/gpu/drm/r128/r128_drv.h | 1 + drivers/gpu/drm/radeon/radeon_drv.h | 1 + include/drm/ati_pcigart.h | 28 ++++++++++++++++++++++++++++ include/drm/drmP.h | 23 ----------------------- 5 files changed, 32 insertions(+), 23 deletions(-) create mode 100644 include/drm/ati_pcigart.h
drivers/gpu/drm/ati_pcigart.c +2 -0
@@ -34,6 +34,8 @@#include <linux/export.h> #include <drm/drmP.h> +#include <drm/ati_pcigart.h> +# define ATI_PCIGART_PAGE_SIZE 4096/**< PCI GART page size */ static int drm_ati_alloc_pcigart_table(struct drm_device *dev,
drivers/gpu/drm/r128/r128_drv.h +1 -0
@@ -35,6 +35,7 @@#ifndef __R128_DRV_H__#define __R128_DRV_H__ +#include <drm/ati_pcigart.h> /* General customization: */ #define DRIVER_AUTHOR "Gareth Hughes, VA Linux Systems Inc."
drivers/gpu/drm/radeon/radeon_drv.h +1 -0
@@ -34,6 +34,7 @@#include <linux/firmware.h> #include <linux/platform_device.h> +#include <drm/ati_pcigart.h> #include "radeon_family.h" /* General customization:
include/drm/ati_pcigart.h new file +28 -0
@@ -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
include/drm/drmP.h +0 -23
@@ -397,24 +397,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
@@ -1253,11 +1235,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);
Signature · 1 line
1.9.3
Quoted 6 lines · Dave Airlie
From: Dave Airlie <[email protected]>
Just move this into a separate header file, and make the two users use it.
Signed-off-by Dave Airlie <[email protected]>
I've shuffled this into the new include/drm/drm_legacy.h I'm creating, but this makes more sense. Can you please apply this to drm-next so that I can rebase?
Reviewed-by Daniel Vetter <[email protected]>
Quoted 128 lines
--- drivers/gpu/drm/ati_pcigart.c | 2 ++ drivers/gpu/drm/r128/r128_drv.h | 1 + drivers/gpu/drm/radeon/radeon_drv.h | 1 + include/drm/ati_pcigart.h | 28 ++++++++++++++++++++++++++++ include/drm/drmP.h | 23 ----------------------- 5 files changed, 32 insertions(+), 23 deletions(-) create mode 100644 include/drm/ati_pcigart.hdrivers/gpu/drm/ati_pcigart.c +2
-0@@ -34,6 +34,8 @@#include <linux/export.h> #include <drm/drmP.h> +#include <drm/ati_pcigart.h> +# define ATI_PCIGART_PAGE_SIZE 4096/**< PCI GART page size */ static int drm_ati_alloc_pcigart_table(struct drm_device *dev,drivers/gpu/drm/r128/r128_drv.h +1
-0@@ -35,6 +35,7 @@#ifndef __R128_DRV_H__#define __R128_DRV_H__ +#include <drm/ati_pcigart.h> /* General customization: */ #define DRIVER_AUTHOR "Gareth Hughes, VA Linux Systems Inc."drivers/gpu/drm/radeon/radeon_drv.h +1
-0@@ -34,6 +34,7 @@#include <linux/firmware.h> #include <linux/platform_device.h> +#include <drm/ati_pcigart.h> #include "radeon_family.h" /* General customization: include/drm/ati_pcigart.h new file +28
-0@@ -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 include/drm/drmP.h +0
-23@@ -397,24 +397,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 @@ -1253,11 +1235,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);Signature · 6 lines
1.9.3 _______________________________________________ dri-devel mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/dri-devel
Signature · 3 lines
Daniel Vetter Software Engineer, Intel Corporation +41 (0) 79 365 57 48 - http://blog.ffwll.ch
Quoted 6 lines · Dave Airlie
From: Dave Airlie <[email protected]>
Just move this into a separate header file, and make the two users use it.
Signed-off-by Dave Airlie <[email protected]>
Reviewed-by Alex Deucher <[email protected]>
Quoted 128 lines
--- drivers/gpu/drm/ati_pcigart.c | 2 ++ drivers/gpu/drm/r128/r128_drv.h | 1 + drivers/gpu/drm/radeon/radeon_drv.h | 1 + include/drm/ati_pcigart.h | 28 ++++++++++++++++++++++++++++ include/drm/drmP.h | 23 ----------------------- 5 files changed, 32 insertions(+), 23 deletions(-) create mode 100644 include/drm/ati_pcigart.hdrivers/gpu/drm/ati_pcigart.c +2
-0@@ -34,6 +34,8 @@#include <linux/export.h> #include <drm/drmP.h> +#include <drm/ati_pcigart.h> +# define ATI_PCIGART_PAGE_SIZE 4096/**< PCI GART page size */ static int drm_ati_alloc_pcigart_table(struct drm_device *dev,drivers/gpu/drm/r128/r128_drv.h +1
-0@@ -35,6 +35,7 @@#ifndef __R128_DRV_H__#define __R128_DRV_H__ +#include <drm/ati_pcigart.h> /* General customization: */ #define DRIVER_AUTHOR "Gareth Hughes, VA Linux Systems Inc."drivers/gpu/drm/radeon/radeon_drv.h +1
-0@@ -34,6 +34,7 @@#include <linux/firmware.h> #include <linux/platform_device.h> +#include <drm/ati_pcigart.h> #include "radeon_family.h" /* General customization: include/drm/ati_pcigart.h new file +28
-0@@ -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 include/drm/drmP.h +0
-24@@ -397,24 +397,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 @@ -1253,11 +1235,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); --1.9.3
_______________________________________________
dri-devel mailing list
[email protected]
http://lists.freedesktop.org/mailman/listinfo/dri-devel