diff options
| author | Alex Deucher <alex@samba.(none)> | 2007-12-12 22:37:44 -0500 |
|---|---|---|
| committer | Alex Deucher <alex@samba.(none)> | 2007-12-12 22:37:44 -0500 |
| commit | f5ac34983411e4c4f41ab1817dce582830f398fd (patch) | |
| tree | 4d2c47513ae6893ff7ea928704718356eb3824cd /src/radeon_dri.c | |
| parent | f2b2e0804183b52d9d3f56ad85b3552ece76c544 (diff) | |
| parent | 6ccf5b33d27218ae1c45ab93c122438ed536d8ba (diff) | |
Merge branch 'master' of git+ssh://agd5f@git.freedesktop.org/git/xorg/driver/xf86-video-ati into atombios-support
merge and fix conflicts
Diffstat (limited to 'src/radeon_dri.c')
| -rw-r--r-- | src/radeon_dri.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/src/radeon_dri.c b/src/radeon_dri.c index dbfa8d9e..ac8d03c9 100644 --- a/src/radeon_dri.c +++ b/src/radeon_dri.c @@ -1361,6 +1361,9 @@ Bool RADEONDRISetVBlankInterrupt(ScrnInfoPtr pScrn, Bool on) xf86CrtcConfigPtr xf86_config = XF86_CRTC_CONFIG_PTR(pScrn); int value = 0; + if (!info->want_vblank_interrupts) + on = FALSE; + if (info->directRenderingEnabled && info->pKernelDRMVersion->version_minor >= 28) { if (on) { if (xf86_config->num_crtc > 1 && xf86_config->crtc[1]->enabled) |