summaryrefslogtreecommitdiff
path: root/src/xvmc/i915_xvmc.h
diff options
context:
space:
mode:
authorZhenyu Wang <zhenyu.z.wang@intel.com>2007-11-16 13:51:44 +0800
committerZhenyu Wang <zhenyu.z.wang@intel.com>2007-11-16 13:51:44 +0800
commita6e8f4ef0481c66fda4f22fcc4bb0ef9c000f0cd (patch)
tree0a166623557d712c678233cdd3e3b2b757d69b09 /src/xvmc/i915_xvmc.h
parent6c68fcc93917565712b6a9386df54d0204e4ea8f (diff)
xvmc: remove i915 drm map type
Diffstat (limited to 'src/xvmc/i915_xvmc.h')
-rw-r--r--src/xvmc/i915_xvmc.h27
1 files changed, 8 insertions, 19 deletions
diff --git a/src/xvmc/i915_xvmc.h b/src/xvmc/i915_xvmc.h
index 4c7aaa75..9a727386 100644
--- a/src/xvmc/i915_xvmc.h
+++ b/src/xvmc/i915_xvmc.h
@@ -44,17 +44,6 @@
#define PCI_CHIP_Q33_G 0x29D2
/*
- * i915XvMCDrmMap: Holds the data about the DRM maps
- */
-typedef struct _i915XvMCDrmMap {
- drm_handle_t handle;
- unsigned long offset;
- unsigned long size;
- unsigned long bus_addr;
- drmAddress map;
-} i915XvMCDrmMap, *i915XvMCDrmMapPtr;
-
-/*
* i915XvMCContext:
* Private Context data referenced via the privData
* pointer in the XvMCContext structure.
@@ -82,12 +71,12 @@ typedef struct _i915XvMCContext {
void *drawHash;
int deviceID;
- i915XvMCDrmMap sis;
- i915XvMCDrmMap msb;
- i915XvMCDrmMap ssb;
- i915XvMCDrmMap psp;
- i915XvMCDrmMap psc;
- i915XvMCDrmMap corrdata;
+ intel_xvmc_drm_map_t sis;
+ intel_xvmc_drm_map_t msb;
+ intel_xvmc_drm_map_t ssb;
+ intel_xvmc_drm_map_t psp;
+ intel_xvmc_drm_map_t psc;
+ intel_xvmc_drm_map_t corrdata;
} i915XvMCContext;
/*
@@ -102,7 +91,7 @@ typedef struct _i915XvMCSubpicture {
unsigned int last_flip;
unsigned int pitch;
unsigned char palette[3][16];
- i915XvMCDrmMap srf;
+ intel_xvmc_drm_map_t srf;
i915XvMCContext *privContext;
} i915XvMCSubpicture;
@@ -122,7 +111,7 @@ typedef struct _i915XvMCSurface {
unsigned int uvStride;
unsigned int width; /* Dimensions */
unsigned int height;
- i915XvMCDrmMap srf;
+ intel_xvmc_drm_map_t srf;
i915XvMCContext *privContext;
i915XvMCSubpicture *privSubPic; /* Subpicture to be blended when
* displaying. NULL if none. */