diff options
| author | Eric Anholt <eric@anholt.net> | 2007-07-19 06:31:26 -0700 |
|---|---|---|
| committer | Eric Anholt <eric@anholt.net> | 2007-07-19 06:31:26 -0700 |
| commit | 05204b9c8d021e019456a8dbd83c012e277c7aaf (patch) | |
| tree | 5639c2821d47e92cc615059cbc12e9c050753230 /shared-core/via_drm.h | |
| parent | e544286eae71a6b150af4d86096895c14e42c36e (diff) | |
| parent | 0c95d489abd19efd2ba017e78a4b28cea0854e77 (diff) | |
Merge branch 'origin'
Diffstat (limited to 'shared-core/via_drm.h')
| -rw-r--r-- | shared-core/via_drm.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/shared-core/via_drm.h b/shared-core/via_drm.h index 635e4637..b15785b3 100644 --- a/shared-core/via_drm.h +++ b/shared-core/via_drm.h @@ -54,7 +54,7 @@ #define VIA_NR_XVMC_LOCKS 5 #define VIA_MAX_CACHELINE_SIZE 64 #define XVMCLOCKPTR(saPriv,lockNo) \ - ((volatile drm_hw_lock_t *)(((((unsigned long) (saPriv)->XvMCLockArea) + \ + ((volatile struct drm_hw_lock *)(((((unsigned long) (saPriv)->XvMCLockArea) + \ (VIA_MAX_CACHELINE_SIZE - 1)) & \ ~(VIA_MAX_CACHELINE_SIZE - 1)) + \ VIA_MAX_CACHELINE_SIZE*(lockNo))) @@ -187,7 +187,7 @@ typedef struct _drm_via_tex_region { typedef struct _drm_via_sarea { unsigned int dirty; unsigned int nbox; - drm_clip_rect_t boxes[VIA_NR_SAREA_CLIPRECTS]; + struct drm_clip_rect boxes[VIA_NR_SAREA_CLIPRECTS]; drm_via_tex_region_t texList[VIA_NR_TEX_REGIONS + 1]; int texAge; /* last time texture was uploaded */ int ctxOwner; /* last context to upload state */ |