FAILED: patch "[PATCH] drm/i915: Fix use of engine->index for register offset" failed to apply to 4.8-stable tree
Subsystems (3)
[email protected]
maintainerThe patch below does not apply to the 4.8-stable tree.
If someone wants it applied there, or to any other stable or longterm tree, then please email the backport, including the original git commit id to <[email protected]>.
thanks,
greg k-h
------------------ original commit in Linus's tree ------------------
Quoted 1 line
From
5ac9793bf9f43cb4d8ecdcc521be1ba87057841aMon Sep 17 00:00:00 2001
From: Chris Wilson <[email protected]>
Date: Wed, 27 Jul 2016 19:11:17 +0100
Subject: [PATCH] drm/i915: Fix use of engine->index for register offset
Since commit de1add360522 ("drm/i915: Decouple execbuf uAPI from internal implementation") the index of the engine (its engine->id) in the internal list no longer matches the hardware id. However, in a couple of locations we missed fixing up the difference. In this case, RING_FAULT_REG() refers to engine->id which is now not what the register offset actually should be. Fortunately, in both case we should be more or less looping over 0..I915_NUM_ENGINES.
drivers/gpu/drm/i915/i915_reg.h +1 -1
@@ -1648,7 +1648,7 @@ enum skl_disp_power_wells {#define ARB_MODE_BWGTLB_DISABLE (1<<9)#define ARB_MODE_SWIZZLE_BDW (1<<1)#define RENDER_HWS_PGA_GEN7 _MMIO(0x04080) -#define RING_FAULT_REG (engine) _MMIO(0x4094 + 0x100*(engine)->id) +#define RING_FAULT_REG (engine) _MMIO(0x4094 + 0x100*(engine)->hw_id)#define RING_FAULT_GTTSEL_MASK (1<<11)#define RING_FAULT_SRCID (x) (((x) >> 3) & 0xff)#define RING_FAULT_FAULT_TYPE (x) (((x) >> 1) & 0x3)