diff options
Diffstat (limited to 'meta/packages/xorg-driver/xf86-video-intel-dri2/004_reduce_driver_boottime.patch')
-rw-r--r--[-rwxr-xr-x] | meta/packages/xorg-driver/xf86-video-intel-dri2/004_reduce_driver_boottime.patch | 52 |
1 files changed, 13 insertions, 39 deletions
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 @@ | |||
1 | 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 | 1 | diff --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 | 2 | index 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 |
13 | 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 | 14 | diff --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 | 15 | index 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)); |