xserver: Branch 'master' - 2 commits

[Adam Jackson]

 Xext/xselinux.c          |    2 ++
 hw/xfree86/ddc/xf86DDC.c |    7 ++++++-
 2 files changed, 8 insertions(+), 1 deletion(-)

New commits:
commit 8c6b4a827624aa70aea94b449fee6d5df8504105
Author: Adam Jackson <ajax at redhat.com>
Date:   Fri Feb 27 12:42:43 2009 -0500

    DDC: Redo extended device probe slightly.
    
    We'll now only mention the E-EDID segment register if the device is
    actually E-EDID-capable.  While we're here, check for DDC/CI and
    standard EEPROM support too.

diff --git a/hw/xfree86/ddc/xf86DDC.c b/hw/xfree86/ddc/xf86DDC.c
index e3f40ec..dba14d5 100644
--- a/hw/xfree86/ddc/xf86DDC.c
+++ b/hw/xfree86/ddc/xf86DDC.c
@@ -138,8 +138,13 @@ DDC2Init(int scrnIndex, I2CBusPtr pBus)
      */
     pBus->RiseFallTime = 20;
  
-    DDC2MakeDevice(pBus, 0x0060, "E-EDID segment register");
     dev = DDC2MakeDevice(pBus, 0x00A0, "ddc2");
+    if (xf86I2CProbeAddress(pBus, 0x0060))
+	DDC2MakeDevice(pBus, 0x0060, "E-EDID segment register");
+    if (xf86I2CProbeAddress(pBus, 0x0062))
+	DDC2MakeDevice(pBus, 0x0062, "EDID EEPROM interface");
+    if (xf86I2CProbeAddress(pBus, 0x006E))
+	DDC2MakeDevice(pBus, 0x006E, "DDC control interface");
 
     return dev;
 }
commit b030f858f2f1ce1fd27a73ebf7f9ec5db541a668
Author: Adam Jackson <ajax at redhat.com>
Date:   Sat Feb 21 19:56:20 2009 -0500

    selinux: Don't bother relabeling resources that are being destroyed
    
    Makes window destroy about 40x faster in Xvfb.

diff --git a/Xext/xselinux.c b/Xext/xselinux.c
index e2eeac9..6d51fa1 100644
--- a/Xext/xselinux.c
+++ b/Xext/xselinux.c
@@ -1146,6 +1146,8 @@ SELinuxResourceState(CallbackListPtr *pcbl, pointer unused, pointer calldata)
 
     if (rec->type != RT_WINDOW)
 	return;
+    if (rec->state != ResourceStateAdding)
+	return;
 
     pWin = (WindowPtr)rec->value;
     subj = dixLookupPrivate(&wClient(pWin)->devPrivates, subjectKey);