[src/trunk]: src/sys/external/bsd/drm2/dist/drm/i915 Fix formatting and locki...

[riastradh <riastradh%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/155bfcbceb2b
branches:  trunk
changeset: 797473:155bfcbceb2b
user:      riastradh <riastradh%NetBSD.org@localhost>
date:      Fri Jul 18 19:48:34 2014 +0000

description:
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.

diffstat:

 sys/external/bsd/drm2/dist/drm/i915/i915_gpu_error.c |  4 +---
 1 files changed, 1 insertions(+), 3 deletions(-)

diffs (23 lines):

diff -r 02337a55a6b6 -r 155bfcbceb2b sys/external/bsd/drm2/dist/drm/i915/i915_gpu_error.c
--- a/sys/external/bsd/drm2/dist/drm/i915/i915_gpu_error.c      Fri Jul 18 19:38:02 2014 +0000
+++ b/sys/external/bsd/drm2/dist/drm/i915/i915_gpu_error.c      Fri Jul 18 19:48:34 2014 +0000
@@ -334,7 +334,7 @@
        }
 
        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 @@
        }
 
 #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