diff options
| author | Thomas Hellstrom <unichrome@shipmail.org> | 2005-10-22 15:12:05 +0000 |
|---|---|---|
| committer | Thomas Hellstrom <unichrome@shipmail.org> | 2005-10-22 15:12:05 +0000 |
| commit | b63b771285a91e85c2dc7daf77191c423fb4d2a5 (patch) | |
| tree | e129bf5d1576d0edddd0617e96ecb6d117959afa /shared-core/via_drm.h | |
| parent | 79f30e79ec5b05b2052988e3e6edba8624e3d1c5 (diff) | |
via: Sync via_drm.h with 3D driver. Bump via patchlevel and date.
Diffstat (limited to 'shared-core/via_drm.h')
| -rw-r--r-- | shared-core/via_drm.h | 15 |
1 files changed, 12 insertions, 3 deletions
diff --git a/shared-core/via_drm.h b/shared-core/via_drm.h index 292106ab..5fbbcc72 100644 --- a/shared-core/via_drm.h +++ b/shared-core/via_drm.h @@ -107,8 +107,13 @@ #define VIA_BACK 0x2 #define VIA_DEPTH 0x4 #define VIA_STENCIL 0x8 -#define VIDEO 0 -#define AGP 1 + +#define VIA_MEM_VIDEO 0 /* matches drm constant */ +#define VIA_MEM_AGP 1 /* matches drm constant */ +#define VIA_MEM_SYSTEM 2 +#define VIA_MEM_MIXED 3 +#define VIA_MEM_UNKNOWN 4 + typedef struct { uint32_t offset; uint32_t size; @@ -194,8 +199,12 @@ typedef struct _drm_via_sarea { unsigned int XvMCDisplaying[VIA_NR_XVMC_PORTS]; unsigned int XvMCSubPicOn[VIA_NR_XVMC_PORTS]; - unsigned int XvMCCtxNoGrabbed; /* Last context to hold decoder */ + unsigned int XvMCCtxNoGrabbed; /* Last context to hold decoder */ + + /* Used by the 3d driver only at this point, for pageflipping: + */ + unsigned int pfCurrentOffset; } drm_via_sarea_t; typedef struct _drm_via_cmdbuf_size { |