Module Name: src
Committed By: riastradh
Date: Mon Aug 27 14:43:32 UTC 2018
Modified Files:
src/sys/external/bsd/drm2/dist/drm: drm_irq.c
Log Message:
Caller must also hold vblank_time_lock here.
To generate a diff of this commit:
cvs rdiff -u -r1.14 -r1.15 src/sys/external/bsd/drm2/dist/drm/drm_irq.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/drm_irq.c
diff -u src/sys/external/bsd/drm2/dist/drm/drm_irq.c:1.14 src/sys/external/bsd/drm2/dist/drm/drm_irq.c:1.15
--- src/sys/external/bsd/drm2/dist/drm/drm_irq.c:1.14 Mon Aug 27 14:43:15 2018
+++ src/sys/external/bsd/drm2/dist/drm/drm_irq.c Mon Aug 27 14:43:32 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: drm_irq.c,v 1.14 2018/08/27 14:43:15 riastradh Exp $ */
+/* $NetBSD: drm_irq.c,v 1.15 2018/08/27 14:43:32 riastradh Exp $ */
/*
* drm_irq.c IRQ and vblank support
@@ -35,7 +35,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: drm_irq.c,v 1.14 2018/08/27 14:43:15 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: drm_irq.c,v 1.15 2018/08/27 14:43:32 riastradh Exp $");
#include <drm/drmP.h>
#include "drm_trace.h"
@@ -205,6 +205,7 @@ static void drm_update_vblank_count(stru
int framedur_ns = vblank->framedur_ns;
assert_spin_locked(&dev->vbl_lock);
+ assert_spin_locked(&dev->vblank_time_lock);
/*
* Interrupts were disabled prior to this call, so deal with counter
