diff options
Diffstat (limited to 'drivers/char/drm/via_drm.h')
-rw-r--r-- | drivers/char/drm/via_drm.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/char/drm/via_drm.h b/drivers/char/drm/via_drm.h index e4ee97d7156f..8f53c76062e9 100644 --- a/drivers/char/drm/via_drm.h +++ b/drivers/char/drm/via_drm.h | |||
@@ -40,7 +40,7 @@ | |||
40 | #define VIA_NR_XVMC_LOCKS 5 | 40 | #define VIA_NR_XVMC_LOCKS 5 |
41 | #define VIA_MAX_CACHELINE_SIZE 64 | 41 | #define VIA_MAX_CACHELINE_SIZE 64 |
42 | #define XVMCLOCKPTR(saPriv,lockNo) \ | 42 | #define XVMCLOCKPTR(saPriv,lockNo) \ |
43 | ((volatile drm_hw_lock_t *)(((((unsigned long) (saPriv)->XvMCLockArea) + \ | 43 | ((volatile struct drm_hw_lock *)(((((unsigned long) (saPriv)->XvMCLockArea) + \ |
44 | (VIA_MAX_CACHELINE_SIZE - 1)) & \ | 44 | (VIA_MAX_CACHELINE_SIZE - 1)) & \ |
45 | ~(VIA_MAX_CACHELINE_SIZE - 1)) + \ | 45 | ~(VIA_MAX_CACHELINE_SIZE - 1)) + \ |
46 | VIA_MAX_CACHELINE_SIZE*(lockNo))) | 46 | VIA_MAX_CACHELINE_SIZE*(lockNo))) |
@@ -182,7 +182,7 @@ typedef struct _drm_via_tex_region { | |||
182 | typedef struct _drm_via_sarea { | 182 | typedef struct _drm_via_sarea { |
183 | unsigned int dirty; | 183 | unsigned int dirty; |
184 | unsigned int nbox; | 184 | unsigned int nbox; |
185 | drm_clip_rect_t boxes[VIA_NR_SAREA_CLIPRECTS]; | 185 | struct drm_clip_rect boxes[VIA_NR_SAREA_CLIPRECTS]; |
186 | drm_via_tex_region_t texList[VIA_NR_TEX_REGIONS + 1]; | 186 | drm_via_tex_region_t texList[VIA_NR_TEX_REGIONS + 1]; |
187 | int texAge; /* last time texture was uploaded */ | 187 | int texAge; /* last time texture was uploaded */ |
188 | int ctxOwner; /* last context to upload state */ | 188 | int ctxOwner; /* last context to upload state */ |