summaryrefslogtreecommitdiff
path: root/drivers
diff options
context:
space:
mode:
authorDave Airlie <airlied@redhat.com>2015-03-07 07:39:37 +1000
committerDave Airlie <airlied@redhat.com>2015-03-07 07:39:37 +1000
commitb0b20ce347b66a705943628ec0cc9e0a30eb785e (patch)
treef818bf6665a714c937fe5d6aa65e88e07ac2051f /drivers
parent4afb1534775ffcea984ab63cf9cc217203318bfe (diff)
parent13a7a6ac0a11197edcd0f756a035f472b42cdf8b (diff)
downloadkernel-b0b20ce347b66a705943628ec0cc9e0a30eb785e.tar.gz
Merge tag 'v4.0-rc2' into drm-fixes
Linux 4.0-rc2 Merging this manually as the i915 change is in it, and intel fixes are on top of this
Diffstat (limited to 'drivers')
-rw-r--r--drivers/gpu/drm/i915/intel_display.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c
index 3117679299a6..e730789b53b7 100644
--- a/drivers/gpu/drm/i915/intel_display.c
+++ b/drivers/gpu/drm/i915/intel_display.c
@@ -8713,6 +8713,7 @@ retry:
old->release_fb->funcs->destroy(old->release_fb);
goto fail;
}
+ crtc->primary->crtc = crtc;
/* let the connector get through one full cycle before testing */
intel_wait_for_vblank(dev, intel_crtc->pipe);