diff options
| author | Eric Anholt <eric@anholt.net> | 2006-12-11 16:02:29 -0800 |
|---|---|---|
| committer | Eric Anholt <eric@anholt.net> | 2006-12-11 16:02:29 -0800 |
| commit | c8c1fb64ccecfb88f9923ad65c9898aa44692260 (patch) | |
| tree | 206d51f5eb934376974dc6da9983573d35140507 /src/i830_display.c | |
| parent | 3f3791ba2ece8e8a7aa3a5676f5f6361862a292c (diff) | |
Move the overlay mode switch status updates to when we enable/disable crtcs.
This should help if we mode switch with randr during video playback, and also
simplifies the code by moving the protection all to one place.
Diffstat (limited to 'src/i830_display.c')
| -rw-r--r-- | src/i830_display.c | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/src/i830_display.c b/src/i830_display.c index b2d9e351..f05b5c73 100644 --- a/src/i830_display.c +++ b/src/i830_display.c @@ -511,8 +511,14 @@ i830_crtc_dpms(xf86CrtcPtr crtc, int mode) /* Enable the plane */ temp = INREG(dspcntr_reg); OUTREG(dspcntr_reg, temp | DISPLAY_PLANE_ENABLE); + + /* Give the overlay scaler a chance to enable if it's on this pipe */ + i830_crtc_dpms_video(crtc, TRUE); break; case DPMSModeOff: + /* Give the overlay scaler a chance to disable if it's on this pipe */ + i830_crtc_dpms_video(crtc, FALSE); + /* Disable display plane */ temp = INREG(dspcntr_reg); OUTREG(dspcntr_reg, temp & ~DISPLAY_PLANE_ENABLE); |