Module Name: src
Committed By: riastradh
Date: Wed Jul 24 03:52:13 UTC 2013
Modified Files:
src/sys/modules/i915drm2 [riastradh-drm2]: Makefile
Added Files:
src/sys/external/bsd/drm2/i915drm [riastradh-drm2]: i915_gem.c
i915_irq.c i915_sysfs.c intel_fb.c intel_pm.c intel_ringbuffer.c
Log Message:
Stub out i915_{gem,irq,sysfs}.c and intel_{fb,pm,ringbuffer}.c for now.
To generate a diff of this commit:
cvs rdiff -u -r0 -r1.1.2.1 src/sys/external/bsd/drm2/i915drm/i915_gem.c \
src/sys/external/bsd/drm2/i915drm/i915_irq.c \
src/sys/external/bsd/drm2/i915drm/i915_sysfs.c \
src/sys/external/bsd/drm2/i915drm/intel_fb.c \
src/sys/external/bsd/drm2/i915drm/intel_pm.c \
src/sys/external/bsd/drm2/i915drm/intel_ringbuffer.c
cvs rdiff -u -r1.1.2.7 -r1.1.2.8 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/modules/i915drm2/Makefile
diff -u src/sys/modules/i915drm2/Makefile:1.1.2.7 src/sys/modules/i915drm2/Makefile:1.1.2.8
--- src/sys/modules/i915drm2/Makefile:1.1.2.7 Wed Jul 24 03:43:26 2013
+++ src/sys/modules/i915drm2/Makefile Wed Jul 24 03:52:13 2013
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1.2.7 2013/07/24 03:43:26 riastradh Exp $
+# $NetBSD: Makefile,v 1.1.2.8 2013/07/24 03:52:13 riastradh Exp $
.include "../Makefile.inc"
.include "../drm2/Makefile.inc"
@@ -20,7 +20,7 @@ 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.c # XXX overridden for now
#SRCS+= i915_gem_context.c
#SRCS+= i915_gem_debug.c
#SRCS+= i915_gem_dmabuf.c
@@ -30,16 +30,16 @@ SRCS+= i915_drv.c
#SRCS+= i915_gem_stolen.c
#SRCS+= i915_gem_tiling.c
#SRCS+= i915_ioc32.c
-#SRCS+= i915_irq.c
+SRCS+= i915_irq.c
SRCS+= i915_suspend.c
-#SRCS+= i915_sysfs.c # XXX No sysfs in NetBSD.
+SRCS+= i915_sysfs.c # XXX No sysfs in NetBSD.
SRCS+= intel_bios.c
SRCS+= intel_crt.c
SRCS+= intel_ddi.c
SRCS+= intel_display.c
SRCS+= intel_dp.c
SRCS+= intel_dvo.c
-#SRCS+= intel_fb.c # XXX Rewrite for wscons.
+SRCS+= intel_fb.c # XXX Rewrite for wscons.
SRCS+= intel_hdmi.c
SRCS+= intel_i2c.c
SRCS+= intel_lvds.c
@@ -47,8 +47,8 @@ SRCS+= intel_modes.c
SRCS+= intel_opregion.c
SRCS+= intel_overlay.c
SRCS+= intel_panel.c
-#SRCS+= intel_pm.c # XXX Hook up later...
-#SRCS+= intel_ringbuffer.c # XXX Hook up later...
+SRCS+= intel_pm.c # XXX overridden for now
+SRCS+= intel_ringbuffer.c # XXX overridden for now
SRCS+= intel_sdvo.c
SRCS+= intel_sprite.c
SRCS+= intel_tv.c
Added files:
Index: src/sys/external/bsd/drm2/i915drm/i915_gem.c
diff -u /dev/null src/sys/external/bsd/drm2/i915drm/i915_gem.c:1.1.2.1
--- /dev/null Wed Jul 24 03:52:13 2013
+++ src/sys/external/bsd/drm2/i915drm/i915_gem.c Wed Jul 24 03:52:13 2013
@@ -0,0 +1,440 @@
+/* $NetBSD: i915_gem.c,v 1.1.2.1 2013/07/24 03:52:13 riastradh Exp $ */
+
+/*-
+ * Copyright (c) 2013 The NetBSD Foundation, Inc.
+ * All rights reserved.
+ *
+ * This code is derived from software contributed to The NetBSD Foundation
+ * by Taylor R. Campbell.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
+ * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
+ * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
+ * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ */
+
+/* i915_gem*.c stubs */
+
+#include <sys/cdefs.h>
+__KERNEL_RCSID(0, "$NetBSD: i915_gem.c,v 1.1.2.1 2013/07/24 03:52:13 riastradh Exp $");
+
+#include "i915_drv.h"
+
+int
+i915_add_request(struct intel_ring_buffer *ring __unused,
+ struct drm_file *file __unused, u32 *out_seqno __unused)
+{
+ return ENOTTY;
+}
+
+struct drm_i915_gem_object *
+i915_gem_alloc_object(struct drm_device *dev __unused, size_t size __unused)
+{
+ return NULL;
+}
+
+int
+i915_gem_attach_phys_object(struct drm_device *dev __unused,
+ struct drm_i915_gem_object *obj __unused, int id __unused,
+ int align __unused)
+{
+ return ENOTTY;
+}
+
+int
+i915_gem_busy_ioctl(struct drm_device *dev, void *data, struct drm_file *file)
+{
+ return ENOTTY;
+}
+
+void
+i915_gem_cleanup_aliasing_ppgtt(struct drm_device *dev __unused)
+{
+}
+
+void
+i915_gem_cleanup_ringbuffer(struct drm_device *dev __unused)
+{
+}
+
+void
+i915_gem_cleanup_stolen(struct drm_device *dev __unused)
+{
+}
+
+void
+i915_gem_context_close(struct drm_device *dev __unused,
+ struct drm_file *file __unused)
+{
+}
+
+void
+i915_gem_context_fini(struct drm_device *dev __unused)
+{
+}
+
+int
+i915_gem_context_create_ioctl(struct drm_device *dev, void *data,
+ struct drm_file *file)
+{
+ return ENOTTY;
+}
+
+int
+i915_gem_context_destroy_ioctl(struct drm_device *dev, void *data,
+ struct drm_file *file)
+{
+ return ENOTTY;
+}
+
+void
+i915_gem_context_init(struct drm_device *dev __unused)
+{
+}
+
+int
+i915_gem_create_ioctl(struct drm_device *dev, void *data,
+ struct drm_file *file)
+{
+ return ENOTTY;
+}
+
+void
+i915_gem_detach_phys_object(struct drm_device *dev __unused,
+ struct drm_i915_gem_object *obj __unused)
+{
+}
+
+int
+i915_gem_dumb_create(struct drm_file *file __unused,
+ struct drm_device *dev __unused,
+ struct drm_mode_create_dumb *args __unused)
+{
+ return ENOTTY;
+}
+
+int
+i915_gem_dumb_destroy(struct drm_file *file __unused,
+ struct drm_device *dev __unused,
+ uint32_t handle __unused)
+{
+ return ENOTTY;
+}
+
+int
+i915_gem_entervt_ioctl(struct drm_device *dev, void *data,
+ struct drm_file *file)
+{
+ return ENOTTY;
+}
+
+int
+i915_gem_execbuffer(struct drm_device *dev, void *data, struct drm_file *file)
+{
+ return ENOTTY;
+}
+
+int
+i915_gem_execbuffer2(struct drm_device *dev, void *data, struct drm_file *file)
+{
+ return ENOTTY;
+}
+
+void
+i915_gem_free_all_phys_object(struct drm_device *dev __unused)
+{
+}
+
+void
+i915_gem_free_object(struct drm_gem_object *obj)
+{
+}
+
+int
+i915_gem_get_aperture_ioctl(struct drm_device *dev, void *data,
+ struct drm_file *file)
+{
+ return ENOTTY;
+}
+
+int
+i915_gem_get_caching_ioctl(struct drm_device *dev, void *data,
+ struct drm_file *file)
+{
+ return ENOTTY;
+}
+
+int
+i915_gem_get_tiling(struct drm_device *dev, void *data,
+ struct drm_file *file)
+{
+ return ENOTTY;
+}
+
+int
+i915_gem_gtt_init(struct drm_device *dev __unused)
+{
+ return 0;
+}
+
+void
+i915_gem_gtt_fini(struct drm_device *dev __unused)
+{
+}
+
+int
+i915_gem_idle(struct drm_device *dev __unused)
+{
+ return 0;
+}
+
+int
+i915_gem_init_hw(struct drm_device *dev __unused)
+{
+ return 0;
+}
+
+int
+i915_gem_init_object(struct drm_gem_object *obj __unused)
+{
+ return ENOTTY;
+}
+
+void
+i915_gem_init_ppgtt(struct drm_device *dev __unused)
+{
+}
+
+int
+i915_gem_init_stolen(struct drm_device *dev __unused)
+{
+ return 0;
+}
+
+void
+i915_gem_init_swizzling(struct drm_device *dev __unused)
+{
+}
+
+int
+i915_gem_init(struct drm_device *dev __unused)
+{
+ return 0;
+}
+
+int
+i915_gem_init_ioctl(struct drm_device *dev, void *data, struct drm_file *file)
+{
+ return ENOTTY;
+}
+
+void
+i915_gem_lastclose(struct drm_device *dev __unused)
+{
+}
+
+int
+i915_gem_leavevt_ioctl(struct drm_device *dev, void *data,
+ struct drm_file *file)
+{
+ return ENOTTY;
+}
+
+void
+i915_gem_load(struct drm_device *dev __unused)
+{
+}
+
+int
+i915_gem_madvise_ioctl(struct drm_device *dev, void *data,
+ struct drm_file *file)
+{
+ return ENOTTY;
+}
+
+int
+i915_gem_mmap_gtt(struct drm_file *file __unused,
+ struct drm_device *dev __unused, uint32_t handle __unused,
+ uint64_t *offset __unused)
+{
+ return ENOTTY;
+}
+
+int
+i915_gem_mmap_ioctl(struct drm_device *dev, void *data, struct drm_file *file)
+{
+ return ENOTTY;
+}
+
+int
+i915_gem_mmap_gtt_ioctl(struct drm_device *dev, void *data,
+ struct drm_file *file)
+{
+ return ENOTTY;
+}
+
+int
+i915_gem_object_get_fence(struct drm_i915_gem_object *obj __unused)
+{
+ return ENOTTY;
+}
+
+int
+i915_gem_object_pin(struct drm_i915_gem_object *obj __unused,
+ uint32_t alignment __unused, bool map_and_fenceable __unused,
+ bool nonblocking __unused)
+{
+ return ENOTTY;
+}
+
+int
+i915_gem_object_pin_to_display_plane(struct drm_i915_gem_object *obj __unused,
+ u32 alignment __unused, struct intel_ring_buffer *pipelined __unused)
+{
+ return ENOTTY;
+}
+
+int
+i915_gem_object_put_fence(struct drm_i915_gem_object *obj __unused)
+{
+ return ENOTTY;
+}
+
+int
+i915_gem_object_set_to_gtt_domain(struct drm_i915_gem_object *obj __unused,
+ bool write __unused)
+{
+ return ENOTTY;
+}
+
+void
+i915_gem_object_unpin(struct drm_i915_gem_object *obj __unused)
+{
+}
+
+int
+i915_gem_pin_ioctl(struct drm_device *dev, void *data, struct drm_file *file)
+{
+ return ENOTTY;
+}
+
+int
+i915_gem_pread_ioctl(struct drm_device *dev, void *data, struct drm_file *file)
+{
+ return ENOTTY;
+}
+
+int
+i915_gem_pwrite_ioctl(struct drm_device *dev, void *data,
+ struct drm_file *file)
+{
+ return ENOTTY;
+}
+
+void
+i915_gem_release(struct drm_device *dev __unused,
+ struct drm_file *file __unused)
+{
+}
+
+void
+i915_gem_reset(struct drm_device *dev __unused)
+{
+}
+
+void
+i915_gem_restore_gtt_mappings(struct drm_device *dev __unused)
+{
+}
+
+void
+i915_gem_retire_requests(struct drm_device *dev __unused)
+{
+}
+
+int
+i915_gem_set_caching_ioctl(struct drm_device *dev, void *data,
+ struct drm_file *file)
+{
+ return ENOTTY;
+}
+
+int
+i915_gem_set_domain_ioctl(struct drm_device *dev, void *data,
+ struct drm_file *file)
+{
+ return ENOTTY;
+}
+
+int
+i915_gem_set_tiling(struct drm_device *dev, void *data,
+ struct drm_file *file)
+{
+ return ENOTTY;
+}
+
+int
+i915_gem_sw_finish_ioctl(struct drm_device *dev, void *data,
+ struct drm_file *file)
+{
+ return ENOTTY;
+}
+
+int
+i915_gem_throttle_ioctl(struct drm_device *dev, void *data,
+ struct drm_file *file)
+{
+ return ENOTTY;
+}
+
+int
+i915_gem_unpin_ioctl(struct drm_device *dev, void *data, struct drm_file *file)
+{
+ return ENOTTY;
+}
+
+int
+i915_gem_wait_ioctl(struct drm_device *dev, void *data, struct drm_file *file)
+{
+ return ENOTTY;
+}
+
+int
+i915_gpu_idle(struct drm_device *dev __unused)
+{
+ return 0;
+}
+
+int
+i915_mutex_lock_interruptible(struct drm_device *dev __unused)
+{
+ return ENOTTY;
+}
+
+void
+i915_update_gfx_val(struct drm_i915_private *dev_priv __unused)
+{
+}
+
+int
+i915_wait_seqno(struct intel_ring_buffer *ring __unused,
+ uint32_t seqno __unused)
+{
+ return ENOTTY;
+}
Index: src/sys/external/bsd/drm2/i915drm/i915_irq.c
diff -u /dev/null src/sys/external/bsd/drm2/i915drm/i915_irq.c:1.1.2.1
--- /dev/null Wed Jul 24 03:52:13 2013
+++ src/sys/external/bsd/drm2/i915drm/i915_irq.c Wed Jul 24 03:52:13 2013
@@ -0,0 +1,49 @@
+/* $NetBSD: i915_irq.c,v 1.1.2.1 2013/07/24 03:52:13 riastradh Exp $ */
+
+/*-
+ * Copyright (c) 2013 The NetBSD Foundation, Inc.
+ * All rights reserved.
+ *
+ * This code is derived from software contributed to The NetBSD Foundation
+ * by Taylor R. Campbell.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
+ * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
+ * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
+ * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ */
+
+/* i915_irq.c stubs */
+
+#include <sys/cdefs.h>
+__KERNEL_RCSID(0, "$NetBSD: i915_irq.c,v 1.1.2.1 2013/07/24 03:52:13 riastradh Exp $");
+
+#include "i915_drv.h"
+
+void
+i915_disable_pipestat(struct drm_i915_private *dev_priv __unused,
+ int pipe __unused, u32 mask __unused)
+{
+}
+
+void
+i915_enable_pipestat(struct drm_i915_private *dev_priv __unused,
+ int pipe __unused, u32 mask __unused)
+{
+}
Index: src/sys/external/bsd/drm2/i915drm/i915_sysfs.c
diff -u /dev/null src/sys/external/bsd/drm2/i915drm/i915_sysfs.c:1.1.2.1
--- /dev/null Wed Jul 24 03:52:13 2013
+++ src/sys/external/bsd/drm2/i915drm/i915_sysfs.c Wed Jul 24 03:52:13 2013
@@ -0,0 +1,42 @@
+/* $NetBSD: i915_sysfs.c,v 1.1.2.1 2013/07/24 03:52:13 riastradh Exp $ */
+
+/*-
+ * Copyright (c) 2013 The NetBSD Foundation, Inc.
+ * All rights reserved.
+ *
+ * This code is derived from software contributed to The NetBSD Foundation
+ * by Taylor R. Campbell.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
+ * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
+ * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
+ * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ */
+
+/* i915_sysfs.c stubs */
+
+#include <sys/cdefs.h>
+__KERNEL_RCSID(0, "$NetBSD: i915_sysfs.c,v 1.1.2.1 2013/07/24 03:52:13 riastradh Exp $");
+
+#include "i915_drv.h"
+
+void
+i915_teardown_sysfs(struct drm_device *dev __unused)
+{
+}
Index: src/sys/external/bsd/drm2/i915drm/intel_fb.c
diff -u /dev/null src/sys/external/bsd/drm2/i915drm/intel_fb.c:1.1.2.1
--- /dev/null Wed Jul 24 03:52:13 2013
+++ src/sys/external/bsd/drm2/i915drm/intel_fb.c Wed Jul 24 03:52:13 2013
@@ -0,0 +1,48 @@
+/* $NetBSD: intel_fb.c,v 1.1.2.1 2013/07/24 03:52:13 riastradh Exp $ */
+
+/*-
+ * Copyright (c) 2013 The NetBSD Foundation, Inc.
+ * All rights reserved.
+ *
+ * This code is derived from software contributed to The NetBSD Foundation
+ * by Taylor R. Campbell.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
+ * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
+ * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
+ * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ */
+
+/* intel_fb.c stubs */
+
+#include <sys/cdefs.h>
+__KERNEL_RCSID(0, "$NetBSD: intel_fb.c,v 1.1.2.1 2013/07/24 03:52:13 riastradh Exp $");
+
+#include "i915_drv.h"
+
+void
+intel_fb_output_poll_changed(struct drm_device *dev __unused)
+{
+}
+
+void
+intel_fb_restore_mode(struct drm_device *dev __unused)
+{
+}
+
Index: src/sys/external/bsd/drm2/i915drm/intel_pm.c
diff -u /dev/null src/sys/external/bsd/drm2/i915drm/intel_pm.c:1.1.2.1
--- /dev/null Wed Jul 24 03:52:13 2013
+++ src/sys/external/bsd/drm2/i915drm/intel_pm.c Wed Jul 24 03:52:13 2013
@@ -0,0 +1,115 @@
+/* $NetBSD: intel_pm.c,v 1.1.2.1 2013/07/24 03:52:13 riastradh Exp $ */
+
+/*-
+ * Copyright (c) 2013 The NetBSD Foundation, Inc.
+ * All rights reserved.
+ *
+ * This code is derived from software contributed to The NetBSD Foundation
+ * by Taylor R. Campbell.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
+ * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
+ * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
+ * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ */
+
+/* intel_pm.c stubs */
+
+#include <sys/cdefs.h>
+__KERNEL_RCSID(0, "$NetBSD: intel_pm.c,v 1.1.2.1 2013/07/24 03:52:13 riastradh Exp $");
+
+#include "i915_drv.h"
+
+int
+__gen6_gt_wait_for_fifo(struct drm_i915_private *dev_priv __unused)
+{
+ return 0;
+}
+
+void
+gen6_gt_check_fifodbg(struct drm_i915_private *dev_priv __unused)
+{
+}
+
+void
+intel_disable_fbc(struct drm_device *dev __unused)
+{
+}
+
+void
+intel_disable_gt_powersave(struct drm_device *dev __unused)
+{
+}
+
+void
+intel_enable_gt_powersave(struct drm_device *dev __unused)
+{
+}
+
+void
+intel_gpu_ips_init(struct drm_i915_private *dev_priv)
+{
+}
+
+void
+intel_gpu_ips_teardown(void)
+{
+}
+
+void
+intel_gt_reset(struct drm_device *dev __unused)
+{
+}
+
+void
+intel_init_clock_gating(struct drm_device *dev __unused)
+{
+}
+
+void
+intel_init_pm(struct drm_device *dev __unused)
+{
+}
+
+void
+intel_init_power_wells(struct drm_device *dev __unused)
+{
+}
+
+void
+intel_update_fbc(struct drm_device *dev __unused)
+{
+}
+
+void
+intel_update_linetime_watermarks(struct drm_device *dev __unused,
+ int pipe __unused, struct drm_display_mode *mode __unused)
+{
+}
+
+void
+intel_update_sprite_watermarks(struct drm_device *dev __unused,
+ int pipe __unused, uint32_t sprite_width __unused, int pixel_size __unused)
+{
+}
+
+void
+intel_update_watermarks(struct drm_device *dev __unused)
+{
+}
Index: src/sys/external/bsd/drm2/i915drm/intel_ringbuffer.c
diff -u /dev/null src/sys/external/bsd/drm2/i915drm/intel_ringbuffer.c:1.1.2.1
--- /dev/null Wed Jul 24 03:52:13 2013
+++ src/sys/external/bsd/drm2/i915drm/intel_ringbuffer.c Wed Jul 24 03:52:13 2013
@@ -0,0 +1,71 @@
+/* $NetBSD: intel_ringbuffer.c,v 1.1.2.1 2013/07/24 03:52:13 riastradh Exp $ */
+
+/*-
+ * Copyright (c) 2013 The NetBSD Foundation, Inc.
+ * All rights reserved.
+ *
+ * This code is derived from software contributed to The NetBSD Foundation
+ * by Taylor R. Campbell.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
+ * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
+ * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
+ * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ */
+
+/* intel_ringbuffer.c stubs */
+
+#include <sys/cdefs.h>
+__KERNEL_RCSID(0, "$NetBSD: intel_ringbuffer.c,v 1.1.2.1 2013/07/24 03:52:13 riastradh Exp $");
+
+#include "i915_drv.h"
+
+void
+intel_cleanup_ring_buffer(struct intel_ring_buffer *ring __unused)
+{
+}
+
+int
+intel_render_ring_init_dri(struct drm_device *dev __unused, u64 start __unused,
+ u32 size __unused)
+{
+ return 0;
+}
+
+void
+intel_ring_advance(struct intel_ring_buffer *ring __unused)
+{
+}
+
+int
+intel_ring_begin(struct intel_ring_buffer *ring __unused, int n __unused)
+{
+ return ENOTTY;
+}
+
+int
+intel_ring_idle(struct intel_ring_buffer *ring __unused)
+{
+ return 0;
+}
+
+void
+intel_ring_setup_status_page(struct intel_ring_buffer *ring __unused)
+{
+}
