From: Ander Conselvan de Oliveira <ander.conselvan.de.oliveira@intel.com>
Date: Thu, 15 Jan 2015 12:55:27 +0000 (+0200)
Subject: drm/i915: Keep drm_crtc->state in sync with intel_crtc->config
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=16f3f658e5f808235c04f0ac157e9b5c8916d7a3;p=GitHub%2Fmoto-9609%2Fandroid_kernel_motorola_exynos9610.git

drm/i915: Keep drm_crtc->state in sync with intel_crtc->config

So that atomic operations will reference the right crtc state.

Signed-off-by: Ander Conselvan de Oliveira <ander.conselvan.de.oliveira@intel.com>
Reviewed-by: Matt Roper <matthew.d.roper@intel.com>
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
---

diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c
index 5f2601a0f59f..c5cbcd74387a 100644
--- a/drivers/gpu/drm/i915/intel_display.c
+++ b/drivers/gpu/drm/i915/intel_display.c
@@ -8931,6 +8931,7 @@ static void intel_crtc_set_state(struct intel_crtc *crtc,
 {
 	kfree(crtc->config);
 	crtc->config = crtc_state;
+	crtc->base.state = &crtc_state->base;
 }
 
 static void intel_crtc_destroy(struct drm_crtc *crtc)