drm/i915: Simplify and fix object to display tracking
Subsystems (2)
PATCH 1/1 drm/i915: Simplify and fix object to display tracking
From: Tvrtko Ursulin <[email protected]>
Purpose of this tracking is to know when to flush the cache between the non-coherent display engine. Previously to:
commit 121920faf2ccce9aa66a7e2588415c9647b66104
Author: Tvrtko Ursulin <[email protected]>
Date: Mon Mar 23 11:10:37 2015 +0000
drm/i915/skl: Query display address through a wrapper
This worked by a mix of direct flag manipulation and checking for existence of a pinned GGTT VMA.
With the introduction of rotated display mappings this approach is no longer correct.
New simpler approach is to just keep this count over calls which pin and unpin objects to and from display.
(Inspired and extracted code from a larger rework by Chris Wilson.)
--- drivers/gpu/drm/i915/i915_drv.h | 3 ++- drivers/gpu/drm/i915/i915_gem.c | 33 +++++++++------------------------ 2 files changed, 11 insertions(+), 25 deletions(-)
drivers/gpu/drm/i915/i915_drv.h +2 -1
@@ -1969,7 +1969,8 @@ struct drm_i915_gem_object {*/ unsigned int fault_mappable:1; unsigned int pin_mappable:1; - unsigned int pin_display:1; + unsigned int pin_display:3; +#define I915_MAX_PIN_DISPLAY 7/* * Is the object to be mapped as read-only to the GPU
drivers/gpu/drm/i915/i915_gem.c +9 -24
@@ -3849,24 +3849,6 @@ unlock:return ret; } -static bool is_pin_display (struct drm_i915_gem_object *obj) -{ -struct i915_vma *vma; - - vma =i915_gem_obj_to_ggtt (obj); -if (!vma) -return false; - -/* There are 2 sources that pin objects: -* 1. The display engine (scanouts, sprites, cursors); -* 2. Reservations for execbuffer; -* -* We can ignore reservations as we hold the struct_mutex and -* are only called outside of the reservation path. -*/ -return vma->pin_count; -} -/* * Prepare buffer for display plane (scanout, cursors, etc). * Can be called from an uninterruptible phase (modesetting) and allows
@@ -3879,9 +3861,11 @@ i915_gem_object_pin_to_display_plane(struct drm_i915_gem_object *obj, const struct i915_ggtt_view *view) {u32 old_read_domains, old_write_domain; -bool was_pin_display;int ret; +if (WARN_ON (obj->pin_display ==I915_MAX_PIN_DISPLAY )) +return -ENODEV ; +if (pipelined !=i915_gem_request_get_ring (obj->last_read_req)) { ret =i915_gem_object_sync (obj, pipelined);if (ret)
@@ -3891,8 +3875,7 @@ i915_gem_object_pin_to_display_plane(struct drm_i915_gem_object *obj,/* Mark the pin_display early so that we account for the * display coherency whilst setting up the cache domains. */ - was_pin_display = obj->pin_display; - obj->pin_display = true; + obj->pin_display++;/* The display engine is not coherent with the LLC cache on gen6. As * a result, we make sure that the pinning that is about to occur is
@@ -3936,8 +3919,7 @@ i915_gem_object_pin_to_display_plane(struct drm_i915_gem_object *obj,return 0 ; err_unpin_display: -WARN_ON (was_pin_display !=is_pin_display (obj)); - obj->pin_display = was_pin_display; + obj->pin_display--;return ret; }
@@ -3945,9 +3927,12 @@ void i915_gem_object_unpin_from_display_plane(struct drm_i915_gem_object *obj, const struct i915_ggtt_view *view) { + if (WARN_ON(obj->pin_display == 0)) + return; +i915_gem_object_ggtt_unpin_view (obj, view); - obj->pin_display =is_pin_display (obj); + obj->pin_display--; }int
Signature · 6 lines
2.3.2 _______________________________________________ Intel-gfx mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/intel-gfx
Quoted 34 lines · Tvrtko Ursulin
From: Tvrtko Ursulin <[email protected]>
Purpose of this tracking is to know when to flush the cache between the non-coherent display engine. Previously to:
commit
121920faf2ccce9aa66a7e2588415c9647b66104
Author: Tvrtko Ursulin <[email protected]>
Date: Mon Mar 23 11:10:37 2015 +0000drm/i915/skl: Query display address through a wrapper
This worked by a mix of direct flag manipulation and checking for existence of a pinned GGTT VMA.
With the introduction of rotated display mappings this approach is no longer correct.
New simpler approach is to just keep this count over calls which pin and unpin objects to and from display.
(Inspired and extracted code from a larger rework by Chris Wilson.)
Signed-off-by Tvrtko Ursulin <[email protected]>Cc Chris Wilson <[email protected]>--- drivers/gpu/drm/i915/i915_drv.h | 3 ++- drivers/gpu/drm/i915/i915_gem.c | 33 +++++++++------------------------ 2 files changed, 11 insertions(+), 25 deletions(-)drivers/gpu/drm/i915/i915_drv.h +0
-0
drivers/gpu/drm/i915/i915_drv.h struct drm_i915_gem_object { · line 1973
Quoted 6 lines
drivers/gpu/drm/i915/i915_drv.h +2
-1@@ -1969,7 +1969,8 @@ struct drm_i915_gem_object {*/ unsigned int fault_mappable:1; unsigned int pin_mappable:1; - unsigned int pin_display:1; + unsigned int pin_display:3; +#define I915_MAX_PIN_DISPLAY 7
Why is that enough?
Quoted 86 lines
drivers/gpu/drm/i915/i915_drv.h +0
-0/* * Is the object to be mapped as read-only to the GPU drivers/gpu/drm/i915/i915_gem.c +9
-24@@ -3849,24 +3849,6 @@ unlock:return ret; } -static bool is_pin_display (struct drm_i915_gem_object *obj) -{ -struct i915_vma *vma; - - vma =i915_gem_obj_to_ggtt (obj); -if (!vma) -return false; - -/* There are 2 sources that pin objects: -* 1. The display engine (scanouts, sprites, cursors); -* 2. Reservations for execbuffer; -* -* We can ignore reservations as we hold the struct_mutex and -* are only called outside of the reservation path. -*/ -return vma->pin_count; -} -/* * Prepare buffer for display plane (scanout, cursors, etc). * Can be called from an uninterruptible phase (modesetting) and allows @@ -3879,9 +3861,11 @@ i915_gem_object_pin_to_display_plane(struct drm_i915_gem_object *obj, const struct i915_ggtt_view *view) {u32 old_read_domains, old_write_domain; -bool was_pin_display;int ret; +if (WARN_ON (obj->pin_display ==I915_MAX_PIN_DISPLAY )) +return -ENODEV ; +if (pipelined !=i915_gem_request_get_ring (obj->last_read_req)) { ret =i915_gem_object_sync (obj, pipelined);if (ret)@@ -3891,8 +3875,7 @@ i915_gem_object_pin_to_display_plane(struct drm_i915_gem_object *obj,/* Mark the pin_display early so that we account for the * display coherency whilst setting up the cache domains. */ - was_pin_display = obj->pin_display; - obj->pin_display = true; + obj->pin_display++;/* The display engine is not coherent with the LLC cache on gen6. As * a result, we make sure that the pinning that is about to occur is @@ -3936,8 +3919,7 @@ i915_gem_object_pin_to_display_plane(struct drm_i915_gem_object *obj,return 0 ; err_unpin_display: -WARN_ON (was_pin_display !=is_pin_display (obj)); - obj->pin_display = was_pin_display; + obj->pin_display--;return ret; }@@ -3945,9 +3927,12 @@ void i915_gem_object_unpin_from_display_plane(struct drm_i915_gem_object *obj, const struct i915_ggtt_view *view) { + if (WARN_ON(obj->pin_display == 0)) + return; +i915_gem_object_ggtt_unpin_view (obj, view); - obj->pin_display =is_pin_display (obj); + obj->pin_display--; }int Signature · 6 lines
2.3.2 _______________________________________________ Intel-gfx mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/intel-gfx
Signature · 6 lines
Ville Syrjälä Intel OTC _______________________________________________ Intel-gfx mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/intel-gfx
Quoted 14 lines · Ville Syrjälä
drivers/gpu/drm/i915/i915_drv.h struct drm_i915_gem_object { · line 1973
Quoted 11 lines · Tvrtko Ursulin
drivers/gpu/drm/i915/i915_drv.h +2
-1@@ -1969,7 +1969,8 @@ struct drm_i915_gem_object {*/ unsigned int fault_mappable:1; unsigned int pin_mappable:1; - unsigned int pin_display:1; + unsigned int pin_display:3; +#define I915_MAX_PIN_DISPLAY 7Why is that enough?
I had it split across two counters, which limited the number of times an object could pinned to the display plane NUM_PLANES+1. I thought I was saving space by using a few bits from a hole in the object and putting the full counter on the vma.
-Chris
Signature · 5 lines
Chris Wilson, Intel Open Source Technology Centre _______________________________________________ Intel-gfx mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/intel-gfx
Quoted 14 lines · Tvrtko Ursulin
From: Tvrtko Ursulin <[email protected]>
Purpose of this tracking is to know when to flush the cache between the non-coherent display engine. Previously to:
commit
121920faf2ccce9aa66a7e2588415c9647b66104
Author: Tvrtko Ursulin <[email protected]>
Date: Mon Mar 23 11:10:37 2015 +0000drm/i915/skl: Query display address through a wrapper
This worked by a mix of direct flag manipulation and checking for existence of a pinned GGTT VMA.
Quoted 7 lines
With the introduction of rotated display mappings this approach is no longer correct.
New simpler approach is to just keep this count over calls which pin and unpin objects to and from display.
(Inspired and extracted code from a larger rework by Chris Wilson.)
Hmm, given a stuck pageflip worker we can easily end up with the same object pinned into the display plane several times. (If that is not enough to convince, think about async pageflips and a low priority worker.) Multiply that over each CRTC doing its own pinning and it is quite easy to run afoul of I915_MAX_PIN_DISPLAY. I was thinking that having the counter on the vma was cleaner, but in retrospect I think we just want a full counter on the object.
-Chris
Signature · 5 lines
Chris Wilson, Intel Open Source Technology Centre _______________________________________________ Intel-gfx mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH v2 1/1 drm/i915: Simplify and fix object to display tracking
In reply to Tvrtko UrsulinFrom: Tvrtko Ursulin <[email protected]>
Purpose of this tracking is to know when to flush the cache between the non-coherent display engine. Previously to:
commit 121920faf2ccce9aa66a7e2588415c9647b66104
Author: Tvrtko Ursulin <[email protected]>
Date: Mon Mar 23 11:10:37 2015 +0000
drm/i915/skl: Query display address through a wrapper
This worked by a mix of direct flag manipulation and checking for existence of a pinned GGTT VMA.
With the introduction of rotated display mappings this approach is no longer correct.
New simpler approach is to just keep this count over calls which pin and unpin objects to and from display.
(Inspired and extracted code from a larger rework by Chris Wilson.)
v2: Remove the limit since it is not well defined.
--- drivers/gpu/drm/i915/i915_drv.h | 3 ++- drivers/gpu/drm/i915/i915_gem.c | 30 ++++++------------------------ 2 files changed, 8 insertions(+), 25 deletions(-)
drivers/gpu/drm/i915/i915_drv.h +2 -1
@@ -1969,7 +1969,6 @@ struct drm_i915_gem_object {*/ unsigned int fault_mappable:1; unsigned int pin_mappable:1; - unsigned int pin_display:1;/* * Is the object to be mapped as read-only to the GPU
@@ -1983,6 +1982,8 @@ struct drm_i915_gem_object { unsigned int frontbuffer_bits:INTEL_FRONTBUFFER_BITS; +unsigned int pin_display; +struct sg_table *pages;int pages_pin_count;
drivers/gpu/drm/i915/i915_gem.c +6 -24
@@ -3849,24 +3849,6 @@ unlock:return ret; } -static bool is_pin_display (struct drm_i915_gem_object *obj) -{ -struct i915_vma *vma; - - vma =i915_gem_obj_to_ggtt (obj); -if (!vma) -return false; - -/* There are 2 sources that pin objects: -* 1. The display engine (scanouts, sprites, cursors); -* 2. Reservations for execbuffer; -* -* We can ignore reservations as we hold the struct_mutex and -* are only called outside of the reservation path. -*/ -return vma->pin_count; -} -/* * Prepare buffer for display plane (scanout, cursors, etc). * Can be called from an uninterruptible phase (modesetting) and allows
@@ -3879,7 +3861,6 @@ i915_gem_object_pin_to_display_plane(struct drm_i915_gem_object *obj, const struct i915_ggtt_view *view) {u32 old_read_domains, old_write_domain; -bool was_pin_display;int ret;if (pipelined !=i915_gem_request_get_ring (obj->last_read_req)) {
@@ -3891,8 +3872,7 @@ i915_gem_object_pin_to_display_plane(struct drm_i915_gem_object *obj,/* Mark the pin_display early so that we account for the * display coherency whilst setting up the cache domains. */ - was_pin_display = obj->pin_display; - obj->pin_display = true; + obj->pin_display++;/* The display engine is not coherent with the LLC cache on gen6. As * a result, we make sure that the pinning that is about to occur is
@@ -3936,8 +3916,7 @@ i915_gem_object_pin_to_display_plane(struct drm_i915_gem_object *obj,return 0 ; err_unpin_display: -WARN_ON (was_pin_display !=is_pin_display (obj)); - obj->pin_display = was_pin_display; + obj->pin_display--;return ret; }
@@ -3945,9 +3924,12 @@ void i915_gem_object_unpin_from_display_plane(struct drm_i915_gem_object *obj, const struct i915_ggtt_view *view) { + if (WARN_ON(obj->pin_display == 0)) + return; +i915_gem_object_ggtt_unpin_view (obj, view); - obj->pin_display =is_pin_display (obj); + obj->pin_display--; }int
Signature · 6 lines
2.3.2 _______________________________________________ Intel-gfx mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/intel-gfx
Quoted 3 lines · Tvrtko Ursulin
From: Tvrtko Ursulin <[email protected]>
Purpose of this tracking is to know when to flush the cache between the
CPU and the
Quoted 1 line
non-coherent display engine. Previously to:
s/Previously/Prior/
Quoted 7 lines
commit
121920faf2ccce9aa66a7e2588415c9647b66104
Author: Tvrtko Ursulin <[email protected]>
Date: Mon Mar 23 11:10:37 2015 +0000drm/i915/skl: Query display address through a wrapper
Quoted 8 lines
This worked by a mix of direct flag manipulation and checking for existence of a pinned GGTT VMA.
With the introduction of rotated display mappings this approach is no longer correct.
New simpler approach is to just keep this count over calls which pin and unpin objects to and from display.
at the slight cost of extra space in every bo.
Quoted 7 lines
(Inspired and extracted code from a larger rework by Chris Wilson.)
v2: Remove the limit since it is not well defined.
Signed-off-by Tvrtko Ursulin <[email protected]>Cc Chris Wilson <[email protected]>
Proof reading someone else's changelog is much simpler than coming up with one from scratch.
-Chris
Signature · 5 lines
Chris Wilson, Intel Open Source Technology Centre _______________________________________________ Intel-gfx mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/intel-gfx
Quoted 21 lines · Chris Wilson
Quoted 3 lines · Tvrtko Ursulin
From: Tvrtko Ursulin <[email protected]>
Purpose of this tracking is to know when to flush the cache between the
CPU and the
Quoted 1 line
non-coherent display engine. Previously to:
s/Previously/Prior/
Quoted 10 lines
commit
121920faf2ccce9aa66a7e2588415c9647b66104
Author: Tvrtko Ursulin <[email protected]>
Date: Mon Mar 23 11:10:37 2015 +0000drm/i915/skl: Query display address through a wrapper
This worked by a mix of direct flag manipulation and checking for existence of a pinned GGTT VMA.
Quoted 7 lines
Quoted 5 lines
With the introduction of rotated display mappings this approach is no longer correct.
New simpler approach is to just keep this count over calls which pin and unpin objects to and from display.
at the slight cost of extra space in every bo.
Is space is a concern, how about just a flag then? Counter kind of lost its usefulness at the moment.
Quoted 5 lines
Quoted 5 lines
(Inspired and extracted code from a larger rework by Chris Wilson.)
v2: Remove the limit since it is not well defined.
Quoted 7 lines
Quoted 2 lines
Signed-off-by Tvrtko Ursulin <[email protected]>Cc Chris Wilson <[email protected]>Proof reading someone else's changelog is much simpler than coming up with one from scratch.
Reviewed-by Chris Wilson <[email protected]>
Thanks!
Tvrtko
_______________________________________________
Intel-gfx mailing list
[email protected]
http://lists.freedesktop.org/mailman/listinfo/intel-gfx
Quoted 26 lines · Tvrtko Ursulin
Quoted 24 lines · Chris Wilson
Quoted 3 lines · Tvrtko Ursulin
From: Tvrtko Ursulin <[email protected]>
Purpose of this tracking is to know when to flush the cache between the
CPU and the
Quoted 1 line
non-coherent display engine. Previously to:
s/Previously/Prior/
Quoted 13 lines
commit
121920faf2ccce9aa66a7e2588415c9647b66104
Author: Tvrtko Ursulin <[email protected]>
Date: Mon Mar 23 11:10:37 2015 +0000drm/i915/skl: Query display address through a wrapper
This worked by a mix of direct flag manipulation and checking for existence of a pinned GGTT VMA.
With the introduction of rotated display mappings this approach is no longer correct.
Quoted 7 lines
Quoted 4 lines
Quoted 2 lines
New simpler approach is to just keep this count over calls which pin and unpin objects to and from display.
at the slight cost of extra space in every bo.
Is space is a concern, how about just a flag then? Counter kind of lost its usefulness at the moment.
Space is always a concern with something that we allocate in the tens of thousands - however, we round object sizes up to a cacheline, so keeping the object trim is quite hard and our objects are already quite large. Every now and again we try and go on a diet, but it doesn't last.
What's the shortcoming of the counter?
-Chris
Signature · 5 lines
Chris Wilson, Intel Open Source Technology Centre _______________________________________________ Intel-gfx mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/intel-gfx
Task id: 6104 -------------------------------------Summary-------------------------------------
Platform Delta drm-intel-nightly Series Applied
PNV -4 272/272 268/272
ILK 302/302 302/302 SNB 303/303 303/303 IVB 338/338 338/338 BYT 287/287 287/287 HSW 361/361 361/361 BDW 308/308 308/308 -------------------------------------Detailed------------------------------------- Platform Test drm-intel-nightly Series Applied PNV igt@gem_userptr_blits@coherency-sync CRASH(2)PASS(3) CRASH(2) *PNV igt@gem_fence_thrash@bo-write-verify-threaded-none PASS(3) CRASH(1)PASS(1) PNV igt@gem_tiled_pread_pwrite FAIL(3)PASS(2) FAIL(2) PNV igt@gen3_render_tiledx_blits FAIL(3)PASS(1) FAIL(2)
Note: You need to pay more attention to line start with '*'
_______________________________________________
Intel-gfx mailing list [email protected]
http://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH v3 1/1 drm/i915: Simplify and fix object to display tracking
In reply to Tvrtko UrsulinFrom: Tvrtko Ursulin <[email protected]>
Purpose of this tracking is to know when to flush the cache between the CPU and the non-coherent display engine. Prior to:
commit 121920faf2ccce9aa66a7e2588415c9647b66104
Author: Tvrtko Ursulin <[email protected]>
Date: Mon Mar 23 11:10:37 2015 +0000
drm/i915/skl: Query display address through a wrapper
This worked by a mix of direct flag manipulation and checking for existence of a pinned GGTT VMA.
With the introduction of rotated display mappings this approach is no longer correct.
New simpler approach is to just keep this count over calls which pin and unpin objects to and from display, at the slight cost of extra space in every bo.
(Inspired and extracted code from a larger rework by Chris Wilson.)
v2: Remove the limit since it is not well defined. (Chris Wilson, Ville Syrjälä)
v3: Commit message corrections. (Chris Wilson)
--- drivers/gpu/drm/i915/i915_drv.h | 3 ++- drivers/gpu/drm/i915/i915_gem.c | 30 ++++++------------------------ 2 files changed, 8 insertions(+), 25 deletions(-)
drivers/gpu/drm/i915/i915_drv.h +2 -1
@@ -1969,7 +1969,6 @@ struct drm_i915_gem_object {*/ unsigned int fault_mappable:1; unsigned int pin_mappable:1; - unsigned int pin_display:1;/* * Is the object to be mapped as read-only to the GPU
@@ -1983,6 +1982,8 @@ struct drm_i915_gem_object { unsigned int frontbuffer_bits:INTEL_FRONTBUFFER_BITS; +unsigned int pin_display; +struct sg_table *pages;int pages_pin_count;
drivers/gpu/drm/i915/i915_gem.c +6 -24
@@ -3849,24 +3849,6 @@ unlock:return ret; } -static bool is_pin_display (struct drm_i915_gem_object *obj) -{ -struct i915_vma *vma; - - vma =i915_gem_obj_to_ggtt (obj); -if (!vma) -return false; - -/* There are 2 sources that pin objects: -* 1. The display engine (scanouts, sprites, cursors); -* 2. Reservations for execbuffer; -* -* We can ignore reservations as we hold the struct_mutex and -* are only called outside of the reservation path. -*/ -return vma->pin_count; -} -/* * Prepare buffer for display plane (scanout, cursors, etc). * Can be called from an uninterruptible phase (modesetting) and allows
@@ -3879,7 +3861,6 @@ i915_gem_object_pin_to_display_plane(struct drm_i915_gem_object *obj, const struct i915_ggtt_view *view) {u32 old_read_domains, old_write_domain; -bool was_pin_display;int ret;if (pipelined !=i915_gem_request_get_ring (obj->last_read_req)) {
@@ -3891,8 +3872,7 @@ i915_gem_object_pin_to_display_plane(struct drm_i915_gem_object *obj,/* Mark the pin_display early so that we account for the * display coherency whilst setting up the cache domains. */ - was_pin_display = obj->pin_display; - obj->pin_display = true; + obj->pin_display++;/* The display engine is not coherent with the LLC cache on gen6. As * a result, we make sure that the pinning that is about to occur is
@@ -3936,8 +3916,7 @@ i915_gem_object_pin_to_display_plane(struct drm_i915_gem_object *obj,return 0 ; err_unpin_display: -WARN_ON (was_pin_display !=is_pin_display (obj)); - obj->pin_display = was_pin_display; + obj->pin_display--;return ret; }
@@ -3945,9 +3924,12 @@ void i915_gem_object_unpin_from_display_plane(struct drm_i915_gem_object *obj, const struct i915_ggtt_view *view) { + if (WARN_ON(obj->pin_display == 0)) + return; +i915_gem_object_ggtt_unpin_view (obj, view); - obj->pin_display =is_pin_display (obj); + obj->pin_display--; }int
Signature · 6 lines
2.3.2 _______________________________________________ Intel-gfx mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/intel-gfx
Joonas Lahtinen
maintainerQuoted 47 lines · Tvrtko Ursulin
From: Tvrtko Ursulin <[email protected]>
Purpose of this tracking is to know when to flush the cache between the CPU and the non-coherent display engine. Prior to:
commit
121920faf2ccce9aa66a7e2588415c9647b66104
Author: Tvrtko Ursulin <[email protected]>
Date: Mon Mar 23 11:10:37 2015 +0000drm/i915/skl: Query display address through a wrapper
This worked by a mix of direct flag manipulation and checking for existence of a pinned GGTT VMA.
With the introduction of rotated display mappings this approach is no longer correct.
New simpler approach is to just keep this count over calls which pin and unpin objects to and from display, at the slight cost of extra space in every bo.
(Inspired and extracted code from a larger rework by Chris Wilson.)
v2: Remove the limit since it is not well defined. (Chris Wilson, Ville Syrjälä)
v3: Commit message corrections. (Chris Wilson)Signed-off-by Tvrtko Ursulin <[email protected]>Reviewed-by Chris Wilson <[email protected]>Cc Chris Wilson <[email protected]>--- drivers/gpu/drm/i915/i915_drv.h | 3 ++- drivers/gpu/drm/i915/i915_gem.c | 30 ++++++------------------------ 2 files changed, 8 insertions(+), 25 deletions(-)drivers/gpu/drm/i915/i915_drv.h +0
-1@@ -1969,7 +1969,6 @@ struct drm_i915_gem_object {*/ unsigned int fault_mappable:1; unsigned int pin_mappable:1; - unsigned int pin_display:1;/* * Is the object to be mapped as read-only to the GPU
drivers/gpu/drm/i915/i915_drv.h struct drm_i915_gem_object { · line 1986
Quoted 5 lines
drivers/gpu/drm/i915/i915_drv.h +2
-0@@ -1983,6 +1982,8 @@ struct drm_i915_gem_object { unsigned int frontbuffer_bits:INTEL_FRONTBUFFER_BITS; +unsigned int pin_display; +
Here. Comment below.
drivers/gpu/drm/i915/i915_drv.h struct drm_i915_gem_object { · line 1989
Quoted 3 lines
drivers/gpu/drm/i915/i915_drv.h +0
-0struct sg_table *pages;int pages_pin_count;
How about naming it like the variable just below it (pages_pin_count). So let it be "display_pin_count", and make it just "int" too, I don't think the 1 bit reduction in pin count matters really, but having sign makes it useful for detecting negative pin count errors? At least I'd make it signed integer and make some of the spots WARN_ON(xxx--- < 0).
Regards, Joonas
Quoted 61 lines
drivers/gpu/drm/i915/i915_gem.c +2
-23@@ -3849,24 +3849,6 @@ unlock:return ret; } -static bool is_pin_display (struct drm_i915_gem_object *obj) -{ -struct i915_vma *vma; - - vma =i915_gem_obj_to_ggtt (obj); -if (!vma) -return false; - -/* There are 2 sources that pin objects: -* 1. The display engine (scanouts, sprites, cursors); -* 2. Reservations for execbuffer; -* -* We can ignore reservations as we hold the struct_mutex and -* are only called outside of the reservation path. -*/ -return vma->pin_count; -} -/* * Prepare buffer for display plane (scanout, cursors, etc). * Can be called from an uninterruptible phase (modesetting) and allows @@ -3879,7 +3861,6 @@ i915_gem_object_pin_to_display_plane(struct drm_i915_gem_object *obj, const struct i915_ggtt_view *view) {u32 old_read_domains, old_write_domain; -bool was_pin_display;int ret;if (pipelined !=i915_gem_request_get_ring (obj->last_read_req)) {@@ -3891,8 +3872,7 @@ i915_gem_object_pin_to_display_plane(struct drm_i915_gem_object *obj,/* Mark the pin_display early so that we account for the * display coherency whilst setting up the cache domains. */ - was_pin_display = obj->pin_display; - obj->pin_display = true; + obj->pin_display++;/* The display engine is not coherent with the LLC cache on gen6. As * a result, we make sure that the pinning that is about to occur is @@ -3936,8 +3916,7 @@ i915_gem_object_pin_to_display_plane(struct drm_i915_gem_object *obj,return 0 ; err_unpin_display: -WARN_ON (was_pin_display !=is_pin_display (obj)); - obj->pin_display = was_pin_display; + obj->pin_display--;return ret; }@@ -3945,9 +3924,12 @@ void i915_gem_object_unpin_from_display_plane(struct drm_i915_gem_object *obj, const struct i915_ggtt_view *view) {
drivers/gpu/drm/i915/i915_gem.c void · line 3935
Quoted 10 lines
drivers/gpu/drm/i915/i915_gem.c +4
-1+if (WARN_ON (obj->pin_display ==0 )) +return ; +i915_gem_object_ggtt_unpin_view (obj, view); - obj->pin_display =is_pin_display (obj); + obj->pin_display--; }int
_______________________________________________
Intel-gfx mailing list
[email protected]
http://lists.freedesktop.org/mailman/listinfo/intel-gfx
Hi,
Quoted 60 lines · Joonas Lahtinen
Quoted 47 lines · Tvrtko Ursulin
From: Tvrtko Ursulin <[email protected]>
Purpose of this tracking is to know when to flush the cache between the CPU and the non-coherent display engine. Prior to:
commit
121920faf2ccce9aa66a7e2588415c9647b66104
Author: Tvrtko Ursulin <[email protected]>
Date: Mon Mar 23 11:10:37 2015 +0000drm/i915/skl: Query display address through a wrapper
This worked by a mix of direct flag manipulation and checking for existence of a pinned GGTT VMA.
With the introduction of rotated display mappings this approach is no longer correct.
New simpler approach is to just keep this count over calls which pin and unpin objects to and from display, at the slight cost of extra space in every bo.
(Inspired and extracted code from a larger rework by Chris Wilson.)
v2: Remove the limit since it is not well defined. (Chris Wilson, Ville Syrjälä)
v3: Commit message corrections. (Chris Wilson)Signed-off-by Tvrtko Ursulin <[email protected]>Reviewed-by Chris Wilson <[email protected]>Cc Chris Wilson <[email protected]>--- drivers/gpu/drm/i915/i915_drv.h | 3 ++- drivers/gpu/drm/i915/i915_gem.c | 30 ++++++------------------------ 2 files changed, 8 insertions(+), 25 deletions(-)drivers/gpu/drm/i915/i915_drv.h +0
-1@@ -1969,7 +1969,6 @@ struct drm_i915_gem_object {*/ unsigned int fault_mappable:1; unsigned int pin_mappable:1; - unsigned int pin_display:1;/* * Is the object to be mapped as read-only to the GPU drivers/gpu/drm/i915/i915_drv.h struct drm_i915_gem_object { · line 1986
Quoted 5 lines
drivers/gpu/drm/i915/i915_drv.h +2
-0@@ -1983,6 +1982,8 @@ struct drm_i915_gem_object { unsigned int frontbuffer_bits:INTEL_FRONTBUFFER_BITS; +unsigned int pin_display; +Here. Comment below.
drivers/gpu/drm/i915/i915_drv.h struct drm_i915_gem_object { · line 1989
Quoted 3 lines
drivers/gpu/drm/i915/i915_drv.h +0
-0struct sg_table *pages;int pages_pin_count;
Quoted 5 lines
How about naming it like the variable just below it (
pages_pin_count). So let it be "display_pin_count", and make it just "int" too, I don't think the 1 bit reduction in pin count matters really, but having sign makes it useful for detecting negative pin count errors? At least I'd make it signed integer and make some of the spotsWARN_ON(xxx--- < 0).
It can't go negative due check in i915_gem_object_unpin_from_display_plane.
Regards,
Tvrtko
_______________________________________________
Intel-gfx mailing list
[email protected]
http://lists.freedesktop.org/mailman/listinfo/intel-gfx
Quoted 60 lines · Joonas Lahtinen
Quoted 47 lines · Tvrtko Ursulin
From: Tvrtko Ursulin <[email protected]>
Purpose of this tracking is to know when to flush the cache between the CPU and the non-coherent display engine. Prior to:
commit
121920faf2ccce9aa66a7e2588415c9647b66104
Author: Tvrtko Ursulin <[email protected]>
Date: Mon Mar 23 11:10:37 2015 +0000drm/i915/skl: Query display address through a wrapper
This worked by a mix of direct flag manipulation and checking for existence of a pinned GGTT VMA.
With the introduction of rotated display mappings this approach is no longer correct.
New simpler approach is to just keep this count over calls which pin and unpin objects to and from display, at the slight cost of extra space in every bo.
(Inspired and extracted code from a larger rework by Chris Wilson.)
v2: Remove the limit since it is not well defined. (Chris Wilson, Ville Syrjälä)
v3: Commit message corrections. (Chris Wilson)Signed-off-by Tvrtko Ursulin <[email protected]>Reviewed-by Chris Wilson <[email protected]>Cc Chris Wilson <[email protected]>--- drivers/gpu/drm/i915/i915_drv.h | 3 ++- drivers/gpu/drm/i915/i915_gem.c | 30 ++++++------------------------ 2 files changed, 8 insertions(+), 25 deletions(-)drivers/gpu/drm/i915/i915_drv.h +0
-1@@ -1969,7 +1969,6 @@ struct drm_i915_gem_object {*/ unsigned int fault_mappable:1; unsigned int pin_mappable:1; - unsigned int pin_display:1;/* * Is the object to be mapped as read-only to the GPU drivers/gpu/drm/i915/i915_drv.h struct drm_i915_gem_object { · line 1986
Quoted 5 lines
drivers/gpu/drm/i915/i915_drv.h +2
-0@@ -1983,6 +1982,8 @@ struct drm_i915_gem_object { unsigned int frontbuffer_bits:INTEL_FRONTBUFFER_BITS; +unsigned int pin_display; +Here. Comment below.
drivers/gpu/drm/i915/i915_drv.h struct drm_i915_gem_object { · line 1989
Quoted 3 lines
drivers/gpu/drm/i915/i915_drv.h +0
-0struct sg_table *pages;int pages_pin_count;
Quoted 5 lines
How about naming it like the variable just below it (
pages_pin_count). So let it be "display_pin_count", and make it just "int" too, I don't think the 1 bit reduction in pin count matters really, but having sign makes it useful for detecting negative pin count errors? At least I'd make it signed integer and make some of the spotsWARN_ON(xxx--- < 0).
We already have the counter underflow detection. We could just as well make pages_pin_count unsigned. I blame my own laziness. -Chris
Signature · 5 lines
Chris Wilson, Intel Open Source Technology Centre _______________________________________________ Intel-gfx mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/intel-gfx
Task id: 6104 -------------------------------------Summary-------------------------------------
Platform Delta drm-intel-nightly Series Applied
PNV -4 272/272 268/272
ILK 302/302 302/302 SNB 303/303 303/303 IVB 338/338 338/338 BYT 287/287 287/287 HSW 361/361 361/361 BDW 308/308 308/308 -------------------------------------Detailed------------------------------------- Platform Test drm-intel-nightly Series Applied PNV igt@gem_userptr_blits@coherency-sync CRASH(2)PASS(3) CRASH(2) *PNV igt@gem_fence_thrash@bo-write-verify-threaded-none PASS(3) CRASH(1)PASS(1) PNV igt@gem_tiled_pread_pwrite FAIL(3)PASS(2) FAIL(2) PNV igt@gen3_render_tiledx_blits FAIL(3)PASS(1) FAIL(2)
Note: You need to pay more attention to line start with '*'
_______________________________________________
Intel-gfx mailing list [email protected]
http://lists.freedesktop.org/mailman/listinfo/intel-gfx
Task id: 6103 -------------------------------------Summary-------------------------------------
Platform Delta drm-intel-nightly Series Applied
PNV 276/276 276/276 ILK 303/303 303/303 SNB 304/304 304/304 IVB 338/338 338/338 BYT 287/287 287/287 HSW 361/361 361/361 BDW 309/309 309/309
-------------------------------------Detailed-------------------------------------
Platform Test drm-intel-nightly Series Applied
Note: You need to pay more attention to line start with '*'
_______________________________________________
Intel-gfx mailing list
[email protected]
http://lists.freedesktop.org/mailman/listinfo/intel-gfx