summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAnder Conselvan de Oliveira <ander.conselvan.de.oliveira@intel.com>2015-01-15 14:55:27 +0200
committerDaniel Vetter <daniel.vetter@ffwll.ch>2015-01-27 09:50:51 +0100
commit16f3f658e5f808235c04f0ac157e9b5c8916d7a3 (patch)
tree946933732dcd04a4f1f194dc7a624bc7b0c23444
parentf5de6e0739e7f64edcea4f4bd42b862f2ffb2353 (diff)
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>
-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 5f2601a0f59..c5cbcd74387 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)