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

Commit 4f520660 authored by Chris Wilson's avatar Chris Wilson Committed by Greg Kroah-Hartman
Browse files

drm/i915: Whitelist context-local timestamp in the gen9 cmdparser 



commit 273500ae71711c040d258a7b3f4b6f44c368fff2 upstream.

Allow batch buffers to read their own _local_ cumulative HW runtime of
their logical context.

Fixes: 0f2f39758341 ("drm/i915: Add gen9 BCS cmdparsing")
Signed-off-by: default avatarChris Wilson <chris@chris-wilson.co.uk>
Cc: Mika Kuoppala <mika.kuoppala@linux.intel.com>
Cc: <stable@vger.kernel.org> # v5.4+
Reviewed-by: default avatarMika Kuoppala <mika.kuoppala@linux.intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20200601161942.30854-1-chris@chris-wilson.co.uk


(cherry picked from commit f9496520df11de00fbafc3cbd693b9570d600ab3)
Signed-off-by: default avatarJoonas Lahtinen <joonas.lahtinen@linux.intel.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 1d3c79f4

drivers/gpu/drm/i915/i915_cmd_parser.c

+4 −0
Original line number Diff line number Diff line
@@ -570,6 +570,9 @@ struct drm_i915_reg_descriptor { 
#define REG32(_reg, ...) \

	{ .addr = (_reg), __VA_ARGS__ }



#define REG32_IDX(_reg, idx) \

	{ .addr = _reg(idx) }



/*

 * Convenience macro for adding 64-bit registers.

 *
@@ -667,6 +670,7 @@ static const struct drm_i915_reg_descriptor gen9_blt_regs[] = { 
	REG64_IDX(RING_TIMESTAMP, BSD_RING_BASE),

	REG32(BCS_SWCTRL),

	REG64_IDX(RING_TIMESTAMP, BLT_RING_BASE),

	REG32_IDX(RING_CTX_TIMESTAMP, BLT_RING_BASE),

	REG64_IDX(BCS_GPR, 0),

	REG64_IDX(BCS_GPR, 1),

	REG64_IDX(BCS_GPR, 2),