[src/riastradh-drm2]: src/sys Unhook i915_gem*.c from the build for now.

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

details:   https://anonhg.NetBSD.org/src/rev/d8e79fe6d1e1
branches:  riastradh-drm2
changeset: 788417:d8e79fe6d1e1
user:      riastradh <riastradh%NetBSD.org@localhost>
date:      Wed Jul 24 03:42:37 2013 +0000

description:
Unhook i915_gem*.c from the build for now.

diffstat:

 sys/external/bsd/drm2/dist/drm/i915/intel_overlay.c |  30 +++++++++++++++++++++
 sys/modules/i915drm2/Makefile                       |  24 ++++++++--------
 2 files changed, 42 insertions(+), 12 deletions(-)

diffs (94 lines):

diff -r a09d1b97e836 -r d8e79fe6d1e1 sys/external/bsd/drm2/dist/drm/i915/intel_overlay.c
--- a/sys/external/bsd/drm2/dist/drm/i915/intel_overlay.c       Wed Jul 24 03:42:21 2013 +0000
+++ b/sys/external/bsd/drm2/dist/drm/i915/intel_overlay.c       Wed Jul 24 03:42:37 2013 +0000
@@ -25,6 +25,7 @@
  *
  * Derived from Xorg ddx, xf86-video-intel, src/i830_video.c
  */
+#include <linux/kernel.h>
 #include <drm/drmP.h>
 #include <drm/i915_drm.h>
 #include "i915_drv.h"
@@ -167,6 +168,28 @@
        u16 RESERVEDG[0x100 / 2 - N_HORIZ_UV_TAPS * N_PHASES];
 };
 
+#ifdef __NetBSD__              /* XXX intel overlay iomem */
+#  define      __intel_overlay_iomem
+#  define      __iomem                 __intel_overlay_iomem
+
+static inline uint32_t
+ioread32(const uint32_t __intel_overlay_iomem *ptr)
+{
+       const uint32_t value = *ptr;
+
+       __insn_barrier();
+       return value;
+}
+
+static inline void
+iowrite32(uint32_t value, uint32_t __intel_overlay_iomem *ptr)
+{
+
+       __insn_barrier();
+       *ptr = value;
+}
+#endif
+
 struct intel_overlay {
        struct drm_device *dev;
        struct intel_crtc *crtc;
@@ -204,8 +227,15 @@
 static void intel_overlay_unmap_regs(struct intel_overlay *overlay,
                                     struct overlay_registers __iomem *regs)
 {
+#ifdef __NetBSD__              /* XXX io mapping */
+       struct drm_i915_private *dev_priv = overlay->dev->dev_private;
+
+       if (!OVERLAY_NEEDS_PHYSICAL(overlay->dev))
+               io_mapping_unmap(dev_priv->mm.gtt_mapping, regs);
+#else
        if (!OVERLAY_NEEDS_PHYSICAL(overlay->dev))
                io_mapping_unmap(regs);
+#endif
 }
 
 static int intel_overlay_do_wait_request(struct intel_overlay *overlay,
diff -r a09d1b97e836 -r d8e79fe6d1e1 sys/modules/i915drm2/Makefile
--- a/sys/modules/i915drm2/Makefile     Wed Jul 24 03:42:21 2013 +0000
+++ b/sys/modules/i915drm2/Makefile     Wed Jul 24 03:42:37 2013 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1.2.4 2013/07/24 03:27:18 riastradh Exp $
+# $NetBSD: Makefile,v 1.1.2.5 2013/07/24 03:42:37 riastradh Exp $
 
 .include "../Makefile.inc"
 .include "../drm2/Makefile.inc"
@@ -20,17 +20,17 @@
 #SRCS+=        i915_debugfs.c          # XXX No debugfs in NetBSD.
 SRCS+= i915_dma.c
 SRCS+= i915_drv.c
-SRCS+= i915_gem.c
-SRCS+= i915_gem_context.c
-SRCS+= i915_gem_debug.c
-SRCS+= i915_gem_dmabuf.c
-SRCS+= i915_gem_evict.c
-SRCS+= i915_gem_execbuffer.c
-SRCS+= i915_gem_gtt.c
-SRCS+= i915_gem_stolen.c
-SRCS+= i915_gem_tiling.c
-SRCS+= i915_ioc32.c
-SRCS+= i915_irq.c
+#SRCS+=        i915_gem.c
+#SRCS+=        i915_gem_context.c
+#SRCS+=        i915_gem_debug.c
+#SRCS+=        i915_gem_dmabuf.c
+#SRCS+=        i915_gem_evict.c
+#SRCS+=        i915_gem_execbuffer.c
+#SRCS+=        i915_gem_gtt.c
+#SRCS+=        i915_gem_stolen.c
+#SRCS+=        i915_gem_tiling.c
+#SRCS+=        i915_ioc32.c
+#SRCS+=        i915_irq.c
 SRCS+= i915_suspend.c
 #SRCS+=        i915_sysfs.c            # XXX No sysfs in NetBSD.
 SRCS+= intel_bios.c