summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
authorRichard Purdie <rpurdie@linux.intel.com>2008-10-29 14:55:26 +0000
committerRichard Purdie <rpurdie@linux.intel.com>2008-10-29 14:55:26 +0000
commite61ea24100067bdcd82be23607500d1acbcc91cb (patch)
tree55433c486ae43889b43179a076624097e029ffb9 /meta
parent3e7b691f60630bd224ab95374ddb5f3c108f645e (diff)
parentf21745fa921c1eacb9740ba4f08813a54be4ab8d (diff)
downloadpoky-e61ea24100067bdcd82be23607500d1acbcc91cb.tar.gz
Merge branch 'pli1/X11-rework' of git@moblin-mdi.jf.intel.com:poky-staging into master-dev
Diffstat (limited to 'meta')
-rw-r--r--meta/conf/distro/poky.conf2
-rw-r--r--meta/packages/drm/libdrm_2.4.0.bb10
-rw-r--r--[-rwxr-xr-x]meta/packages/xorg-driver/xf86-video-intel-dri2/002_avoid_duplicate_SaveHWState.patch9
-rw-r--r--[-rwxr-xr-x]meta/packages/xorg-driver/xf86-video-intel-dri2/004_reduce_driver_boottime.patch52
-rw-r--r--[-rwxr-xr-x]meta/packages/xorg-driver/xf86-video-intel-dri2/005_disable_sdvo_TV_port_restoreHW.patch15
-rw-r--r--[-rwxr-xr-x]meta/packages/xorg-driver/xf86-video-intel-dri2/006_disable_check_lvds_panelpower_status.patch11
-rwxr-xr-xmeta/packages/xorg-driver/xf86-video-intel-dri2/007_disable_tiling_and_enable_UXA.patch28
-rw-r--r--meta/packages/xorg-driver/xf86-video-intel-dri2_git.bb5
-rw-r--r--meta/packages/xorg-lib/xtrans_1.2.2.bb12
-rw-r--r--meta/packages/xorg-xserver/xserver-xf86-dri-lite_git.bb3
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"
79PREFERRED_PROVIDER_virtual/update-alternatives ?= "update-alternatives-cworth" 79PREFERRED_PROVIDER_virtual/update-alternatives ?= "update-alternatives-cworth"
80PREFERRED_PROVIDER_virtual/update-alternatives-native ?= "opkg-native" 80PREFERRED_PROVIDER_virtual/update-alternatives-native ?= "opkg-native"
81PREFERRED_PROVIDER_virtual/libx11 ?= "libx11-diet" 81PREFERRED_PROVIDER_virtual/libx11 ?= "libx11-diet"
82PREFERRED_PROVIDER_xf86-video-intel ?= xf86-video-intel 82PREFERRED_PROVIDER_xf86-video-intel ?= "xf86-video-intel"
83 83
84VIRTUAL-RUNTIME_update-alternatives ?= "update-alternatives-cworth" 84VIRTUAL-RUNTIME_update-alternatives ?= "update-alternatives-cworth"
85 85
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 @@
1SECTION = "x11/base"
2LICENSE = "MIT"
3SRC_URI = "http://dri.freedesktop.org/libdrm/libdrm-${PV}.tar.bz2"
4PROVIDES = "drm"
5
6inherit autotools pkgconfig
7
8do_stage() {
9 autotools_stage_all
10}
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 @@
1diff -urN xf86-video-intel-2.5.96.0/src/i830_driver.c xf86-video-intel-2.5.96.0.new/src/i830_driver.c 1diff --git a/src/i830_driver.c b/src/i830_driver.c
2--- xf86-video-intel-2.5.96.0/src/i830_driver.c 2008-09-13 06:58:45.000000000 +0800 2index 7bc10fd..6cd30b2 100644
3+++ xf86-video-intel-2.5.96.0.new/src/i830_driver.c 2008-09-25 21:22:08.000000000 +0800 3--- a/src/i830_driver.c
4@@ -1782,7 +1782,7 @@ 4+++ b/src/i830_driver.c
5@@ -1792,7 +1792,7 @@ I830PreInit(ScrnInfoPtr pScrn, int flags)
5 return FALSE; 6 return FALSE;
6 7
7 pI830 = I830PTR(pScrn); 8 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 @@
1diff -urN xf86-video-intel-2.5.96.0/src/i830_display.c xf86-video-intel-2.5.96.0.new/src/i830_display.c 1diff --git a/src/i830_display.c b/src/i830_display.c
2--- xf86-video-intel-2.5.96.0/src/i830_display.c 2008-09-11 05:10:10.000000000 +0800 2index 95ce51e..2c49b43 100644
3+++ xf86-video-intel-2.5.96.0.new/src/i830_display.c 2008-09-25 21:27:42.000000000 +0800 3--- a/src/i830_display.c
4@@ -376,7 +376,7 @@ 4+++ b/src/i830_display.c
5@@ -376,7 +376,7 @@ void
5 i830WaitForVblank(ScrnInfoPtr pScreen) 6 i830WaitForVblank(ScrnInfoPtr pScreen)
6 { 7 {
7 /* Wait for 20ms, i.e. one cycle at 50hz. */ 8 /* 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
10 } 11 }
11 12
12 void 13 void
13diff -urN xf86-video-intel-2.5.96.0/src/i830_driver.c xf86-video-intel-2.5.96.0.new/src/i830_driver.c 14diff --git a/src/i830_driver.c b/src/i830_driver.c
14--- xf86-video-intel-2.5.96.0/src/i830_driver.c 2008-09-25 21:23:52.000000000 +0800 15index 6cd30b2..223967f 100644
15+++ xf86-video-intel-2.5.96.0.new/src/i830_driver.c 2008-09-25 21:30:13.000000000 +0800 16--- a/src/i830_driver.c
16@@ -2293,7 +2293,7 @@ 17+++ b/src/i830_driver.c
18@@ -2303,7 +2303,7 @@ SaveHWState(ScrnInfoPtr pScrn)
17 static void 19 static void
18 i830_dpll_settle(void) 20 i830_dpll_settle(void)
19 { 21 {
@@ -22,7 +24,7 @@ diff -urN xf86-video-intel-2.5.96.0/src/i830_driver.c xf86-video-intel-2.5.96.0.
22 } 24 }
23 25
24 static Bool 26 static Bool
25@@ -2315,14 +2315,12 @@ 27@@ -2325,14 +2325,12 @@ RestoreHWState(ScrnInfoPtr pScrn)
26 xf86OutputPtr output = xf86_config->output[i]; 28 xf86OutputPtr output = xf86_config->output[i];
27 output->funcs->dpms(output, DPMSModeOff); 29 output->funcs->dpms(output, DPMSModeOff);
28 } 30 }
@@ -37,21 +39,7 @@ diff -urN xf86-video-intel-2.5.96.0/src/i830_driver.c xf86-video-intel-2.5.96.0.
37 39
38 if (IS_MOBILE(pI830) && !IS_I830(pI830)) 40 if (IS_MOBILE(pI830) && !IS_I830(pI830))
39 OUTREG(LVDS, pI830->saveLVDS); 41 OUTREG(LVDS, pI830->saveLVDS);
40@@ -2369,11 +2367,13 @@ 42@@ -2422,13 +2420,11 @@ RestoreHWState(ScrnInfoPtr pScrn)
41 OUTREG(FPA0, pI830->saveFPA0);
42 OUTREG(FPA1, pI830->saveFPA1);
43 OUTREG(DPLL_A, pI830->saveDPLL_A);
44+ POSTING_READ(DPLL_A);
45 i830_dpll_settle();
46 if (IS_I965G(pI830))
47 OUTREG(DPLL_A_MD, pI830->saveDPLL_A_MD);
48 else
49 OUTREG(DPLL_A, pI830->saveDPLL_A);
50+ POSTING_READ(DPLL_A);
51 i830_dpll_settle();
52
53 /* Restore mode config */
54@@ -2409,13 +2409,11 @@
55 DISPPLANE_SEL_PIPE_A) { 43 DISPPLANE_SEL_PIPE_A) {
56 OUTREG(DSPACNTR, pI830->saveDSPACNTR); 44 OUTREG(DSPACNTR, pI830->saveDSPACNTR);
57 OUTREG(DSPABASE, INREG(DSPABASE)); 45 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.
65 } 53 }
66 54
67 /* See note about pipe programming above */ 55 /* See note about pipe programming above */
68@@ -2430,11 +2428,13 @@ 56@@ -2484,13 +2480,11 @@ RestoreHWState(ScrnInfoPtr pScrn)
69 OUTREG(FPB0, pI830->saveFPB0);
70 OUTREG(FPB1, pI830->saveFPB1);
71 OUTREG(DPLL_B, pI830->saveDPLL_B);
72+ POSTING_READ(DPLL_B);
73 i830_dpll_settle();
74 if (IS_I965G(pI830))
75 OUTREG(DPLL_B_MD, pI830->saveDPLL_B_MD);
76 else
77 OUTREG(DPLL_B, pI830->saveDPLL_B);
78+ POSTING_READ(DPLL_B);
79 i830_dpll_settle();
80
81 /* Restore mode config */
82@@ -2468,13 +2468,11 @@
83 DISPPLANE_SEL_PIPE_B) { 57 DISPPLANE_SEL_PIPE_B) {
84 OUTREG(DSPACNTR, pI830->saveDSPACNTR); 58 OUTREG(DSPACNTR, pI830->saveDSPACNTR);
85 OUTREG(DSPABASE, INREG(DSPABASE)); 59 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 @@
1diff -urN xf86-video-intel-2.5.96.0/src/i830_driver.c xf86-video-intel-2.5.96.0.new/src/i830_driver.c 1diff --git a/src/i830_driver.c b/src/i830_driver.c
2--- xf86-video-intel-2.5.96.0/src/i830_driver.c 2008-09-25 21:32:45.000000000 +0800 2index 223967f..4f95db0 100644
3+++ xf86-video-intel-2.5.96.0.new/src/i830_driver.c 2008-09-25 21:34:19.000000000 +0800 3--- a/src/i830_driver.c
4@@ -912,6 +912,7 @@ 4+++ b/src/i830_driver.c
5@@ -912,6 +912,7 @@ I830SetupOutputs(ScrnInfoPtr pScrn)
5 if (IS_MOBILE(pI830) && !IS_I830(pI830)) 6 if (IS_MOBILE(pI830) && !IS_I830(pI830))
6 i830_lvds_init(pScrn); 7 i830_lvds_init(pScrn);
7 8
8+#if 0 9+#if 0
9 if (IS_I9XX(pI830)) { 10 if (IS_I9XX(pI830)) {
10 if (INREG(SDVOB) & SDVO_DETECTED) { 11 if ((INREG(SDVOB) & SDVO_DETECTED) || pI830->force_sdvo_detect) {
11 Bool found = i830_sdvo_init(pScrn, SDVOB); 12 Bool found = i830_sdvo_init(pScrn, SDVOB);
12@@ -931,7 +932,8 @@ 13@@ -931,7 +932,8 @@ I830SetupOutputs(ScrnInfoPtr pScrn)
13 } 14 }
14 if (IS_I9XX(pI830) && IS_MOBILE(pI830)) 15 if (IS_I9XX(pI830) && IS_MOBILE(pI830))
15 i830_tv_init(pScrn); 16 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.
19 for (o = 0; o < config->num_output; o++) 20 for (o = 0; o < config->num_output; o++)
20 { 21 {
21 xf86OutputPtr output = config->output[o]; 22 xf86OutputPtr output = config->output[o];
22@@ -1612,7 +1614,9 @@ 23@@ -1622,7 +1624,9 @@ I830AccelMethodInit(ScrnInfoPtr pScrn)
23 PreInitCleanup(pScrn); 24 PreInitCleanup(pScrn);
24 return FALSE; 25 return FALSE;
25 } 26 }
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 @@
1diff -urN xf86-video-intel-2.5.96.0/src/i830_lvds.c xf86-video-intel-2.5.96.0.new/src/i830_lvds.c 1diff --git a/src/i830_lvds.c b/src/i830_lvds.c
2--- xf86-video-intel-2.5.96.0/src/i830_lvds.c 2008-09-01 05:27:39.000000000 +0800 2index 0d67d50..adb0dba 100644
3+++ xf86-video-intel-2.5.96.0.new/src/i830_lvds.c 2008-09-25 21:36:13.000000000 +0800 3--- a/src/i830_lvds.c
4@@ -404,10 +404,11 @@ 4+++ b/src/i830_lvds.c
5@@ -404,10 +404,11 @@ i830SetLVDSPanelPower(xf86OutputPtr output, Bool on)
5 dev_priv->backlight_duty_cycle = dev_priv->backlight_max; 6 dev_priv->backlight_duty_cycle = dev_priv->backlight_max;
6 7
7 OUTREG(PP_CONTROL, INREG(PP_CONTROL) | POWER_TARGET_ON); 8 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
14 dev_priv->set_backlight(output, dev_priv->backlight_duty_cycle); 15 dev_priv->set_backlight(output, dev_priv->backlight_duty_cycle);
15 dev_priv->dpmsoff = FALSE; 16 dev_priv->dpmsoff = FALSE;
16 } else { 17 } else {
17@@ -420,10 +421,11 @@ 18@@ -420,10 +421,11 @@ i830SetLVDSPanelPower(xf86OutputPtr output, Bool on)
18 dev_priv->set_backlight(output, 0); 19 dev_priv->set_backlight(output, 0);
19 20
20 OUTREG(PP_CONTROL, INREG(PP_CONTROL) & ~POWER_TARGET_ON); 21 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 @@
1diff -urN xf86-video-intel-2.5.96.0/src/i830_driver.c xf86-video-intel-2.5.96.0.new/src/i830_driver.c
2--- xf86-video-intel-2.5.96.0/src/i830_driver.c 2008-09-27 18:19:07.000000000 +0800
3+++ xf86-video-intel-2.5.96.0.new/src/i830_driver.c 2008-09-27 18:20:13.000000000 +0800
4@@ -1511,12 +1511,12 @@
5 * for example. :)
6 */
7 if (!(pI830->accel == ACCEL_NONE)) {
8-#ifdef I830_USE_UXA
9- pI830->accel = ACCEL_UXA;
10-#endif
11 #ifdef I830_USE_EXA
12 pI830->accel = ACCEL_EXA;
13 #endif
14+#ifdef I830_USE_UXA
15+ pI830->accel = ACCEL_UXA;
16+#endif
17 #if I830_USE_XAA + I830_USE_EXA + I830_USE_UXA >= 2
18 from = X_DEFAULT;
19 if ((s = (char *)xf86GetOptValString(pI830->Options,
20@@ -3106,7 +3106,7 @@
21 #endif
22
23 /* Enable tiling by default */
24- pI830->tiling = TRUE;
25+ pI830->tiling = FALSE;
26
27 /* Allow user override if they set a value */
28 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"
7 7
8PE = "1" 8PE = "1"
9PR = "r0" 9PR = "r0"
10PV = "1.5.0+git${SRCREV}" 10PV = "2.4.97+git${SRCREV}"
11 11
12SRC_URI = "git://anongit.freedesktop.org/git/xorg/driver/xf86-video-intel;protocol=git;branch=dri2 \ 12SRC_URI = "git://anongit.freedesktop.org/git/xorg/driver/xf86-video-intel;protocol=git;branch=dri2 \
13 file://002_avoid_duplicate_SaveHWState.patch;patch=1 \ 13 file://002_avoid_duplicate_SaveHWState.patch;patch=1 \
14 file://004_reduce_driver_boottime.patch;patch=1 \ 14 file://004_reduce_driver_boottime.patch;patch=1 \
15 file://005_disable_sdvo_TV_port_restoreHW.patch;patch=1 \ 15 file://005_disable_sdvo_TV_port_restoreHW.patch;patch=1 \
16 file://006_disable_check_lvds_panelpower_status.patch;patch=1 \ 16 file://006_disable_check_lvds_panelpower_status.patch;patch=1"
17 file://007_disable_tiling_and_enable_UXA.patch;patch=1"
18 17
19S = "${WORKDIR}/git" 18S = "${WORKDIR}/git"
20 19
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 @@
1require xorg-lib-common.inc
2
3DESCRIPTION = "network API translation layer to insulate X applications and \
4libraries from OS network vageries."
5PE = "1"
6PR = "r0"
7
8FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/xtrans"
9
10RDEPENDS_${PN}-dev = ""
11
12XORG_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"
10 10
11SRC_URI = "git://anongit.freedesktop.org/git/xorg/xserver;protocol=git \ 11SRC_URI = "git://anongit.freedesktop.org/git/xorg/xserver;protocol=git \
12 file://xorg.conf \ 12 file://xorg.conf \
13 file://libdri-xinerama-symbol.patch;patch=1" 13 file://libdri-xinerama-symbol.patch;patch=1 \
14 file://xserver-boottime.patch;patch=1"
14 15
15# Misc build failure for master HEAD 16# Misc build failure for master HEAD
16SRC_URI += "file://fix_open_max_preprocessor_error.patch;patch=1" 17SRC_URI += "file://fix_open_max_preprocessor_error.patch;patch=1"