drm: i915: remove timeval users
Subsystems (2)
PATCH RESEND 1/1 drm: i915: remove timeval users
struct timeval is deprecated because it cannot represent times past 2038. In this driver, the only use of this structure is to capture debug information. This is easily changed to ktime_t, which we then format as needed when printing it later.
---
Sent in November 2017, got the review from Chis, but the patch so far hasn't been merged. Resending it unchanged, please apply for 4.16 or 4.17.
--- drivers/gpu/drm/i915/i915_drv.h | 6 +++--- drivers/gpu/drm/i915/i915_gpu_error.c | 25 ++++++++++++++----------- 2 files changed, 17 insertions(+), 14 deletions(-)
drivers/gpu/drm/i915/i915_drv.h +3 -3
@@ -453,9 +453,9 @@ struct intel_display_error_state;struct i915_gpu_state {struct kref ref; -struct timeval time; -struct timeval boottime; -struct timeval uptime; +ktime_t time; +ktime_t boottime; +ktime_t uptime;struct drm_i915_private *i915;
drivers/gpu/drm/i915/i915_gpu_error.c +14 -11
@@ -610,6 +610,7 @@ int i915_error_state_to_str(struct drm_i915_error_state_buf *m, {struct drm_i915_private *dev_priv = m->i915;struct drm_i915_error_object *obj; +struct timespec64 ts;int i, j;if (!error) {
@@ -620,12 +621,15 @@ int i915_error_state_to_str(struct drm_i915_error_state_buf *m,if (*error->error_msg)err_printf (m,"%s\n" , error->error_msg);err_printf (m,"Kernel: " UTS_RELEASE "\n" ); -err_printf (m,"Time: %ld s %ld us\n" , - error->time.tv_sec, error->time.tv_usec); -err_printf (m,"Boottime: %ld s %ld us\n" , - error->boottime.tv_sec, error->boottime.tv_usec); -err_printf (m,"Uptime: %ld s %ld us\n" , - error->uptime.tv_sec, error->uptime.tv_usec); + ts =ktime_to_timespec64 (error->time); +err_printf (m,"Time: %lld s %ld us\n" , + (s64 )ts.tv_sec, ts.tv_nsec /NSEC_PER_USEC ); + ts =ktime_to_timespec64 (error->boottime); +err_printf (m,"Boottime: %lld s %ld us\n" , + (s64 )ts.tv_sec, ts.tv_nsec /NSEC_PER_USEC ); + ts =ktime_to_timespec64 (error->uptime); +err_printf (m,"Uptime: %lld s %ld us\n" , + (s64 )ts.tv_sec, ts.tv_nsec /NSEC_PER_USEC );for (i =0 ; i <ARRAY_SIZE (error->engine); i++) { if (error->engine[i].hangcheck_stalled &&
@@ -1737,11 +1741,10 @@ static int capture(void *data) {struct i915_gpu_state *error = data; -do_gettimeofday (&error->time); - error->boottime =ktime_to_timeval (ktime_get_boottime ()); - error->uptime = -ktime_to_timeval (ktime_sub (ktime_get (), - error->i915->gt.last_init_time)); + error->time =ktime_get_real (); + error->boottime =ktime_get_boottime (); + error->uptime =ktime_sub (ktime_get (), + error->i915->gt.last_init_time);capture_params (error);capture_uc_state (error);
Signature · 6 lines
2.9.0 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Patchwork
CI✓ Fi.CI.BAT: success for drm: i915: remove timeval users (rev2)
== Series Details ==
== Series Details ==
Series: drm: i915: remove timeval users (rev2)
URL : https://patchwork.freedesktop.org/series/33147/
State : success
== Summary ==
Series 33147v2 drm: i915: remove timeval users
https://patchwork.freedesktop.org/api/1.0/series/33147/revisions/2/mbox/
Test debugfs_test:
Subgroup read_all_entries:
dmesg-fail -> DMESG-WARN (fi-elk-e7500) fdo#103989
pass -> INCOMPLETE (fi-snb-2520m) fdo#103713
Test gem_mmap_gtt:
Subgroup basic-small-bo-tiledx:
fail -> PASS (fi-gdg-551) fdo#102575fdo#103989 https://bugs.freedesktop.org/show_bug.cgi?id=103989
fdo#103713 https://bugs.freedesktop.org/show_bug.cgi?id=103713
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:422s fi-bdw-gvtdvm total:288 pass:264 dwarn:0 dfail:0 fail:0 skip:24 time:424s fi-blb-e6850 total:288 pass:223 dwarn:1 dfail:0 fail:0 skip:64 time:372s fi-bsw-n3050 total:288 pass:242 dwarn:0 dfail:0 fail:0 skip:46 time:495s fi-bwr-2160 total:288 pass:183 dwarn:0 dfail:0 fail:0 skip:105 time:281s fi-bxt-dsi total:288 pass:258 dwarn:0 dfail:0 fail:0 skip:30 time:483s fi-bxt-j4205 total:288 pass:259 dwarn:0 dfail:0 fail:0 skip:29 time:483s fi-byt-j1900 total:288 pass:253 dwarn:0 dfail:0 fail:0 skip:35 time:466s fi-byt-n2820 total:288 pass:249 dwarn:0 dfail:0 fail:0 skip:39 time:452s fi-elk-e7500 total:224 pass:168 dwarn:10 dfail:0 fail:0 skip:45 fi-gdg-551 total:288 pass:180 dwarn:0 dfail:0 fail:0 skip:108 time:279s fi-glk-1 total:288 pass:260 dwarn:0 dfail:0 fail:0 skip:28 time:512s fi-hsw-4770 total:288 pass:261 dwarn:0 dfail:0 fail:0 skip:27 time:395s fi-hsw-4770r total:288 pass:261 dwarn:0 dfail:0 fail:0 skip:27 time:400s fi-ilk-650 total:288 pass:228 dwarn:0 dfail:0 fail:0 skip:60 time:410s fi-ivb-3520m total:288 pass:259 dwarn:0 dfail:0 fail:0 skip:29 time:456s fi-ivb-3770 total:288 pass:255 dwarn:0 dfail:0 fail:0 skip:33 time:410s fi-kbl-7500u total:288 pass:263 dwarn:1 dfail:0 fail:0 skip:24 time:457s fi-kbl-7560u total:288 pass:269 dwarn:0 dfail:0 fail:0 skip:19 time:494s fi-kbl-7567u total:288 pass:268 dwarn:0 dfail:0 fail:0 skip:20 time:451s fi-kbl-r total:288 pass:261 dwarn:0 dfail:0 fail:0 skip:27 time:505s fi-pnv-d510 total:288 pass:222 dwarn:1 dfail:0 fail:0 skip:65 time:576s fi-skl-6260u total:288 pass:268 dwarn:0 dfail:0 fail:0 skip:20 time:425s fi-skl-6600u total:288 pass:261 dwarn:0 dfail:0 fail:0 skip:27 time:512s fi-skl-6700hq total:288 pass:262 dwarn:0 dfail:0 fail:0 skip:26 time:526s fi-skl-6700k2 total:288 pass:264 dwarn:0 dfail:0 fail:0 skip:24 time:490s fi-skl-6770hq total:288 pass:268 dwarn:0 dfail:0 fail:0 skip:20 time:476s fi-skl-gvtdvm total:288 pass:265 dwarn:0 dfail:0 fail:0 skip:23 time:432s fi-snb-2520m total:3 pass:2 dwarn:0 dfail:0 fail:0 skip:0 fi-snb-2600 total:288 pass:248 dwarn:0 dfail:0 fail:0 skip:40 time:394s Blacklisted hosts: fi-cfl-s2 total:288 pass:262 dwarn:0 dfail:0 fail:0 skip:26 time:567s fi-glk-dsi total:288 pass:258 dwarn:0 dfail:0 fail:0 skip:30 time:469s
a5cf4f0319302df5036145fd6c96d6966cc677ae drm-tip: 2018y-01m-17d-09h-14m-44s UTC integration manifest b9503a3bd5e9 drm: i915: remove timeval users
== Logs ==
For more details see: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_7700/issues.html
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Patchwork
CI✗ Fi.CI.IGT: failure for drm: i915: remove timeval users (rev2)
In reply to Arnd Bergmann== Series Details ==
== Series Details ==
Series: drm: i915: remove timeval users (rev2)
URL : https://patchwork.freedesktop.org/series/33147/
State : failure
== Summary ==
Test drv_suspend:
Subgroup fence-restore-untiled:
skip -> PASS (shard-snb) fdo#102365
Test kms_frontbuffer_tracking:
Subgroup fbc-1p-offscren-pri-shrfb-draw-blt:
fail -> PASS (shard-snb) fdo#101623
Test kms_flip:
Subgroup 2x-flip-vs-wf_vblank-interruptible:
pass -> FAIL (shard-hsw)
Subgroup 2x-flip-vs-blocking-wf-vblank:
pass -> INCOMPLETE (shard-hsw)fdo#102365 https://bugs.freedesktop.org/show_bug.cgi?id=102365
fdo#101623 https://bugs.freedesktop.org/show_bug.cgi?id=101623
shard-hsw total:2688 pass:1680 dwarn:1 dfail:0 fail:12 skip:992 time:14067s shard-snb total:2753 pass:1318 dwarn:1 dfail:0 fail:11 skip:1423 time:7818s Blacklisted hosts: shard-apl total:2753 pass:1716 dwarn:1 dfail:0 fail:21 skip:1015 time:13768s shard-kbl total:2753 pass:1840 dwarn:1 dfail:0 fail:23 skip:889 time:10761s
== Logs ==
For more details see: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_7700/shards.html
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
A message that is not in the archive (sent off-list or not yet received): [email protected]
Quoted 13 lines · Chris Wilson
Quoting Arnd Bergmann (2018-01-17 15:48:53)
Quoted 11 lines
struct timeval is deprecated because it cannot represent times past 2038. In this driver, the only use of this structure is to capture debug information. This is easily changed to
ktime_t, which we then format as needed when printing it later.Reviewed-by Chris Wilson <[email protected]>Signed-off-by Arnd Bergmann <[email protected]>---
Sent in November 2017, got the review from Chis, but the patch so far hasn't been merged. Resending it unchanged, please apply for 4.16 or 4.17.
Quoted 2 lines
Looks like it falls to me to push it as well. That means it will be 4.17 unless expedited by request...
4.17 is fine with me, it's only a cleanup and while I want to do all of these in the end, I don't care which release they land in as long as I don't have to carry the patches myself.
Arnd