diff options
| author | Alan Hourihane <alanh@fairlite.demon.co.uk> | 2005-01-06 14:43:14 +0000 |
|---|---|---|
| committer | Alan Hourihane <alanh@fairlite.demon.co.uk> | 2005-01-06 14:43:14 +0000 |
| commit | 076c5116ae5eda1822da70184cbcc8942b470541 (patch) | |
| tree | ee07fbc884b3374284d12a7dbf7c3b30a7cb0413 /src/i830_memory.c | |
| parent | edb9b6fde0948bb1121a8456500ef9f55f734376 (diff) | |
Add:
- Intel i915GM support to 2D DDX and 3D Mesa drivers.
- PanelID identification
- DRI suspend/resume support
- Detection of monitor changes on VT switches
- Support custom video modes if available in the Video BIOS
- 3D enhancements:
* GL_ARB_texture_cube_map
* GL_EXT_blend_equation_separate
* GL_ATI_blend_equation_separate
* GL_ARB_point_parameters
* GL_NV_blend_square
* GL_EXT_cull_vertex
* GL_ARB_depth_texture
* GL_SGIX_depth_texture
* GL_ARB_shadow
* GL_EXT_shadow_funcs
* GL_3DFX_texture_compression_FXT1
By Tungsten Graphics, Keith Whitwell & Alan Hourihane.
Diffstat (limited to 'src/i830_memory.c')
| -rw-r--r-- | src/i830_memory.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/i830_memory.c b/src/i830_memory.c index aad103a8..15de1806 100644 --- a/src/i830_memory.c +++ b/src/i830_memory.c @@ -1236,7 +1236,7 @@ SetFence(ScrnInfoPtr pScrn, int nr, unsigned int start, unsigned int pitch, i830Reg->Fence[nr] = 0; - if (IS_I915G(pI830)) + if (IS_I915G(pI830) || IS_I915GM(pI830)) fence_mask = ~I915G_FENCE_START_MASK; else fence_mask = ~I830_FENCE_START_MASK; @@ -1244,7 +1244,7 @@ SetFence(ScrnInfoPtr pScrn, int nr, unsigned int start, unsigned int pitch, if (start & fence_mask) { xf86DrvMsg(X_WARNING, pScrn->scrnIndex, "SetFence: %d: start (0x%08x) is not %s aligned\n", - nr, start, (IS_I915G(pI830)) ? "1MB" : "512k"); + nr, start, (IS_I915G(pI830) || IS_I915GM(pI830)) ? "1MB" : "512k"); return; } @@ -1264,7 +1264,7 @@ SetFence(ScrnInfoPtr pScrn, int nr, unsigned int start, unsigned int pitch, val = (start | FENCE_X_MAJOR | FENCE_VALID); - if (IS_I915G(pI830)) { + if (IS_I915G(pI830) || IS_I915GM(pI830)) { switch (size) { case MB(1): val |= I915G_FENCE_SIZE_1M; @@ -1325,7 +1325,7 @@ SetFence(ScrnInfoPtr pScrn, int nr, unsigned int start, unsigned int pitch, } } - if (IS_I915G(pI830)) + if (IS_I915G(pI830) || IS_I915GM(pI830)) fence_pitch = pitch / 512; else fence_pitch = pitch / 128; |