[src/trunk]: src/sys/external/bsd/drm2/dist/drm/i915/display i915: Work aroun...

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

details:   https://anonhg.NetBSD.org/src/rev/e4d1fd547174
branches:  trunk
changeset: 1028676:e4d1fd547174
user:      riastradh <riastradh%NetBSD.org@localhost>
date:      Sun Dec 19 11:39:45 2021 +0000

description:
i915: Work around current_is_async.

diffstat:

 sys/external/bsd/drm2/dist/drm/i915/display/intel_fbdev.c |  6 ++++--
 1 files changed, 4 insertions(+), 2 deletions(-)

diffs (28 lines):

diff -r 460ea2bec12b -r e4d1fd547174 sys/external/bsd/drm2/dist/drm/i915/display/intel_fbdev.c
--- a/sys/external/bsd/drm2/dist/drm/i915/display/intel_fbdev.c Sun Dec 19 11:39:38 2021 +0000
+++ b/sys/external/bsd/drm2/dist/drm/i915/display/intel_fbdev.c Sun Dec 19 11:39:45 2021 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: intel_fbdev.c,v 1.6 2021/12/19 11:39:32 riastradh Exp $        */
+/*     $NetBSD: intel_fbdev.c,v 1.7 2021/12/19 11:39:45 riastradh Exp $        */
 
 /*
  * Copyright © 2007 David Airlie
@@ -27,7 +27,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: intel_fbdev.c,v 1.6 2021/12/19 11:39:32 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: intel_fbdev.c,v 1.7 2021/12/19 11:39:45 riastradh Exp $");
 
 #include <linux/async.h>
 #include <linux/console.h>
@@ -568,7 +568,9 @@
                return;
 
        cancel_work_sync(&dev_priv->fbdev_suspend_work);
+#ifndef __NetBSD__             /* XXX fb async */
        if (!current_is_async())
+#endif
                intel_fbdev_sync(ifbdev);
 
        drm_fb_helper_unregister_fbi(&ifbdev->helper);