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

Commit e3f51ece authored by Matthew Auld's avatar Matthew Auld Committed by Joonas Lahtinen
Browse files

drm/i915: cleanup use of INSTR_CLIENT_MASK 



Doing cmd_header >> 29 to extract our 3-bit client value where we know
cmd_header is a u32 shouldn't then also require the use of a mask. So
remove the redundant operation and get rid of INSTR_CLIENT_MASK now that
there are no longer any users.

Cc: Chris Wilson <chris@chris-wilson.co.uk>
Signed-off-by: default avatarMatthew Auld <matthew.auld@intel.com>
Reviewed-by: default avatarChris Wilson <chris@chris-wilson.co.uk>
Signed-off-by: default avatarJoonas Lahtinen <joonas.lahtinen@linux.intel.com>
Link: http://patchwork.freedesktop.org/patch/msgid/1479163174-29686-1-git-send-email-matthew.auld@intel.com
parent 30576a2c

drivers/gpu/drm/i915/i915_cmd_parser.c

+3 −3
Original line number Diff line number Diff line
@@ -558,7 +558,7 @@ static const struct drm_i915_reg_table hsw_blt_reg_tables[] = { 


static u32 gen7_render_get_cmd_length_mask(u32 cmd_header)

{

	u32 client = (cmd_header & INSTR_CLIENT_MASK) >> INSTR_CLIENT_SHIFT;

	u32 client = cmd_header >> INSTR_CLIENT_SHIFT;

	u32 subclient =

		(cmd_header & INSTR_SUBCLIENT_MASK) >> INSTR_SUBCLIENT_SHIFT;
@@ -577,7 +577,7 @@ static u32 gen7_render_get_cmd_length_mask(u32 cmd_header) 


static u32 gen7_bsd_get_cmd_length_mask(u32 cmd_header)

{

	u32 client = (cmd_header & INSTR_CLIENT_MASK) >> INSTR_CLIENT_SHIFT;

	u32 client = cmd_header >> INSTR_CLIENT_SHIFT;

	u32 subclient =

		(cmd_header & INSTR_SUBCLIENT_MASK) >> INSTR_SUBCLIENT_SHIFT;

	u32 op = (cmd_header & INSTR_26_TO_24_MASK) >> INSTR_26_TO_24_SHIFT;
@@ -600,7 +600,7 @@ static u32 gen7_bsd_get_cmd_length_mask(u32 cmd_header) 


static u32 gen7_blt_get_cmd_length_mask(u32 cmd_header)

{

	u32 client = (cmd_header & INSTR_CLIENT_MASK) >> INSTR_CLIENT_SHIFT;

	u32 client = cmd_header >> INSTR_CLIENT_SHIFT;



	if (client == INSTR_MI_CLIENT)

		return 0x3F;

drivers/gpu/drm/i915/i915_reg.h

+0 −1
Original line number Diff line number Diff line
@@ -294,7 +294,6 @@ static inline bool i915_mmio_reg_valid(i915_reg_t reg) 
 * Instruction field definitions used by the command parser

 */

#define INSTR_CLIENT_SHIFT      29

#define INSTR_CLIENT_MASK       0xE0000000

#define   INSTR_MI_CLIENT       0x0

#define   INSTR_BC_CLIENT       0x2

#define   INSTR_RC_CLIENT       0x3