diff options
Diffstat (limited to 'meta/packages/xorg-driver/xf86-video-intel-dri2')
-rw-r--r-- | meta/packages/xorg-driver/xf86-video-intel-dri2/004_reduce_driver_boottime.patch | 66 |
1 files changed, 5 insertions, 61 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 97921223d0..3f8c5c7bde 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,8 +1,8 @@ | |||
1 | diff --git a/src/i830_display.c b/src/i830_display.c | 1 | Index: git/src/i830_display.c |
2 | index 95ce51e..2c49b43 100644 | 2 | =================================================================== |
3 | --- a/src/i830_display.c | 3 | --- git.orig/src/i830_display.c 2008-10-29 15:46:24.000000000 +0000 |
4 | +++ b/src/i830_display.c | 4 | +++ git/src/i830_display.c 2008-10-29 18:27:47.000000000 +0000 |
5 | @@ -376,7 +376,7 @@ void | 5 | @@ -376,7 +376,7 @@ |
6 | i830WaitForVblank(ScrnInfoPtr pScreen) | 6 | i830WaitForVblank(ScrnInfoPtr pScreen) |
7 | { | 7 | { |
8 | /* Wait for 20ms, i.e. one cycle at 50hz. */ | 8 | /* Wait for 20ms, i.e. one cycle at 50hz. */ |
@@ -11,59 +11,3 @@ index 95ce51e..2c49b43 100644 | |||
11 | } | 11 | } |
12 | 12 | ||
13 | void | 13 | void |
14 | diff --git a/src/i830_driver.c b/src/i830_driver.c | ||
15 | index 6cd30b2..223967f 100644 | ||
16 | --- a/src/i830_driver.c | ||
17 | +++ b/src/i830_driver.c | ||
18 | @@ -2303,7 +2303,7 @@ SaveHWState(ScrnInfoPtr pScrn) | ||
19 | static void | ||
20 | i830_dpll_settle(void) | ||
21 | { | ||
22 | - usleep(10000); /* 10 ms *should* be plenty */ | ||
23 | + usleep(150); /* 10 ms *should* be plenty */ | ||
24 | } | ||
25 | |||
26 | static Bool | ||
27 | @@ -2325,14 +2325,12 @@ RestoreHWState(ScrnInfoPtr pScrn) | ||
28 | xf86OutputPtr output = xf86_config->output[i]; | ||
29 | output->funcs->dpms(output, DPMSModeOff); | ||
30 | } | ||
31 | - i830WaitForVblank(pScrn); | ||
32 | |||
33 | /* Disable pipes */ | ||
34 | for (i = 0; i < xf86_config->num_crtc; i++) { | ||
35 | xf86CrtcPtr crtc = xf86_config->crtc[i]; | ||
36 | crtc->funcs->dpms(crtc, DPMSModeOff); | ||
37 | } | ||
38 | - i830WaitForVblank(pScrn); | ||
39 | |||
40 | if (IS_MOBILE(pI830) && !IS_I830(pI830)) | ||
41 | OUTREG(LVDS, pI830->saveLVDS); | ||
42 | @@ -2422,13 +2420,11 @@ RestoreHWState(ScrnInfoPtr pScrn) | ||
43 | DISPPLANE_SEL_PIPE_A) { | ||
44 | OUTREG(DSPACNTR, pI830->saveDSPACNTR); | ||
45 | OUTREG(DSPABASE, INREG(DSPABASE)); | ||
46 | - i830WaitForVblank(pScrn); | ||
47 | } | ||
48 | if ((pI830->saveDSPBCNTR & DISPPLANE_SEL_PIPE_MASK) == | ||
49 | DISPPLANE_SEL_PIPE_A) { | ||
50 | OUTREG(DSPBCNTR, pI830->saveDSPBCNTR); | ||
51 | OUTREG(DSPBBASE, INREG(DSPBBASE)); | ||
52 | - i830WaitForVblank(pScrn); | ||
53 | } | ||
54 | |||
55 | /* See note about pipe programming above */ | ||
56 | @@ -2484,13 +2480,11 @@ RestoreHWState(ScrnInfoPtr pScrn) | ||
57 | DISPPLANE_SEL_PIPE_B) { | ||
58 | OUTREG(DSPACNTR, pI830->saveDSPACNTR); | ||
59 | OUTREG(DSPABASE, INREG(DSPABASE)); | ||
60 | - i830WaitForVblank(pScrn); | ||
61 | } | ||
62 | if ((pI830->saveDSPBCNTR & DISPPLANE_SEL_PIPE_MASK) == | ||
63 | DISPPLANE_SEL_PIPE_B) { | ||
64 | OUTREG(DSPBCNTR, pI830->saveDSPBCNTR); | ||
65 | OUTREG(DSPBBASE, INREG(DSPBBASE)); | ||
66 | - i830WaitForVblank(pScrn); | ||
67 | } | ||
68 | } | ||
69 | |||