Now that linus has real separate struct drm_map and struct drm_local_map,
the drm_local_map_t typedef is gratuituous and I don't like typedefs of
structs that much so remove it.
Signed-off-by: Benjamin Herrenschmidt <b...@kernel.crashing.org>
---
drivers/gpu/drm/i810/i810_drv.h | 4 ++--
drivers/gpu/drm/i830/i830_drv.h | 4 ++--
drivers/gpu/drm/i915/i915_drv.h | 6 +++---
drivers/gpu/drm/mga/mga_drv.h | 12 ++++++------
drivers/gpu/drm/r128/r128_drv.h | 10 +++++-----
drivers/gpu/drm/radeon/radeon_cp.c | 2 +-
drivers/gpu/drm/radeon/radeon_drv.h | 12 ++++++------
drivers/gpu/drm/savage/savage_drv.h | 16 ++++++++--------
drivers/gpu/drm/sis/sis_drv.h | 2 +-
drivers/gpu/drm/sis/sis_mm.c | 4 ++--
drivers/gpu/drm/via/via_drv.h | 8 ++++----
drivers/gpu/drm/via/via_verifier.c | 11 ++++++-----
drivers/gpu/drm/via/via_verifier.h | 2 +-
include/drm/drmP.h | 2 --
14 files changed, 47 insertions(+), 48 deletions(-)
--- linux-work.orig/drivers/gpu/drm/mga/mga_drv.h 2009-02-04
13:36:05.000000000 +1100
+++ linux-work/drivers/gpu/drm/mga/mga_drv.h 2009-02-04 13:36:05.000000000
+1100
@@ -138,12 +138,12 @@ typedef struct drm_mga_private {
unsigned int texture_offset;
unsigned int texture_size;
- drm_local_map_t *sarea;
- drm_local_map_t *mmio;
- drm_local_map_t *status;
- drm_local_map_t *warp;
- drm_local_map_t *primary;
- drm_local_map_t *agp_textures;
+ struct drm_local_map *sarea;
+ struct drm_local_map *mmio;
+ struct drm_local_map *status;
+ struct drm_local_map *warp;
+ struct drm_local_map *primary;
+ struct drm_local_map *agp_textures;
unsigned long agp_handle;
unsigned int agp_size;
Index: linux-work/drivers/gpu/drm/r128/r128_drv.h
===================================================================
--- linux-work.orig/drivers/gpu/drm/r128/r128_drv.h 2009-02-04
13:35:45.000000000 +1100
+++ linux-work/drivers/gpu/drm/r128/r128_drv.h 2009-02-04 13:36:05.000000000
+1100
@@ -115,11 +115,11 @@ typedef struct drm_r128_private {
u32 depth_pitch_offset_c;
u32 span_pitch_offset_c;
- drm_local_map_t *sarea;
- drm_local_map_t *mmio;
- drm_local_map_t *cce_ring;
- drm_local_map_t *ring_rptr;
- drm_local_map_t *agp_textures;
+ struct drm_local_map *sarea;
+ struct drm_local_map *mmio;
+ struct drm_local_map *cce_ring;
+ struct drm_local_map *ring_rptr;
+ struct drm_local_map *agp_textures;
struct drm_ati_pcigart_info gart_info;
} drm_r128_private_t;
Index: linux-work/drivers/gpu/drm/radeon/radeon_cp.c
===================================================================
--- linux-work.orig/drivers/gpu/drm/radeon/radeon_cp.c 2009-02-04
13:36:05.000000000 +1100
+++ linux-work/drivers/gpu/drm/radeon/radeon_cp.c 2009-02-04
13:36:05.000000000 +1100
@@ -1818,7 +1818,7 @@ void radeon_master_destroy(struct drm_de
int radeon_driver_firstopen(struct drm_device *dev)
{
int ret;
- drm_local_map_t *map;
+ struct drm_local_map *map;
drm_radeon_private_t *dev_priv = dev->dev_private;
dev_priv->gart_info.table_size = RADEON_PCIGART_TABLE_SIZE;
Index: linux-work/drivers/gpu/drm/radeon/radeon_drv.h
===================================================================
--- linux-work.orig/drivers/gpu/drm/radeon/radeon_drv.h 2009-02-04
13:36:05.000000000 +1100
+++ linux-work/drivers/gpu/drm/radeon/radeon_drv.h 2009-02-04
13:36:05.000000000 +1100
@@ -227,7 +227,7 @@ struct radeon_virt_surface {
#define RADEON_PURGE_EMITED (1 < 1)
struct drm_radeon_master_private {
- drm_local_map_t *sarea;
+ struct drm_local_map *sarea;
drm_radeon_sarea_t *sarea_priv;
};
@@ -290,10 +290,10 @@ typedef struct drm_radeon_private {
unsigned long buffers_offset;
unsigned long gart_textures_offset;
- drm_local_map_t *sarea;
- drm_local_map_t *cp_ring;
- drm_local_map_t *ring_rptr;
- drm_local_map_t *gart_textures;
+ struct drm_local_map *sarea;
+ struct drm_local_map *cp_ring;
+ struct drm_local_map *ring_rptr;
+ struct drm_local_map *gart_textures;
struct mem_block *gart_heap;
struct mem_block *fb_heap;
@@ -320,7 +320,7 @@ typedef struct drm_radeon_private {
int num_gb_pipes;
int track_flush;
- drm_local_map_t *mmio;
+ struct drm_local_map *mmio;
} drm_radeon_private_t;
typedef struct drm_radeon_buf_priv {
Index: linux-work/drivers/gpu/drm/savage/savage_drv.h
===================================================================
--- linux-work.orig/drivers/gpu/drm/savage/savage_drv.h 2009-02-04
13:35:45.000000000 +1100
+++ linux-work/drivers/gpu/drm/savage/savage_drv.h 2009-02-04
13:36:05.000000000 +1100
@@ -151,14 +151,14 @@ typedef struct drm_savage_private {
unsigned int texture_size;
/* memory regions in physical memory */
- drm_local_map_t *sarea;
- drm_local_map_t *mmio;
- drm_local_map_t *fb;
- drm_local_map_t *aperture;
- drm_local_map_t *status;
- drm_local_map_t *agp_textures;
- drm_local_map_t *cmd_dma;
- drm_local_map_t fake_dma;
+ struct drm_local_map *sarea;
+ struct drm_local_map *mmio;
+ struct drm_local_map *fb;
+ struct drm_local_map *aperture;
+ struct drm_local_map *status;
+ struct drm_local_map *agp_textures;
+ struct drm_local_map *cmd_dma;
+ struct drm_local_map fake_dma;
struct {
int handle;
Index: linux-work/drivers/gpu/drm/i810/i810_drv.h
===================================================================
--- linux-work.orig/drivers/gpu/drm/i810/i810_drv.h 2009-02-04
16:55:05.000000000 +1100
+++ linux-work/drivers/gpu/drm/i810/i810_drv.h 2009-02-04 16:55:18.000000000
+1100
@@ -61,7 +61,7 @@ typedef struct drm_i810_buf_priv {
int currently_mapped;
void *virtual;
void *kernel_virtual;
- drm_local_map_t map;
+ struct drm_local_map map;
} drm_i810_buf_priv_t;
typedef struct _drm_i810_ring_buffer {
@@ -73,7 +73,7 @@ typedef struct _drm_i810_ring_buffer {
int head;
int tail;
int space;
- drm_local_map_t map;
+ struct drm_local_map map;
} drm_i810_ring_buffer_t;
typedef struct drm_i810_private {
Index: linux-work/drivers/gpu/drm/i830/i830_drv.h
===================================================================
--- linux-work.orig/drivers/gpu/drm/i830/i830_drv.h 2009-02-04
16:55:32.000000000 +1100
+++ linux-work/drivers/gpu/drm/i830/i830_drv.h 2009-02-04 16:55:43.000000000
+1100
@@ -68,7 +68,7 @@ typedef struct drm_i830_buf_priv {
int currently_mapped;
void __user *virtual;
void *kernel_virtual;
- drm_local_map_t map;
+ struct drm_local_map map;
} drm_i830_buf_priv_t;
typedef struct _drm_i830_ring_buffer {
@@ -80,7 +80,7 @@ typedef struct _drm_i830_ring_buffer {
int head;
int tail;
int space;
- drm_local_map_t map;
+ struct drm_local_map map;
} drm_i830_ring_buffer_t;
typedef struct drm_i830_private {
Index: linux-work/drivers/gpu/drm/i915/i915_drv.h
===================================================================
--- linux-work.orig/drivers/gpu/drm/i915/i915_drv.h 2009-02-04
16:55:58.000000000 +1100
+++ linux-work/drivers/gpu/drm/i915/i915_drv.h 2009-02-04 16:56:17.000000000
+1100
@@ -91,7 +91,7 @@ typedef struct _drm_i915_ring_buffer {
int head;
int tail;
int space;
- drm_local_map_t map;
+ struct drm_local_map map;
struct drm_gem_object *ring_obj;
} drm_i915_ring_buffer_t;
@@ -117,7 +117,7 @@ struct intel_opregion {
};
struct drm_i915_master_private {
- drm_local_map_t *sarea;
+ struct drm_local_map *sarea;
struct _drm_i915_sarea *sarea_priv;
};
#define I915_FENCE_REG_NONE -1
@@ -140,7 +140,7 @@ typedef struct drm_i915_private {
dma_addr_t dma_status_page;
uint32_t counter;
unsigned int status_gfx_addr;
- drm_local_map_t hws_map;
+ struct drm_local_map hws_map;
struct drm_gem_object *hws_obj;
unsigned int cpp;
Index: linux-work/drivers/gpu/drm/sis/sis_drv.h
===================================================================
--- linux-work.orig/drivers/gpu/drm/sis/sis_drv.h 2009-02-04
17:00:29.000000000 +1100
+++ linux-work/drivers/gpu/drm/sis/sis_drv.h 2009-02-04 17:00:36.000000000
+1100
@@ -52,7 +52,7 @@ enum sis_family {
#define SIS_WRITE(reg, val) DRM_WRITE32(SIS_BASE, reg, val);
typedef struct drm_sis_private {
- drm_local_map_t *mmio;
+ struct drm_local_map *mmio;
unsigned int idle_fault;
struct drm_sman sman;
unsigned int chipset;
Index: linux-work/drivers/gpu/drm/sis/sis_mm.c
===================================================================
--- linux-work.orig/drivers/gpu/drm/sis/sis_mm.c 2009-02-04
17:00:44.000000000 +1100
+++ linux-work/drivers/gpu/drm/sis/sis_mm.c 2009-02-04 17:00:59.000000000
+1100
@@ -216,10 +216,10 @@ static int sis_ioctl_agp_alloc(struct dr
return sis_drm_alloc(dev, file_priv, data, AGP_TYPE);
}
-static drm_local_map_t *sis_reg_init(struct drm_device *dev)
+static struct drm_local_map *sis_reg_init(struct drm_device *dev)
{
struct drm_map_list *entry;
- drm_local_map_t *map;
+ struct drm_local_map *map;
list_for_each_entry(entry, &dev->maplist, head) {
map = entry->map;
Index: linux-work/drivers/gpu/drm/via/via_drv.h
===================================================================
--- linux-work.orig/drivers/gpu/drm/via/via_drv.h 2009-02-04
17:01:09.000000000 +1100
+++ linux-work/drivers/gpu/drm/via/via_drv.h 2009-02-04 17:01:28.000000000
+1100
@@ -44,7 +44,7 @@
#define VIA_NUM_IRQS 4
typedef struct drm_via_ring_buffer {
- drm_local_map_t map;
+ struct drm_local_map map;
char *virtual_start;
} drm_via_ring_buffer_t;
@@ -59,9 +59,9 @@ typedef struct drm_via_irq {
typedef struct drm_via_private {
drm_via_sarea_t *sarea_priv;
- drm_local_map_t *sarea;
- drm_local_map_t *fb;
- drm_local_map_t *mmio;
+ struct drm_local_map *sarea;
+ struct drm_local_map *fb;
+ struct drm_local_map *mmio;
unsigned long agpAddr;
wait_queue_head_t decoder_queue[VIA_NR_XVMC_LOCKS];
char *dma_ptr;
Index: linux-work/drivers/gpu/drm/via/via_verifier.c
===================================================================
--- linux-work.orig/drivers/gpu/drm/via/via_verifier.c 2009-02-04
17:01:36.000000000 +1100
+++ linux-work/drivers/gpu/drm/via/via_verifier.c 2009-02-04
17:02:03.000000000 +1100
@@ -249,13 +249,14 @@ eat_words(const uint32_t ** buf, const u
* Partially stolen from drm_memory.h
*/
-static __inline__ drm_local_map_t *via_drm_lookup_agp_map(drm_via_state_t *seq,
- unsigned long offset,
- unsigned long size,
- struct drm_device * dev)
+static __inline__
+struct drm_local_map *via_drm_lookup_agp_map(drm_via_state_t *seq,
+ unsigned long offset,
+ unsigned long size,
+ struct drm_device * dev)
{
struct drm_map_list *r_list;
- drm_local_map_t *map = seq->map_cache;
+ struct drm_local_map *map = seq->map_cache;
if (map && map->offset <= offset
&& (offset + size) <= (map->offset + map->size)) {
Index: linux-work/drivers/gpu/drm/via/via_verifier.h
===================================================================
--- linux-work.orig/drivers/gpu/drm/via/via_verifier.h 2009-02-04
17:02:15.000000000 +1100
+++ linux-work/drivers/gpu/drm/via/via_verifier.h 2009-02-04
17:02:21.000000000 +1100
@@ -48,7 +48,7 @@ typedef struct {
int agp_texture;
int multitex;
struct drm_device *dev;
- drm_local_map_t *map_cache;
+ struct drm_local_map *map_cache;
uint32_t vertex_count;
int agp;
const uint32_t *buf_start;
Index: linux-work/include/drm/drmP.h
===================================================================
--- linux-work.orig/include/drm/drmP.h 2009-02-04 16:54:40.000000000 +1100
+++ linux-work/include/drm/drmP.h 2009-02-04 16:54:41.000000000 +1100
@@ -535,8 +535,6 @@ struct drm_local_map {
int mtrr; /**< MTRR slot used */
};
-typedef struct drm_local_map drm_local_map_t;
-
/**
* Mappings list
*/
------------------------------------------------------------------------------
Create and Deploy Rich Internet Apps outside the browser with Adobe(R)AIR(TM)
software. With Adobe AIR, Ajax developers can use existing skills and code to
build responsive, highly engaging applications that combine the power of local
resources and data with the reach of the web. Download the Adobe AIR SDK and
Ajax docs to start building applications today-http://p.sf.net/sfu/adobe-com
--
_______________________________________________
Dri-devel mailing list
Dri-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/dri-devel
