xf86-video-intel: src/sna/sna_display.c
Chris Wilson
ickle at kemper.freedesktop.org
Fri Oct 3 09:21:48 PDT 2014
src/sna/sna_display.c | 15 +++++++++------
1 file changed, 9 insertions(+), 6 deletions(-)
New commits:
commit 7d60a9be3da1163866573d2ffda9635a914ac795
Author: Chris Wilson <chris at chris-wilson.co.uk>
Date: Fri Oct 3 17:20:31 2014 +0100
sna: Update vblank interval after enabling outputs
In a couple of cases we can re-enable CRTC. After doing so we should
recompute the minimum vblank interval.
Signed-off-by: Chris Wilson <chris at chris-wilson.co.uk>
diff --git a/src/sna/sna_display.c b/src/sna/sna_display.c
index d1f3974..b1144bb 100644
--- a/src/sna/sna_display.c
+++ b/src/sna/sna_display.c
@@ -2355,11 +2355,12 @@ sna_crtc_dpms(xf86CrtcPtr crtc, int mode)
assert(priv);
priv->dpms_mode = mode;
- if (mode == DPMSModeOn &&
- crtc->enabled &&
- priv->bo == NULL &&
- !__sna_crtc_set_mode(crtc))
- mode = DPMSModeOff;
+ if (mode == DPMSModeOn && crtc->enabled && priv->bo == NULL) {
+ if (__sna_crtc_set_mode(crtc))
+ update_flush_interval(to_sna(crtc->scrn));
+ else
+ mode = DPMSModeOff;
+ }
if (mode != DPMSModeOn)
sna_crtc_disable(crtc);
@@ -4334,7 +4335,7 @@ sna_mode_resize(ScrnInfoPtr scrn, int width, int height)
xf86CrtcPtr crtc = config->crtc[i];
assert(to_sna_crtc(crtc) != NULL);
- if (!crtc->enabled)
+ if (to_sna_crtc(crtc)->bo == NULL)
continue;
if (!__sna_crtc_set_mode(crtc))
@@ -5959,6 +5960,8 @@ sna_mode_enable(struct sna *sna)
__sna_crtc_set_mode(crtc);
}
+
+ update_flush_interval(sna);
}
void
More information about the xorg-commit
mailing list