[src/trunk]: src/sys/external/bsd/drm2 bring in old drm changes

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

details:   https://anonhg.NetBSD.org/src/rev/564308211cad
branches:  trunk
changeset: 365711:564308211cad
user:      riastradh <riastradh%NetBSD.org@localhost>
date:      Mon Aug 27 06:16:37 2018 +0000

description:
bring in old drm changes

ifdef out some fb_info usage which we don't have and some of it
ifdef'd out in old drm

strangely reg_offset isn't used in the i2c whatever-thing

we need one more member to drm_fb_helper

define CONFIG_DRM_FBDEV_EMULATION so hopefully fewer redefinitions


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

diffstat:

 sys/external/bsd/drm2/dist/drm/i915/intel_fbdev.c |   7 ++++---
 sys/external/bsd/drm2/dist/drm/i915/intel_i2c.c   |  12 ++++++++----
 sys/external/bsd/drm2/i915drm/files.i915drmkms    |   3 ++-
 3 files changed, 14 insertions(+), 8 deletions(-)

diffs (105 lines):

diff -r 6ddffc52ee07 -r 564308211cad sys/external/bsd/drm2/dist/drm/i915/intel_fbdev.c
--- a/sys/external/bsd/drm2/dist/drm/i915/intel_fbdev.c Mon Aug 27 06:16:22 2018 +0000
+++ b/sys/external/bsd/drm2/dist/drm/i915/intel_fbdev.c Mon Aug 27 06:16:37 2018 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: intel_fbdev.c,v 1.6 2018/08/27 04:58:24 riastradh Exp $        */
+/*     $NetBSD: intel_fbdev.c,v 1.7 2018/08/27 06:16:37 riastradh Exp $        */
 
 /*
  * Copyright © 2007 David Airlie
@@ -27,7 +27,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: intel_fbdev.c,v 1.6 2018/08/27 04:58:24 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: intel_fbdev.c,v 1.7 2018/08/27 06:16:37 riastradh Exp $");
 
 #include <linux/async.h>
 #include <linux/module.h>
@@ -214,7 +214,6 @@
        bool prealloc = false;
 
        mutex_lock(&dev->struct_mutex);
-
        if (intel_fb &&
            (sizes->fb_width > intel_fb->base.width ||
             sizes->fb_height > intel_fb->base.height)) {
@@ -722,11 +721,13 @@
 
 static void intel_fbdev_suspend_worker(struct work_struct *work)
 {
+#ifndef __NetBSD__             /* XXX fb suspend */
        intel_fbdev_set_suspend(container_of(work,
                                             struct drm_i915_private,
                                             fbdev_suspend_work)->dev,
                                FBINFO_STATE_RUNNING,
                                true);
+#endif
 }
 
 int intel_fbdev_init(struct drm_device *dev)
diff -r 6ddffc52ee07 -r 564308211cad sys/external/bsd/drm2/dist/drm/i915/intel_i2c.c
--- a/sys/external/bsd/drm2/dist/drm/i915/intel_i2c.c   Mon Aug 27 06:16:22 2018 +0000
+++ b/sys/external/bsd/drm2/dist/drm/i915/intel_i2c.c   Mon Aug 27 06:16:37 2018 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: intel_i2c.c,v 1.15 2018/08/27 04:58:24 riastradh Exp $ */
+/*     $NetBSD: intel_i2c.c,v 1.16 2018/08/27 06:16:37 riastradh Exp $ */
 
 /*
  * Copyright (c) 2006 Dave Airlie <airlied%linux.ie@localhost>
@@ -29,7 +29,7 @@
  *     Chris Wilson <chris%chris-wilson.co.uk@localhost>
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: intel_i2c.c,v 1.15 2018/08/27 04:58:24 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: intel_i2c.c,v 1.16 2018/08/27 06:16:37 riastradh Exp $");
 
 #include <linux/i2c.h>
 #include <linux/i2c-algo-bit.h>
@@ -289,7 +289,7 @@
        if (cold) {
                i = 50;
                do {
-                       gmbus2 = I915_READ_NOTRACE(GMBUS2 + reg_offset);
+                       gmbus2 = I915_READ_NOTRACE(GMBUS2);
                        if (ISSET(gmbus2, (GMBUS_SATOER | gmbus2_status)))
                                break;
                        DELAY(1000);
@@ -304,7 +304,7 @@
                            &dev_priv->gmbus_wait_queue,
                            &dev_priv->gmbus_wait_lock,
                            1,
-                           (gmbus2 = I915_READ_NOTRACE(GMBUS2 + reg_offset),
+                           (gmbus2 = I915_READ_NOTRACE(GMBUS2),
                                ISSET(gmbus2,
                                    (GMBUS_SATOER | gmbus2_status))));
                        spin_unlock(&dev_priv->gmbus_wait_lock);
@@ -718,7 +718,11 @@
                         "i915 gmbus %s",
                         get_gmbus_pin(dev_priv, pin)->name);
 
+#ifdef __NetBSD__
                bus->adapter.dev.parent = dev->dev;
+#else
+               bus->adapter.dev.parent = &dev->pdev->dev;
+#endif
                bus->dev_priv = dev_priv;
 
                bus->adapter.algo = &gmbus_algorithm;
diff -r 6ddffc52ee07 -r 564308211cad sys/external/bsd/drm2/i915drm/files.i915drmkms
--- a/sys/external/bsd/drm2/i915drm/files.i915drmkms    Mon Aug 27 06:16:22 2018 +0000
+++ b/sys/external/bsd/drm2/i915drm/files.i915drmkms    Mon Aug 27 06:16:37 2018 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: files.i915drmkms,v 1.13 2018/08/27 05:44:57 riastradh Exp $
+#      $NetBSD: files.i915drmkms,v 1.14 2018/08/27 06:16:37 riastradh Exp $
 
 define intelfbbus      { }
 device i915drmkms: drmkms, drmkms_pci, intelfbbus, agp_i810
@@ -19,6 +19,7 @@
 # XXX x86 kludge.
 makeoptions    i915drmkms      CPPFLAGS+="-DCONFIG_DRM_I915_FBDEV=1"
 makeoptions    i915drmkms      CPPFLAGS+="-DCONFIG_DRM_I915_PRELIMINARY_HW_SUPPORT=0"
+makeoptions    i915drmkms      CPPFLAGS+="-DCONFIG_DRM_FBDEV_EMULATION=1"
 
 file   external/bsd/drm2/i915drm/i915_module.c         i915drmkms
 file   external/bsd/drm2/i915drm/i915_pci.c            i915drmkms