Skip to contentSkip to conversation

drm/i915/icl: local_clock returns an u64

PATCH In review Michel Thierry 3 participants 5 messages Mar 1, 2018 – Mar 2, 2018

Subsystems (2)
lore
Share & tools
lore
#0 lore raw

PATCH 1/1 drm/i915/icl: local_clock returns an u64

So change timeout_ts and use time_after64 in gen11_gt_engine_intr.

Fixes 51951ae7ed00 ("drm/i915/icl: Interrupt handling").
Cc Daniele Ceraolo Spurio <[email protected]>
Cc Chris Wilson <[email protected]>
Cc Oscar Mateo <[email protected]>
Cc Mika Kuoppala <[email protected]>
---
 drivers/gpu/drm/i915/i915_irq.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/gpu/drm/i915/i915_irq.c +2 -2
index eacb08034776..45f10db757e2 100644
@@ -2813,7 +2813,7 @@ gen11_gt_engine_intr(struct drm_i915_private * const i915,
 		     const unsigned int bank, const unsigned int bit)
 {
 	void __iomem * const regs = i915->regs;
-	u32 timeout_ts;
+	u64 timeout_ts;
 	u32 ident;
 
 	raw_reg_write(regs, GEN11_IIR_REG_SELECTOR(bank), BIT(bit));
@@ -2826,7 +2826,7 @@ gen11_gt_engine_intr(struct drm_i915_private * const i915,
 	do {
 		ident = raw_reg_read(regs, GEN11_INTR_IDENTITY_REG(bank));
 	} while (!(ident & GEN11_INTR_DATA_VALID) &&
-		 !time_after32(local_clock() >> 10, timeout_ts));
+		 !time_after64(local_clock() >> 10, timeout_ts));
 
 	if (unlikely(!(ident & GEN11_INTR_DATA_VALID))) {
 		DRM_ERROR("INTR_IDENTITY_REG%u:%u 0x%08x not valid!\n",
Signature · 6 lines
2.16.2

_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
#1 lore raw
Quoted 2 lines · Michel Thierry

So change timeout_ts and use time_after64 in gen11_gt_engine_intr.

I just read Chris' original comment about this, so ignore the patch,

"The squash should be made, but time_after64 is no more correct since the native 32b/64b wrapped arithmetic is accurate. So what can be done here is remove the casts and use time_after32() if we truly cared."

-Michel

Quoted 26 lines
Fixes 51951ae7ed00 ("drm/i915/icl: Interrupt handling").
Cc Daniele Ceraolo Spurio <[email protected]>
Cc Chris Wilson <[email protected]>
Cc Oscar Mateo <[email protected]>
Cc Mika Kuoppala <[email protected]>
---
  drivers/gpu/drm/i915/i915_irq.c | 4 ++--
  1 file changed, 2 insertions(+), 2 deletions(-)
drivers/gpu/drm/i915/i915_irq.c +1 -1
index eacb08034776..45f10db757e2 100644
@@ -2813,7 +2813,7 @@ gen11_gt_engine_intr(struct drm_i915_private * const i915,
  		     const unsigned int bank, const unsigned int bit)
  {
  	void __iomem * const regs = i915->regs;
-	u32 timeout_ts;
+	u64 timeout_ts;
  	u32 ident;
 
  	raw_reg_write(regs, GEN11_IIR_REG_SELECTOR(bank), BIT(bit));

drivers/gpu/drm/i915/i915_irq.c gen11_gt_engine_intr(struct drm_i915_private * const i915, · line 2832

Quoted 8 lines
drivers/gpu/drm/i915/i915_irq.c +1 -1
@@ -2826,7 +2826,7 @@ gen11_gt_engine_intr(struct drm_i915_private * const i915,
  	do {
  		ident = raw_reg_read(regs, GEN11_INTR_IDENTITY_REG(bank));
  	} while (!(ident & GEN11_INTR_DATA_VALID) &&
-		 !time_after32(local_clock() >> 10, timeout_ts));
+		 !time_after64(local_clock() >> 10, timeout_ts));
 
  	if (unlikely(!(ident & GEN11_INTR_DATA_VALID))) {
  		DRM_ERROR("INTR_IDENTITY_REG%u:%u 0x%08x not valid!\n",

_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

#2 lore raw

✓ Fi.CI.BAT: success for drm/i915/icl: local_clock returns an u64

In reply to Michel Thierry
== Series Details ==

== Series Details ==

Series: drm/i915/icl: local_clock returns an u64
URL : https://patchwork.freedesktop.org/series/39231/
State : success

== Summary ==

Series 39231v1 drm/i915/icl: local_clock returns an u64
https://patchwork.freedesktop.org/api/1.0/series/39231/revisions/1/mbox/

---- Known issues:

Test gem_exec_reloc:

        Subgroup basic-write-cpu:
                pass       -> INCOMPLETE (fi-byt-j1900) fdo#102657
Test gem_mmap_gtt:
        Subgroup basic-small-bo-tiledx:
                pass       -> FAIL       (fi-gdg-551) fdo#102575

fdo#102657 https://bugs.freedesktop.org/show_bug.cgi?id=102657
fdo#102575 https://bugs.freedesktop.org/show_bug.cgi?id=102575

fi-bdw-5557u     total:288  pass:267  dwarn:0   dfail:0   fail:0   skip:21  time:416s
fi-bdw-gvtdvm    total:288  pass:264  dwarn:0   dfail:0   fail:0   skip:24  time:423s
fi-blb-e6850     total:288  pass:223  dwarn:1   dfail:0   fail:0   skip:64  time:370s
fi-bsw-n3050     total:288  pass:242  dwarn:0   dfail:0   fail:0   skip:46  time:483s
fi-bwr-2160      total:288  pass:183  dwarn:0   dfail:0   fail:0   skip:105 time:277s
fi-bxt-dsi       total:288  pass:258  dwarn:0   dfail:0   fail:0   skip:30  time:478s
fi-bxt-j4205     total:288  pass:259  dwarn:0   dfail:0   fail:0   skip:29  time:486s
fi-byt-j1900     total:77   pass:67   dwarn:0   dfail:0   fail:0   skip:9  
fi-byt-n2820     total:288  pass:249  dwarn:0   dfail:0   fail:0   skip:39  time:451s
fi-cfl-8700k     total:288  pass:260  dwarn:0   dfail:0   fail:0   skip:28  time:392s
fi-cfl-s2        total:288  pass:262  dwarn:0   dfail:0   fail:0   skip:26  time:564s
fi-cnl-y3        total:288  pass:262  dwarn:0   dfail:0   fail:0   skip:26  time:567s
fi-elk-e7500     total:288  pass:229  dwarn:0   dfail:0   fail:0   skip:59  time:413s
fi-gdg-551       total:288  pass:179  dwarn:0   dfail:0   fail:1   skip:108 time:288s
fi-glk-1         total:288  pass:260  dwarn:0   dfail:0   fail:0   skip:28  time:505s
fi-hsw-4770      total:288  pass:261  dwarn:0   dfail:0   fail:0   skip:27  time:386s
fi-ilk-650       total:288  pass:228  dwarn:0   dfail:0   fail:0   skip:60  time:408s
fi-ivb-3520m     total:288  pass:259  dwarn:0   dfail:0   fail:0   skip:29  time:454s
fi-ivb-3770      total:288  pass:255  dwarn:0   dfail:0   fail:0   skip:33  time:412s
fi-kbl-7500u     total:288  pass:263  dwarn:1   dfail:0   fail:0   skip:24  time:449s
fi-kbl-7560u     total:288  pass:269  dwarn:0   dfail:0   fail:0   skip:19  time:487s
fi-kbl-7567u     total:288  pass:268  dwarn:0   dfail:0   fail:0   skip:20  time:446s
fi-kbl-r         total:288  pass:261  dwarn:0   dfail:0   fail:0   skip:27  time:491s
fi-pnv-d510      total:288  pass:222  dwarn:1   dfail:0   fail:0   skip:65  time:586s
fi-skl-6260u     total:288  pass:268  dwarn:0   dfail:0   fail:0   skip:20  time:423s
fi-skl-6600u     total:288  pass:261  dwarn:0   dfail:0   fail:0   skip:27  time:497s
fi-skl-6700hq    total:288  pass:262  dwarn:0   dfail:0   fail:0   skip:26  time:518s
fi-skl-6700k2    total:288  pass:264  dwarn:0   dfail:0   fail:0   skip:24  time:482s
fi-skl-6770hq    total:288  pass:268  dwarn:0   dfail:0   fail:0   skip:20  time:470s
fi-skl-guc       total:288  pass:260  dwarn:0   dfail:0   fail:0   skip:28  time:408s
fi-skl-gvtdvm    total:288  pass:265  dwarn:0   dfail:0   fail:0   skip:23  time:425s
fi-snb-2520m     total:288  pass:248  dwarn:0   dfail:0   fail:0   skip:40  time:517s
fi-snb-2600      total:288  pass:248  dwarn:0   dfail:0   fail:0   skip:40  time:396s

Blacklisted hosts:
fi-cfl-u total:288 pass:262 dwarn:0 dfail:0 fail:0 skip:26 time:496s

7fe823aaeff7c50eeaf9b238a179b41771e08f9e drm-tip: 2018y-03m-01d-15h-58m-23s UTC integration manifest 51aa0cc8c1e8 drm/i915/icl: local_clock returns an u64

== Logs ==

For more details see: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_8202/issues.html
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

#4 lore raw

✓ Fi.CI.IGT: success for drm/i915/icl: local_clock returns an u64

In reply to Michel Thierry
== Series Details ==

== Series Details ==

Series: drm/i915/icl: local_clock returns an u64
URL : https://patchwork.freedesktop.org/series/39231/
State : success

== Summary ==

---- Possible new issues:

Test kms_fence_pin_leak:

                incomplete -> PASS       (shard-apl)

---- Known issues:

Test kms_chv_cursor_fail:

        Subgroup pipe-b-128x128-bottom-edge:
                dmesg-warn -> PASS       (shard-snb) fdo#105185
Test pm_rpm:
        Subgroup system-suspend-execbuf:
                pass       -> INCOMPLETE (shard-hsw) fdo#103375

fdo#105185 https://bugs.freedesktop.org/show_bug.cgi?id=105185
fdo#103375 https://bugs.freedesktop.org/show_bug.cgi?id=103375

shard-apl        total:3461 pass:1820 dwarn:1   dfail:0   fail:7   skip:1632 time:12111s
shard-hsw        total:3399 pass:1735 dwarn:1   dfail:0   fail:1   skip:1660 time:11519s
shard-snb        total:3461 pass:1359 dwarn:2   dfail:0   fail:1   skip:2099 time:6662s

Blacklisted hosts:
shard-kbl total:3391 pass:1905 dwarn:4 dfail:0 fail:7 skip:1474 time:9149s

== Logs ==

For more details see: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_8202/shards.html
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx