Skip to contentSkip to conversation

drm/i915: intel_frontbuffer_flush can now be static

PATCH Applied Paulo Zanoni 3 participants 6 messages Jul 8, 2015 – Jul 9, 2015

Subsystems (3)
lore
Share & tools
lore
#0 lore raw

PATCH 1/3 drm/i915: intel_frontbuffer_flush can now be static

From: Paulo Zanoni <[email protected]>

So make it static.

---
 drivers/gpu/drm/i915/intel_drv.h         | 3 ---
 drivers/gpu/drm/i915/intel_frontbuffer.c | 6 +++---
 2 files changed, 3 insertions(+), 6 deletions(-)
drivers/gpu/drm/i915/intel_drv.h +0 -3
index beeb4d3..4e137f8 100644
@@ -977,9 +977,6 @@ void intel_frontbuffer_flip_prepare(struct drm_device *dev,
 				    unsigned frontbuffer_bits);
 void intel_frontbuffer_flip_complete(struct drm_device *dev,
 				     unsigned frontbuffer_bits);
-void intel_frontbuffer_flush(struct drm_device *dev,
-			     unsigned frontbuffer_bits,
-			     enum fb_op_origin origin);
 void intel_frontbuffer_flip(struct drm_device *dev,
 			    unsigned frontbuffer_bits);
 unsigned int intel_fb_align_height(struct drm_device *dev,
drivers/gpu/drm/i915/intel_frontbuffer.c +3 -3
index cb5a6f0..122533d 100644
@@ -113,9 +113,9 @@ void intel_fb_obj_invalidate(struct drm_i915_gem_object *obj,
  *
  * Can be called without any locks held.
  */
-void intel_frontbuffer_flush(struct drm_device *dev,
-			     unsigned frontbuffer_bits,
-			     enum fb_op_origin origin)
+static void intel_frontbuffer_flush(struct drm_device *dev,
+				    unsigned frontbuffer_bits,
+				    enum fb_op_origin origin)
 {
 	struct drm_i915_private *dev_priv = to_i915(dev);
 
Signature · 6 lines
2.1.4

_______________________________________________
Intel-gfx mailing list
[email protected]
http://lists.freedesktop.org/mailman/listinfo/intel-gfx
#1 lore raw

PATCH 2/3 drm/i915: fix intel_fb_obj_flush documentation

From: Paulo Zanoni <[email protected]>

Reported by the kbuild test robot.

Regression introduced by:
commit de152b627eb3018de91ec5c5a50b38e17d80a88b

Author: Rodrigo Vivi <[email protected]>
Date:   Tue Jul 7 16:28:51 2015 -0700

drm/i915: Add origin to frontbuffer tracking flush

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

---
 drivers/gpu/drm/i915/intel_frontbuffer.c | 1 +
 1 file changed, 1 insertion(+)
drivers/gpu/drm/i915/intel_frontbuffer.c +1 -0
index 122533d..dc8f14d 100644
@@ -136,6 +136,7 @@ static void intel_frontbuffer_flush(struct drm_device *dev,
  * intel_fb_obj_flush - flush frontbuffer object
  * @obj: GEM object to flush
  * @retire: set when retiring asynchronous rendering
+ * @origin: which operation caused the flush
  *
  * This function gets called every time rendering on the given object has
  * completed and frontbuffer caching can be started again. If @retire is true
Signature · 6 lines
2.1.4

_______________________________________________
Intel-gfx mailing list
[email protected]
http://lists.freedesktop.org/mailman/listinfo/intel-gfx
#4 lore raw

PATCH 3/3 drm/i915: fix intel_frontbuffer_flip documentation

In reply to Paulo Zanoni

From: Paulo Zanoni <[email protected]>

Reported by the kbuild test robot.

Regression introduced by:
commit fdbff9282c0f5f61ffc87d57461b04d943250910

Author: Daniel Vetter <[email protected]>
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)

---
 Documentation/DocBook/drm.tmpl           | 1 -
 drivers/gpu/drm/i915/intel_frontbuffer.c | 1 -
 2 files changed, 2 deletions(-)
Documentation/DocBook/drm.tmpl +0 -1
index 596b11d..30b3651 100644
@@ -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>
drivers/gpu/drm/i915/intel_frontbuffer.c +0 -1
index dc8f14d..b5b1d25 100644
@@ -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)
 {
Signature · 6 lines
2.1.4

_______________________________________________
Intel-gfx mailing list
[email protected]
http://lists.freedesktop.org/mailman/listinfo/intel-gfx
Reviewed-by on v1 2/3
#2 lore raw

Re: [PATCH 2/3] drm/i915: fix intel_fb_obj_flush documentation

In reply to Paulo Zanoni

ops... Sorry..
I could swear I had added this... or probably forgot to send the version that had it...

Anyway:

Quoted 35 lines · Paulo Zanoni

From: Paulo Zanoni <[email protected]>

Reported by the kbuild test robot.

Regression introduced by:
commit de152b627eb3018de91ec5c5a50b38e17d80a88b

Author: Rodrigo Vivi <[email protected]>
Date:   Tue Jul 7 16:28:51 2015 -0700

drm/i915: Add origin to frontbuffer tracking flush

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

---
 drivers/gpu/drm/i915/intel_frontbuffer.c | 1 +
 1 file changed, 1 insertion(+)
drivers/gpu/drm/i915/intel_frontbuffer.c +1 -0
index 122533d..dc8f14d 100644
@@ -136,6 +136,7 @@ static void intel_frontbuffer_flush(struct drm_device
 *dev,
  * intel_fb_obj_flush - flush frontbuffer object
  * @obj: GEM object to flush
  * @retire: set when retiring asynchronous rendering
+ * @origin: which operation caused the flush
  *
  * This function gets called every time rendering on the given object has

* completed and frontbuffer caching can be started again. If @retire is
true
--
2.1.4

Quoted 5 lines

_______________________________________________
Intel-gfx mailing list
[email protected]
http://lists.freedesktop.org/mailman/listinfo/intel-gfx

_______________________________________________
Intel-gfx mailing list
[email protected]
http://lists.freedesktop.org/mailman/listinfo/intel-gfx

#3 lore raw

Re: [PATCH 2/3] drm/i915: fix intel_fb_obj_flush documentation

Quoted 7 lines · Rodrigo Vivi

ops... Sorry..
I could swear I had added this... or probably forgot to send the version that had it...

Anyway:

Queued for -next, thanks for the patch.
-Daniel

Signature · 7 lines
Daniel Vetter
Software Engineer, Intel Corporation
http://blog.ffwll.ch
_______________________________________________
Intel-gfx mailing list
[email protected]
http://lists.freedesktop.org/mailman/listinfo/intel-gfx
#5 lore raw

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

In reply to Paulo Zanoni
Quoted 6 lines · Paulo Zanoni

From: Paulo Zanoni <[email protected]>

Reported by the kbuild test robot.

Regression introduced by:
commit fdbff9282c0f5f61ffc87d57461b04d943250910

Quoted 7 lines
Author: Daniel Vetter <[email protected]>
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)

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

Quoted 36 lines
---
 Documentation/DocBook/drm.tmpl           | 1 -
 drivers/gpu/drm/i915/intel_frontbuffer.c | 1 -
 2 files changed, 2 deletions(-)
Documentation/DocBook/drm.tmpl +0 -1
index 596b11d..30b3651 100644
@@ -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>
drivers/gpu/drm/i915/intel_frontbuffer.c +0 -1
index dc8f14d..b5b1d25 100644
@@ -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)
 {
Signature · 6 lines
2.1.4

_______________________________________________
Intel-gfx mailing list
[email protected]
http://lists.freedesktop.org/mailman/listinfo/intel-gfx
Signature · 7 lines
Daniel Vetter
Software Engineer, Intel Corporation
http://blog.ffwll.ch
_______________________________________________
Intel-gfx mailing list
[email protected]
http://lists.freedesktop.org/mailman/listinfo/intel-gfx