[Intel-gfx] [PATCH 1/5] drm/i915: Ensure crtc_state backpointer is initialized

Matt Roper matthew.d.roper at intel.com
Sun Mar 8 14:00:41 PDT 2015


From: Matt Roper <matt at mattrope.com>

Since our legacy modeset paths directly kzalloc CRTC state objects at
the moment rather than calling intel_crtc_duplicate_state(), we need to
manually ensure the ->crtc backpointer is always initialized.

Signed-off-by: Matt Roper <matt at mattrope.com>
---
 drivers/gpu/drm/i915/intel_display.c | 1 +
 1 file changed, 1 insertion(+)

diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c
index 43d3575..188f87f 100644
--- a/drivers/gpu/drm/i915/intel_display.c
+++ b/drivers/gpu/drm/i915/intel_display.c
@@ -11228,6 +11228,7 @@ static int __intel_set_mode(struct drm_crtc *crtc,
 		/* mode_set/enable/disable functions rely on a correct pipe
 		 * config. */
 		intel_crtc_set_state(to_intel_crtc(crtc), pipe_config);
+                pipe_config->base.crtc = &intel_crtc->base;
 
 		/*
 		 * Calculate and store various constants which
-- 
1.8.5.1



More information about the Intel-gfx mailing list