diff options
| author | Alan Hourihane <alanh@fairlite.demon.co.uk> | 2006-08-21 12:08:01 +0100 |
|---|---|---|
| committer | Alan Hourihane <alanh@fairlite.demon.co.uk> | 2006-08-21 12:08:01 +0100 |
| commit | dad0e7fc09fa7794f20278d9d99abd96a21b691e (patch) | |
| tree | 8d9d5f4cff66ccbaf1b890f4c9137c870cf4018e /src | |
| parent | 361c49ad3cfe58b9ab98dfb6e95de505c0d63730 (diff) | |
| parent | 43daaec63929c1f0e54a5125375d8147629da4b9 (diff) | |
Merge branch 'master' of git+ssh://git.freedesktop.org/git/xorg/driver/xf86-video-intel
Diffstat (limited to 'src')
| -rw-r--r-- | src/i830_video.c | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/src/i830_video.c b/src/i830_video.c index 693c703f..7f6eb80d 100644 --- a/src/i830_video.c +++ b/src/i830_video.c @@ -2288,6 +2288,15 @@ BroadwaterDisplayVideoTextured(ScrnInfoPtr pScrn, I830PortPrivPtr pPriv, int id, */ *pI830->used3D |= 1 << 30; +#ifdef XF86DRI + /* Tell the DRI that we're smashing its state. */ + if (pI830->directRenderingEnabled) { + drmI830Sarea *pSAREAPriv = DRIGetSAREAPrivate(pScrn->pScreen); + + pSAREAPriv->ctxOwner = DRIGetContext(pScrn->pScreen); + } +#endif /* XF86DRI */ + next_offset = 0; /* Set up our layout of state in framebuffer. First the general state: */ |