[src/trunk]: src/sys/external/bsd/drm2/include/drm provide enum irqreturn

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

details:   https://anonhg.NetBSD.org/src/rev/7801185fe3b6
branches:  trunk
changeset: 992408:7801185fe3b6
user:      riastradh <riastradh%NetBSD.org@localhost>
date:      Mon Aug 27 06:16:01 2018 +0000

description:
provide enum irqreturn

merge in old ifdefs
ifdef out code that I'm unsure about right away and turn into panic
call.


Author: coypu <coypu%sdf.org@localhost>
Committer: Taylor R Campbell <riastradh%NetBSD.org@localhost>

diffstat:

 sys/external/bsd/drm2/dist/drm/i915/intel_display.c |  9 +++++++--
 sys/external/bsd/drm2/dist/drm/i915/intel_dp.c      |  8 ++++++--
 sys/external/bsd/drm2/include/drm/drm_irq_netbsd.h  |  8 +++++---
 3 files changed, 18 insertions(+), 7 deletions(-)

diffs (96 lines):

diff -r 86297a890696 -r 7801185fe3b6 sys/external/bsd/drm2/dist/drm/i915/intel_display.c
--- a/sys/external/bsd/drm2/dist/drm/i915/intel_display.c       Mon Aug 27 06:15:32 2018 +0000
+++ b/sys/external/bsd/drm2/dist/drm/i915/intel_display.c       Mon Aug 27 06:16:01 2018 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: intel_display.c,v 1.16 2018/08/27 04:58:24 riastradh Exp $     */
+/*     $NetBSD: intel_display.c,v 1.17 2018/08/27 06:16:01 riastradh Exp $     */
 
 /*
  * Copyright © 2006-2007 Intel Corporation
@@ -27,7 +27,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: intel_display.c,v 1.16 2018/08/27 04:58:24 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: intel_display.c,v 1.17 2018/08/27 06:16:01 riastradh Exp $");
 
 #include <linux/dmi.h>
 #include <linux/module.h>
@@ -14770,7 +14770,11 @@
                dev_priv->display.queue_flip = intel_default_queue_flip;
        }
 
+#ifdef __NetBSD__
+       linux_mutex_init(&dev_priv->pps_mutex);
+#else
        mutex_init(&dev_priv->pps_mutex);
+#endif
 }
 
 /*
@@ -14978,6 +14982,7 @@
        vga_put(dev->pdev, VGA_RSRC_LEGACY_IO);
 #endif
        udelay(300);
+#endif
 
        I915_WRITE(vga_reg, VGA_DISP_DISABLE);
        POSTING_READ(vga_reg);
diff -r 86297a890696 -r 7801185fe3b6 sys/external/bsd/drm2/dist/drm/i915/intel_dp.c
--- a/sys/external/bsd/drm2/dist/drm/i915/intel_dp.c    Mon Aug 27 06:15:32 2018 +0000
+++ b/sys/external/bsd/drm2/dist/drm/i915/intel_dp.c    Mon Aug 27 06:16:01 2018 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: intel_dp.c,v 1.11 2018/08/27 04:58:24 riastradh Exp $  */
+/*     $NetBSD: intel_dp.c,v 1.12 2018/08/27 06:16:01 riastradh Exp $  */
 
 /*
  * Copyright © 2008 Intel Corporation
@@ -28,7 +28,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: intel_dp.c,v 1.11 2018/08/27 04:58:24 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: intel_dp.c,v 1.12 2018/08/27 06:16:01 riastradh Exp $");
 
 #include <linux/i2c.h>
 #include <linux/slab.h>
@@ -579,6 +579,9 @@
 static int edp_notify_handler(struct notifier_block *this, unsigned long code,
                              void *unused)
 {
+#ifdef __NetBSD__
+       panic("XXX");
+#else
        struct intel_dp *intel_dp = container_of(this, typeof(* intel_dp),
                                                 edp_notifier);
        struct drm_device *dev = intel_dp_to_dev(intel_dp);
@@ -608,6 +611,7 @@
        pps_unlock(intel_dp);
 
        return 0;
+#endif
 }
 
 static bool edp_have_panel_power(struct intel_dp *intel_dp)
diff -r 86297a890696 -r 7801185fe3b6 sys/external/bsd/drm2/include/drm/drm_irq_netbsd.h
--- a/sys/external/bsd/drm2/include/drm/drm_irq_netbsd.h        Mon Aug 27 06:15:32 2018 +0000
+++ b/sys/external/bsd/drm2/include/drm/drm_irq_netbsd.h        Mon Aug 27 06:16:01 2018 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: drm_irq_netbsd.h,v 1.4 2015/01/01 01:15:42 mrg Exp $   */
+/*     $NetBSD: drm_irq_netbsd.h,v 1.5 2018/08/27 06:16:01 riastradh Exp $     */
 
 /*-
  * Copyright (c) 2013 The NetBSD Foundation, Inc.
@@ -34,8 +34,10 @@
 
 typedef int irqreturn_t;
 
-#define        IRQ_NONE        0
-#define        IRQ_HANDLED     1
+enum irqreturn {
+       IRQ_NONE = 0x0,
+       IRQ_HANDLED = 0x1,
+};
 
 #define        DRM_IRQ_ARGS    void *arg