Skip to contentSkip to conversation

drm/i915: Fix semaphore_seqno and semaphore_mboxes sizes

PATCH In review Rodrigo Vivi 2 participants 2 messages Jul 17, 2014

Subsystems (2)
lore
Share & tools
lore

Rodrigo Vivi

author maintainer
#0 lore raw

PATCH 1/1 drm/i915: Fix semaphore_seqno and semaphore_mboxes sizes

Otherwise some iteractions depending on the current number of active rings could overflow.

---
 drivers/gpu/drm/i915/i915_drv.h | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/gpu/drm/i915/i915_drv.h +2 -2
index 2b8308d..190f0e5 100644
@@ -342,7 +342,7 @@ struct drm_i915_error_state {
 		u32 cpu_ring_head;
 		u32 cpu_ring_tail;
 
-		u32 semaphore_seqno[I915_NUM_RINGS - 1];
+		u32 semaphore_seqno[I915_NUM_RINGS];
 
 		/* Register state */
 		u32 tail;
@@ -361,7 +361,7 @@ struct drm_i915_error_state {
 		u32 fault_reg;
 		u64 faddr;
 		u32 rc_psmi; /* sleep state */
-		u32 semaphore_mboxes[I915_NUM_RINGS - 1];
+		u32 semaphore_mboxes[I915_NUM_RINGS];
 
 		struct drm_i915_error_object {
 			int page_count;
Signature · 1 line
1.9.3
#1 lore raw

just ignore this one..

Quoted 40 lines · Rodrigo Vivi

Otherwise some iteractions depending on the current number of active rings could overflow.

---
 drivers/gpu/drm/i915/i915_drv.h | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/gpu/drm/i915/i915_drv.h +2 -3
index 2b8308d..190f0e5 100644
@@ -342,7 +342,7 @@ struct drm_i915_error_state {
                u32 cpu_ring_head;
                u32 cpu_ring_tail;
 
-               u32 semaphore_seqno[I915_NUM_RINGS - 1];
+               u32 semaphore_seqno[I915_NUM_RINGS];
 
                /* Register state */
                u32 tail;
@@ -361,7 +361,7 @@ struct drm_i915_error_state {
                u32 fault_reg;
                u64 faddr;
                u32 rc_psmi; /* sleep state */
-               u32 semaphore_mboxes[I915_NUM_RINGS - 1];
+               u32 semaphore_mboxes[I915_NUM_RINGS];
 
                struct drm_i915_error_object {
                        int page_count;
--

1.9.3

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

Signature · 2 lines
Rodrigo Vivi
Blog: http://blog.vivi.eng.br

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