summaryrefslogtreecommitdiffstats
path: root/meta/packages/xorg-driver
diff options
context:
space:
mode:
authorPeng Li <peng.li@intel.com>2008-10-28 23:34:50 +0800
committerPeng Li <peng.li@intel.com>2008-10-29 22:28:00 +0800
commit37ea0eea9134ea476992f74bc56f7935590a969b (patch)
tree1cb92277dc743ea5b594fcdedcd637f400716bc5 /meta/packages/xorg-driver
parente76840f41a1a5e42a3f13bd2804310852acc0d25 (diff)
downloadpoky-37ea0eea9134ea476992f74bc56f7935590a969b.tar.gz
xf86-video-intel-dri2: rebase X fastboot patches
rebase X fastboot patches for latest driver
Diffstat (limited to 'meta/packages/xorg-driver')
-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
4 files changed, 32 insertions, 55 deletions
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);
generated by cgit v1.2.3-54-g00ecf (git 2.39.0) at 2024-06-26 22:30:53 +0000