---

yaml
---
r: 233339
b: refs/heads/master
c: 04dbff5
h: refs/heads/master
i:
  233337: fd78cd8
  233335: d054296
v: v3

[refs]

@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 8102e126c0827b5336065fd86d3d313b60fde23a
+refs/heads/master: 04dbff52600719017598f7439bf42e5a72e7de3b

trunk/drivers/gpu/drm/i915/intel_display.c

@@ -5558,9 +5558,7 @@ static void intel_crtc_reset(struct drm_crtc *crtc)
 	/* Reset flags back to the 'unknown' status so that they
 	 * will be correctly set on the initial modeset.
 	 */
-	intel_crtc->cursor_addr = 0;
 	intel_crtc->dpms_mode = -1;
-	intel_crtc->active = true; /* force the pipe off on setup_init_config */
 }
 
 static struct drm_crtc_helper_funcs intel_helper_funcs = {
@@ -5666,6 +5664,7 @@ static void intel_crtc_init(struct drm_device *dev, int pipe)
 	dev_priv->pipe_to_crtc_mapping[intel_crtc->pipe] = &intel_crtc->base;
 
 	intel_crtc_reset(&intel_crtc->base);
+	intel_crtc->active = true; /* force the pipe off on setup_init_config */
 
 	if (HAS_PCH_SPLIT(dev)) {
 		intel_helper_funcs.prepare = ironlake_crtc_prepare;