On Mon, Feb 24, 2014 at 01:27:26PM +0200, Ville Syrjälä wrote:
> On Fri, Feb 21, 2014 at 01:13:39PM -0800, Jesse Barnes wrote:
> > To silence locking complaints. This was a rebase failure on my part in
> >
> > commit fa9fa083d0606cb323f6105c17702460ea0a6780
> > Author: Jesse Barnes <jbarnes@xxxxxxxxxxxxxxxx>
> > Date: Tue Feb 11 15:28:56 2014 -0800
> >
> > drm/i915: read out hw state earlier v2
> >
> > Reported-by: Ville Syrjälä <ville.syrjala@xxxxxxxxxxxxxxx>
> > Signed-off-by: Jesse Barnes <jbarnes@xxxxxxxxxxxxxxxx>
>
> Reviewed-by: Ville Syrjälä <ville.syrjala@xxxxxxxxxxxxxxx>
Needed some shuffling, but queued for -next, thanks for the patch.
-Daniel
>
> > ---
> > drivers/gpu/drm/i915/intel_display.c | 2 ++
> > 1 file changed, 2 insertions(+)
> >
> > diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c
> > index 13ad064..69cade7 100644
> > --- a/drivers/gpu/drm/i915/intel_display.c
> > +++ b/drivers/gpu/drm/i915/intel_display.c
> > @@ -11282,7 +11282,9 @@ void intel_modeset_init(struct drm_device *dev)
> > /* Just in case the BIOS is doing something questionable. */
> > intel_disable_fbc(dev);
> >
> > + mutex_lock(&dev->mode_config.mutex);
> > intel_modeset_setup_hw_state(dev, false);
> > + mutex_unlock(&dev->mode_config.mutex);
> >
> > list_for_each_entry(crtc, &dev->mode_config.crtc_list,
> > base.head) {
> > --
> > 1.7.9.5
> >
> > _______________________________________________
> > Intel-gfx mailing list
> > Intel-gfx@xxxxxxxxxxxxxxxxxxxxx
> > http://lists.freedesktop.org/mailman/listinfo/intel-gfx
>
> --
> Ville Syrjälä
> Intel OTC
> _______________________________________________
> 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
