~ubuntu-branches/ubuntu/jaunty/mesa/jaunty

« back to all changes in this revision

Viewing changes to debian/patches/102_dont_vblank.patch

  • Committer: Bazaar Package Importer
  • Author(s): Timo Aaltonen
  • Date: 2009-01-23 10:20:24 UTC
  • mfrom: (1.2.14 upstream)
  • Revision ID: james.westby@ubuntu.com-20090123102024-1f3kmb3aea7wzk67
Tags: 7.3~rc3-1ubuntu1
* Merge with Debian experimental.
* Drop 102_dont_vblank.patch, since the new drm code in the kernel
  fixes the bugs that it worked around.
* Bump the build-dependency of libdrm to 2.4.4. It's the first version
  with necessary changes to build this.

Show diffs side-by-side

added added

removed removed

Lines of Context:
1
 
diff --git a/src/mesa/drivers/dri/intel/intel_screen.c b/src/mesa/drivers/dri/intel/intel_screen.c
2
 
index 5233e58..5dded4b 100644
3
 
--- a/src/mesa/drivers/dri/intel/intel_screen.c
4
 
+++ b/src/mesa/drivers/dri/intel/intel_screen.c
5
 
@@ -55,7 +55,7 @@ PUBLIC const char __driConfigOptions[] =
6
 
    DRI_CONF_BEGIN
7
 
    DRI_CONF_SECTION_PERFORMANCE
8
 
       DRI_CONF_FTHROTTLE_MODE(DRI_CONF_FTHROTTLE_IRQS)
9
 
-      DRI_CONF_VBLANK_MODE(DRI_CONF_VBLANK_ALWAYS_SYNC)
10
 
+      DRI_CONF_VBLANK_MODE(DRI_CONF_VBLANK_DEF_INTERVAL_0)
11
 
       /* Options correspond to DRI_CONF_BO_REUSE_DISABLED,
12
 
        * DRI_CONF_BO_REUSE_ALL
13
 
        */