diff options
| author | Zhenyu Wang <zhenyu.z.wang@intel.com> | 2008-03-11 14:37:41 +0800 |
|---|---|---|
| committer | Zhenyu Wang <zhenyu.z.wang@intel.com> | 2008-03-11 14:37:41 +0800 |
| commit | 31654f52b084ebb32f69854dfb1c342c9da07928 (patch) | |
| tree | 415cb1ba373cc815964bd2441aa546ebd5f74a9f /src/i830.h | |
| parent | a03aca101d4d51ed2279a99d1137ce3b7ef364e2 (diff) | |
| parent | 02c0ffb1d8112a6fb03f9c8eae9ec1a1fca123ef (diff) | |
Merge branch 'master' into xvmc
Conflicts:
man/intel.man
src/i830_driver.c
Diffstat (limited to 'src/i830.h')
| -rw-r--r-- | src/i830.h | 9 |
1 files changed, 8 insertions, 1 deletions
@@ -40,6 +40,8 @@ SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. #define I830DEBUG #endif +#include <stdint.h> + #ifndef REMAP_RESERVED #define REMAP_RESERVED 0 #endif @@ -626,6 +628,7 @@ typedef struct _I830Rec { CARD32 saveFBC_LL_BASE; CARD32 saveFBC_CONTROL2; CARD32 saveFBC_CONTROL; + CARD32 saveFBC_FENCE_OFF; enum last_3d *last_3d; @@ -705,7 +708,9 @@ extern Bool I830DRIFinishScreenInit(ScreenPtr pScreen); extern void I830DRIUnlock(ScrnInfoPtr pScrn); extern Bool I830DRILock(ScrnInfoPtr pScrn); extern Bool I830DRISetVBlankInterrupt (ScrnInfoPtr pScrn, Bool on); -Bool i830_update_dri_buffers(ScrnInfoPtr pScrn); +extern Bool i830_update_dri_buffers(ScrnInfoPtr pScrn); +extern Bool I830DRISetHWS(ScrnInfoPtr pScrn); +extern Bool I830DRIInstIrqHandler(ScrnInfoPtr pScrn); #endif unsigned long intel_get_pixmap_offset(PixmapPtr pPix); @@ -850,6 +855,8 @@ extern const int I830CopyROP[16]; #define QUIRK_IGNORE_TV 0x00000001 #define QUIRK_IGNORE_LVDS 0x00000002 #define QUIRK_IGNORE_MACMINI_LVDS 0x00000004 +#define QUIRK_PIPEA_FORCE 0x00000008 +#define QUIRK_IVCH_NEED_DVOB 0x00000010 extern void i830_fixup_devices(ScrnInfoPtr); #endif /* _I830_H_ */ |