diff mbox

[3/3] drm/i915: fix intel_frontbuffer_flip documentation

Message ID 1436389719-16392-3-git-send-email-przanoni@gmail.com (mailing list archive)
State New, archived
Headers show

Commit Message

Paulo Zanoni July 8, 2015, 9:08 p.m. UTC 
From: Paulo Zanoni <paulo.r.zanoni@intel.com>

Reported by the kbuild test robot.

Regression introduced by:
commit fdbff9282c0f5f61ffc87d57461b04d943250910
Author: Daniel Vetter <daniel.vetter@ffwll.ch>
Date:   Thu Jun 18 11:23:24 2015 +0200
    drm/i915: Clear fb_tracking.busy_bits also for synchronous flips

(I reviewed this commit, so it's also my fault)

Signed-off-by: Paulo Zanoni <paulo.r.zanoni@intel.com>
---
 Documentation/DocBook/drm.tmpl           | 1 -
 drivers/gpu/drm/i915/intel_frontbuffer.c | 1 -
 2 files changed, 2 deletions(-)

Comments

Daniel Vetter July 9, 2015, 5:18 p.m. UTC | #1 
On Wed, Jul 08, 2015 at 06:08:39PM -0300, Paulo Zanoni wrote:
> From: Paulo Zanoni <paulo.r.zanoni@intel.com>
> 
> Reported by the kbuild test robot.
> 
> Regression introduced by:
> commit fdbff9282c0f5f61ffc87d57461b04d943250910
> Author: Daniel Vetter <daniel.vetter@ffwll.ch>
> Date:   Thu Jun 18 11:23:24 2015 +0200
>     drm/i915: Clear fb_tracking.busy_bits also for synchronous flips
> 
> (I reviewed this commit, so it's also my fault)
> 
> Signed-off-by: Paulo Zanoni <paulo.r.zanoni@intel.com>

Patch 1&3 also merged to dinq, thanks.
-Daniel

> ---
>  Documentation/DocBook/drm.tmpl           | 1 -
>  drivers/gpu/drm/i915/intel_frontbuffer.c | 1 -
>  2 files changed, 2 deletions(-)
> 
> diff --git a/Documentation/DocBook/drm.tmpl b/Documentation/DocBook/drm.tmpl
> index 596b11d..30b3651 100644
> --- a/Documentation/DocBook/drm.tmpl
> +++ b/Documentation/DocBook/drm.tmpl
> @@ -4012,7 +4012,6 @@ int num_ioctls;</synopsis>
>          <title>Frontbuffer Tracking</title>
>  !Pdrivers/gpu/drm/i915/intel_frontbuffer.c frontbuffer tracking
>  !Idrivers/gpu/drm/i915/intel_frontbuffer.c
> -!Fdrivers/gpu/drm/i915/intel_drv.h intel_frontbuffer_flip
>  !Fdrivers/gpu/drm/i915/i915_gem.c i915_gem_track_fb
>        </sect2>
>        <sect2>
> diff --git a/drivers/gpu/drm/i915/intel_frontbuffer.c b/drivers/gpu/drm/i915/intel_frontbuffer.c
> index dc8f14d..b5b1d25 100644
> --- a/drivers/gpu/drm/i915/intel_frontbuffer.c
> +++ b/drivers/gpu/drm/i915/intel_frontbuffer.c
> @@ -229,7 +229,6 @@ void intel_frontbuffer_flip_complete(struct drm_device *dev,
>   *
>   * Can be called without any locks held.
>   */
> -
>  void intel_frontbuffer_flip(struct drm_device *dev,
>  			    unsigned frontbuffer_bits)
>  {
> -- 
> 2.1.4
> 
> _______________________________________________
> Intel-gfx mailing list
> Intel-gfx@lists.freedesktop.org
> http://lists.freedesktop.org/mailman/listinfo/intel-gfx
diff mbox

Patch

diff --git a/Documentation/DocBook/drm.tmpl b/Documentation/DocBook/drm.tmpl
index 596b11d..30b3651 100644
--- a/Documentation/DocBook/drm.tmpl
+++ b/Documentation/DocBook/drm.tmpl
@@ -4012,7 +4012,6 @@  int num_ioctls;</synopsis>
         <title>Frontbuffer Tracking</title>
 !Pdrivers/gpu/drm/i915/intel_frontbuffer.c frontbuffer tracking
 !Idrivers/gpu/drm/i915/intel_frontbuffer.c
-!Fdrivers/gpu/drm/i915/intel_drv.h intel_frontbuffer_flip
 !Fdrivers/gpu/drm/i915/i915_gem.c i915_gem_track_fb
       </sect2>
       <sect2>
diff --git a/drivers/gpu/drm/i915/intel_frontbuffer.c b/drivers/gpu/drm/i915/intel_frontbuffer.c
index dc8f14d..b5b1d25 100644
--- a/drivers/gpu/drm/i915/intel_frontbuffer.c
+++ b/drivers/gpu/drm/i915/intel_frontbuffer.c
@@ -229,7 +229,6 @@  void intel_frontbuffer_flip_complete(struct drm_device *dev,
  *
  * Can be called without any locks held.
  */
-
 void intel_frontbuffer_flip(struct drm_device *dev,
 			    unsigned frontbuffer_bits)
 {