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

drm: Allow drm_atomic_helper_wait_for_vblanks while cold. 

This enables us to do a mode-switch before interrupts are running.
This commit is contained in:
riastradh 2021-12-19 12:43:52 +00:00
parent 3b32b9463a
commit a331185e6c
1 changed files with 23 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
sys/external/bsd/drm2/dist/drm/drm_atomic_helper.c vendored
View File

@ -1,4 +1,4 @@
/* $NetBSD: drm_atomic_helper.c,v 1.9 2021/12/19 12:05:08 riastradh Exp $ */
/* $NetBSD: drm_atomic_helper.c,v 1.10 2021/12/19 12:43:52 riastradh Exp $ */
/*
* Copyright (C) 2014 Red Hat
@ -28,7 +28,7 @@
*/
#include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: drm_atomic_helper.c,v 1.9 2021/12/19 12:05:08 riastradh Exp $");
__KERNEL_RCSID(0, "$NetBSD: drm_atomic_helper.c,v 1.10 2021/12/19 12:43:52 riastradh Exp $");
#include <linux/dma-fence.h>
#include <linux/ktime.h>
@ -1466,13 +1466,27 @@ drm_atomic_helper_wait_for_vblanks(struct drm_device *dev,
continue;
#ifdef __NetBSD__
spin_lock(&dev->event_lock);
DRM_SPIN_WAIT_ON(ret, &dev->vblank[i].queue,
&dev->event_lock,
msecs_to_jiffies(50),
(old_state->crtcs[i].last_vblank_count !=
drm_crtc_vblank_count(crtc)));
spin_unlock(&dev->event_lock);
if (cold) {
unsigned timo = 100;
ret = -ETIMEDOUT;
while (timo --> 0 && ret) {
spin_lock(&dev->event_lock);
if (old_state->crtcs[i].last_vblank_count !=
drm_crtc_vblank_count(crtc)) {
ret = 0;
}
spin_unlock(&dev->event_lock);
}
} else {
spin_lock(&dev->event_lock);
DRM_SPIN_WAIT_ON(ret, &dev->vblank[i].queue,
&dev->event_lock,
msecs_to_jiffies(100),
(old_state->crtcs[i].last_vblank_count !=
drm_crtc_vblank_count(crtc)));
spin_unlock(&dev->event_lock);
}
#else
ret = wait_event_timeout(dev->vblank[i].queue,
old_state->crtcs[i].last_vblank_count !=