On Tue, Sep 30, 2014 at 05:34:44PM -0300, Paulo Zanoni wrote: > 2014-09-30 17:10 GMT-03:00 Daniel Vetter <daniel.vetter@xxxxxxxx>: > > Oh well. > > > > Signed-off-by: Daniel Vetter <daniel.vetter@xxxxxxxx> > > --- > > drivers/gpu/drm/i915/intel_drv.h | 2 +- > > drivers/gpu/drm/i915/intel_frontbuffer.c | 13 ++++++------- > > 2 files changed, 7 insertions(+), 8 deletions(-) > > > > diff --git a/drivers/gpu/drm/i915/intel_drv.h b/drivers/gpu/drm/i915/intel_drv.h > > index 91e2b128c537..4e71ae5e3832 100644 > > --- a/drivers/gpu/drm/i915/intel_drv.h > > +++ b/drivers/gpu/drm/i915/intel_drv.h > > @@ -816,7 +816,7 @@ void intel_frontbuffer_flip_complete(struct drm_device *dev, > > void intel_frontbuffer_flush(struct drm_device *dev, > > unsigned frontbuffer_bits); > > /** > > - * intel_frontbuffer_flip - prepare frontbuffer flip > > + * intel_frontbuffer_flip - synchronous frontbuffer flip > > * @dev: DRM device > > * @frontbuffer_bits: frontbuffer plane tracking bits > > * > > diff --git a/drivers/gpu/drm/i915/intel_frontbuffer.c b/drivers/gpu/drm/i915/intel_frontbuffer.c > > index 969af6e7b634..437fa8072adf 100644 > > --- a/drivers/gpu/drm/i915/intel_frontbuffer.c > > +++ b/drivers/gpu/drm/i915/intel_frontbuffer.c > > @@ -28,7 +28,7 @@ > > * DOC: frontbuffer tracking > > * > > * Many features require us to track changes to the currently active > > - * frontbuffer, especially rendering targetted at the frontbuffer. > > + * frontbuffer, especially rendering targeted at the frontbuffer. > > * > > * To be able to do so GEM tracks frontbuffers using a bitmask for all possible > > * frontbuffer slots through i915_gem_track_fb(). The function in this file are > > @@ -55,7 +55,7 @@ > > * cancelled as soon as busyness is detected. > > * > > * Note that there's also an older frontbuffer activity tracking scheme which > > - * just trackings general activity. This is done by the various mark_busy and > > + * just tracks general activity. This is done by the various mark_busy and > > * mark_idle functions. For display power management features using these > > * functions is deprecated and should be avoided. > > */ > > @@ -166,7 +166,7 @@ void intel_fb_obj_invalidate(struct drm_i915_gem_object *obj, > > * > > * This function gets called every time rendering on the given planes has > > * completed and frontbuffer caching can be started again. Flushes will get > > - * delayed if they're blocked by some oustanding asynchronous rendering. > > + * delayed if they're blocked by some outstanding asynchronous rendering. > > * > > * Can be called without any locks held. > > */ > > @@ -229,7 +229,7 @@ void intel_fb_obj_flush(struct drm_i915_gem_object *obj, > > } > > > > /** > > - * intel_frontbuffer_flip_prepare - prepare asnychronous frontbuffer flip > > + * intel_frontbuffer_flip_prepare - prepare asynchronous frontbuffer flip > > * @dev: DRM device > > * @frontbuffer_bits: frontbuffer plane tracking bits > > * > > @@ -253,12 +253,12 @@ void intel_frontbuffer_flip_prepare(struct drm_device *dev, > > } > > > > /** > > - * intel_frontbuffer_flip_complete - complete asynchronous frontbuffer flush > > + * intel_frontbuffer_flip_complete - complete asynchronous frontbuffer flip > > * @dev: DRM device > > * @frontbuffer_bits: frontbuffer plane tracking bits > > * > > * This function gets called after the flip has been latched and will complete > > - * on the next vblank. It will execute the fush if it hasn't been cancalled yet. > > + * on the next vblank. It will execute the flush if it hasn't been cancalled yet. > > The word "cancalled" could also be fixed :) Fixed. > > With that: Reviewed-by: Paulo Zanoni <paulo.r.zanoni@xxxxxxxxx> Thanks for your review, both patches applied. -Daniel > > > * > > * Can be called without any locks held. > > */ > > @@ -275,4 +275,3 @@ void intel_frontbuffer_flip_complete(struct drm_device *dev, > > > > intel_frontbuffer_flush(dev, frontbuffer_bits); > > } > > - > > -- > > 2.1.1 > > > > _______________________________________________ > > Intel-gfx mailing list > > Intel-gfx@xxxxxxxxxxxxxxxxxxxxx > > http://lists.freedesktop.org/mailman/listinfo/intel-gfx > > > > -- > Paulo Zanoni -- 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