aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDaniel Vetter <daniel.vetter@ffwll.ch>2014-03-11 12:09:31 -0400
committerDaniel Vetter <daniel.vetter@ffwll.ch>2014-05-21 05:30:30 -0400
commitadd1d00823a820f8244c88407d7112d4a66e70c8 (patch)
tree8f1f67db3c736c0a5596179ac9d49e18264a8f66
parentf2752282f7f7b566b07113dd5aa130725aa95ac4 (diff)
drm/i915: Remove drm_vblank_pre/post_modeset calls
Originally these functions have been for user modesetting drivers to ensure vblank processing doesn't fall over completely around modeset changes. This has been carried over ever since then. Now that Ville cleaned our vblank handling with an explicit drm_vblank_off/on braket when disabling/enabling crtcs. So this seems to be unnecessary now. The most important side effect was that due to the delayed vblank disabling we have been pretty much guaranteed to receive a vblank interrupt soonish after a crtc was enabled. Note that our vblank handling across modeset is still fairly decent fubar - we don't actually handle vblank counter all to well. drm_update_vblank_count will make sure that the frame counter always rolls forward, but userspace isn't really all to ready to cope with the big jumps this causes. This isn't a big mostly because the hardware retains the frame counter. But with runtime pm and also across suspend/resume we fall over. Fixing this is a lot more involved and also needs som i-g-ts. So material for another patch series. Reviewed-by: Ville Syrjälä <ville.syrjala@linux.intel.com> Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
-rw-r--r--drivers/gpu/drm/i915/intel_display.c5
1 files changed, 0 insertions, 5 deletions
diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c
index 313f29d1aae2..d061594859ca 100644
--- a/drivers/gpu/drm/i915/intel_display.c
+++ b/drivers/gpu/drm/i915/intel_display.c
@@ -7199,15 +7199,10 @@ static int intel_crtc_mode_set(struct drm_crtc *crtc,
7199 struct intel_encoder *encoder; 7199 struct intel_encoder *encoder;
7200 struct intel_crtc *intel_crtc = to_intel_crtc(crtc); 7200 struct intel_crtc *intel_crtc = to_intel_crtc(crtc);
7201 struct drm_display_mode *mode = &intel_crtc->config.requested_mode; 7201 struct drm_display_mode *mode = &intel_crtc->config.requested_mode;
7202 int pipe = intel_crtc->pipe;
7203 int ret; 7202 int ret;
7204 7203
7205 drm_vblank_pre_modeset(dev, pipe);
7206
7207 ret = dev_priv->display.crtc_mode_set(crtc, x, y, fb); 7204 ret = dev_priv->display.crtc_mode_set(crtc, x, y, fb);
7208 7205
7209 drm_vblank_post_modeset(dev, pipe);
7210
7211 if (ret != 0) 7206 if (ret != 0)
7212 return ret; 7207 return ret;
7213 7208