Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 0ffba1fc authored by Chris Wilson's avatar Chris Wilson
Browse files

drm/i915: Silence smatch for cmdparser 



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: default avatarChris 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: default avatarMatthew Auld <matthew.william.auld@gmail.com>
Reviewed-by: default avatarGabriel Krisman Bertazi <krisman@collabora.co.uk>
parent 5684514b

drivers/gpu/drm/i915/i915_cmd_parser.c

+3 −10
Original line number Diff line number Diff line
@@ -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,