Merge tag 'for-4.1' of git://git.kernel.org/pub/scm/linux/kernel/git/kishon/linux...

[deliverable/linux.git] / drivers / gpu / drm / i915 / intel_display.c

diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c
index 30faf6c262e583eb493b5c09bc7f8de74c7ef2c0..f75173c20f47677f1a8462dabc78b10ac7b4645f 100644 (file)
--- a/drivers/gpu/drm/i915/intel_display.c
+++ b/drivers/gpu/drm/i915/intel_display.c
@@ -2442,6 +2442,7 @@ intel_find_plane_obj(struct intel_crtc *intel_crtc,
                struct drm_plane *primary = intel_crtc->base.primary;
 
                primary->state->crtc = &intel_crtc->base;
+               primary->crtc = &intel_crtc->base;
                update_state_fb(primary);
 
                return;
@@ -2476,6 +2477,7 @@ intel_find_plane_obj(struct intel_crtc *intel_crtc,
                        drm_framebuffer_reference(c->primary->fb);
                        primary->fb = c->primary->fb;
                        primary->state->crtc = &intel_crtc->base;
+                       primary->crtc = &intel_crtc->base;
                        obj->frontbuffer_bits |= INTEL_FRONTBUFFER_PRIMARY(intel_crtc->pipe);
                        break;
                }