On Fri, Feb 07, 2014 at 12:10:36PM -0800, Jesse Barnes wrote: > Read out the current plane configuration at init time into a new > plane_config structure. This allows us to track any existing > framebuffers attached to the plane and potentially re-use them in our > fbdev code for a smooth handoff. > > v2: update for new pitch_for_width function (Jesse) > comment how get_plane_config works with shared fbs (Jesse) > v3: s/ARGB/XRGB (Ville) > use pipesrc width/height (Ville) > fix fourcc comment (Bob) > use drm_format_plane_cpp (Ville) > v4: use fb for tracking fb data object (Ville) > v5: fix up gen2 pitch limits (Ville) > v6: read out stride as well (Daniel) > v7: split out init ordering changes (Daniel) > don't fetch config if !CONFIG_FB > v8: use proper height in get_plane_config (Chris) > v9: fix CONFIG_FB check for modular configs (Jani) > v10: add comment about stolen allocation stomping > > Signed-off-by: Jesse Barnes <jbarnes@xxxxxxxxxxxxxxxx> > --- [snip] > @@ -11062,6 +11176,32 @@ void intel_modeset_init(struct drm_device *dev) > > /* Just in case the BIOS is doing something questionable. */ > intel_disable_fbc(dev); > + > + drm_modeset_lock_all(dev); > + drm_mode_config_reset(dev); > + intel_modeset_setup_hw_state(dev, false); > + drm_modeset_unlock_all(dev); This smells like rebase fail - the hunk from older patches where you drop this code seems to have been lost. Also I've originally asked you to split this out with a bit of justification why we need this at a different place for the fb reconstruction. I just like to give this a spent independent of the other bits a bit, since the setup sequence is known to be really brittle. -Daniel -- 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
