Merge remote-tracking branch 'origin/released'

Conflicts:
	fontconfig/.gitignore
	libX11/src/ConvSel.c
	libX11/src/CrGlCur.c
	libX11/src/CrWindow.c
	libX11/src/GetDflt.c
	libX11/src/Window.c
	libX11/src/xlibi18n/XimProto.h
	libX11/src/xlibi18n/lcDynamic.c
	libxcb/src/.gitignore
	libxcb/src/xcb_ext.c
	libxcb/src/xcb_xid.c
	mesalib/src/glsl/.gitignore
	mesalib/src/glsl/glcpp/.gitignore
	mesalib/src/mapi/glapi/gen/glX_API.xml
	mesalib/src/mapi/glapi/glapi_getproc.c
	mesalib/src/mesa/main/.gitignore
	mesalib/src/mesa/main/syncobj.c
	mesalib/src/mesa/program/.gitignore
	xkbcomp/listing.c
	xkbcomp/xkbpath.c
	xorg-server/.gitignore
	xorg-server/Xext/xvmain.c
	xorg-server/dix/dispatch.c
	xorg-server/hw/xwin/glx/winpriv.h
	xorg-server/hw/xwin/winprefsyacc.y
	xorg-server/hw/xwin/winscrinit.c
	xorg-server/xkeyboard-config/rules/bin/ml1_s.sh
	xorg-server/xkeyboard-config/rules/bin/ml1v1_s.sh
	xorg-server/xkeyboard-config/rules/bin/ml1v_s.sh
	xorg-server/xkeyboard-config/rules/bin/ml_s.sh
	xorg-server/xkeyboard-config/rules/bin/mlv_s.sh
	xorg-server/xkeyboard-config/rules/compat/.gitignore

4 files changed, 123 insertions, 126 deletions

diff --git a/xorg-server/hw/xfree86/ddc/DDC.HOWTO b/xorg-server/hw/xfree86/ddc/DDC.HOWTO
index 1d06ca124..54fbe73ad 100644
--- a/xorg-server/hw/xfree86/ddc/DDC.HOWTO
+++ b/xorg-server/hw/xfree86/ddc/DDC.HOWTO
@@ -1,97 +1,97 @@
-			DDC.HOWTO
-
-  This file describes how to add DDC support to a chipset driver.
-
-1) DDC INITIALIZATION
-
-   When implementing DDC in the driver one has the choice between
-   DDC1 and DDC2. 
-   DDC1 data is continuously transmitted by a DDC1 capable display 
-   device. The data is send serially over a data line; the Vsync 
-   signal serves as clock. Only one EDID 1.x data block can be 
-   transmitted using DDC1. Since transmission of an EDID1 block 
-   using a regular Vsync frequency would take up several seconds 
-   the driver can increase the Vsync frequency to up to 25 kHz as 
-   soon as it detects DDC1 activity on the data line.
-   DDC2 data is transmitted using the I2C protocol. This requires
-   an additional clock line. DDC2 is capable of transmitting EDID1
-   and EDID2 block as well as a VDIF block on display devices that 
-   support these.  
-   Display devices switch into the DDC2 mode as soon as they detect
-   activity on the DDC clock line. Once the are in DDC2 mode they
-   stop transmitting DDC1 signals until the next power cycle.
-
-   Some graphics chipset configurations which are not capable of
-   DDC2 might still be able to read DDC1 data. Where available
-   DDC2 it is preferable. 
-	
-   All relevant prototypes and defines are in xf86DDC.h.
-   DDC2 additionally requires I2C support. The I2C prototypes
-   are in xf86i2c.h.
-
-   DDC1 Support:
-
-     The driver has to provide a read function which waits for the
-     end of the next Vsync signal and reads in and returns the status
-     of the DDC line:
-
-     unsigned int XXX_ddc1Read(ScrnInfoPtr pScrn)
-     
-     Additionally a function is required to increase the Vsync
-     frequency to max. 25 kHz. 
- 
-     void XXX_ddc1SetSpeed(ScrnInfoPtr pScrn, xf86ddcSpeed speed)
- 
-     If the speed argument is DDC_FAST the function should increase
-     the Vsync frequency on DDC_SLOW it should restore the original
-     value. For convenience a generic ddc1SetSpeed() function is provided
-     in the vga module for VGA-like chipsets.     
-	
-     void vgaHWddc1SetSpeed(ScrnInfoPtr pScrn, sf86ddcSpeed speed).
-
-     To read out the DDC1 data the driver should call 
-
-     xf86MonPtr xf86DoEDID_DDC1(int scrnIndex, 
-                              void (*DDC1SetSpeed)(ScrnInfoPtr, xf86ddcSpeed),
-                              unsigned int (*DDC1Read)(ScrnInfoPtr))
- 
-     in PreInit(). DDC1SetSpeed is a pointer to the SetSpeed()
-     function, DDC1Read has to point to the DDC1 read function.
-     The function will return a pointer to the xf86Monitor structure
-     which contains all information retrieved by DDC.
-     NULL will be returned on failure.
-
-   DDC2 Support
- 
-     To read out DDC2 information I2C has to be initialized first.
-     (See documentation for the i2c module). 
-     The function 
-     
-     xf86MonPtr xf86DoEDID_DDC2(int scrnIndex, I2CBusPtr pBus)
-
-     is provided to read out and process DDC2 data. A pointer
-     to the I2CBusRec of the appropriate I2C Bus has to be passed
-     as the second argument.
-     The function will return a pointer to the xf86Monitor structure
-     which contains all information retrieved by DDC.
-     NULL will be returned on failure.
-
-   Printing monitor parameters   
-
-     To print out the information contained in the xf86Monitor
-     structure the function 
-
-     xf86MonPtr xf86PrintEDID(xf86MonPtr monitor)
- 
-     is provided.
-
-    Further processing of the xf86Monitor structure is not yet 
-    implemented. However, it is planned to use the information
-    about video modes, gamma values etc.
-    Therefore it is strongly recommended to read out DDC data
-    before any video mode processing is done.
-
-
-
-
-$XFree86: xc/programs/Xserver/hw/xfree86/ddc/DDC.HOWTO,v 1.2 1998/12/06 13:30:39 dawes Exp $
+			DDC.HOWTO

+

+  This file describes how to add DDC support to a chipset driver.

+

+1) DDC INITIALIZATION

+

+   When implementing DDC in the driver one has the choice between

+   DDC1 and DDC2. 

+   DDC1 data is continuously transmitted by a DDC1 capable display 

+   device. The data is send serially over a data line; the Vsync 

+   signal serves as clock. Only one EDID 1.x data block can be 

+   transmitted using DDC1. Since transmission of an EDID1 block 

+   using a regular Vsync frequency would take up several seconds 

+   the driver can increase the Vsync frequency to up to 25 kHz as 

+   soon as it detects DDC1 activity on the data line.

+   DDC2 data is transmitted using the I2C protocol. This requires

+   an additional clock line. DDC2 is capable of transmitting EDID1

+   and EDID2 block as well as a VDIF block on display devices that 

+   support these.  

+   Display devices switch into the DDC2 mode as soon as they detect

+   activity on the DDC clock line. Once the are in DDC2 mode they

+   stop transmitting DDC1 signals until the next power cycle.

+

+   Some graphics chipset configurations which are not capable of

+   DDC2 might still be able to read DDC1 data. Where available

+   DDC2 it is preferable. 

+	

+   All relevant prototypes and defines are in xf86DDC.h.

+   DDC2 additionally requires I2C support. The I2C prototypes

+   are in xf86i2c.h.

+

+   DDC1 Support:

+

+     The driver has to provide a read function which waits for the

+     end of the next Vsync signal and reads in and returns the status

+     of the DDC line:

+

+     unsigned int XXX_ddc1Read(ScrnInfoPtr pScrn)

+     

+     Additionally a function is required to increase the Vsync

+     frequency to max. 25 kHz. 

+ 

+     void XXX_ddc1SetSpeed(ScrnInfoPtr pScrn, xf86ddcSpeed speed)

+ 

+     If the speed argument is DDC_FAST the function should increase

+     the Vsync frequency on DDC_SLOW it should restore the original

+     value. For convenience a generic ddc1SetSpeed() function is provided

+     in the vga module for VGA-like chipsets.     

+	

+     void vgaHWddc1SetSpeed(ScrnInfoPtr pScrn, sf86ddcSpeed speed).

+

+     To read out the DDC1 data the driver should call 

+

+     xf86MonPtr xf86DoEDID_DDC1(int scrnIndex, 

+                              void (*DDC1SetSpeed)(ScrnInfoPtr, xf86ddcSpeed),

+                              unsigned int (*DDC1Read)(ScrnInfoPtr))

+ 

+     in PreInit(). DDC1SetSpeed is a pointer to the SetSpeed()

+     function, DDC1Read has to point to the DDC1 read function.

+     The function will return a pointer to the xf86Monitor structure

+     which contains all information retrieved by DDC.

+     NULL will be returned on failure.

+

+   DDC2 Support

+ 

+     To read out DDC2 information I2C has to be initialized first.

+     (See documentation for the i2c module). 

+     The function 

+     

+     xf86MonPtr xf86DoEDID_DDC2(int scrnIndex, I2CBusPtr pBus)

+

+     is provided to read out and process DDC2 data. A pointer

+     to the I2CBusRec of the appropriate I2C Bus has to be passed

+     as the second argument.

+     The function will return a pointer to the xf86Monitor structure

+     which contains all information retrieved by DDC.

+     NULL will be returned on failure.

+

+   Printing monitor parameters   

+

+     To print out the information contained in the xf86Monitor

+     structure the function 

+

+     xf86MonPtr xf86PrintEDID(xf86MonPtr monitor)

+ 

+     is provided.

+

+    Further processing of the xf86Monitor structure is not yet 

+    implemented. However, it is planned to use the information

+    about video modes, gamma values etc.

+    Therefore it is strongly recommended to read out DDC data

+    before any video mode processing is done.

+

+

+

+

+$XFree86: xc/programs/Xserver/hw/xfree86/ddc/DDC.HOWTO,v 1.2 1998/12/06 13:30:39 dawes Exp $

diff --git a/xorg-server/hw/xfree86/ddc/Makefile.am b/xorg-server/hw/xfree86/ddc/Makefile.am
index 93ea4a2a5..0db5d833f 100644
--- a/xorg-server/hw/xfree86/ddc/Makefile.am
+++ b/xorg-server/hw/xfree86/ddc/Makefile.am
@@ -1,11 +1,11 @@
-sdk_HEADERS = edid.h xf86DDC.h
-
-noinst_LTLIBRARIES = libddc.la
-
-libddc_la_SOURCES = ddc.c interpret_edid.c print_edid.c ddcProperty.c
-
-INCLUDES = $(XORG_INCS) -I$(srcdir)/../i2c
-
-AM_CFLAGS = $(DIX_CFLAGS) $(XORG_CFLAGS)
-
-EXTRA_DIST = DDC.HOWTO
+sdk_HEADERS = edid.h xf86DDC.h

+

+noinst_LTLIBRARIES = libddc.la

+

+libddc_la_SOURCES = ddc.c interpret_edid.c print_edid.c ddcProperty.c

+

+INCLUDES = $(XORG_INCS) -I$(srcdir)/../i2c

+

+AM_CFLAGS = $(DIX_CFLAGS) $(XORG_CFLAGS)

+

+EXTRA_DIST = DDC.HOWTO

diff --git a/xorg-server/hw/xfree86/ddc/ddc.c b/xorg-server/hw/xfree86/ddc/ddc.c
index a1281d735..28c969646 100644
--- a/xorg-server/hw/xfree86/ddc/ddc.c
+++ b/xorg-server/hw/xfree86/ddc/ddc.c
@@ -258,10 +258,9 @@ EDIDRead_DDC1(ScrnInfoPtr pScrn, DDC1SetSpeedProc DDCSpeed,
  * @return NULL if no monitor attached or failure to interpret the EDID.
  */
 xf86MonPtr
-xf86DoEDID_DDC1(int scrnIndex, DDC1SetSpeedProc DDC1SetSpeed,
+xf86DoEDID_DDC1(ScrnInfoPtr pScrn, DDC1SetSpeedProc DDC1SetSpeed,
                 unsigned int (*DDC1Read) (ScrnInfoPtr))
 {
-    ScrnInfoPtr pScrn = xf86Screens[scrnIndex];
     unsigned char *EDID_block = NULL;
     xf86MonPtr tmp = NULL;
 
@@ -285,7 +284,7 @@ xf86DoEDID_DDC1(int scrnIndex, DDC1SetSpeedProc DDC1SetSpeed,
     OsReleaseSignals();
 
     if (EDID_block) {
-        tmp = xf86InterpretEDID(scrnIndex, EDID_block);
+        tmp = xf86InterpretEDID(pScrn->scrnIndex, EDID_block);
     }
 #ifdef DEBUG
     else
@@ -323,7 +322,7 @@ DDC2MakeDevice(I2CBusPtr pBus, int address, char *name)
 }
 
 static I2CDevPtr
-DDC2Init(int scrnIndex, I2CBusPtr pBus)
+DDC2Init(I2CBusPtr pBus)
 {
     I2CDevPtr dev = NULL;
 
@@ -403,9 +402,8 @@ DDC2Read(I2CDevPtr dev, int block, unsigned char *R_Buffer)
  * @return NULL if no monitor attached or failure to interpret the EDID.
  */
 xf86MonPtr
-xf86DoEEDID(int scrnIndex, I2CBusPtr pBus, Bool complete)
+xf86DoEEDID(ScrnInfoPtr pScrn, I2CBusPtr pBus, Bool complete)
 {
-    ScrnInfoPtr pScrn = xf86Screens[scrnIndex];
     unsigned char *EDID_block = NULL;
     xf86MonPtr tmp = NULL;
     I2CDevPtr dev = NULL;
@@ -427,7 +425,7 @@ xf86DoEEDID(int scrnIndex, I2CBusPtr pBus, Bool complete)
     if (noddc || noddc2)
         return NULL;
 
-    if (!(dev = DDC2Init(scrnIndex, pBus)))
+    if (!(dev = DDC2Init(pBus)))
         return NULL;
 
     EDID_block = calloc(1, EDID1_LEN);
@@ -444,7 +442,7 @@ xf86DoEEDID(int scrnIndex, I2CBusPtr pBus, Bool complete)
                 DDC2Read(dev, i + 1, EDID_block + (EDID1_LEN * (1 + i)));
         }
 
-        tmp = xf86InterpretEEDID(scrnIndex, EDID_block);
+        tmp = xf86InterpretEEDID(pScrn->scrnIndex, EDID_block);
     }
 
     if (tmp && complete)
@@ -465,9 +463,9 @@ xf86DoEEDID(int scrnIndex, I2CBusPtr pBus, Bool complete)
  * @return NULL if no monitor attached or failure to interpret the EDID.
  */
 xf86MonPtr
-xf86DoEDID_DDC2(int scrnIndex, I2CBusPtr pBus)
+xf86DoEDID_DDC2(ScrnInfoPtr pScrn, I2CBusPtr pBus)
 {
-    return xf86DoEEDID(scrnIndex, pBus, FALSE);
+    return xf86DoEEDID(pScrn, pBus, FALSE);
 }
 
 /* XXX write me */
@@ -489,9 +487,8 @@ DDC2ReadDisplayID(void)
  * @return NULL if no monitor attached or failure to interpret the DisplayID.
  */
 xf86MonPtr
-xf86DoDisplayID(int scrnIndex, I2CBusPtr pBus)
+xf86DoDisplayID(ScrnInfoPtr pScrn, I2CBusPtr pBus)
 {
-    ScrnInfoPtr pScrn = xf86Screens[scrnIndex];
     unsigned char *did = NULL;
     xf86MonPtr tmp = NULL;
     I2CDevPtr dev = NULL;
@@ -513,7 +510,7 @@ xf86DoDisplayID(int scrnIndex, I2CBusPtr pBus)
     if (noddc || noddc2)
         return NULL;
 
-    if (!(dev = DDC2Init(scrnIndex, pBus)))
+    if (!(dev = DDC2Init(pBus)))
         return NULL;
 
     if ((did = DDC2ReadDisplayID())) {
@@ -521,7 +518,7 @@ xf86DoDisplayID(int scrnIndex, I2CBusPtr pBus)
         if (!tmp)
             return NULL;
 
-        tmp->scrnIndex = scrnIndex;
+        tmp->scrnIndex = pScrn->scrnIndex;
         tmp->flags |= MONITOR_DISPLAYID;
         tmp->rawData = did;
     }
diff --git a/xorg-server/hw/xfree86/ddc/xf86DDC.h b/xorg-server/hw/xfree86/ddc/xf86DDC.h
index 2071d530d..c63da8bff 100644
--- a/xorg-server/hw/xfree86/ddc/xf86DDC.h
+++ b/xorg-server/hw/xfree86/ddc/xf86DDC.h
@@ -24,15 +24,15 @@ typedef enum {
 
 typedef void (*DDC1SetSpeedProc) (ScrnInfoPtr, xf86ddcSpeed);
 
-extern _X_EXPORT xf86MonPtr xf86DoEDID_DDC1(int scrnIndex,
+extern _X_EXPORT xf86MonPtr xf86DoEDID_DDC1(ScrnInfoPtr pScrn,
                                             DDC1SetSpeedProc DDC1SetSpeed,
                                             unsigned
                                             int (*DDC1Read) (ScrnInfoPtr)
     );
 
-extern _X_EXPORT xf86MonPtr xf86DoEDID_DDC2(int scrnIndex, I2CBusPtr pBus);
+extern _X_EXPORT xf86MonPtr xf86DoEDID_DDC2(ScrnInfoPtr pScrn, I2CBusPtr pBus);
 
-extern _X_EXPORT xf86MonPtr xf86DoEEDID(int scrnIndex, I2CBusPtr pBus, Bool);
+extern _X_EXPORT xf86MonPtr xf86DoEEDID(ScrnInfoPtr pScrn, I2CBusPtr pBus, Bool);
 
 extern _X_EXPORT xf86MonPtr xf86PrintEDID(xf86MonPtr monPtr);
 
@@ -50,7 +50,7 @@ extern _X_EXPORT DisplayModePtr xf86DDCGetModes(int scrnIndex, xf86MonPtr DDC);
 extern _X_EXPORT Bool
  xf86MonitorIsHDMI(xf86MonPtr mon);
 
-extern _X_EXPORT xf86MonPtr xf86DoDisplayID(int scrnIndex, I2CBusPtr pBus);
+extern _X_EXPORT xf86MonPtr xf86DoDisplayID(ScrnInfoPtr pScrn, I2CBusPtr pBus);
 
 extern _X_EXPORT void
  xf86DisplayIDMonitorSet(int scrnIndex, MonPtr mon, xf86MonPtr DDC);