[Date Prev][Date Next] [Thread Prev][Thread Next] [Date Index] [Thread Index]

Bug#542064: marked as done (xserver-xorg: please include patches to fix idle time computation)

Your message dated Tue, 29 Sep 2009 16:28:16 +0000
with message-id <E1MsfYm-0003Cg-D3@ries.debian.org>
and subject line Bug#542064: fixed in xorg-server 2:1.6.99.903-1
has caused the Debian Bug report #542064,
regarding xserver-xorg: please include patches to fix idle time computation
to be marked as done.

This means that you claim that the problem has been dealt with.
If this is not the case it is now your responsibility to reopen the
Bug report if necessary, and/or fix the problem forthwith.

(NB: If you are a system administrator and have no idea what this
message is talking about, this may indicate a serious mail system
misconfiguration somewhere. Please contact owner@bugs.debian.org
immediately.)


-- 
542064: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=542064
Debian Bug Tracking System
Contact owner@bugs.debian.org with problems
--- Begin Message --- 
Package: xserver-xorg
Version: 1:7.4+4
Severity: wishlist

Hi,

as explained in [0], gnome-power-manager 2.28 will stop including any of
the (not always working) kludges to work around the idle time
computation issues in the X server.

The author has provided supposedly correct patches to fix this behavior
to Xorg. The first patch has already been committed, and the second is
very small. It would be nice to have these fixes included in Debian
before g-p-m 2.28 is uploaded.

I’m attaching the patches.

[0] http://blogs.gnome.org/hughsie/2009/08/17/gnome-power-manager-and-blanking-removal-of-bodges/

Thanks,
-- 
 .''`.      Josselin Mouette
: :' :
`. `'   “I recommend you to learn English in hope that you in
  `-     future understand things”  -- Jörg Schilling

From db568f9eabf3450d8a023597ff007df355b13ea8 Mon Sep 17 00:00:00 2001
From: Peter Hutterer <peter.hutterer@who-t.net>
Date: Thu, 13 Aug 2009 06:37:00 +0000
Subject: Xext: fix up wrong conditions for negative sync transitions.

If the counter had a value higher than the trigger value for a negative
transition, the trigger value did not get set.

The correct sequence of checks is:
if (positive transition)
   if (counter value < trigger value)
      set up trigger
if (negative transition)
   if (counter value > trigger value)
      set up trigger

Red Hat Bug 501601 <https://bugzilla.redhat.com/show_bug.cgi?id=501601>

Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
---
diff --git a/Xext/sync.c b/Xext/sync.c
index 5f4ce56..667f8ab 100644
--- a/Xext/sync.c
+++ b/Xext/sync.c
@@ -962,28 +962,24 @@ SyncComputeBracketValues(SyncCounter *pCounter, Bool startOver)
 		pnewltval = &psci->bracket_less;
 	    }
 	}
-	else if ( (pTrigger->test_type == XSyncPositiveTransition &&
+	else if (pTrigger->test_type == XSyncNegativeTransition &&
 		   ct != XSyncCounterNeverIncreases)
-		 ||
-		 (pTrigger->test_type == XSyncNegativeTransition &&
+	{
+	    if (XSyncValueGreaterThan(pCounter->value, pTrigger->test_value) &&
+		XSyncValueGreaterThan(pTrigger->test_value, psci->bracket_less))
+	    {
+		psci->bracket_less = pTrigger->test_value;
+		pnewltval = &psci->bracket_less;
+	    }
+	}
+        else if (pTrigger->test_type == XSyncPositiveTransition &&
 		  ct != XSyncCounterNeverDecreases)
-		 )
 	{
-	    if (XSyncValueLessThan(pCounter->value, pTrigger->test_value))
+	    if (XSyncValueLessThan(pCounter->value, pTrigger->test_value) &&
+		XSyncValueLessThan(pTrigger->test_value, psci->bracket_greater))
 	    {
-		if (XSyncValueLessThan(pTrigger->test_value,
-				       psci->bracket_greater))
-		{
-		    psci->bracket_greater = pTrigger->test_value;
-		    pnewgtval = &psci->bracket_greater;
-		}
-		else
-		if (XSyncValueGreaterThan(pTrigger->test_value,
-					  psci->bracket_less))
-		{
-		    psci->bracket_less = pTrigger->test_value;
-		    pnewltval = &psci->bracket_less;
-		}
+		psci->bracket_greater = pTrigger->test_value;
+		pnewgtval = &psci->bracket_greater;
 	    }
 	}
     } /* end for each trigger */
--
cgit v0.8.2

From 9c5fcee00d247c5bcf8a9af3a2e332ea4416f7e8 Mon Sep 17 00:00:00 2001
From: Richard Hughes <richard@hughsie.com>
Date: Mon, 17 Aug 2009 09:15:32 +0100
Subject: [PATCH 2/2] Do not reset lastDeviceEventTime when we do dixSaveScreens

When we turn off DPMS with DPMSModeOff and do dixSaveScreens, don't reset the
event time else session clients using IDLETIME will be reset.
---
 dix/window.c |    2 --
 1 files changed, 0 insertions(+), 2 deletions(-)

diff --git a/dix/window.c b/dix/window.c
index 32e26d9..1a645f6 100644
--- a/dix/window.c
+++ b/dix/window.c
@@ -3128,8 +3128,6 @@ dixSaveScreens(ClientPtr client, int on, int mode)
 
     if (on == SCREEN_SAVER_FORCER)
     {
-	UpdateCurrentTimeIf();
-	lastDeviceEventTime = currentTime;
 	if (mode == ScreenSaverReset)
 	    what = SCREEN_SAVER_OFF;
 	else
-- 
1.6.2.5

Attachment: signature.asc
Description: Ceci est une partie de message =?ISO-8859-1?Q?num=E9riquement?= =?ISO-8859-1?Q?_sign=E9e?=


--- End Message ---
--- Begin Message --- 
Source: xorg-server
Source-Version: 2:1.6.99.903-1

We believe that the bug you reported is fixed in the latest version of
xorg-server, which is due to be installed in the Debian FTP archive:

xdmx-tools_1.6.99.903-1_amd64.deb
  to pool/main/x/xorg-server/xdmx-tools_1.6.99.903-1_amd64.deb
xdmx_1.6.99.903-1_amd64.deb
  to pool/main/x/xorg-server/xdmx_1.6.99.903-1_amd64.deb
xnest_1.6.99.903-1_amd64.deb
  to pool/main/x/xorg-server/xnest_1.6.99.903-1_amd64.deb
xorg-server_1.6.99.903-1.diff.gz
  to pool/main/x/xorg-server/xorg-server_1.6.99.903-1.diff.gz
xorg-server_1.6.99.903-1.dsc
  to pool/main/x/xorg-server/xorg-server_1.6.99.903-1.dsc
xorg-server_1.6.99.903.orig.tar.gz
  to pool/main/x/xorg-server/xorg-server_1.6.99.903.orig.tar.gz
xserver-common_1.6.99.903-1_all.deb
  to pool/main/x/xorg-server/xserver-common_1.6.99.903-1_all.deb
xserver-xephyr_1.6.99.903-1_amd64.deb
  to pool/main/x/xorg-server/xserver-xephyr_1.6.99.903-1_amd64.deb
xserver-xfbdev_1.6.99.903-1_amd64.deb
  to pool/main/x/xorg-server/xserver-xfbdev_1.6.99.903-1_amd64.deb
xserver-xorg-core-dbg_1.6.99.903-1_amd64.deb
  to pool/main/x/xorg-server/xserver-xorg-core-dbg_1.6.99.903-1_amd64.deb
xserver-xorg-core_1.6.99.903-1_amd64.deb
  to pool/main/x/xorg-server/xserver-xorg-core_1.6.99.903-1_amd64.deb
xserver-xorg-dev_1.6.99.903-1_amd64.deb
  to pool/main/x/xorg-server/xserver-xorg-dev_1.6.99.903-1_amd64.deb
xvfb_1.6.99.903-1_amd64.deb
  to pool/main/x/xorg-server/xvfb_1.6.99.903-1_amd64.deb



A summary of the changes between this version and the previous one is
attached.

Thank you for reporting the bug, which will now be closed.  If you
have further comments please address them to 542064@bugs.debian.org,
and the maintainer will reopen the bug report if appropriate.

Debian distribution maintenance software
pp.
Julien Cristau <jcristau@debian.org> (supplier of updated xorg-server package)

(This message was generated automatically at their request; if you
believe that there is a problem with it please contact the archive
administrators by mailing ftpmaster@debian.org)


-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

Format: 1.8
Date: Tue, 29 Sep 2009 17:51:05 +0200
Source: xorg-server
Binary: xserver-xorg-core xserver-xorg-dev xdmx xdmx-tools xnest xvfb xserver-xephyr xserver-xfbdev xserver-xorg-core-dbg xserver-common
Architecture: source all amd64
Version: 2:1.6.99.903-1
Distribution: experimental
Urgency: low
Maintainer: Debian X Strike Force <debian-x@lists.debian.org>
Changed-By: Julien Cristau <jcristau@debian.org>
Description: 
 xdmx       - distributed multihead X server
 xdmx-tools - Distributed Multihead X tools
 xnest      - Nested X server
 xserver-common - common files used by various X servers
 xserver-xephyr - nested X server
 xserver-xfbdev - Linux framebuffer device tiny X server
 xserver-xorg-core - Xorg X server - core server
 xserver-xorg-core-dbg - Xorg - the X.Org X server (debugging symbols)
 xserver-xorg-dev - Xorg X server - development files
 xvfb       - Virtual Framebuffer 'fake' X server
Closes: 325181 427121 487904 500583 541254 542064 544988
Changes: 
 xorg-server (2:1.6.99.903-1) experimental; urgency=low
 .
   * New upstream snapshot.
     + doesn't fill log file with errors when acpid isn't running
       (closes: #487904, #500583)
     + adds autoconfig for geode variants (closes: #544988)
     + fixes idle time computation (closes: #542064)
     + Xnest uses the host's mouse acceleration and speed (closes: #325181)
     + Xephyr now has a manpage (closes: #427121)
     + Xdmx works again (closes: #541254)
   * Update build deps
   * Update patch stack:
     - 20_hurd-i386.diff applied upstream
     - fedora-bad-fbdev-thats-mine.patch applied upstream
     - fedora-pci-primary.diff superseded upstream
     - fedora-vboxvideo.diff applied upstream
     - kfreebsd-ftbfs.diff applied upstream
     - Add-libgcrypt-as-an-option-for-sha1.diff refreshed
     - Turn-on-ModeDebug-by-default.patch refreshed
   * Cleanup some libtool cruft in debian/rules clean.
   * Bump serverminver, videoabiver and inputabiver.
   * Bump debhelper compat level to 5:
     - handle dh_strip behaviour change
     - fix xserver-xorg-core.install
   * Bump Standards-Version to 3.8.3.
Checksums-Sha1: 
 34cf2c86f3e6348b4e6113b4b367d6bb6e642f21 3313 xorg-server_1.6.99.903-1.dsc
 824b9364ccf3d927a1bcd984e81b45c894a5e713 6586045 xorg-server_1.6.99.903.orig.tar.gz
 6b7efe258e9f7d2df6dbb79b8d71c594674d23de 324712 xorg-server_1.6.99.903-1.diff.gz
 69be97d787fbc52d3d3c1e1e5c70e5a0e553c317 52090 xserver-common_1.6.99.903-1_all.deb
 309f822fde69c1e4f380b82f839ae7ade37d6add 2457230 xserver-xorg-core_1.6.99.903-1_amd64.deb
 e3b857ac7faa05d7e166a14c2e510c408c9f9f48 1159218 xserver-xorg-dev_1.6.99.903-1_amd64.deb
 c1d6f73d6499f07e0b4249eb1be3ef4d669dbd1b 1678830 xdmx_1.6.99.903-1_amd64.deb
 d0cd73a7708456be02e34d3c56eaa2372aac0ea8 972252 xdmx-tools_1.6.99.903-1_amd64.deb
 8b80cdecf22d50721a4baa7412a0d6838e9b2bf3 1594962 xnest_1.6.99.903-1_amd64.deb
 14b682c2e0456afe8fc8127012860fc35949019c 1707828 xvfb_1.6.99.903-1_amd64.deb
 29367f74650894a2c38e25725da82f47f734757d 1793622 xserver-xephyr_1.6.99.903-1_amd64.deb
 bf52e09aabd81e44da18a63a041eed266e5d0563 1733374 xserver-xfbdev_1.6.99.903-1_amd64.deb
 9e8bd515a02f364934e983a4b102204bf1217752 6032042 xserver-xorg-core-dbg_1.6.99.903-1_amd64.deb
Checksums-Sha256: 
 9c5838ef8039c3e54aff7860760d5bc9b69d13a63b2034b57156068b9843d44b 3313 xorg-server_1.6.99.903-1.dsc
 211e0bdcebbdb908c0e1507167afbc9df1e6a1ba9d3a3463be3b888c307966b4 6586045 xorg-server_1.6.99.903.orig.tar.gz
 a17139f6678c9450501c55137bb351ef67a2dd3d8ffa3273df989586fadfa904 324712 xorg-server_1.6.99.903-1.diff.gz
 b8d01b109c570235083d5e2a06bf0626f31638caa030d6f12e463a09ff83dd2b 52090 xserver-common_1.6.99.903-1_all.deb
 ec5be7a3fa2ce322789f1fac8ac04f80de167e45ed7b98b1c1ff57162b0f4b0b 2457230 xserver-xorg-core_1.6.99.903-1_amd64.deb
 eaa1763ad9ed45d8ce3434157694d7789733c63e0cc4ebcab832cbe694c52e9e 1159218 xserver-xorg-dev_1.6.99.903-1_amd64.deb
 940b274bb68bf76e7735bb07138bec8bc8ada57b4a0cc0149f19d5753f300d09 1678830 xdmx_1.6.99.903-1_amd64.deb
 4f717239bf8f2bdb07e7ea843abdb3ecc792be10989aa179f9715be516e4c0a4 972252 xdmx-tools_1.6.99.903-1_amd64.deb
 2be30a522e5014ebde30c6d798ea512dc8cc91d9d9124a03751d8770bd641a2c 1594962 xnest_1.6.99.903-1_amd64.deb
 1c693c7aa089246ece793479c92333e30ee3f5f3d11ddef522fed65eab2cbc81 1707828 xvfb_1.6.99.903-1_amd64.deb
 fa3715c070df7f28349ea92bb9513ddbaa04764c3bd035296a234002834594c5 1793622 xserver-xephyr_1.6.99.903-1_amd64.deb
 c96ea6f5de029a0a5eed40390ab489023339916b72216b6db755e8b35b6cf1fa 1733374 xserver-xfbdev_1.6.99.903-1_amd64.deb
 fd4becd63308792907677c35bfcf31980c5f7fd8ab7340d0c48b37d9182dcf13 6032042 xserver-xorg-core-dbg_1.6.99.903-1_amd64.deb
Files: 
 cf2884d28c7d76ed8adc4244e177289a 3313 x11 optional xorg-server_1.6.99.903-1.dsc
 f2c7aa9baa61058c784e850935fa3e6f 6586045 x11 optional xorg-server_1.6.99.903.orig.tar.gz
 09c5d130f04681eab017dd648c574365 324712 x11 optional xorg-server_1.6.99.903-1.diff.gz
 36ac0db0cce03a0094c62f06c4c6cccb 52090 x11 optional xserver-common_1.6.99.903-1_all.deb
 a4708093c0b0b7597015af6aae86edf3 2457230 x11 optional xserver-xorg-core_1.6.99.903-1_amd64.deb
 ceb2632908e27ea9cf11fba592bb2dc3 1159218 x11 optional xserver-xorg-dev_1.6.99.903-1_amd64.deb
 44445b20e7a5e75677eaf903d95d78f6 1678830 x11 optional xdmx_1.6.99.903-1_amd64.deb
 1f632b5266ee443cb2cf6adfca244cfa 972252 x11 optional xdmx-tools_1.6.99.903-1_amd64.deb
 69f17b9addb14aa552ef49871fc0b324 1594962 x11 optional xnest_1.6.99.903-1_amd64.deb
 3ef429a01c151a58bc6dab034ec0f8c1 1707828 x11 optional xvfb_1.6.99.903-1_amd64.deb
 c18a1adfa78ae38e55748f9850232c34 1793622 x11 optional xserver-xephyr_1.6.99.903-1_amd64.deb
 61ad1f5364632445fb80fc9a32b97a82 1733374 x11 optional xserver-xfbdev_1.6.99.903-1_amd64.deb
 f6a5d83aa220324286d3a6521842f36a 6032042 debug extra xserver-xorg-core-dbg_1.6.99.903-1_amd64.deb

-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.10 (GNU/Linux)

iEYEARECAAYFAkrCLtsACgkQmEvTgKxfcAzTOwCfXVV4powzKE1z6wOz81knm7Ir
/R4AoKPvYFRV+celU+HFT2L2wBcme90q
=3KdG
-----END PGP SIGNATURE-----

--- End Message ---
Reply to: