From 4b4108513258904bf0b04fea28a18e7b23126fbc Mon Sep 17 00:00:00 2001 From: Robert Bragg Date: Wed, 29 Oct 2008 18:00:37 +0000 Subject: Adds xf86-video-intel_git.bb This also moves the patchs in xf86-video-intel-dri2/ -> xf86-video-intel/ --- .../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 -------------------- .../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 ++++++++++++++++ 9 files changed, 111 insertions(+), 88 deletions(-) delete mode 100644 meta/packages/xorg-driver/xf86-video-intel-dri2/002_avoid_duplicate_SaveHWState.patch delete mode 100644 meta/packages/xorg-driver/xf86-video-intel-dri2/004_reduce_driver_boottime.patch delete mode 100644 meta/packages/xorg-driver/xf86-video-intel-dri2/005_disable_sdvo_TV_port_restoreHW.patch delete mode 100644 meta/packages/xorg-driver/xf86-video-intel-dri2/006_disable_check_lvds_panelpower_status.patch create mode 100755 meta/packages/xorg-driver/xf86-video-intel/002_avoid_duplicate_SaveHWState.patch create mode 100755 meta/packages/xorg-driver/xf86-video-intel/004_reduce_driver_boottime.patch create mode 100755 meta/packages/xorg-driver/xf86-video-intel/005_disable_sdvo_TV_port_restoreHW.patch create mode 100755 meta/packages/xorg-driver/xf86-video-intel/006_disable_check_lvds_panelpower_status.patch create mode 100644 meta/packages/xorg-driver/xf86-video-intel_git.bb (limited to 'meta/packages') 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 12a980bbf..000000000 --- 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 3f8c5c7bd..000000000 --- a/meta/packages/xorg-driver/xf86-video-intel-dri2/004_reduce_driver_boottime.patch +++ /dev/null @@ -1,13 +0,0 @@ -Index: git/src/i830_display.c -=================================================================== ---- git.orig/src/i830_display.c 2008-10-29 15:46:24.000000000 +0000 -+++ git/src/i830_display.c 2008-10-29 18:27:47.000000000 +0000 -@@ -376,7 +376,7 @@ - i830WaitForVblank(ScrnInfoPtr pScreen) - { - /* Wait for 20ms, i.e. one cycle at 50hz. */ -- usleep(30000); -+ usleep(21000); - } - - void 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 338acb2ba..000000000 --- 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 092544381..000000000 --- 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 { - pp_status = INREG(PP_STATUS); - } while (pp_status & PP_ON); -- -+#endif - dev_priv->dpmsoff = TRUE; - } - } diff --git a/meta/packages/xorg-driver/xf86-video-intel/002_avoid_duplicate_SaveHWState.patch b/meta/packages/xorg-driver/xf86-video-intel/002_avoid_duplicate_SaveHWState.patch new file mode 100755 index 000000000..12a980bbf --- /dev/null +++ b/meta/packages/xorg-driver/xf86-video-intel/002_avoid_duplicate_SaveHWState.patch @@ -0,0 +1,13 @@ +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/004_reduce_driver_boottime.patch b/meta/packages/xorg-driver/xf86-video-intel/004_reduce_driver_boottime.patch new file mode 100755 index 000000000..3f8c5c7bd --- /dev/null +++ b/meta/packages/xorg-driver/xf86-video-intel/004_reduce_driver_boottime.patch @@ -0,0 +1,13 @@ +Index: git/src/i830_display.c +=================================================================== +--- git.orig/src/i830_display.c 2008-10-29 15:46:24.000000000 +0000 ++++ git/src/i830_display.c 2008-10-29 18:27:47.000000000 +0000 +@@ -376,7 +376,7 @@ + i830WaitForVblank(ScrnInfoPtr pScreen) + { + /* Wait for 20ms, i.e. one cycle at 50hz. */ +- usleep(30000); ++ usleep(21000); + } + + void diff --git a/meta/packages/xorg-driver/xf86-video-intel/005_disable_sdvo_TV_port_restoreHW.patch b/meta/packages/xorg-driver/xf86-video-intel/005_disable_sdvo_TV_port_restoreHW.patch new file mode 100755 index 000000000..338acb2ba --- /dev/null +++ b/meta/packages/xorg-driver/xf86-video-intel/005_disable_sdvo_TV_port_restoreHW.patch @@ -0,0 +1,32 @@ +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/006_disable_check_lvds_panelpower_status.patch b/meta/packages/xorg-driver/xf86-video-intel/006_disable_check_lvds_panelpower_status.patch new file mode 100755 index 000000000..092544381 --- /dev/null +++ b/meta/packages/xorg-driver/xf86-video-intel/006_disable_check_lvds_panelpower_status.patch @@ -0,0 +1,30 @@ +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 { + pp_status = INREG(PP_STATUS); + } while (pp_status & PP_ON); +- ++#endif + dev_priv->dpmsoff = TRUE; + } + } diff --git a/meta/packages/xorg-driver/xf86-video-intel_git.bb b/meta/packages/xorg-driver/xf86-video-intel_git.bb new file mode 100644 index 000000000..d51c4e8b1 --- /dev/null +++ b/meta/packages/xorg-driver/xf86-video-intel_git.bb @@ -0,0 +1,23 @@ +require xf86-video-common.inc + +DESCRIPTION = "X.Org X server -- Intel i8xx, i9xx display driver" +DEPENDS += "virtual/libx11 libxvmc drm dri2proto glproto \ + virtual/libgl xineramaproto libpciaccess" +PROVIDES = "xf86-video-intel" + +PR = "r1" +PV = "2.4.97.0+git${SRCREV}" + +#TODO: Investigate the fact that these patches fail to apply to git master a.t.m +#file://002_avoid_duplicate_SaveHWState.patch;patch=1 +#file://004_reduce_driver_boottime.patch;patch=1 +SRC_URI = "git://anongit.freedesktop.org/git/xorg/driver/xf86-video-intel;protocol=git \ + file://005_disable_sdvo_TV_port_restoreHW.patch;patch=1 \ + file://006_disable_check_lvds_panelpower_status.patch;patch=1" + +S = "${WORKDIR}/git" + +COMPATIBLE_HOST = '(i.86.*-linux)' + +EXTRA_OECONF = "--enable-dri --disable-static" + -- cgit v1.2.3