Module Name: src
Committed By: riastradh
Date: Wed Jul 24 03:42:37 UTC 2013
Modified Files:
src/sys/external/bsd/drm2/dist/drm/i915 [riastradh-drm2]:
intel_overlay.c
src/sys/modules/i915drm2 [riastradh-drm2]: Makefile
Log Message:
Unhook i915_gem*.c from the build for now.
To generate a diff of this commit:
cvs rdiff -u -r1.1.1.1.2.2 -r1.1.1.1.2.3 \
src/sys/external/bsd/drm2/dist/drm/i915/intel_overlay.c
cvs rdiff -u -r1.1.2.4 -r1.1.2.5 src/sys/modules/i915drm2/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/external/bsd/drm2/dist/drm/i915/intel_overlay.c
diff -u src/sys/external/bsd/drm2/dist/drm/i915/intel_overlay.c:1.1.1.1.2.2 src/sys/external/bsd/drm2/dist/drm/i915/intel_overlay.c:1.1.1.1.2.3
--- src/sys/external/bsd/drm2/dist/drm/i915/intel_overlay.c:1.1.1.1.2.2 Tue Jul 23 21:28:22 2013
+++ src/sys/external/bsd/drm2/dist/drm/i915/intel_overlay.c Wed Jul 24 03:42:37 2013
@@ -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 @@ struct overlay_registers {
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 @@ intel_overlay_map_regs(struct intel_over
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,
Index: src/sys/modules/i915drm2/Makefile
diff -u src/sys/modules/i915drm2/Makefile:1.1.2.4 src/sys/modules/i915drm2/Makefile:1.1.2.5
--- src/sys/modules/i915drm2/Makefile:1.1.2.4 Wed Jul 24 03:27:18 2013
+++ src/sys/modules/i915drm2/Makefile Wed Jul 24 03:42:37 2013
@@ -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+= dvo_tfp410.c
#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
