drm/i915: Keep drm_crtc->state in sync with intel_crtc->config
authorAnder Conselvan de Oliveira <ander.conselvan.de.oliveira@intel.com>
Thu, 15 Jan 2015 12:55:27 +0000 (14:55 +0200)
committerDaniel Vetter <daniel.vetter@ffwll.ch>
Tue, 27 Jan 2015 08:50:51 +0000 (09:50 +0100)
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>
drivers/gpu/drm/i915/intel_display.c

index 5f2601a0f59f6930d6bffdd72e67505a1fba8759..c5cbcd74387a6713724ef2c66b1873265f83e87b 100644 (file)
@@ -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)