]> git.baikalelectronics.ru Git - kernel.git/commitdiff
drm/i915: Silence smatch for cmdparser
authorChris Wilson <chris@chris-wilson.co.uk>
Tue, 7 Nov 2017 15:40:55 +0000 (15:40 +0000)
committerChris Wilson <chris@chris-wilson.co.uk>
Tue, 7 Nov 2017 16:52:24 +0000 (16:52 +0000)
drivers/gpu/drm/i915/i915_cmd_parser.c:808:23: error: not an lvalue
drivers/gpu/drm/i915/i915_cmd_parser.c:811:23: error: not an lvalue
drivers/gpu/drm/i915/i915_cmd_parser.c:814:23: error: not an lvalue
drivers/gpu/drm/i915/i915_cmd_parser.c:808:23: error: not an lvalue
drivers/gpu/drm/i915/i915_cmd_parser.c:811:23: error: not an lvalue
drivers/gpu/drm/i915/i915_cmd_parser.c:814:23: error: not an lvalue
drivers/gpu/drm/i915/i915_cmd_parser.c:808:23: error: not an lvalue
drivers/gpu/drm/i915/i915_cmd_parser.c:811:23: error: not an lvalue
drivers/gpu/drm/i915/i915_cmd_parser.c:814:23: error: not an lvalue
drivers/gpu/drm/i915/i915_cmd_parser.c:808:23: error: not an lvalue
drivers/gpu/drm/i915/i915_cmd_parser.c:811:23: error: not an lvalue
drivers/gpu/drm/i915/i915_cmd_parser.c:814:23: error: not an lvalue

If we move the shift into each case not only do we kill the warning from
smatch, but we shrink the code slightly:

   text    data     bss     dec     hex filename
1267906   20587    3168 1291661  13b58d before
1267890   20587    3168 1291645  13b57d after

Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
Cc: Joonas Lahtinen <joonas.lahtinen@linux.intel.com>
Cc: Mika Kuoppala <mika.kuoppala@linux.intel.com>
Cc: Matthew Auld <matthew.william.auld@gmail.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20171107154055.19460-1-chris@chris-wilson.co.uk
Reviewed-by: Matthew Auld <matthew.william.auld@gmail.com>
Reviewed-by: Gabriel Krisman Bertazi <krisman@collabora.co.uk>
drivers/gpu/drm/i915/i915_cmd_parser.c

index 8ba932b22f7c80b85b7bcdd234affa88e2bf04d5..b11629beeb634dbb363cfeceab3efd53673066cb 100644 (file)
@@ -798,22 +798,15 @@ struct cmd_node {
  */
 static inline u32 cmd_header_key(u32 x)
 {
-       u32 shift;
-
        switch (x >> INSTR_CLIENT_SHIFT) {
        default:
        case INSTR_MI_CLIENT:
-               shift = STD_MI_OPCODE_SHIFT;
-               break;
+               return x >> STD_MI_OPCODE_SHIFT;
        case INSTR_RC_CLIENT:
-               shift = STD_3D_OPCODE_SHIFT;
-               break;
+               return x >> STD_3D_OPCODE_SHIFT;
        case INSTR_BC_CLIENT:
-               shift = STD_2D_OPCODE_SHIFT;
-               break;
+               return x >> STD_2D_OPCODE_SHIFT;
        }
-
-       return x >> shift;
 }
 
 static int init_hash_table(struct intel_engine_cs *engine,