korg/linux
0
0
Fork 0
mirror of https://mirrors.bfsu.edu.cn/git/linux.git synced 2024-11-18 09:44:18 +08:00
Code Issues Packages Projects Releases Wiki Activity

drm: split ati_pcigart.h out of drmP.h

Browse Source 
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>
This commit is contained in:
Dave Airlie 2014-09-10 18:23:07 +10:00
parent 10d123b2f2
commit fd7e0d7192
5 changed files with 32 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
drivers/gpu/drm/ati_pcigart.c
View File

@ -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,

1
drivers/gpu/drm/r128/r128_drv.h
View File

@ -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."

1
drivers/gpu/drm/radeon/radeon_drv.h
View File

@ -34,6 +34,7 @@
#include <linux/firmware.h>
#include <linux/platform_device.h>
#include <drm/ati_pcigart.h>
#include "radeon_family.h"
/* General customization:

28
include/drm/ati_pcigart.h Normal file
View File

@ -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

23
include/drm/drmP.h
View File

@ -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);