Aren
/
NetBSD
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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.
This commit is contained in:
riastradh 2014-07-18 19:48:34 +00:00
parent a168439b5a
commit 2ef9395ae2
1 changed files with 1 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
sys/external/bsd/drm2/dist/drm/i915/i915_gpu_error.c vendored
View File

@ -334,7 +334,7 @@ int i915_error_state_to_str(struct drm_i915_error_state_buf *m,
}
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(struct drm_device *dev,
}
#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