2015-06-18 5:30 GMT-03:00 Daniel Vetter <daniel.vetter@xxxxxxxx>: > Must have missed the transition. Reviewed-by: Paulo Zanoni <paulo.r.zanoni@xxxxxxxxx> > > Signed-off-by: Daniel Vetter <daniel.vetter@xxxxxxxxx> > --- > drivers/gpu/drm/i915/intel_frontbuffer.c | 12 ++++++------ > 1 file changed, 6 insertions(+), 6 deletions(-) > > diff --git a/drivers/gpu/drm/i915/intel_frontbuffer.c b/drivers/gpu/drm/i915/intel_frontbuffer.c > index ede6ccc45375..0635ee004c29 100644 > --- a/drivers/gpu/drm/i915/intel_frontbuffer.c > +++ b/drivers/gpu/drm/i915/intel_frontbuffer.c > @@ -82,7 +82,7 @@ void intel_fb_obj_invalidate(struct drm_i915_gem_object *obj, > enum fb_op_origin origin) > { > struct drm_device *dev = obj->base.dev; > - struct drm_i915_private *dev_priv = dev->dev_private; > + struct drm_i915_private *dev_priv = to_i915(dev); > > WARN_ON(!mutex_is_locked(&dev->struct_mutex)); > > @@ -117,7 +117,7 @@ void intel_fb_obj_invalidate(struct drm_i915_gem_object *obj, > void intel_frontbuffer_flush(struct drm_device *dev, > unsigned frontbuffer_bits) > { > - struct drm_i915_private *dev_priv = dev->dev_private; > + struct drm_i915_private *dev_priv = to_i915(dev); > > /* Delay flushing when rings are still busy.*/ > mutex_lock(&dev_priv->fb_tracking.lock); > @@ -145,7 +145,7 @@ void intel_fb_obj_flush(struct drm_i915_gem_object *obj, > bool retire) > { > struct drm_device *dev = obj->base.dev; > - struct drm_i915_private *dev_priv = dev->dev_private; > + struct drm_i915_private *dev_priv = to_i915(dev); > unsigned frontbuffer_bits; > > WARN_ON(!mutex_is_locked(&dev->struct_mutex)); > @@ -182,7 +182,7 @@ void intel_fb_obj_flush(struct drm_i915_gem_object *obj, > void intel_frontbuffer_flip_prepare(struct drm_device *dev, > unsigned frontbuffer_bits) > { > - struct drm_i915_private *dev_priv = dev->dev_private; > + struct drm_i915_private *dev_priv = to_i915(dev); > > mutex_lock(&dev_priv->fb_tracking.lock); > dev_priv->fb_tracking.flip_bits |= frontbuffer_bits; > @@ -206,7 +206,7 @@ void intel_frontbuffer_flip_prepare(struct drm_device *dev, > void intel_frontbuffer_flip_complete(struct drm_device *dev, > unsigned frontbuffer_bits) > { > - struct drm_i915_private *dev_priv = dev->dev_private; > + struct drm_i915_private *dev_priv = to_i915(dev); > > mutex_lock(&dev_priv->fb_tracking.lock); > /* Mask any cancelled flips. */ > @@ -232,7 +232,7 @@ inline > void intel_frontbuffer_flip(struct drm_device *dev, > unsigned frontbuffer_bits) > { > - struct drm_i915_private *dev_priv = dev->dev_private; > + struct drm_i915_private *dev_priv = to_i915(dev); > > mutex_lock(&dev_priv->fb_tracking.lock); > dev_priv->fb_tracking.flip_bits |= frontbuffer_bits; > -- > 2.1.0 > > _______________________________________________ > Intel-gfx mailing list > Intel-gfx@xxxxxxxxxxxxxxxxxxxxx > http://lists.freedesktop.org/mailman/listinfo/intel-gfx -- Paulo Zanoni _______________________________________________ Intel-gfx mailing list Intel-gfx@xxxxxxxxxxxxxxxxxxxxx http://lists.freedesktop.org/mailman/listinfo/intel-gfx