This email list is read-only. Emails sent to this list will be discarded
----------------------------------
meta-moblin/conf/distro/moblin.conf | 2 +-
meta-moblin/conf/machine/netbook.conf | 13 ++--
meta-moblin/packages/tasks/task-moblin.bb | 2 +-
meta/conf/bitbake.conf | 1 -
meta/conf/distro/include/poky-fixed-revisions.inc | 14 +++-
.../distro/include/preferred-xorg-versions.inc | 17 +++--
meta/packages/drm/libdrm_2.3.1.bb | 10 ---
meta/packages/mesa/mesa-dri_7.2.bb | 14 +++-
meta/packages/mesa/mesa-dri_git.bb | 24 ++++++--
.../002_avoid_duplicate_SaveHWState.patch | 13 ----
.../004_reduce_driver_boottime.patch | 69 --------------------
.../005_disable_sdvo_TV_port_restoreHW.patch | 32 ---------
.../006_disable_check_lvds_panelpower_status.patch | 30 ---------
.../xorg-driver/xf86-video-intel-dri2_git.bb | 6 +-
.../002_avoid_duplicate_SaveHWState.patch | 13 ++++
.../004_reduce_driver_boottime.patch | 13 ++++
.../005_disable_sdvo_TV_port_restoreHW.patch | 32 +++++++++
.../006_disable_check_lvds_panelpower_status.patch | 30 +++++++++
meta/packages/xorg-driver/xf86-video-intel_git.bb | 23 +++++++
meta/packages/xorg-lib/xtrans_1.2.1.bb | 12 ----
.../xorg-xserver/xserver-xf86-dri-lite_git.bb | 6 +-
.../xorg-xserver/xserver-xf86-dri2-lite_git.bb | 22 ++++++
22 files changed, 199 insertions(+), 199 deletions(-)
New commits:
commit 35b85e9398e3048089739ddb02a295aacf89a781
Author: Robert Bragg <[EMAIL PROTECTED]>
Date: Thu Oct 30 18:30:11 2008 +0000
[task-moblin] bumps PR, so that machine mods to XSERVER get noticed
commit 147f91a320e14050d1d6a88ae0bf910b66fd060f
Author: Robert Bragg <[EMAIL PROTECTED]>
Date: Wed Oct 29 17:42:15 2008 +0000
This removes xtrans 1.2.1 since we now have xtrans 1.2.2
commit 47de7433460804696fc6e3d445e015b17b61acd3
Author: Robert Bragg <[EMAIL PROTECTED]>
Date: Wed Oct 29 17:14:08 2008 +0000
Deletes libdrm_2.3.1 since we now have libdrm_2.4.0
commit bcb38a847bf89578921ab892e899df53b78a65a5
Author: Robert Bragg <[EMAIL PROTECTED]>
Date: Wed Oct 29 17:30:34 2008 +0000
Bumps revisions for various X packages
Updates for xserver-xf86-dri-lite, xtrans, mesa-dri, libdrm,
xf86-input-mouse,
xf86-input-keyboard, xf86-input-synaptics, xf86-video-intel,
xf86-video-intel-dri2
commit 156a9927377cf3482d5728d408a872c82c484784
Author: Robert Bragg <[EMAIL PROTECTED]>
Date: Thu Oct 30 18:14:05 2008 +0000
[xserver-xf86-dri2-lite_git] Removes the PE=1
commit 4b4108513258904bf0b04fea28a18e7b23126fbc
Author: Robert Bragg <[EMAIL PROTECTED]>
Date: Wed Oct 29 18:00:37 2008 +0000
Adds xf86-video-intel_git.bb
This also moves the patchs in xf86-video-intel-dri2/ -> xf86-video-intel/
commit b74cb8ace07d099b21c90ce74d65da230c84bf0b
Author: Robert Bragg <[EMAIL PROTECTED]>
Date: Wed Oct 29 17:56:57 2008 +0000
[xserver-xf86-dri-lite_git.bb] bumps the PR
commit 5321ad4b1395d36a25581878bbdc2f5095351b1d
Author: Robert Bragg <[EMAIL PROTECTED]>
Date: Wed Oct 29 17:45:51 2008 +0000
Adds a new xserver-xf86-dri2-lite_git.bb package for building the X server
with dri2 enabled
commit 9807c58b5a25adc95b9e4a8648e7f0fdd2576669
Author: Robert Bragg <[EMAIL PROTECTED]>
Date: Wed Oct 29 17:43:42 2008 +0000
[xserver-xf86-dri-lite] Bumps the PV and explicitly disables dri2
commit 5924dde351a9f7a58369f1dbd77126c1308a353d
Author: Robert Bragg <[EMAIL PROTECTED]>
Date: Wed Oct 29 18:33:27 2008 +0000
[xf86-video-intel-dri2] Updates 004_reduce_driver_boottime.patch
commit c36db8d9b4b76c4e9b1c495a1226d352a4274436
Author: Robert Bragg <[EMAIL PROTECTED]>
Date: Wed Oct 29 17:38:16 2008 +0000
[xf86-video-intel-dri2] comments out reduce_driver_boottime.patch
This patch doesn't apply a.t.m to the latest driver (Will come back and
rebase
this later)
commit 43015b416d08145ddd28987e846c37f55d8a3d31
Author: Robert Bragg <[EMAIL PROTECTED]>
Date: Wed Oct 29 17:29:51 2008 +0000
[poky-fixed-revisions.inc] Updates Git versions for various X packages
Updates for xserver-xf86-dri-lite, xserver-xf86-dri2-lite, dri2proto,
xf86-video-intel, xf86-video-intel-dri2, xf86-input-keyboard,
xf86-input-mouse, xf86-input-synaptics, mesa-dri, libdrm
commit d5b1c1dd857169314e2a3e7ce066ac771edabc17
Author: Robert Bragg <[EMAIL PROTECTED]>
Date: Wed Oct 29 17:23:57 2008 +0000
[bitbake.conf] Removes the MACHINE_DRI_MODULES var since it's no longer
used by mesa
commit 8231fc119b4e0f9d041da810f2aeb0bd77e7dfc5
Author: Robert Bragg <[EMAIL PROTECTED]>
Date: Wed Oct 29 17:18:38 2008 +0000
[netbook.conf] removes MACHINE_DRI_MODULES, use xf86-video-intel (not dri2)
default
MACHINE_DRI_MODULES is no longer used in the mesa recipe and the dri2 driver
depends on dri2.h which depends on the xserver being built for dri2.
Since the mesa package now splits up the dri drivers into seperate packages
this adds mesa-dri-driver-i915 to XSERVER
commit 5924520f14e1afa35447ebe2d3f7a991c38bd457
Author: Robert Bragg <[EMAIL PROTECTED]>
Date: Wed Oct 29 17:35:45 2008 +0000
[mesa dri] Adds splitting of dri drivers into seperate packages
This removes the earlier use of the MACHINE_DRI_MODULES variable to
configure
which drivers were built
commit c50e0101937249349de5f90dcf8707245557edf5
Author: Robert Bragg <[EMAIL PROTECTED]>
Date: Wed Oct 29 17:17:21 2008 +0000
[moblin.conf] Adds quotes for PREFERRED_PROVIDER_xf86-video-intel ?=
"xf86-video-intel"
commit 057abf00db9cb9b7a6fdadecb83f7ddc18c78460
Author: Robert Bragg <[EMAIL PROTECTED]>
Date: Thu Oct 23 20:35:24 2008 +0100
Makes PREFERRED_PROVIDERs in machine/netbook.conf overrideable via ?=
operator
Diff in this email is a maximum of 400 lines.
diff --git a/meta-moblin/conf/distro/moblin.conf
b/meta-moblin/conf/distro/moblin.conf
index 20d96cc..ab86f15 100644
--- a/meta-moblin/conf/distro/moblin.conf
+++ b/meta-moblin/conf/distro/moblin.conf
@@ -75,7 +75,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-moblin/conf/machine/netbook.conf
b/meta-moblin/conf/machine/netbook.conf
index e227018..25dd551 100644
--- a/meta-moblin/conf/machine/netbook.conf
+++ b/meta-moblin/conf/machine/netbook.conf
@@ -13,16 +13,17 @@ MACHINE_FEATURES = "kernel26 screen keyboard pci usbhost
ext2 ext3 x86 wifi \
KERNEL_IMAGETYPE = "bzImage"
-PREFERRED_PROVIDER_virtual/kernel = "linux-moblin"
-PREFERRED_PROVIDER_virtual/libx11 = "libx11-trim"
-PREFERRED_PROVIDER_virtual/libgl = "mesa-dri"
-PREFERRED_PROVIDER_virtual/xserver = "xserver-xf86-dri-lite"
+PREFERRED_PROVIDER_virtual/kernel ?= "linux-moblin"
+PREFERRED_PROVIDER_virtual/libx11 ?= "libx11-trim"
+PREFERRED_PROVIDER_virtual/libgl ?= "mesa-dri"
+PREFERRED_PROVIDER_virtual/xserver ?= "xserver-xf86-dri-lite"
+PREFERRED_PROVIDER_virtual/xserver-xf86 ?= "xserver-xf86-dri-lite"
XSERVER ?= "xserver-xf86-dri-lite \
xf86-input-mouse \
xf86-input-keyboard \
xf86-input-synaptics \
- xf86-video-intel-dri2"
-MACHINE_DRI_MODULES = "i915"
+ xf86-video-intel \
+ mesa-dri-driver-i915"
MACHINE_EXTRA_RDEPENDS = "rt2860"
diff --git a/meta-moblin/packages/tasks/task-moblin.bb
b/meta-moblin/packages/tasks/task-moblin.bb
index 9b34d99..a886613 100644
--- a/meta-moblin/packages/tasks/task-moblin.bb
+++ b/meta-moblin/packages/tasks/task-moblin.bb
@@ -3,7 +3,7 @@
#
DESCRIPTION = "Tasks for Moblin"
-PR = "r30"
+PR = "r31"
PACKAGES = "\
task-moblin-apps-console \
diff --git a/meta/conf/bitbake.conf b/meta/conf/bitbake.conf
index 6919649..1289a34 100644
--- a/meta/conf/bitbake.conf
+++ b/meta/conf/bitbake.conf
@@ -625,7 +625,6 @@ MACHINE_DISPLAY_WIDTH_PIXELS ?= "240"
MACHINE_DISPLAY_HEIGHT_PIXELS ?= "320"
MACHINE_DISPLAY_ORIENTATION ?= "0"
MACHINE_DISPLAY_BPP ?= "16"
-MACHINE_DRI_MODULES ?= "auto"
DISTRO_EXTRA_RDEPENDS ?= ""
DISTRO_EXTRA_RRECOMMENDS ?= ""
diff --git a/meta/conf/distro/include/poky-fixed-revisions.inc
b/meta/conf/distro/include/poky-fixed-revisions.inc
index 461e74f..3c62a32 100644
--- a/meta/conf/distro/include/poky-fixed-revisions.inc
+++ b/meta/conf/distro/include/poky-fixed-revisions.inc
@@ -153,10 +153,12 @@ SRCREV_pn-uboot-openmoko_upstream ?=
"1ce55151c85d068f70317a8d65c61058b891afb4"
SRCREV_pn-usbpath-native = "3172"
SRCREV_pn-usbpath = "3172"
SRCREV_pn-xserver-kdrive-glamo ?= "a51364e2f23d4b6331c5ed613ce3f7e15f8e540f"
+SRCREV_pn-xserver-xf86-dri-lite ?= "d936a4235c9625bd41569cef3452dd086284e0d7"
+SRCREV_pn-xserver-xf86-dri2-lite ?= "d936a4235c9625bd41569cef3452dd086284e0d7"
SRCREV_pn-gsm0710muxd ?= "6fecc78198dd821bbe29efd096bd8fecd855179d"
SRCREV_pn-gsmd2 ?= "963f34df8fa3ff4b301079dcf86e9acea6b6fe0f"
SRCREV_pn-metacity-clutter ?= "b52f1df75af8216b13539431283fd1cfaa33cf51"
-SRCREV_pn-dri2proto ?= "abb1edc487543c26856afdbe6a7e2c088a1e82ee"
+SRCREV_pn-dri2proto ?= "8cab3f0e6f551220bd11074779f4ccec1e948e00"
SRCREV_pn-inputproto ?= "2166b77ea60bd9cd87f1311a2e7d461db071cb07"
SRCREV_pn-inputproto-native ?= "2166b77ea60bd9cd87f1311a2e7d461db071cb07"
SRCREV_pn-inputproto-sdk ?= "2166b77ea60bd9cd87f1311a2e7d461db071cb07"
@@ -173,8 +175,14 @@ SRCREV_pn-libxcb-sdk ?=
"625ed596cae6dd8175aeb6cb6f26784928042f22"
SRCREV_pn-xcb-proto ?= "d81ca233e98be8fa59e8c90d262c0516944c5a66"
SRCREV_pn-xcb-proto-native ?= "d81ca233e98be8fa59e8c90d262c0516944c5a66"
SRCREV_pn-libxext ?= "49563f5d76637e2ca28fe0b91ce3114271c0955d"
-SRCREV_pn-xf86-video-intel-dri2 ?= "afd089e9653e172cf1a9e28a216d834d5b69b2b7"
-#
+SRCREV_pn-xf86-video-intel ?= "87ea531c5dc5b39809395b277c330854aaaaf019"
+SRCREV_pn-xf86-video-intel-dri2 = "3dd7f0f9423bb891bc99cd3b77dc3d57e057a7ef"
+SRCREV_pn-xf86-input-keyboard ?= "3e28d68b50d291938734e9684b8296ca864f3892"
+SRCREV_pn-xf86-input-mouse ?= "ea5cfe804e112f320f14ad896c7802d53551d3e6"
+SRCREV_pn-xf86-input-synaptics ?= "934bc0012f948c52aadc8eda912f7728fb7394a2"
+SRCREV_pn-mesa-dri ?= "1bf94d419805538ac23a4d0b04d31ac5e4487aca"
+SRCREV_pn-libdrm ?= "b7d54b1dba8eba24da1b9cdd2116a26b98365b81"
+
# Preferred Versions:
#
PREFERRED_VERSION_libmatchbox ?= "1.9"
diff --git a/meta/conf/distro/include/preferred-xorg-versions.inc
b/meta/conf/distro/include/preferred-xorg-versions.inc
index f4d9eb4..2bec394 100644
--- a/meta/conf/distro/include/preferred-xorg-versions.inc
+++ b/meta/conf/distro/include/preferred-xorg-versions.inc
@@ -129,22 +129,23 @@ PREFERRED_VERSION_xproxymanagementprotocol ?= "1.0.2"
PREFERRED_VERSION_xrandr ?= "1.2.3"
PREFERRED_VERSION_xrdb ?= "1.0.5"
PREFERRED_VERSION_xserver-kdrive ?= "1.3.0.0"
-PREFERRED_VERSION_xserver-xf86-dri-lite ?= "1.5.0"
+PREFERRED_VERSION_xserver-xf86-dri-lite ?= "1.5.99.1+git${SRCREV}"
PREFERRED_VERSION_xset ?= "1.0.4"
-PREFERRED_VERSION_xtrans ?= "1.2.1"
+PREFERRED_VERSION_xtrans ?= "1.2.2"
PREFERRED_VERSION_xtrans-native ?= "1.0.4"
PREFERRED_VERSION_xtrans-sdk ?= "1.0.4"
PREFERRED_VERSION_xvinfo ?= "1.0.2"
PREFERRED_VERSION_xwininfo ?= "1.0.3"
-PREFERRED_VERSION_mesa-dri ?= "7.2"
-PREFERRED_VERSION_libdrm ?= "2.3.1"
+PREFERRED_VERSION_mesa-dri ?= "7.3.0+git${SRCREV}"
+PREFERRED_VERSION_libdrm ?= "2.4.0+git${SRCREV}"
PREFERRED_VERSION_xcb-proto ?= "1.2+gitr${SRCREV}"
PREFERRED_VERSION_libxcb ?= "1.1.90.1+gitr${SRCREV}"
PREFERRED_VERSION_libxcb-sdk ?= "1.1.90.1+gitr${SRCREV}"
PREFERRED_VERSION_libpciaccess ?= "0.10.3"
PREFERRED_VERSION_xf86-input-evdev ?= "2.0.4"
-PREFERRED_VERSION_xf86-input-mouse ?= "1.3.0"
-PREFERRED_VERSION_xf86-input-keyboard ?= "1.3.1"
-PREFERRED_VERSION_xf86-input-synaptics ?= "0.15.0"
-PREFERRED_VERSION_xf86-video-intel ?= "2.4.2"
+PREFERRED_VERSION_xf86-input-mouse ?= "1.3.0+git${SRCREV}"
+PREFERRED_VERSION_xf86-input-keyboard ?= "1.3.1+git${SRCREV}"
+PREFERRED_VERSION_xf86-input-synaptics ?= "0.15.2+git${SRCREV}"
+PREFERRED_VERSION_xf86-video-intel ?= "2.4.97.0+git${SRCREV}"
+PREFERRED_VERSION_xf86-video-intel-dri2 ?= "2.4.97.0+git${SRCREV}"
diff --git a/meta/packages/drm/libdrm_2.3.1.bb
b/meta/packages/drm/libdrm_2.3.1.bb
deleted file mode 100644
index 9caf9b4..0000000
--- a/meta/packages/drm/libdrm_2.3.1.bb
+++ /dev/null
@@ -1,10 +0,0 @@
-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/mesa/mesa-dri_7.2.bb
b/meta/packages/mesa/mesa-dri_7.2.bb
index 77b68c4..43e4cb5 100644
--- a/meta/packages/mesa/mesa-dri_7.2.bb
+++ b/meta/packages/mesa/mesa-dri_7.2.bb
@@ -5,7 +5,7 @@ LIB_DEPS = "libdrm virtual/libx11 libxext libxxf86vm libxdamage
libxfixes expat"
DEPENDS = "${PROTO_DEPS} ${LIB_DEPS}"
-PR = "r5"
+PR = "r6"
# most of our targets do not have DRI so will use mesa-xlib
DEFAULT_PREFERENCE = "-1"
@@ -14,16 +14,24 @@ DEFAULT_PREFERENCE = "-1"
DEFAULT_PREFERENCE_netbook = "1"
PACKAGES =+ "${PN}-xprogs"
+PACKAGES_DYNAMIC = "mesa-dri-driver-*"
-FILES_${PN} += "${libdir}/dri/*.so"
FILES_${PN}-dbg += "${libdir}/dri/.debug/*"
FILES_${PN}-xprogs = "${bindir}/glxdemo ${bindir}/glxgears ${bindir}/glxheads
${bindir}/glxinfo"
-EXTRA_OECONF += "--with-driver=dri --with-dri-drivers=${MACHINE_DRI_MODULES}"
+EXTRA_OECONF += "--with-driver=dri"
do_install_append () {
install -d ${D}/usr/bin
install -m 0755 ${S}/progs/xdemos/{glxdemo,glxgears,glxheads,glxinfo}
${D}/usr/bin/
}
+python populate_packages_prepend() {
+ import os.path
+
+ dri_drivers_root = os.path.join(bb.data.getVar('libdir', d, 1), "dri")
+
+ do_split_packages(d, dri_drivers_root, '^(.*)_dri\.so$',
'mesa-dri-driver-%s', 'Mesa %s DRI driver', extra_depends='')
+}
+
COMPATIBLE_HOST = '(i.86.*-linux)'
diff --git a/meta/packages/mesa/mesa-dri_git.bb
b/meta/packages/mesa/mesa-dri_git.bb
index 25eaa5a..e565ac5 100644
--- a/meta/packages/mesa/mesa-dri_git.bb
+++ b/meta/packages/mesa/mesa-dri_git.bb
@@ -6,22 +6,36 @@ LIB_DEPS = "libdrm virtual/libx11 libxext libxxf86vm
libxdamage libxfixes expat"
DEPENDS = "${PROTO_DEPS} ${LIB_DEPS}"
PV = "7.3.0+git${SRCREV}"
-PR = "r1"
+PR = "r3"
# most of our targets do not have DRI so will use mesa-xlib
DEFAULT_PREFERENCE = "-1"
-# Netbooks have has DRI support so use mesa-dri by default
+# Netbooks have DRI support so use mesa-dri by default
DEFAULT_PREFERENCE_netbook = "1"
-SRC_URI = "git://anongit.freedesktop.org/git/mesa/mesa;protocol=git"
+SRC_URI =
"git://anongit.freedesktop.org/git/mesa/mesa;protocol=git;branch=intel-2008-q3 "
S = "${WORKDIR}/git"
PACKAGES =+ "${PN}-xprogs"
+PACKAGES_DYNAMIC = "mesa-dri-driver-*"
-FILES_${PN} += "${libdir}/dri/*.so"
FILES_${PN}-dbg += "${libdir}/dri/.debug/*"
+FILES_${PN}-xprogs = "${bindir}/glxdemo ${bindir}/glxgears ${bindir}/glxheads
${bindir}/glxinfo"
-EXTRA_OECONF += "--with-driver=dri --with-dri-drivers=${MACHINE_DRI_MODULES}"
+EXTRA_OECONF += "--with-driver=dri"
+
+do_install_append () {
+ install -d ${D}/usr/bin
+ install -m 0755 ${S}/progs/xdemos/{glxdemo,glxgears,glxheads,glxinfo}
${D}/usr/bin/
+}
+
+python populate_packages_prepend() {
+ import os.path
+
+ dri_drivers_root = os.path.join(bb.data.getVar('libdir', d, 1), "dri")
+
+ do_split_packages(d, dri_drivers_root, '^(.*)_dri\.so$',
'mesa-dri-driver-%s', 'Mesa %s DRI driver', extra_depends='')
+}
COMPATIBLE_HOST = '(i.86.*-linux)'
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
deleted file mode 100644
index 12a980b..0000000
---
a/meta/packages/xorg-driver/xf86-video-intel-dri2/002_avoid_duplicate_SaveHWState.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-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);
-- pI830->SaveGeneration = -1;
-+ pI830->SaveGeneration = serverGeneration;
- pI830->pEnt = pEnt;
- pI830->use_drm_mode = drm_mode_setting;
-
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
deleted file mode 100644
index 9792122..0000000
---
a/meta/packages/xorg-driver/xf86-video-intel-dri2/004_reduce_driver_boottime.patch
+++ /dev/null
@@ -1,69 +0,0 @@
-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. */
-- usleep(30000);
-+ usleep(21000);
- }
-
- void
-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)
- {
-- usleep(10000); /* 10 ms *should* be plenty */
-+ usleep(150); /* 10 ms *should* be plenty */
- }
-
- static Bool
-@@ -2325,14 +2325,12 @@ RestoreHWState(ScrnInfoPtr pScrn)
- xf86OutputPtr output = xf86_config->output[i];
- output->funcs->dpms(output, DPMSModeOff);
- }
-- i830WaitForVblank(pScrn);
-
- /* Disable pipes */
- for (i = 0; i < xf86_config->num_crtc; i++) {
- xf86CrtcPtr crtc = xf86_config->crtc[i];
- crtc->funcs->dpms(crtc, DPMSModeOff);
- }
-- i830WaitForVblank(pScrn);
-
- if (IS_MOBILE(pI830) && !IS_I830(pI830))
- OUTREG(LVDS, pI830->saveLVDS);
-@@ -2422,13 +2420,11 @@ RestoreHWState(ScrnInfoPtr pScrn)
- DISPPLANE_SEL_PIPE_A) {
- OUTREG(DSPACNTR, pI830->saveDSPACNTR);
- OUTREG(DSPABASE, INREG(DSPABASE));
-- i830WaitForVblank(pScrn);
- }
- if ((pI830->saveDSPBCNTR & DISPPLANE_SEL_PIPE_MASK) ==
- DISPPLANE_SEL_PIPE_A) {
- OUTREG(DSPBCNTR, pI830->saveDSPBCNTR);
- OUTREG(DSPBBASE, INREG(DSPBBASE));
-- i830WaitForVblank(pScrn);
- }
-
- /* See note about pipe programming above */
-@@ -2484,13 +2480,11 @@ RestoreHWState(ScrnInfoPtr pScrn)
- DISPPLANE_SEL_PIPE_B) {
- OUTREG(DSPACNTR, pI830->saveDSPACNTR);
- OUTREG(DSPABASE, INREG(DSPABASE));
-- i830WaitForVblank(pScrn);
- }
- if ((pI830->saveDSPBCNTR & DISPPLANE_SEL_PIPE_MASK) ==
- DISPPLANE_SEL_PIPE_B) {
- OUTREG(DSPBCNTR, pI830->saveDSPBCNTR);
- OUTREG(DSPBBASE, INREG(DSPBBASE));
-- i830WaitForVblank(pScrn);
- }
- }
-
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
deleted file mode 100644
index 338acb2..0000000
---
a/meta/packages/xorg-driver/xf86-video-intel-dri2/005_disable_sdvo_TV_port_restoreHW.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-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) || pI830->force_sdvo_detect) {
- Bool found = i830_sdvo_init(pScrn, SDVOB);
-@@ -931,7 +932,8 @@ I830SetupOutputs(ScrnInfoPtr pScrn)
- }
- if (IS_I9XX(pI830) && IS_MOBILE(pI830))
- i830_tv_init(pScrn);
--
-+#endif
-+
- for (o = 0; o < config->num_output; o++)
- {
- xf86OutputPtr output = config->output[o];
-@@ -1622,7 +1624,9 @@ I830AccelMethodInit(ScrnInfoPtr pScrn)
- PreInitCleanup(pScrn);
- return FALSE;
- }
-+#if 0
- RestoreHWState(pScrn);
-+#endif
-
- /* XXX This should go away, replaced by xf86Crtc.c support for it */
- pI830->rotation = RR_Rotate_0;
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
deleted file mode 100644
index 0925443..0000000
---
a/meta/packages/xorg-driver/xf86-video-intel-dri2/006_disable_check_lvds_panelpower_status.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-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);
-+#if 0
- do {
- pp_status = INREG(PP_STATUS);
- } while ((pp_status & PP_ON) == 0);
--
-+#endif
- dev_priv->set_backlight(output, dev_priv->backlight_duty_cycle);
- dev_priv->dpmsoff = FALSE;
- } else {
-@@ -420,10 +421,11 @@ i830SetLVDSPanelPower(xf86OutputPtr output, Bool on)
- dev_priv->set_backlight(output, 0);
-
- OUTREG(PP_CONTROL, INREG(PP_CONTROL) & ~POWER_TARGET_ON);
-+#if 0
- do {
_______________________________________________
Commits mailing list
[email protected]
https://lists.moblin.org/mailman/listinfo/commits
