* [PATCH 1/3] drm/i915: intel_frontbuffer_flush can now be static
@ 2015-07-08 21:08 Paulo Zanoni
2015-07-08 21:08 ` [PATCH 2/3] drm/i915: fix intel_fb_obj_flush documentation Paulo Zanoni
2015-07-08 21:08 ` [PATCH 3/3] drm/i915: fix intel_frontbuffer_flip documentation Paulo Zanoni
0 siblings, 2 replies; 6+ messages in thread
From: Paulo Zanoni @ 2015-07-08 21:08 UTC (permalink / raw)
To: intel-gfx; +Cc: Paulo Zanoni
From: Paulo Zanoni <paulo.r.zanoni@intel.com>
So make it static.
Signed-off-by: Paulo Zanoni <paulo.r.zanoni@intel.com>
---
drivers/gpu/drm/i915/intel_drv.h | 3 ---
drivers/gpu/drm/i915/intel_frontbuffer.c | 6 +++---
2 files changed, 3 insertions(+), 6 deletions(-)
diff --git a/drivers/gpu/drm/i915/intel_drv.h b/drivers/gpu/drm/i915/intel_drv.h
index beeb4d3..4e137f8 100644
--- a/drivers/gpu/drm/i915/intel_drv.h
+++ b/drivers/gpu/drm/i915/intel_drv.h
@@ -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,
diff --git a/drivers/gpu/drm/i915/intel_frontbuffer.c b/drivers/gpu/drm/i915/intel_frontbuffer.c
index cb5a6f0..122533d 100644
--- a/drivers/gpu/drm/i915/intel_frontbuffer.c
+++ b/drivers/gpu/drm/i915/intel_frontbuffer.c
@@ -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);
--
2.1.4
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/intel-gfx
^ permalink raw reply related [flat|nested] 6+ messages in thread* [PATCH 2/3] drm/i915: fix intel_fb_obj_flush documentation
2015-07-08 21:08 [PATCH 1/3] drm/i915: intel_frontbuffer_flush can now be static Paulo Zanoni
@ 2015-07-08 21:08 ` Paulo Zanoni
2015-07-09 17:00 ` Rodrigo Vivi
2015-07-08 21:08 ` [PATCH 3/3] drm/i915: fix intel_frontbuffer_flip documentation Paulo Zanoni
1 sibling, 1 reply; 6+ messages in thread
From: Paulo Zanoni @ 2015-07-08 21:08 UTC (permalink / raw)
To: intel-gfx; +Cc: Paulo Zanoni
From: Paulo Zanoni <paulo.r.zanoni@intel.com>
Reported by the kbuild test robot.
Regression introduced by:
commit de152b627eb3018de91ec5c5a50b38e17d80a88b
Author: Rodrigo Vivi <rodrigo.vivi@intel.com>
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)
Signed-off-by: Paulo Zanoni <paulo.r.zanoni@intel.com>
---
drivers/gpu/drm/i915/intel_frontbuffer.c | 1 +
1 file changed, 1 insertion(+)
diff --git a/drivers/gpu/drm/i915/intel_frontbuffer.c b/drivers/gpu/drm/i915/intel_frontbuffer.c
index 122533d..dc8f14d 100644
--- a/drivers/gpu/drm/i915/intel_frontbuffer.c
+++ b/drivers/gpu/drm/i915/intel_frontbuffer.c
@@ -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
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/intel-gfx
^ permalink raw reply related [flat|nested] 6+ messages in thread* Re: [PATCH 2/3] drm/i915: fix intel_fb_obj_flush documentation
2015-07-08 21:08 ` [PATCH 2/3] drm/i915: fix intel_fb_obj_flush documentation Paulo Zanoni
@ 2015-07-09 17:00 ` Rodrigo Vivi
2015-07-09 17:16 ` Daniel Vetter
0 siblings, 1 reply; 6+ messages in thread
From: Rodrigo Vivi @ 2015-07-09 17:00 UTC (permalink / raw)
To: Paulo Zanoni, intel-gfx; +Cc: Paulo Zanoni
[-- Attachment #1.1: Type: text/plain, Size: 1607 bytes --]
ops... Sorry..
I could swear I had added this... or probably forgot to send the version
that had it...
Anyway:
Reviewed-by: Rodrigo Vivi <rodrigo.vivi@intel.com>
On Wed, Jul 8, 2015 at 2:09 PM Paulo Zanoni <przanoni@gmail.com> wrote:
> From: Paulo Zanoni <paulo.r.zanoni@intel.com>
>
> Reported by the kbuild test robot.
>
> Regression introduced by:
> commit de152b627eb3018de91ec5c5a50b38e17d80a88b
> Author: Rodrigo Vivi <rodrigo.vivi@intel.com>
> 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)
>
> Signed-off-by: Paulo Zanoni <paulo.r.zanoni@intel.com>
> ---
> drivers/gpu/drm/i915/intel_frontbuffer.c | 1 +
> 1 file changed, 1 insertion(+)
>
> diff --git a/drivers/gpu/drm/i915/intel_frontbuffer.c
> b/drivers/gpu/drm/i915/intel_frontbuffer.c
> index 122533d..dc8f14d 100644
> --- a/drivers/gpu/drm/i915/intel_frontbuffer.c
> +++ b/drivers/gpu/drm/i915/intel_frontbuffer.c
> @@ -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
>
> _______________________________________________
> Intel-gfx mailing list
> Intel-gfx@lists.freedesktop.org
> http://lists.freedesktop.org/mailman/listinfo/intel-gfx
>
[-- Attachment #1.2: Type: text/html, Size: 2465 bytes --]
[-- Attachment #2: Type: text/plain, Size: 159 bytes --]
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/intel-gfx
^ permalink raw reply [flat|nested] 6+ messages in thread
* [PATCH 3/3] drm/i915: fix intel_frontbuffer_flip documentation
2015-07-08 21:08 [PATCH 1/3] drm/i915: intel_frontbuffer_flush can now be static Paulo Zanoni
2015-07-08 21:08 ` [PATCH 2/3] drm/i915: fix intel_fb_obj_flush documentation Paulo Zanoni
@ 2015-07-08 21:08 ` Paulo Zanoni
2015-07-09 17:18 ` Daniel Vetter
1 sibling, 1 reply; 6+ messages in thread
From: Paulo Zanoni @ 2015-07-08 21:08 UTC (permalink / raw)
To: intel-gfx; +Cc: Paulo Zanoni
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(-)
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
^ permalink raw reply related [flat|nested] 6+ messages in thread* Re: [PATCH 3/3] drm/i915: fix intel_frontbuffer_flip documentation
2015-07-08 21:08 ` [PATCH 3/3] drm/i915: fix intel_frontbuffer_flip documentation Paulo Zanoni
@ 2015-07-09 17:18 ` Daniel Vetter
0 siblings, 0 replies; 6+ messages in thread
From: Daniel Vetter @ 2015-07-09 17:18 UTC (permalink / raw)
To: Paulo Zanoni; +Cc: intel-gfx, Paulo Zanoni
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
--
Daniel Vetter
Software Engineer, Intel Corporation
http://blog.ffwll.ch
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/intel-gfx
^ permalink raw reply [flat|nested] 6+ messages in thread
end of thread, other threads:[~2015-07-09 17:15 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2015-07-08 21:08 [PATCH 1/3] drm/i915: intel_frontbuffer_flush can now be static Paulo Zanoni
2015-07-08 21:08 ` [PATCH 2/3] drm/i915: fix intel_fb_obj_flush documentation Paulo Zanoni
2015-07-09 17:00 ` Rodrigo Vivi
2015-07-09 17:16 ` Daniel Vetter
2015-07-08 21:08 ` [PATCH 3/3] drm/i915: fix intel_frontbuffer_flip documentation Paulo Zanoni
2015-07-09 17:18 ` Daniel Vetter
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox