Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit fd7e0d71 authored by Dave Airlie's avatar Dave Airlie
Browse files

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: default avatarDaniel Vetter <daniel.vetter@ffwll.ch>
Reviewed-by: default avatarAlex Deucher <alexander.deucher@amd.com>
Signed-off-by: default avatarDave Airlie <airlied@redhat.com>
parent 10d123b2

drivers/gpu/drm/ati_pcigart.c

+2 −0
Original line number Diff line number Diff line
@@ -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
Original line number Diff line number Diff line
@@ -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
Original line number Diff line number Diff line
@@ -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

0 → 100644
+28 −0
Original line number Diff line number Diff line 
#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
Original line number Diff line number Diff line
@@ -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);