summaryrefslogtreecommitdiffstats
path: root/drivers/gpu/drm/i915/i915_cmd_parser.c
diff options
context:
space:
mode:
authorHanno Böck2015-07-29 10:31:04 +0200
committerDaniel Vetter2015-07-29 10:31:04 +0200
commit8453580cb8834dedffda86bcb64f13befc90eb03 (patch)
tree1658f106b0904bce05189a4cb9f101a9e9bc83e5 /drivers/gpu/drm/i915/i915_cmd_parser.c
parentdrm/i915: Properly sort MI coomand table (diff)
downloadkernel-qcow2-linux-8453580cb8834dedffda86bcb64f13befc90eb03.tar.gz
kernel-qcow2-linux-8453580cb8834dedffda86bcb64f13befc90eb03.tar.xz
kernel-qcow2-linux-8453580cb8834dedffda86bcb64f13befc90eb03.zip
drm/i915: Fix command parser table validator
As we may like to use a bisection search on the tables in future, we need them to be ordered. For convenience we expect the compiled tables to be order and check on initialisation. However, the validator used the wrong iterators failed to spot the misordered MI tables and instead walked off into the unknown (as spotted by kasan). Signed-off-by: Hanno Boeck <hanno@hboeck.de> Reviewed-by: Chris Wilson <chris@chris-wilson.co.uk> [danvet: Again hand-assemble patch ...] Signed-off-by: Daniel Vetter <daniel.vetter@intel.com>
Diffstat (limited to 'drivers/gpu/drm/i915/i915_cmd_parser.c')
-rw-r--r--drivers/gpu/drm/i915/i915_cmd_parser.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/gpu/drm/i915/i915_cmd_parser.c b/drivers/gpu/drm/i915/i915_cmd_parser.c
index dc5d9b22cebc..237ff6884a22 100644
--- a/drivers/gpu/drm/i915/i915_cmd_parser.c
+++ b/drivers/gpu/drm/i915/i915_cmd_parser.c
@@ -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) {