Module Name: src
Committed By: riastradh
Date: Fri Jul 18 19:48:34 UTC 2014
Modified Files:
src/sys/external/bsd/drm2/dist/drm/i915: i915_gpu_error.c
Log Message:
Fix formatting and locking errors.
Format time_t by casting to intmax_t and using PRIdMAX, since we have
no PRIxyz for time_t.
We already hold the irq lock on entry to i915_record_ring_state, so
don't take it again.
To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 \
src/sys/external/bsd/drm2/dist/drm/i915/i915_gpu_error.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/external/bsd/drm2/dist/drm/i915/i915_gpu_error.c
diff -u src/sys/external/bsd/drm2/dist/drm/i915/i915_gpu_error.c:1.2 src/sys/external/bsd/drm2/dist/drm/i915/i915_gpu_error.c:1.3
--- src/sys/external/bsd/drm2/dist/drm/i915/i915_gpu_error.c:1.2 Wed Jul 16 20:56:24 2014
+++ src/sys/external/bsd/drm2/dist/drm/i915/i915_gpu_error.c Fri Jul 18 19:48:34 2014
@@ -334,7 +334,7 @@ int i915_error_state_to_str(struct drm_i
}
err_printf(m, "%s\n", error->error_msg);
- err_printf(m, "Time: %ld s %ld us\n", error->time.tv_sec,
+ err_printf(m, "Time: %"PRIdMAX" s %ld us\n", (intmax_t)error->time.tv_sec,
(long)error->time.tv_usec);
#ifndef __NetBSD__ /* XXX kernel version */
err_printf(m, "Kernel: " UTS_RELEASE "\n");
@@ -809,10 +809,8 @@ static void i915_record_ring_state(struc
}
#ifdef __NetBSD__
- spin_lock(&dev_priv->irq_lock);
ering->waiting = DRM_SPIN_WAITERS_P(&ring->irq_queue,
&dev_priv->irq_lock);
- spin_unlock(&dev_priv->irq_lock);
#else
ering->waiting = waitqueue_active(&ring->irq_queue);
#endif
