Skip to content

Commit 50c8299

Browse files
vsyrjalaAndi Shyti
authored andcommitted
drm/i915: Introduce RING_FAULT_VADDR_MASK
Add a proper bitmask definition for the pre-bdw fault virtual address bits insted of abusing PAGE_MASK. Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com> Reviewed-by: Andi Shyti <andi.shyti@linux.intel.com> Signed-off-by: Andi Shyti <andi.shyti@linux.intel.com> Link: https://patchwork.freedesktop.org/patch/msgid/20250211231941.22769-6-ville.syrjala@linux.intel.com
1 parent 66ec4c1 commit 50c8299

File tree

2 files changed

+6
-3
lines changed

2 files changed

+6
-3
lines changed

drivers/gpu/drm/i915/gt/intel_gt.c

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -302,17 +302,19 @@ static void gen6_check_faults(struct intel_gt *gt)
302302
{
303303
struct intel_engine_cs *engine;
304304
enum intel_engine_id id;
305-
unsigned long fault;
306305

307306
for_each_engine(engine, gt, id) {
307+
u32 fault;
308+
308309
fault = GEN6_RING_FAULT_REG_READ(engine);
310+
309311
if (fault & RING_FAULT_VALID) {
310312
gt_dbg(gt, "Unexpected fault\n"
311-
"\tAddr: 0x%08lx\n"
313+
"\tAddr: 0x%08x\n"
312314
"\tAddress space: %s\n"
313315
"\tSource ID: %d\n"
314316
"\tType: %d\n",
315-
fault & PAGE_MASK,
317+
fault & RING_FAULT_VADDR_MASK,
316318
fault & RING_FAULT_GTTSEL_MASK ?
317319
"GGTT" : "PPGTT",
318320
REG_FIELD_GET(RING_FAULT_SRCID_MASK, fault),

drivers/gpu/drm/i915/gt/intel_gt_regs.h

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -326,6 +326,7 @@
326326
_RING_FAULT_REG_VCS, \
327327
_RING_FAULT_REG_VECS, \
328328
_RING_FAULT_REG_BCS))
329+
#define RING_FAULT_VADDR_MASK REG_GENMASK(31, 12) /* pre-bdw */
329330
#define RING_FAULT_ENGINE_ID_MASK REG_GENMASK(16, 12) /* bdw+ */
330331
#define RING_FAULT_GTTSEL_MASK REG_BIT(11) /* pre-bdw */
331332
#define RING_FAULT_SRCID_MASK REG_GENMASK(10, 3)

0 commit comments

Comments
 (0)