On Thu, Apr 05, 2018 at 06:13:52PM +0300, Ville Syrjala wrote: > From: Ville Syrjälä <ville.syrjala@xxxxxxxxxxxxxxx> > > We want to get rid of plane->fb/crtc on atomic drivers. Stop setting > them. > > Signed-off-by: Ville Syrjälä <ville.syrjala@xxxxxxxxxxxxxxx> > Reviewed-by: Maarten Lankhorst <maarten.lankhorst@xxxxxxxxxxxxxxx> There's a bunch more hits I have: - 2x a coment with "Both crtc and plane->crtc" in intel_atomic_plane.c. Probably best to just nuke those. - One comment in intel_crtc_active, just needs to be switched to crtc->primary->state->fb to match the code. It looks like you caught all the functional bits at least. With the above fixed, this is. Reviewed-by: Daniel Vetter <daniel.vetter@xxxxxxxx> > --- > drivers/gpu/drm/i915/intel_display.c | 5 ++--- > 1 file changed, 2 insertions(+), 3 deletions(-) > > diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c > index 415fb8cf2cf4..1912c4f9eb61 100644 > --- a/drivers/gpu/drm/i915/intel_display.c > +++ b/drivers/gpu/drm/i915/intel_display.c > @@ -2877,9 +2877,8 @@ intel_find_initial_plane_obj(struct intel_crtc *intel_crtc, > if (i915_gem_object_is_tiled(obj)) > dev_priv->preserve_bios_swizzle = true; > > - drm_framebuffer_get(fb); > - primary->fb = primary->state->fb = fb; > - primary->crtc = primary->state->crtc = &intel_crtc->base; > + plane_state->fb = fb; > + plane_state->crtc = &intel_crtc->base; > > intel_set_plane_visible(to_intel_crtc_state(crtc_state), > to_intel_plane_state(plane_state), > -- > 2.16.1 > > _______________________________________________ > dri-devel mailing list > dri-devel@xxxxxxxxxxxxxxxxxxxxx > https://lists.freedesktop.org/mailman/listinfo/dri-devel -- Daniel Vetter Software Engineer, Intel Corporation http://blog.ffwll.ch _______________________________________________ Intel-gfx mailing list Intel-gfx@xxxxxxxxxxxxxxxxxxxxx https://lists.freedesktop.org/mailman/listinfo/intel-gfx
