Error in inner loop in validate_cmds_sorted / out of bounds issue
diff mbox

Message ID 20150727211532.646ba446@pc1
State New
Headers show

Commit Message

Hanno Böck July 28, 2015, 4:15 a.m. UTC
On Mon, 27 Jul 2015 09:59:45 +0100
Chris Wilson <chris@chris-wilson.co.uk> wrote:

> The tables aren't sorted, that is worth fixing.

Attached patch should do that and fix the loop. Now it boots without
errors.

Does that look okay? If so please apply.

Comments

Chris Wilson July 28, 2015, 7:45 a.m. UTC | #1
On Mon, Jul 27, 2015 at 09:15:32PM -0700, Hanno Böck wrote:
> On Mon, 27 Jul 2015 09:59:45 +0100
> Chris Wilson <chris@chris-wilson.co.uk> wrote:
> 
> > The tables aren't sorted, that is worth fixing.
> 
> Attached patch should do that and fix the loop. Now it boots without
> errors.
> 
> Does that look okay? If so please apply.

Indeed, nice catch. Could you please read
Documentation/SubmittingPatches and apply your Signed-off-by and then we
can accept this patch under your authorship.

Preferrably this is two patches, (a) fix the tables, (b) fix the
validator. That way we can delay enabling the validator if we need to
fix the tables for others.
-Chris
Daniel Vetter July 28, 2015, 8:14 a.m. UTC | #2
On Tue, Jul 28, 2015 at 08:45:51AM +0100, Chris Wilson wrote:
> On Mon, Jul 27, 2015 at 09:15:32PM -0700, Hanno Böck wrote:
> > On Mon, 27 Jul 2015 09:59:45 +0100
> > Chris Wilson <chris@chris-wilson.co.uk> wrote:
> > 
> > > The tables aren't sorted, that is worth fixing.
> > 
> > Attached patch should do that and fix the loop. Now it boots without
> > errors.
> > 
> > Does that look okay? If so please apply.
> 
> Indeed, nice catch. Could you please read
> Documentation/SubmittingPatches and apply your Signed-off-by and then we
> can accept this patch under your authorship.
> 
> Preferrably this is two patches, (a) fix the tables, (b) fix the
> validator. That way we can delay enabling the validator if we need to
> fix the tables for others.

Also can you please add signed-off-by lines to your patch when
resubmitting? See Documentation/SubmittingPatches for all the details.

Thanks, Daniel

Patch
diff mbox

Signed-off-by: Hanno Boeck <hanno@hboeck.de>

diff --git a/drivers/gpu/drm/i915/i915_cmd_parser.c b/drivers/gpu/drm/i915/i915_cmd_parser.c
index 306d9e4..95aeb70 100644
--- a/drivers/gpu/drm/i915/i915_cmd_parser.c
+++ b/drivers/gpu/drm/i915/i915_cmd_parser.c
@@ -151,8 +151,8 @@  static const struct drm_i915_cmd_descriptor render_cmds[] = {
 	CMD(  MI_ARB_ON_OFF,                    SMI,    F,  1,      R  ),
 	CMD(  MI_PREDICATE,                     SMI,    F,  1,      S  ),
 	CMD(  MI_TOPOLOGY_FILTER,               SMI,    F,  1,      S  ),
-	CMD(  MI_DISPLAY_FLIP,                  SMI,   !F,  0xFF,   R  ),
 	CMD(  MI_SET_APPID,                     SMI,    F,  1,      S  ),
+	CMD(  MI_DISPLAY_FLIP,                  SMI,   !F,  0xFF,   R  ),
 	CMD(  MI_SET_CONTEXT,                   SMI,   !F,  0xFF,   R  ),
 	CMD(  MI_URB_CLEAR,                     SMI,   !F,  0xFF,   S  ),
 	CMD(  MI_STORE_DWORD_IMM,               SMI,   !F,  0x3F,   B,
@@ -564,7 +564,7 @@  static bool validate_cmds_sorted(struct intel_engine_cs *ring,
 
 		for (j = 0; j < table->count; j++) {
 			const struct drm_i915_cmd_descriptor *desc =
-				&table->table[i];
+				&table->table[j];
 			u32 curr = desc->cmd.value & desc->cmd.mask;
 
 			if (curr < previous) {