From 5053b6efd70d10ed99d4f0ea99b2cbdd70cfea1d Mon Sep 17 00:00:00 2001 From: Chris Wilson Date: Thu, 10 Feb 2011 17:38:35 +0000 Subject: [PATCH] --- yaml --- r: 233339 b: refs/heads/master c: 04dbff52600719017598f7439bf42e5a72e7de3b h: refs/heads/master i: 233337: fd78cd8565e84ad599338b3837af4efdab1d5e0d 233335: d0542967215c769f38a6ae02a1b9ae697e5732bd v: v3 --- [refs] | 2 +- trunk/drivers/gpu/drm/i915/intel_display.c | 3 +-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index e0884d7886d0..1d80bdecb6f6 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 8102e126c0827b5336065fd86d3d313b60fde23a +refs/heads/master: 04dbff52600719017598f7439bf42e5a72e7de3b diff --git a/trunk/drivers/gpu/drm/i915/intel_display.c b/trunk/drivers/gpu/drm/i915/intel_display.c index 94622e3a202e..3b006536b3d2 100644 --- a/trunk/drivers/gpu/drm/i915/intel_display.c +++ b/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;