xserver-xorg-video-intel: Changes to 'ubuntu'
debian/changelog | 9 ++
debian/patches/115_quell_vblank_counter_failed.patch | 80 +++++++++++++++++++
debian/patches/series | 1
3 files changed, 90 insertions(+)
New commits:
commit 20f93dda068b32b04a2ff29d8a363a701c0a8cb6
Author: Bryce Harrington <bryce@canonical.com>
Date: Tue Feb 15 19:13:51 2011 -0800
Add 115_quell_vblank_counter_failed.patch: Don't fill up Xorg.0.log with "get vblank counter failed: Invalid argument" warnings. 5 is enough. (LP: #710594)
diff --git a/debian/changelog b/debian/changelog
index 45f47bc..2601257 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,12 @@
+xserver-xorg-video-intel (2:2.14.0-1ubuntu9) natty; urgency=low
+
+ * Add 115_quell_vblank_counter_failed.patch: Don't fill up Xorg.0.log
+ with "get vblank counter failed: Invalid argument" warnings. 5 is
+ enough.
+ (LP: #710594)
+
+ -- Bryce Harrington <bryce@ubuntu.com> Tue, 15 Feb 2011 19:11:25 -0800
+
xserver-xorg-video-intel (2:2.14.0-1ubuntu8) natty; urgency=low
* 111_fix_clipped_window_plane_offset.patch,
diff --git a/debian/patches/115_quell_vblank_counter_failed.patch b/debian/patches/115_quell_vblank_counter_failed.patch
new file mode 100644
index 0000000..2c5e553
--- /dev/null
+++ b/debian/patches/115_quell_vblank_counter_failed.patch
@@ -0,0 +1,80 @@
+diff --git a/src/intel_dri.c b/src/intel_dri.c
+index 7b60e14..65c8f39 100644
+--- a/src/intel_dri.c
++++ b/src/intel_dri.c
+@@ -1057,10 +1057,14 @@ I830DRI2GetMSC(DrawablePtr draw, CARD64 *ust, CARD64 *msc)
+
+ ret = drmWaitVBlank(intel->drmSubFD, &vbl);
+ if (ret) {
+- xf86DrvMsg(scrn->scrnIndex, X_WARNING,
+- "%s:%d get vblank counter failed: %s\n",
+- __FUNCTION__, __LINE__,
+- strerror(errno));
++ static int limit = 5;
++ if (limit) {
++ xf86DrvMsg(scrn->scrnIndex, X_WARNING,
++ "%s:%d get vblank counter failed: %s\n",
++ __FUNCTION__, __LINE__,
++ strerror(errno));
++ limit--;
++ }
+ return FALSE;
+ }
+
+@@ -1113,10 +1117,14 @@ I830DRI2ScheduleWaitMSC(ClientPtr client, DrawablePtr draw, CARD64 target_msc,
+ vbl.request.sequence = 0;
+ ret = drmWaitVBlank(intel->drmSubFD, &vbl);
+ if (ret) {
+- xf86DrvMsg(scrn->scrnIndex, X_WARNING,
+- "%s:%d get vblank counter failed: %s\n",
+- __FUNCTION__, __LINE__,
+- strerror(errno));
++ static int limit = 5;
++ if (limit) {
++ xf86DrvMsg(scrn->scrnIndex, X_WARNING,
++ "%s:%d get vblank counter failed: %s\n",
++ __FUNCTION__, __LINE__,
++ strerror(errno));
++ limit--;
++ }
+ goto out_complete;
+ }
+
+@@ -1143,10 +1151,14 @@ I830DRI2ScheduleWaitMSC(ClientPtr client, DrawablePtr draw, CARD64 target_msc,
+ vbl.request.signal = (unsigned long)wait_info;
+ ret = drmWaitVBlank(intel->drmSubFD, &vbl);
+ if (ret) {
+- xf86DrvMsg(scrn->scrnIndex, X_WARNING,
+- "%s:%d get vblank counter failed: %s\n",
+- __FUNCTION__, __LINE__,
+- strerror(errno));
++ static int limit = 5;
++ if (limit) {
++ xf86DrvMsg(scrn->scrnIndex, X_WARNING,
++ "%s:%d get vblank counter failed: %s\n",
++ __FUNCTION__, __LINE__,
++ strerror(errno));
++ limit--;
++ }
+ goto out_complete;
+ }
+
+@@ -1178,10 +1190,14 @@ I830DRI2ScheduleWaitMSC(ClientPtr client, DrawablePtr draw, CARD64 target_msc,
+ vbl.request.signal = (unsigned long)wait_info;
+ ret = drmWaitVBlank(intel->drmSubFD, &vbl);
+ if (ret) {
+- xf86DrvMsg(scrn->scrnIndex, X_WARNING,
+- "%s:%d get vblank counter failed: %s\n",
+- __FUNCTION__, __LINE__,
+- strerror(errno));
++ static int limit = 5;
++ if (limit) {
++ xf86DrvMsg(scrn->scrnIndex, X_WARNING,
++ "%s:%d get vblank counter failed: %s\n",
++ __FUNCTION__, __LINE__,
++ strerror(errno));
++ limit--;
++ }
+ goto out_complete;
+ }
+
diff --git a/debian/patches/series b/debian/patches/series
index 6bc1536..68ed82b 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -7,3 +7,4 @@
112_fix_error_in_4c4ad555.patch
113_remove_broken_max_base_addresses.patch
114_warnings_cleanup_part_2.patch
+115_quell_vblank_counter_failed.patch
Reply to: