On Sun, Mar 08, 2015 at 02:00:41PM -0700, Matt Roper wrote: > From: Matt Roper <matt@xxxxxxxxxxxx> > > 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@xxxxxxxxxxxx> > --- > 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; Spaces instead of tabs. For coordination could we just pick up the patch from Ander's series instead? Or is that in the part that needs slight reworking? -Daniel > > /* > * Calculate and store various constants which > -- > 1.8.5.1 > > _______________________________________________ > Intel-gfx mailing list > Intel-gfx@xxxxxxxxxxxxxxxxxxxxx > http://lists.freedesktop.org/mailman/listinfo/intel-gfx -- Daniel Vetter Software Engineer, Intel Corporation +41 (0) 79 365 57 48 - http://blog.ffwll.ch _______________________________________________ Intel-gfx mailing list Intel-gfx@xxxxxxxxxxxxxxxxxxxxx http://lists.freedesktop.org/mailman/listinfo/intel-gfx