Source-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[src/netbsd-7]: src Pull up following revision(s) (requested by chs in ticket...
details: https://anonhg.NetBSD.org/src/rev/b9154e6e5680
branches: netbsd-7
changeset: 798814:b9154e6e5680
user: snj <snj%NetBSD.org@localhost>
date: Sun Jan 11 05:59:16 2015 +0000
description:
Pull up following revision(s) (requested by chs in ticket #401):
distrib/sets/lists/modules/md.amd64: revisions 1.46, 1.47 via patch
distrib/sets/lists/modules/md.i386: revisions 1.49, 1.50
sys/dev/ic/pcdisplayvar.h: revision 1.20
sys/dev/ic/vgavar.h: revision 1.32
sys/external/bsd/drm/dist/bsd-core/drm_drv.c: revision 1.26
sys/external/bsd/drm2/dist/drm/drm_agpsupport.c: revisions 1.5, 1.6
sys/external/bsd/drm2/dist/drm/drm_pci.c: revisions 1.4, 1.5
sys/external/bsd/drm2/dist/drm/drm_stub.c: revisions 1.6-1.8
sys/external/bsd/drm2/dist/drm/i915/i915_drv.h: revision 1.11
sys/external/bsd/drm2/dist/drm/radeon/cik.c: revision 1.3
sys/external/bsd/drm2/dist/drm/radeon/ni.c: revision 1.3
sys/external/bsd/drm2/dist/drm/radeon/si.c: revision 1.3
sys/external/bsd/drm2/dist/include/drm/drmP.h: revisions 1.8, 1.9
sys/external/bsd/drm2/dist/include/drm/drm_agpsupport.h: revisions 1.3, 1.4
sys/external/bsd/drm2/drm/drm_drv.c: revision 1.11
sys/external/bsd/drm2/drm/drm_module.c: revision 1.9
sys/external/bsd/drm2/drm/drm_sysctl.c: revisions 1.1-1.4
sys/external/bsd/drm2/drm/drm_vm.c: revision 1.7
sys/external/bsd/drm2/drm/files.drmkms: revisions 1.8, 1.9
sys/external/bsd/drm2/i915drm/files.i915drmkms: revision 1.9
sys/external/bsd/drm2/i915drm/i915_module.c: revisions 1.4, 1.5
sys/external/bsd/drm2/include/drm/drm_sysctl.h: revisions 1.1, 1.2
sys/external/bsd/drm2/include/linux/hdmi.h: revisions 1.3-1.5
sys/external/bsd/drm2/include/linux/module.h: revision 1.5
sys/external/bsd/drm2/include/linux/moduleparam.h: revisions 1.3, 1.4
sys/external/bsd/drm2/include/linux/pci.h: revision 1.11
sys/external/bsd/drm2/linux/linux_module.c: revision 1.5
sys/external/bsd/drm2/nouveau/files.nouveau: revision 1.4
sys/external/bsd/drm2/nouveau/nouveau_module.c: revision 1.3
sys/external/bsd/drm2/pci/drm_pci.c: revision 1.8
sys/external/bsd/drm2/pci/drm_pci_module.c: revision 1.3
sys/external/bsd/drm2/radeon/radeon_module.c: revision 1.3
sys/external/bsd/drm2/ttm/files.ttm: revision 1.1
sys/modules/drm2pci/Makefile: file removal
sys/modules/drmkms/Makefile: revisions 1.4-1.7
sys/modules/drmkms_linux/Makefile: revision 1.5
sys/modules/drmkms_pci/Makefile: revisions 1.3, 1.4
sys/modules/i915drmkms/Makefile: revisions 1.5-1.7
Split drm ttm config into a separate file.
--
Fix module build of drmkms_linux.
--
Remove vestigial drm2pci module, replaced by drmkms_pci.
--
fix the module class.
--
add the drmkms modules
--
make a drm_agp_destroy() function to resolve the circular dependency between
drmkms and drmkms_pci
--
finalize the idr code.
--
add drm_agp_destroy
--
fix drmkms module path for xen.
--
fix build failure.
/tmp/bracket/build/2014.11.10.22.43.46-i386/src/sys/external/bsd/drm2/include/linux/pci.h:36:20: fatal error: acpica.h: No such file or directory
--
make this work: add agpsupport and sysctl code
--
move agpsupport to drmkms to avoid circular dependencies.
--
turn on dynamic ldscript creation to handle link set symbol definitions
used in the automatic sysctl creation.
--
Add __link_set based code to automatically convert the linux module parameters
into sysctls.
--
this module needs MKLDSCRIPT too now
--
more _KERNEL_OPT
--
prettify and add to all the modules that have it.
--
fix description setting.
--
Adjust flags to allow building with clang.
--
Fix build with clang.
--
Drop casts in favour of expressions that actually give the right
pointer.
--
Move all PCI/AGP code back to drmkms_pci module where it belongs.
--
Use correct length for hdmi_infoframe_header_pack in <linux/hdmi.h>.
Fixes PR kern/49411.
--
Back out previous, fix PR kern/49411 correctly.
frame->header.length is not initialized in the vendor packet case.
Instead, make hdmi_infoframe_header_pack take the packet length and
subtract the size of the header when packing the header.
(Could make it take the payload length instead, but for callers it is
more convenient to have a name for the whole packet length.)
--
Fix bounds checking in hdmi_infoframe_header_pack (PR kern/49411).
--
Trivial build fix for no options SYSCTL_INCLUDE_DESCR case, to
avoid -Werror.
OK christos@ and riastradh@
--
fix debugging compilation (ALL kernel)
--
nouveau_nv50_fence.c needs -Wno-shadow.
--
fix a confusion between dev_t and devmajor_t, and include the primary
minor when calling makedev().
diffstat:
distrib/sets/lists/modules/md.amd64 | 18 ++-
distrib/sets/lists/modules/md.i386 | 26 +++-
sys/dev/ic/pcdisplayvar.h | 4 +-
sys/dev/ic/vgavar.h | 4 +-
sys/external/bsd/drm/dist/bsd-core/drm_drv.c | 2 +-
sys/external/bsd/drm2/dist/drm/drm_stub.c | 9 +-
sys/external/bsd/drm2/dist/drm/i915/i915_drv.h | 10 +-
sys/external/bsd/drm2/dist/drm/radeon/cik.c | 6 +-
sys/external/bsd/drm2/dist/drm/radeon/ni.c | 10 +-
sys/external/bsd/drm2/dist/drm/radeon/si.c | 12 +-
sys/external/bsd/drm2/dist/include/drm/drmP.h | 5 +-
sys/external/bsd/drm2/drm/drm_drv.c | 40 +++-
sys/external/bsd/drm2/drm/drm_module.c | 10 +-
sys/external/bsd/drm2/drm/drm_sysctl.c | 163 ++++++++++++++++++++++
sys/external/bsd/drm2/drm/drm_vm.c | 7 +-
sys/external/bsd/drm2/drm/files.drmkms | 28 +---
sys/external/bsd/drm2/i915drm/files.i915drmkms | 7 +-
sys/external/bsd/drm2/i915drm/i915_module.c | 9 +-
sys/external/bsd/drm2/include/drm/drm_sysctl.h | 48 ++++++
sys/external/bsd/drm2/include/linux/hdmi.h | 13 +-
sys/external/bsd/drm2/include/linux/module.h | 14 +-
sys/external/bsd/drm2/include/linux/moduleparam.h | 25 +++-
sys/external/bsd/drm2/include/linux/pci.h | 4 +-
sys/external/bsd/drm2/linux/linux_module.c | 5 +-
sys/external/bsd/drm2/nouveau/files.nouveau | 3 +-
sys/external/bsd/drm2/nouveau/nouveau_module.c | 9 +-
sys/external/bsd/drm2/pci/drm_pci.c | 11 +-
sys/external/bsd/drm2/pci/drm_pci_module.c | 5 +-
sys/external/bsd/drm2/radeon/radeon_module.c | 10 +-
sys/external/bsd/drm2/ttm/files.ttm | 26 +++
sys/modules/Makefile | 25 +-
sys/modules/drm2pci/Makefile | 17 --
sys/modules/drmkms/Makefile | 6 +-
sys/modules/drmkms_linux/Makefile | 3 +-
sys/modules/i915drmkms/Makefile | 16 +-
35 files changed, 473 insertions(+), 137 deletions(-)
diffs (truncated from 1446 to 300 lines):
diff -r 0671f86703c7 -r b9154e6e5680 distrib/sets/lists/modules/md.amd64
--- a/distrib/sets/lists/modules/md.amd64 Sun Jan 11 04:32:38 2015 +0000
+++ b/distrib/sets/lists/modules/md.amd64 Sun Jan 11 05:59:16 2015 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: md.amd64,v 1.41.2.1 2014/08/15 12:53:54 martin Exp $
+# $NetBSD: md.amd64,v 1.41.2.2 2015/01/11 05:59:16 snj Exp $
#
# NOTE that there are two sets of files here:
# @MODULEDIR@ and amd64-xen
@@ -61,6 +61,12 @@
./@MODULEDIR@/cxdtv/cxdtv.kmod base-kernel-modules kmod
./@MODULEDIR@/drm base-kernel-modules kmod
./@MODULEDIR@/drm/drm.kmod base-kernel-modules kmod
+./@MODULEDIR@/drmkms base-kernel-modules kmod
+./@MODULEDIR@/drmkms/drmkms.kmod base-kernel-modules kmod
+./@MODULEDIR@/drmkms_linux base-kernel-modules kmod
+./@MODULEDIR@/drmkms_linux/drmkms_linux.kmod base-kernel-modules kmod
+./@MODULEDIR@/drmkms_pci base-kernel-modules kmod
+./@MODULEDIR@/drmkms_pci/drmkms_pci.kmod base-kernel-modules kmod
./@MODULEDIR@/emdtv base-kernel-modules kmod
./@MODULEDIR@/emdtv/emdtv.kmod base-kernel-modules kmod
./@MODULEDIR@/est base-kernel-modules kmod
@@ -87,6 +93,8 @@
./@MODULEDIR@/hpqlb/hpqlb.kmod base-kernel-modules kmod
./@MODULEDIR@/i915drm base-kernel-modules kmod
./@MODULEDIR@/i915drm/i915drm.kmod base-kernel-modules kmod
+./@MODULEDIR@/i915drmkms base-kernel-modules kmod
+./@MODULEDIR@/i915drmkms/i915drmkms.kmod base-kernel-modules kmod
./@MODULEDIR@/itesio base-kernel-modules kmod
./@MODULEDIR@/itesio/itesio.kmod base-kernel-modules kmod
./@MODULEDIR@/lg3303 base-kernel-modules kmod
@@ -252,6 +260,12 @@
./stand/amd64-xen/@OSRELEASE@/modules/dtrace/dtrace.kmod base-kernel-modules kmod,dtrace,compatmodules
./stand/amd64-xen/@OSRELEASE@/modules/drm base-kernel-modules kmod,compatmodules
./stand/amd64-xen/@OSRELEASE@/modules/drm/drm.kmod base-kernel-modules kmod,compatmodules
+./stand/amd64-xen/@OSRELEASE@/modules/drmkms base-kernel-modules kmod,compatmodules
+./stand/amd64-xen/@OSRELEASE@/modules/drmkms/drmkms.kmod base-kernel-modules kmod,compatmodules
+./stand/amd64-xen/@OSRELEASE@/modules/drmkms_linux base-kernel-modules kmod,compatmodules
+./stand/amd64-xen/@OSRELEASE@/modules/drmkms_linux/drmkms_linux.kmod base-kernel-modules kmod,compatmodules
+./stand/amd64-xen/@OSRELEASE@/modules/drmkms_pci base-kernel-modules kmod,compatmodules
+./stand/amd64-xen/@OSRELEASE@/modules/drmkms_pci/drmkms_pci.kmod base-kernel-modules kmod,compatmodules
./stand/amd64-xen/@OSRELEASE@/modules/dtv base-kernel-modules kmod,compatmodules
./stand/amd64-xen/@OSRELEASE@/modules/dtv/dtv.kmod base-kernel-modules kmod,compatmodules
./stand/amd64-xen/@OSRELEASE@/modules/dtv_math base-kernel-modules kmod,compatmodules
@@ -314,6 +328,8 @@
./stand/amd64-xen/@OSRELEASE@/modules/hythygtemp/hythygtemp.kmod base-kernel-modules kmod,compatmodules
./stand/amd64-xen/@OSRELEASE@/modules/i915drm base-kernel-modules kmod,compatmodules
./stand/amd64-xen/@OSRELEASE@/modules/i915drm/i915drm.kmod base-kernel-modules kmod,compatmodules
+./stand/amd64-xen/@OSRELEASE@/modules/i915drmkms base-kernel-modules kmod,compatmodules
+./stand/amd64-xen/@OSRELEASE@/modules/i915drmkms/i915drmkms.kmod base-kernel-modules kmod,compatmodules
./stand/amd64-xen/@OSRELEASE@/modules/if_axe base-kernel-modules kmod,compatmodules
./stand/amd64-xen/@OSRELEASE@/modules/if_axe/if_axe.kmod base-kernel-modules kmod,compatmodules
./stand/amd64-xen/@OSRELEASE@/modules/if_axen base-kernel-modules kmod,compatmodules
diff -r 0671f86703c7 -r b9154e6e5680 distrib/sets/lists/modules/md.i386
--- a/distrib/sets/lists/modules/md.i386 Sun Jan 11 04:32:38 2015 +0000
+++ b/distrib/sets/lists/modules/md.i386 Sun Jan 11 05:59:16 2015 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: md.i386,v 1.46 2014/08/11 05:19:16 jnemeth Exp $
+# $NetBSD: md.i386,v 1.46.2.1 2015/01/11 05:59:16 snj Exp $
#
# NOTE that there are three sets of files here:
# @MODULEDIR@, i386-xen, and i386pae-xen
@@ -65,6 +65,12 @@
./@MODULEDIR@/cxdtv/cxdtv.kmod base-kernel-modules kmod
./@MODULEDIR@/drm base-kernel-modules kmod
./@MODULEDIR@/drm/drm.kmod base-kernel-modules kmod
+./@MODULEDIR@/drmkms base-kernel-modules kmod
+./@MODULEDIR@/drmkms/drmkms.kmod base-kernel-modules kmod
+./@MODULEDIR@/drmkms_linux base-kernel-modules kmod
+./@MODULEDIR@/drmkms_linux/drmkms_linux.kmod base-kernel-modules kmod
+./@MODULEDIR@/drmkms_pci base-kernel-modules kmod
+./@MODULEDIR@/drmkms_pci/drmkms_pci.kmod base-kernel-modules kmod
./@MODULEDIR@/emdtv base-kernel-modules kmod
./@MODULEDIR@/emdtv/emdtv.kmod base-kernel-modules kmod
./@MODULEDIR@/est base-kernel-modules kmod
@@ -91,6 +97,8 @@
./@MODULEDIR@/hpqlb/hpqlb.kmod base-kernel-modules kmod
./@MODULEDIR@/i915drm base-kernel-modules kmod
./@MODULEDIR@/i915drm/i915drm.kmod base-kernel-modules kmod
+./@MODULEDIR@/i915drmkms base-kernel-modules kmod
+./@MODULEDIR@/i915drmkms/i915drmkms.kmod base-kernel-modules kmod
./@MODULEDIR@/itesio base-kernel-modules kmod
./@MODULEDIR@/itesio/itesio.kmod base-kernel-modules kmod
./@MODULEDIR@/lg3303 base-kernel-modules kmod
@@ -278,6 +286,12 @@
./stand/i386-xen/@OSRELEASE@/modules/dm/dm.kmod base-kernel-modules kmod,compatmodules
./stand/i386-xen/@OSRELEASE@/modules/drm base-kernel-modules kmod,compatmodules
./stand/i386-xen/@OSRELEASE@/modules/drm/drm.kmod base-kernel-modules kmod,compatmodules
+./stand/i386-xen/@OSRELEASE@/modules/drmkms base-kernel-modules kmod
+./stand/i386-xen/@OSRELEASE@/modules/drmkms/drmkms.kmod base-kernel-modules kmod
+./stand/i386-xen/@OSRELEASE@/modules/drmkms_linux base-kernel-modules kmod
+./stand/i386-xen/@OSRELEASE@/modules/drmkms_linux/drmkms_linux.kmod base-kernel-modules kmod
+./stand/i386-xen/@OSRELEASE@/modules/drmkms_pci base-kernel-modules kmod
+./stand/i386-xen/@OSRELEASE@/modules/drmkms_pci/drmkms_pci.kmod base-kernel-modules kmod
./stand/i386-xen/@OSRELEASE@/modules/dtv base-kernel-modules kmod,compatmodules
./stand/i386-xen/@OSRELEASE@/modules/dtv/dtv.kmod base-kernel-modules kmod,compatmodules
./stand/i386-xen/@OSRELEASE@/modules/dtv_math base-kernel-modules kmod,compatmodules
@@ -338,6 +352,8 @@
./stand/i386-xen/@OSRELEASE@/modules/hythygtemp/hythygtemp.kmod base-kernel-modules kmod,compatmodules
./stand/i386-xen/@OSRELEASE@/modules/i915drm base-kernel-modules kmod,compatmodules
./stand/i386-xen/@OSRELEASE@/modules/i915drm/i915drm.kmod base-kernel-modules kmod,compatmodules
+./stand/i386-xen/@OSRELEASE@/modules/i915drmkms base-kernel-modules kmod,compatmodules
+./stand/i386-xen/@OSRELEASE@/modules/i915drmkms/i915drmkms.kmod base-kernel-modules kmod,compatmodules
./stand/i386-xen/@OSRELEASE@/modules/if_axe base-kernel-modules kmod,compatmodules
./stand/i386-xen/@OSRELEASE@/modules/if_axe/if_axe.kmod base-kernel-modules kmod,compatmodules
./stand/i386-xen/@OSRELEASE@/modules/if_axen base-kernel-modules kmod,compatmodules
@@ -657,6 +673,12 @@
./stand/i386pae-xen/@OSRELEASE@/modules/dm/dm.kmod base-kernel-modules kmod,compatmodules
./stand/i386pae-xen/@OSRELEASE@/modules/drm base-kernel-modules kmod,compatmodules
./stand/i386pae-xen/@OSRELEASE@/modules/drm/drm.kmod base-kernel-modules kmod,compatmodules
+./stand/i386pae-xen/@OSRELEASE@/modules/drmkms base-kernel-modules kmod
+./stand/i386pae-xen/@OSRELEASE@/modules/drmkms/drmkms.kmod base-kernel-modules kmod
+./stand/i386pae-xen/@OSRELEASE@/modules/drmkms_linux base-kernel-modules kmod
+./stand/i386pae-xen/@OSRELEASE@/modules/drmkms_linux/drmkms_linux.kmod base-kernel-modules kmod
+./stand/i386pae-xen/@OSRELEASE@/modules/drmkms_pci base-kernel-modules kmod
+./stand/i386pae-xen/@OSRELEASE@/modules/drmkms_pci/drmkms_pci.kmod base-kernel-modules kmod
./stand/i386pae-xen/@OSRELEASE@/modules/dtv base-kernel-modules kmod,compatmodules
./stand/i386pae-xen/@OSRELEASE@/modules/dtv/dtv.kmod base-kernel-modules kmod,compatmodules
./stand/i386pae-xen/@OSRELEASE@/modules/dtv_math base-kernel-modules kmod,compatmodules
@@ -717,6 +739,8 @@
./stand/i386pae-xen/@OSRELEASE@/modules/hythygtemp/hythygtemp.kmod base-kernel-modules kmod,compatmodules
./stand/i386pae-xen/@OSRELEASE@/modules/i915drm base-kernel-modules kmod,compatmodules
./stand/i386pae-xen/@OSRELEASE@/modules/i915drm/i915drm.kmod base-kernel-modules kmod,compatmodules
+./stand/i386pae-xen/@OSRELEASE@/modules/i915drmkms base-kernel-modules kmod,compatmodules
+./stand/i386pae-xen/@OSRELEASE@/modules/i915drmkms/i915drmkms.kmod base-kernel-modules kmod,compatmodules
./stand/i386pae-xen/@OSRELEASE@/modules/if_axe base-kernel-modules kmod,compatmodules
./stand/i386pae-xen/@OSRELEASE@/modules/if_axe/if_axe.kmod base-kernel-modules kmod,compatmodules
./stand/i386pae-xen/@OSRELEASE@/modules/if_axen base-kernel-modules kmod,compatmodules
diff -r 0671f86703c7 -r b9154e6e5680 sys/dev/ic/pcdisplayvar.h
--- a/sys/dev/ic/pcdisplayvar.h Sun Jan 11 04:32:38 2015 +0000
+++ b/sys/dev/ic/pcdisplayvar.h Sun Jan 11 05:59:16 2015 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: pcdisplayvar.h,v 1.19 2009/03/15 15:52:12 cegger Exp $ */
+/* $NetBSD: pcdisplayvar.h,v 1.19.38.1 2015/01/11 05:59:16 snj Exp $ */
/*
* Copyright (c) 1998
@@ -26,7 +26,9 @@
*
*/
+#ifdef _KERNEL_OPT
#include "opt_pcdisplay.h"
+#endif
struct pcdisplayscreen {
struct pcdisplay_handle *hdl;
diff -r 0671f86703c7 -r b9154e6e5680 sys/dev/ic/vgavar.h
--- a/sys/dev/ic/vgavar.h Sun Jan 11 04:32:38 2015 +0000
+++ b/sys/dev/ic/vgavar.h Sun Jan 11 05:59:16 2015 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: vgavar.h,v 1.30 2013/01/21 19:49:15 mlelstv Exp $ */
+/* $NetBSD: vgavar.h,v 1.30.12.1 2015/01/11 05:59:16 snj Exp $ */
/*
* Copyright (c) 1995, 1996 Carnegie-Mellon University.
@@ -29,7 +29,9 @@
#include <sys/callout.h>
+#ifdef _KERNEL_OPT
#include "opt_vga.h"
+#endif
struct vga_handle {
struct pcdisplay_handle vh_ph;
diff -r 0671f86703c7 -r b9154e6e5680 sys/external/bsd/drm/dist/bsd-core/drm_drv.c
--- a/sys/external/bsd/drm/dist/bsd-core/drm_drv.c Sun Jan 11 04:32:38 2015 +0000
+++ b/sys/external/bsd/drm/dist/bsd-core/drm_drv.c Sun Jan 11 05:59:16 2015 +0000
@@ -1124,7 +1124,7 @@
#if defined(__NetBSD__)
/* Module support */
-MODULE(MODULE_CLASS_MISC, drm, "pci");
+MODULE(MODULE_CLASS_DRIVER, drm, "pci");
static int
drm_modcmd(modcmd_t cmd, void *arg)
diff -r 0671f86703c7 -r b9154e6e5680 sys/external/bsd/drm2/dist/drm/drm_stub.c
--- a/sys/external/bsd/drm2/dist/drm/drm_stub.c Sun Jan 11 04:32:38 2015 +0000
+++ b/sys/external/bsd/drm2/dist/drm/drm_stub.c Sun Jan 11 05:59:16 2015 +0000
@@ -341,7 +341,9 @@
{
struct drm_minor *new_minor;
unsigned long flags;
+#ifndef __NetBSD__
int ret;
+#endif
int minor_id;
DRM_DEBUG("\n");
@@ -365,6 +367,7 @@
new_minor->index = minor_id;
+#ifndef __NetBSD__
ret = drm_debugfs_init(new_minor, minor_id, drm_debugfs_root);
if (ret) {
DRM_ERROR("DRM: Failed to initialize /sys/kernel/debug/dri.\n");
@@ -376,7 +379,7 @@
DRM_ERROR("DRM: Error sysfs_device_add.\n");
goto err_debugfs;
}
-
+#endif
/* replace NULL with @minor so lookups will succeed from now on */
spin_lock_irqsave(&drm_minor_lock, flags);
idr_replace(&drm_minors_idr, new_minor, new_minor->index);
@@ -385,6 +388,7 @@
DRM_DEBUG("new minor assigned %d\n", minor_id);
return 0;
+#ifndef __NetBSD__
err_debugfs:
drm_debugfs_cleanup(new_minor);
err_id:
@@ -393,6 +397,7 @@
spin_unlock_irqrestore(&drm_minor_lock, flags);
new_minor->index = 0;
return ret;
+#endif
}
static void drm_minor_unregister(struct drm_device *dev, unsigned int type)
@@ -848,8 +853,10 @@
if (dev->driver->unload)
dev->driver->unload(dev);
+#ifndef __NetBSD__ /* Moved to drm_pci. */
if (dev->agp)
drm_pci_agp_destroy(dev);
+#endif
drm_vblank_cleanup(dev);
diff -r 0671f86703c7 -r b9154e6e5680 sys/external/bsd/drm2/dist/drm/i915/i915_drv.h
--- a/sys/external/bsd/drm2/dist/drm/i915/i915_drv.h Sun Jan 11 04:32:38 2015 +0000
+++ b/sys/external/bsd/drm2/dist/drm/i915/i915_drv.h Sun Jan 11 05:59:16 2015 +0000
@@ -30,12 +30,16 @@
#ifndef _I915_DRV_H_
#define _I915_DRV_H_
-#if defined(__NetBSD__) && (defined(i386) || defined(amd64))
+#if defined(__NetBSD__)
+#ifdef _KERNEL_OPT
+#if defined(i386) || defined(amd64)
#include "acpica.h"
+#endif /* i386 || amd64 */
+#endif /* _KERNEL_OPT */
#if (NACPICA > 0)
#define CONFIG_ACPI
-#endif
-#endif
+#endif /* NACPICA > 0 */
+#endif /* __NetBSD__ */
#include <uapi/drm/i915_drm.h>
diff -r 0671f86703c7 -r b9154e6e5680 sys/external/bsd/drm2/dist/drm/radeon/cik.c
--- a/sys/external/bsd/drm2/dist/drm/radeon/cik.c Sun Jan 11 04:32:38 2015 +0000
+++ b/sys/external/bsd/drm2/dist/drm/radeon/cik.c Sun Jan 11 05:59:16 2015 +0000
@@ -1771,7 +1771,7 @@
{
const __be32 *fw_data;
u32 running, blackout = 0;
- u32 *io_mc_regs;
+ const u32 *io_mc_regs;
int i, regs_size, ucode_size;
if (!rdev->mc_fw)
@@ -1781,11 +1781,11 @@
switch (rdev->family) {
case CHIP_BONAIRE:
- io_mc_regs = (u32 *)&bonaire_io_mc_regs;
+ io_mc_regs = &bonaire_io_mc_regs[0][0];
regs_size = BONAIRE_IO_MC_REGS_SIZE;
break;
case CHIP_HAWAII:
- io_mc_regs = (u32 *)&hawaii_io_mc_regs;
+ io_mc_regs = &hawaii_io_mc_regs[0][0];
regs_size = HAWAII_IO_MC_REGS_SIZE;
break;
default:
diff -r 0671f86703c7 -r b9154e6e5680 sys/external/bsd/drm2/dist/drm/radeon/ni.c
--- a/sys/external/bsd/drm2/dist/drm/radeon/ni.c Sun Jan 11 04:32:38 2015 +0000
+++ b/sys/external/bsd/drm2/dist/drm/radeon/ni.c Sun Jan 11 05:59:16 2015 +0000
@@ -609,7 +609,7 @@
{
const __be32 *fw_data;
u32 mem_type, running, blackout = 0;
- u32 *io_mc_regs;
+ const u32 *io_mc_regs;
int i, ucode_size, regs_size;
if (!rdev->mc_fw)
@@ -617,23 +617,23 @@
switch (rdev->family) {
case CHIP_BARTS:
Home |
Main Index |
Thread Index |
Old Index