Merge branch 'pli1/X11-rework' of git@moblin-mdi.jf.intel.com:poky-staging into master-dev

10 files changed, 59 insertions, 88 deletions

diff --git a/meta/conf/distro/poky.conf b/meta/conf/distro/poky.conf
index 1abafa5d22..4b20438368 100644
--- a/meta/conf/distro/poky.conf
+++ b/meta/conf/distro/poky.conf
@@ -79,7 +79,7 @@ PREFERRED_PROVIDER_virtual/libgl ?= "mesa-xlib"
 PREFERRED_PROVIDER_virtual/update-alternatives ?= "update-alternatives-cworth"
 PREFERRED_PROVIDER_virtual/update-alternatives-native ?= "opkg-native"
 PREFERRED_PROVIDER_virtual/libx11 ?= "libx11-diet"
-PREFERRED_PROVIDER_xf86-video-intel ?= xf86-video-intel
+PREFERRED_PROVIDER_xf86-video-intel ?= "xf86-video-intel"
 
 VIRTUAL-RUNTIME_update-alternatives ?= "update-alternatives-cworth"
 
diff --git a/meta/packages/drm/libdrm_2.4.0.bb b/meta/packages/drm/libdrm_2.4.0.bb
new file mode 100644
index 0000000000..9caf9b4bea
--- /dev/null
+++ b/meta/packages/drm/libdrm_2.4.0.bb
@@ -0,0 +1,10 @@
+SECTION = "x11/base"
+LICENSE = "MIT"
+SRC_URI = "http://dri.freedesktop.org/libdrm/libdrm-${PV}.tar.bz2"
+PROVIDES = "drm"
+
+inherit autotools pkgconfig
+
+do_stage() {
+        autotools_stage_all
+}
diff --git a/meta/packages/xorg-driver/xf86-video-intel-dri2/002_avoid_duplicate_SaveHWState.patch b/meta/packages/xorg-driver/xf86-video-intel-dri2/002_avoid_duplicate_SaveHWState.patch
index 87c2a873eb..12a980bbf8 100755..100644
--- a/meta/packages/xorg-driver/xf86-video-intel-dri2/002_avoid_duplicate_SaveHWState.patch
+++ b/meta/packages/xorg-driver/xf86-video-intel-dri2/002_avoid_duplicate_SaveHWState.patch
@@ -1,7 +1,8 @@
-diff -urN xf86-video-intel-2.5.96.0/src/i830_driver.c xf86-video-intel-2.5.96.0.new/src/i830_driver.c
---- xf86-video-intel-2.5.96.0/src/i830_driver.c 2008-09-13 06:58:45.000000000 +0800
-+++ xf86-video-intel-2.5.96.0.new/src/i830_driver.c     2008-09-25 21:22:08.000000000 +0800
-@@ -1782,7 +1782,7 @@
+diff --git a/src/i830_driver.c b/src/i830_driver.c
+index 7bc10fd..6cd30b2 100644
+--- a/src/i830_driver.c
++++ b/src/i830_driver.c
+@@ -1792,7 +1792,7 @@ I830PreInit(ScrnInfoPtr pScrn, int flags)
        return FALSE;
  
     pI830 = I830PTR(pScrn);
diff --git a/meta/packages/xorg-driver/xf86-video-intel-dri2/004_reduce_driver_boottime.patch b/meta/packages/xorg-driver/xf86-video-intel-dri2/004_reduce_driver_boottime.patch
index f8c214931e..97921223d0 100755..100644
--- a/meta/packages/xorg-driver/xf86-video-intel-dri2/004_reduce_driver_boottime.patch
+++ b/meta/packages/xorg-driver/xf86-video-intel-dri2/004_reduce_driver_boottime.patch
@@ -1,7 +1,8 @@
-diff -urN xf86-video-intel-2.5.96.0/src/i830_display.c xf86-video-intel-2.5.96.0.new/src/i830_display.c
---- xf86-video-intel-2.5.96.0/src/i830_display.c        2008-09-11 05:10:10.000000000 +0800
-+++ xf86-video-intel-2.5.96.0.new/src/i830_display.c    2008-09-25 21:27:42.000000000 +0800
-@@ -376,7 +376,7 @@
+diff --git a/src/i830_display.c b/src/i830_display.c
+index 95ce51e..2c49b43 100644
+--- a/src/i830_display.c
++++ b/src/i830_display.c
+@@ -376,7 +376,7 @@ void
  i830WaitForVblank(ScrnInfoPtr pScreen)
  {
      /* Wait for 20ms, i.e. one cycle at 50hz. */
@@ -10,10 +11,11 @@ diff -urN xf86-video-intel-2.5.96.0/src/i830_display.c xf86-video-intel-2.5.96.0
  }
  
  void
-diff -urN xf86-video-intel-2.5.96.0/src/i830_driver.c xf86-video-intel-2.5.96.0.new/src/i830_driver.c
---- xf86-video-intel-2.5.96.0/src/i830_driver.c 2008-09-25 21:23:52.000000000 +0800
-+++ xf86-video-intel-2.5.96.0.new/src/i830_driver.c     2008-09-25 21:30:13.000000000 +0800
-@@ -2293,7 +2293,7 @@
+diff --git a/src/i830_driver.c b/src/i830_driver.c
+index 6cd30b2..223967f 100644
+--- a/src/i830_driver.c
++++ b/src/i830_driver.c
+@@ -2303,7 +2303,7 @@ SaveHWState(ScrnInfoPtr pScrn)
  static void
  i830_dpll_settle(void)
  {
@@ -22,7 +24,7 @@ diff -urN xf86-video-intel-2.5.96.0/src/i830_driver.c xf86-video-intel-2.5.96.0.
  }
  
  static Bool
-@@ -2315,14 +2315,12 @@
+@@ -2325,14 +2325,12 @@ RestoreHWState(ScrnInfoPtr pScrn)
        xf86OutputPtr   output = xf86_config->output[i];
        output->funcs->dpms(output, DPMSModeOff);
     }
@@ -37,21 +39,7 @@ diff -urN xf86-video-intel-2.5.96.0/src/i830_driver.c xf86-video-intel-2.5.96.0.
  
     if (IS_MOBILE(pI830) && !IS_I830(pI830))
        OUTREG(LVDS, pI830->saveLVDS);
-@@ -2369,11 +2367,13 @@
-    OUTREG(FPA0, pI830->saveFPA0);
-    OUTREG(FPA1, pI830->saveFPA1);
-    OUTREG(DPLL_A, pI830->saveDPLL_A);
-+   POSTING_READ(DPLL_A);
-    i830_dpll_settle();
-    if (IS_I965G(pI830))
-       OUTREG(DPLL_A_MD, pI830->saveDPLL_A_MD);
-    else
-       OUTREG(DPLL_A, pI830->saveDPLL_A);
-+   POSTING_READ(DPLL_A);
-    i830_dpll_settle();
- 
-    /* Restore mode config */
-@@ -2409,13 +2409,11 @@
+@@ -2422,13 +2420,11 @@ RestoreHWState(ScrnInfoPtr pScrn)
         DISPPLANE_SEL_PIPE_A) {
         OUTREG(DSPACNTR, pI830->saveDSPACNTR);
         OUTREG(DSPABASE, INREG(DSPABASE));
@@ -65,21 +53,7 @@ diff -urN xf86-video-intel-2.5.96.0/src/i830_driver.c xf86-video-intel-2.5.96.0.
     }
  
     /* See note about pipe programming above */
-@@ -2430,11 +2428,13 @@
-       OUTREG(FPB0, pI830->saveFPB0);
-       OUTREG(FPB1, pI830->saveFPB1);
-       OUTREG(DPLL_B, pI830->saveDPLL_B);
-+      POSTING_READ(DPLL_B);
-       i830_dpll_settle();
-       if (IS_I965G(pI830))
-         OUTREG(DPLL_B_MD, pI830->saveDPLL_B_MD);
-       else
-         OUTREG(DPLL_B, pI830->saveDPLL_B);
-+      POSTING_READ(DPLL_B);
-       i830_dpll_settle();
-    
-       /* Restore mode config */
-@@ -2468,13 +2468,11 @@
+@@ -2484,13 +2480,11 @@ RestoreHWState(ScrnInfoPtr pScrn)
           DISPPLANE_SEL_PIPE_B) {
           OUTREG(DSPACNTR, pI830->saveDSPACNTR);
           OUTREG(DSPABASE, INREG(DSPABASE));
diff --git a/meta/packages/xorg-driver/xf86-video-intel-dri2/005_disable_sdvo_TV_port_restoreHW.patch b/meta/packages/xorg-driver/xf86-video-intel-dri2/005_disable_sdvo_TV_port_restoreHW.patch
index 6cdeb3e70f..338acb2bac 100755..100644
--- a/meta/packages/xorg-driver/xf86-video-intel-dri2/005_disable_sdvo_TV_port_restoreHW.patch
+++ b/meta/packages/xorg-driver/xf86-video-intel-dri2/005_disable_sdvo_TV_port_restoreHW.patch
@@ -1,15 +1,16 @@
-diff -urN xf86-video-intel-2.5.96.0/src/i830_driver.c xf86-video-intel-2.5.96.0.new/src/i830_driver.c
---- xf86-video-intel-2.5.96.0/src/i830_driver.c 2008-09-25 21:32:45.000000000 +0800
-+++ xf86-video-intel-2.5.96.0.new/src/i830_driver.c     2008-09-25 21:34:19.000000000 +0800
-@@ -912,6 +912,7 @@
+diff --git a/src/i830_driver.c b/src/i830_driver.c
+index 223967f..4f95db0 100644
+--- a/src/i830_driver.c
++++ b/src/i830_driver.c
+@@ -912,6 +912,7 @@ I830SetupOutputs(ScrnInfoPtr pScrn)
     if (IS_MOBILE(pI830) && !IS_I830(pI830))
        i830_lvds_init(pScrn);
  
 +#if 0
     if (IS_I9XX(pI830)) {
-       if (INREG(SDVOB) & SDVO_DETECTED) {
+       if ((INREG(SDVOB) & SDVO_DETECTED) || pI830->force_sdvo_detect) {
          Bool found = i830_sdvo_init(pScrn, SDVOB);
-@@ -931,7 +932,8 @@
+@@ -931,7 +932,8 @@ I830SetupOutputs(ScrnInfoPtr pScrn)
     }
     if (IS_I9XX(pI830) && IS_MOBILE(pI830))
        i830_tv_init(pScrn);
@@ -19,7 +20,7 @@ diff -urN xf86-video-intel-2.5.96.0/src/i830_driver.c xf86-video-intel-2.5.96.0.
     for (o = 0; o < config->num_output; o++)
     {
        xf86OutputPtr       output = config->output[o];
-@@ -1612,7 +1614,9 @@
+@@ -1622,7 +1624,9 @@ I830AccelMethodInit(ScrnInfoPtr pScrn)
         PreInitCleanup(pScrn);
         return FALSE;
      }
diff --git a/meta/packages/xorg-driver/xf86-video-intel-dri2/006_disable_check_lvds_panelpower_status.patch b/meta/packages/xorg-driver/xf86-video-intel-dri2/006_disable_check_lvds_panelpower_status.patch
index b35e43f6ae..092544381a 100755..100644
--- a/meta/packages/xorg-driver/xf86-video-intel-dri2/006_disable_check_lvds_panelpower_status.patch
+++ b/meta/packages/xorg-driver/xf86-video-intel-dri2/006_disable_check_lvds_panelpower_status.patch
@@ -1,7 +1,8 @@
-diff -urN xf86-video-intel-2.5.96.0/src/i830_lvds.c xf86-video-intel-2.5.96.0.new/src/i830_lvds.c
---- xf86-video-intel-2.5.96.0/src/i830_lvds.c   2008-09-01 05:27:39.000000000 +0800
-+++ xf86-video-intel-2.5.96.0.new/src/i830_lvds.c       2008-09-25 21:36:13.000000000 +0800
-@@ -404,10 +404,11 @@
+diff --git a/src/i830_lvds.c b/src/i830_lvds.c
+index 0d67d50..adb0dba 100644
+--- a/src/i830_lvds.c
++++ b/src/i830_lvds.c
+@@ -404,10 +404,11 @@ i830SetLVDSPanelPower(xf86OutputPtr output, Bool on)
             dev_priv->backlight_duty_cycle = dev_priv->backlight_max;
  
         OUTREG(PP_CONTROL, INREG(PP_CONTROL) | POWER_TARGET_ON);
@@ -14,7 +15,7 @@ diff -urN xf86-video-intel-2.5.96.0/src/i830_lvds.c xf86-video-intel-2.5.96.0.ne
         dev_priv->set_backlight(output, dev_priv->backlight_duty_cycle);
         dev_priv->dpmsoff = FALSE;
      } else {
-@@ -420,10 +421,11 @@
+@@ -420,10 +421,11 @@ i830SetLVDSPanelPower(xf86OutputPtr output, Bool on)
         dev_priv->set_backlight(output, 0);
  
         OUTREG(PP_CONTROL, INREG(PP_CONTROL) & ~POWER_TARGET_ON);
diff --git a/meta/packages/xorg-driver/xf86-video-intel-dri2/007_disable_tiling_and_enable_UXA.patch b/meta/packages/xorg-driver/xf86-video-intel-dri2/007_disable_tiling_and_enable_UXA.patch
deleted file mode 100755
index 7f60295db2..0000000000
--- a/meta/packages/xorg-driver/xf86-video-intel-dri2/007_disable_tiling_and_enable_UXA.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-diff -urN xf86-video-intel-2.5.96.0/src/i830_driver.c xf86-video-intel-2.5.96.0.new/src/i830_driver.c
---- xf86-video-intel-2.5.96.0/src/i830_driver.c 2008-09-27 18:19:07.000000000 +0800
-+++ xf86-video-intel-2.5.96.0.new/src/i830_driver.c     2008-09-27 18:20:13.000000000 +0800
-@@ -1511,12 +1511,12 @@
-      * for example. :)
-      */
-     if (!(pI830->accel == ACCEL_NONE)) {
--#ifdef I830_USE_UXA
--       pI830->accel = ACCEL_UXA;
--#endif
- #ifdef I830_USE_EXA
-        pI830->accel = ACCEL_EXA;
- #endif
-+#ifdef I830_USE_UXA
-+       pI830->accel = ACCEL_UXA;
-+#endif
- #if I830_USE_XAA + I830_USE_EXA + I830_USE_UXA >= 2
-        from = X_DEFAULT;
-        if ((s = (char *)xf86GetOptValString(pI830->Options,
-@@ -3106,7 +3106,7 @@
- #endif
- 
-    /* Enable tiling by default */
--   pI830->tiling = TRUE;
-+   pI830->tiling = FALSE;
- 
-    /* Allow user override if they set a value */
-    if (xf86IsOptionSet(pI830->Options, OPTION_TILING)) {
diff --git a/meta/packages/xorg-driver/xf86-video-intel-dri2_git.bb b/meta/packages/xorg-driver/xf86-video-intel-dri2_git.bb
index 4df2b1cb08..d74a358a38 100644
--- a/meta/packages/xorg-driver/xf86-video-intel-dri2_git.bb
+++ b/meta/packages/xorg-driver/xf86-video-intel-dri2_git.bb
@@ -7,14 +7,13 @@ PROVIDES = "xf86-video-intel"
 
 PE = "1"
 PR = "r0"
-PV = "1.5.0+git${SRCREV}"
+PV = "2.4.97+git${SRCREV}"
 
 SRC_URI = "git://anongit.freedesktop.org/git/xorg/driver/xf86-video-intel;protocol=git;branch=dri2 \
            file://002_avoid_duplicate_SaveHWState.patch;patch=1 \
            file://004_reduce_driver_boottime.patch;patch=1 \
            file://005_disable_sdvo_TV_port_restoreHW.patch;patch=1 \
-           file://006_disable_check_lvds_panelpower_status.patch;patch=1 \
-           file://007_disable_tiling_and_enable_UXA.patch;patch=1"
+           file://006_disable_check_lvds_panelpower_status.patch;patch=1"
 
 S = "${WORKDIR}/git"
 
diff --git a/meta/packages/xorg-lib/xtrans_1.2.2.bb b/meta/packages/xorg-lib/xtrans_1.2.2.bb
new file mode 100644
index 0000000000..75ba93c783
--- /dev/null
+++ b/meta/packages/xorg-lib/xtrans_1.2.2.bb
@@ -0,0 +1,12 @@
+require xorg-lib-common.inc
+
+DESCRIPTION = "network API translation layer to insulate X applications and \
+libraries from OS network vageries."
+PE = "1"
+PR = "r0"
+
+FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/xtrans"
+
+RDEPENDS_${PN}-dev = ""
+
+XORG_PN = "xtrans"
diff --git a/meta/packages/xorg-xserver/xserver-xf86-dri-lite_git.bb b/meta/packages/xorg-xserver/xserver-xf86-dri-lite_git.bb
index 39e286570e..1fe84a3b66 100644
--- a/meta/packages/xorg-xserver/xserver-xf86-dri-lite_git.bb
+++ b/meta/packages/xorg-xserver/xserver-xf86-dri-lite_git.bb
@@ -10,7 +10,8 @@ DEFAULT_PREFERENCE = "-1"
 
 SRC_URI = "git://anongit.freedesktop.org/git/xorg/xserver;protocol=git \
            file://xorg.conf \
-           file://libdri-xinerama-symbol.patch;patch=1"
+           file://libdri-xinerama-symbol.patch;patch=1 \
+           file://xserver-boottime.patch;patch=1"
 
 # Misc build failure for master HEAD
 SRC_URI += "file://fix_open_max_preprocessor_error.patch;patch=1"