diff options
| author | Matthieu Herrb <matthieu@cvs.openbsd.org> | 2008-06-29 20:13:43 +0000 |
|---|---|---|
| committer | Matthieu Herrb <matthieu@cvs.openbsd.org> | 2008-06-29 20:13:43 +0000 |
| commit | daf9e68907d685a3e11c8d8b0fd8b0337dfa7d06 (patch) | |
| tree | c38a0b2990116e2e57ca63d77801e706494607b8 /driver/xf86-video-intel/src/i830.h | |
| parent | 7fca8660c62e2dd619c7b58b45f9f3a96d87de36 (diff) | |
update to xf86-video-intel 2.3.2. Tested among others by okan@.
Diffstat (limited to 'driver/xf86-video-intel/src/i830.h')
| -rw-r--r-- | driver/xf86-video-intel/src/i830.h | 22 |
1 files changed, 18 insertions, 4 deletions
diff --git a/driver/xf86-video-intel/src/i830.h b/driver/xf86-video-intel/src/i830.h index 0ae8270d0..def693fbc 100644 --- a/driver/xf86-video-intel/src/i830.h +++ b/driver/xf86-video-intel/src/i830.h @@ -426,6 +426,8 @@ typedef struct _I830Rec { i830_memory *logical_context; + i830_memory *power_context; + #ifdef XF86DRI i830_memory *back_buffer; i830_memory *third_buffer; @@ -552,10 +554,6 @@ typedef struct _I830Rec { Bool StolenOnly; - Bool swfSaved; - uint32_t saveSWF0; - uint32_t saveSWF4; - Bool checkDevices; /* Driver phase/state information */ @@ -647,6 +645,11 @@ typedef struct _I830Rec { uint32_t saveFBC_CONTROL2; uint32_t saveFBC_CONTROL; uint32_t saveFBC_FENCE_OFF; + uint32_t saveRENCLK_GATE_D1; + uint32_t saveRENCLK_GATE_D2; + uint32_t saveDSPCLK_GATE_D; + uint32_t saveRAMCLK_GATE_D; + uint32_t savePWRCTXA; enum last_3d *last_3d; @@ -658,6 +661,8 @@ typedef struct _I830Rec { #define I830PTR(p) ((I830Ptr)((p)->driverPrivate)) +#define ARRAY_SIZE(x) (sizeof(x) / sizeof(x[0])) + #define I830_SELECT_FRONT 0 #define I830_SELECT_BACK 1 #define I830_SELECT_DEPTH 2 @@ -768,6 +773,7 @@ void i830_free_memory(ScrnInfoPtr pScrn, i830_memory *mem); extern long I830CheckAvailableMemory(ScrnInfoPtr pScrn); Bool i830_allocate_2d_memory(ScrnInfoPtr pScrn); Bool i830_allocate_texture_memory(ScrnInfoPtr pScrn); +Bool i830_allocate_pwrctx(ScrnInfoPtr pScrn); Bool i830_allocate_3d_memory(ScrnInfoPtr pScrn); #ifdef INTEL_XVMC Bool i830_allocate_xvmc_buffer(ScrnInfoPtr pScrn, const char *name, @@ -848,6 +854,14 @@ i830_get_transformed_coordinates_3d(int x, int y, PictTransformPtr transform, void i830_enter_render(ScrnInfoPtr); +static inline void +i830_wait_ring_idle(ScrnInfoPtr pScrn) +{ + I830Ptr pI830 = I830PTR(pScrn); + + I830WaitLpRing(pScrn, pI830->LpRing->mem->size - 8, 0); +} + static inline int i830_fb_compression_supported(I830Ptr pI830) { if (!IS_MOBILE(pI830)) |