CVS commit: src/sys/external/bsd/drm2/dist/drm/i915
Module Name:src Committed By: riastradh Date: Wed Feb 25 13:30:02 UTC 2015 Modified Files: src/sys/external/bsd/drm2/dist/drm/i915: intel_ringbuffer.c Log Message: Back-port attempt [1/2] to fix i915drmkms on G4X, from Linux. commit ece4a17d237a79f63fbfaf3f724a12b6d500555c Author: Jiri Kosina jkos...@suse.cz Date: Thu Aug 7 16:29:53 2014 +0200 drm/i915: read HEAD register back in init_ring_common() to enforce ordering Withtout this, ring initialization fails reliabily during resume with [drm:init_ring_common] *ERROR* render ring initialization failed ctl 000 1f001 head ff8804 tail start 000e4000 This is not a complete fix, but it is verified to make the ring initialization failures during resume much less likely. We were not able to root-cause this bug (likely HW-specific to Gen4 chips) yet. This is therefore used as a ducttape before problem is fully understood and proper fix created, so that people don't suffer from completely unusable systems in the meantime. The discussion and debugging is happening at https://bugs.freedesktop.org/show_bug.cgi?id=76554 To generate a diff of this commit: cvs rdiff -u -r1.4 -r1.5 \ src/sys/external/bsd/drm2/dist/drm/i915/intel_ringbuffer.c 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_ringbuffer.c diff -u src/sys/external/bsd/drm2/dist/drm/i915/intel_ringbuffer.c:1.4 src/sys/external/bsd/drm2/dist/drm/i915/intel_ringbuffer.c:1.5 --- src/sys/external/bsd/drm2/dist/drm/i915/intel_ringbuffer.c:1.4 Wed Jul 16 20:56:25 2014 +++ src/sys/external/bsd/drm2/dist/drm/i915/intel_ringbuffer.c Wed Feb 25 13:30:02 2015 @@ -499,6 +499,9 @@ static int init_ring_common(struct intel else ring_setup_phys_status_page(ring); + /* Enforce ordering by reading HEAD register back */ + I915_READ_HEAD(ring); + /* Initialize the ring. This must happen _after_ we've cleared the ring * registers with the above sequence (the readback of the HEAD registers * also enforces ordering), otherwise the hw might lose the new ring
CVS commit: src/sys/external/bsd/drm2/dist/drm/i915
Module Name:src Committed By: riastradh Date: Wed Feb 25 13:35:25 UTC 2015 Modified Files: src/sys/external/bsd/drm2/dist/drm/i915: intel_ringbuffer.c Log Message: Back-port attempt [2/2] to fix i915drmkms on G4X, from Linux. commit 95468892fdfeef6d1004b524e35957629efdbe00 Author: Chris Wilson ch...@chris-wilson.co.uk Date: Thu Aug 7 15:39:54 2014 +0100 drm/i915: Reset the HEAD pointer for the ring after writing START Ville found an old w/a documented for g4x that suggested that we need to reset the HEAD after writing START. This is a useful fixup for some of the g4x ring initialisation woes, but as usual, not all. v2: Do the rewrite unconditionally anyway To generate a diff of this commit: cvs rdiff -u -r1.5 -r1.6 \ src/sys/external/bsd/drm2/dist/drm/i915/intel_ringbuffer.c 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_ringbuffer.c diff -u src/sys/external/bsd/drm2/dist/drm/i915/intel_ringbuffer.c:1.5 src/sys/external/bsd/drm2/dist/drm/i915/intel_ringbuffer.c:1.6 --- src/sys/external/bsd/drm2/dist/drm/i915/intel_ringbuffer.c:1.5 Wed Feb 25 13:30:02 2015 +++ src/sys/external/bsd/drm2/dist/drm/i915/intel_ringbuffer.c Wed Feb 25 13:35:25 2015 @@ -507,6 +507,14 @@ static int init_ring_common(struct intel * also enforces ordering), otherwise the hw might lose the new ring * register values. */ I915_WRITE_START(ring, i915_gem_obj_ggtt_offset(obj)); + + /* WaClearRingBufHeadRegAtInit:ctg,elk */ + if (I915_READ_HEAD(ring)) + DRM_DEBUG(%s initialization failed [head=%08x], fudging\n, + ring-name, I915_READ_HEAD(ring)); + I915_WRITE_HEAD(ring, 0); + (void)I915_READ_HEAD(ring); + I915_WRITE_CTL(ring, ((ring-size - PAGE_SIZE) RING_NR_PAGES) | RING_VALID);
CVS commit: src/sys/external/bsd/drm2/include/linux
Module Name:src Committed By: riastradh Date: Wed Feb 25 14:02:43 UTC 2015 Modified Files: src/sys/external/bsd/drm2/include/linux: io-mapping.h Log Message: linux/io-mapping.h needs sys/mman.h for PROT_READ/WRITE. From chs@. To generate a diff of this commit: cvs rdiff -u -r1.4 -r1.5 src/sys/external/bsd/drm2/include/linux/io-mapping.h 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/include/linux/io-mapping.h diff -u src/sys/external/bsd/drm2/include/linux/io-mapping.h:1.4 src/sys/external/bsd/drm2/include/linux/io-mapping.h:1.5 --- src/sys/external/bsd/drm2/include/linux/io-mapping.h:1.4 Sat Oct 18 11:39:54 2014 +++ src/sys/external/bsd/drm2/include/linux/io-mapping.h Wed Feb 25 14:02:43 2015 @@ -1,4 +1,4 @@ -/* $NetBSD: io-mapping.h,v 1.4 2014/10/18 11:39:54 njoly Exp $ */ +/* $NetBSD: io-mapping.h,v 1.5 2015/02/25 14:02:43 riastradh Exp $ */ /*- * Copyright (c) 2013 The NetBSD Foundation, Inc. @@ -36,6 +36,7 @@ #include sys/bus.h #include sys/kmem.h #include sys/systm.h +#include sys/mman.h #include uvm/uvm_extern.h
CVS commit: src/sys/arch/arm
Module Name:src
Committed By: joerg
Date: Wed Feb 25 13:52:42 UTC 2015
Modified Files:
src/sys/arch/arm/allwinner: awin_space.c
src/sys/arch/arm/amlogic: amlogic_space.c
src/sys/arch/arm/arm: cpufunc.c
src/sys/arch/arm/arm32: bus_dma.c db_machdep.c pmap.c
src/sys/arch/arm/broadcom: bcm2835_space.c bcm53xx_pax.c bcmgen_space.c
src/sys/arch/arm/include: lock.h locore.h mutex.h rwlock.h
src/sys/arch/arm/include/arm32: pmap.h
src/sys/arch/arm/rockchip: rockchip_space.c
src/sys/arch/arm/samsung: exynos_space.c
src/sys/arch/arm/zynq: zynq_space.c
Log Message:
Improve inline asm around dsb/dmb/isb:
- always use volatile and mark them as memory barrier
- use the common version from locore.h in all places not included from
userland
To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 src/sys/arch/arm/allwinner/awin_space.c
cvs rdiff -u -r1.1 -r1.2 src/sys/arch/arm/amlogic/amlogic_space.c
cvs rdiff -u -r1.150 -r1.151 src/sys/arch/arm/arm/cpufunc.c
cvs rdiff -u -r1.90 -r1.91 src/sys/arch/arm/arm32/bus_dma.c
cvs rdiff -u -r1.22 -r1.23 src/sys/arch/arm/arm32/db_machdep.c
cvs rdiff -u -r1.316 -r1.317 src/sys/arch/arm/arm32/pmap.c
cvs rdiff -u -r1.6 -r1.7 src/sys/arch/arm/broadcom/bcm2835_space.c
cvs rdiff -u -r1.13 -r1.14 src/sys/arch/arm/broadcom/bcm53xx_pax.c
cvs rdiff -u -r1.4 -r1.5 src/sys/arch/arm/broadcom/bcmgen_space.c
cvs rdiff -u -r1.31 -r1.32 src/sys/arch/arm/include/lock.h
cvs rdiff -u -r1.18 -r1.19 src/sys/arch/arm/include/locore.h
cvs rdiff -u -r1.19 -r1.20 src/sys/arch/arm/include/mutex.h
cvs rdiff -u -r1.8 -r1.9 src/sys/arch/arm/include/rwlock.h
cvs rdiff -u -r1.137 -r1.138 src/sys/arch/arm/include/arm32/pmap.h
cvs rdiff -u -r1.1 -r1.2 src/sys/arch/arm/rockchip/rockchip_space.c
cvs rdiff -u -r1.1 -r1.2 src/sys/arch/arm/samsung/exynos_space.c
cvs rdiff -u -r1.1 -r1.2 src/sys/arch/arm/zynq/zynq_space.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/arm/allwinner/awin_space.c
diff -u src/sys/arch/arm/allwinner/awin_space.c:1.3 src/sys/arch/arm/allwinner/awin_space.c:1.4
--- src/sys/arch/arm/allwinner/awin_space.c:1.3 Thu Feb 20 21:45:49 2014
+++ src/sys/arch/arm/allwinner/awin_space.c Wed Feb 25 13:52:42 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: awin_space.c,v 1.3 2014/02/20 21:45:49 matt Exp $ */
+/* $NetBSD: awin_space.c,v 1.4 2015/02/25 13:52:42 joerg Exp $ */
/*-
* Copyright (c) 2012 The NetBSD Foundation, Inc.
@@ -31,7 +31,7 @@
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: awin_space.c,v 1.3 2014/02/20 21:45:49 matt Exp $);
+__KERNEL_RCSID(0, $NetBSD: awin_space.c,v 1.4 2015/02/25 13:52:42 joerg Exp $);
#include sys/param.h
#include sys/systm.h
@@ -366,17 +366,8 @@ awin_bs_barrier(void *t, bus_space_handl
{
flags = BUS_SPACE_BARRIER_READ|BUS_SPACE_BARRIER_WRITE;
- if (flags) {
- /* Issue an ARM11 Data Syncronisation Barrier (DSB) */
-#ifdef _ARM_ARCH_7
- __asm __volatile(dsb);
-#else
- __asm__ __volatile__ (mcr p15, 0, %0, c7, c10, 4 : : r (0)
- : memory);
-#endif
- return;
- }
-
+ if (flags)
+ arm_dsb();
}
void *
Index: src/sys/arch/arm/amlogic/amlogic_space.c
diff -u src/sys/arch/arm/amlogic/amlogic_space.c:1.1 src/sys/arch/arm/amlogic/amlogic_space.c:1.2
--- src/sys/arch/arm/amlogic/amlogic_space.c:1.1 Sat Feb 7 17:20:17 2015
+++ src/sys/arch/arm/amlogic/amlogic_space.c Wed Feb 25 13:52:42 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: amlogic_space.c,v 1.1 2015/02/07 17:20:17 jmcneill Exp $ */
+/* $NetBSD: amlogic_space.c,v 1.2 2015/02/25 13:52:42 joerg Exp $ */
/*-
* Copyright (c) 2012 The NetBSD Foundation, Inc.
@@ -31,7 +31,7 @@
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: amlogic_space.c,v 1.1 2015/02/07 17:20:17 jmcneill Exp $);
+__KERNEL_RCSID(0, $NetBSD: amlogic_space.c,v 1.2 2015/02/25 13:52:42 joerg Exp $);
#include sys/param.h
#include sys/systm.h
@@ -366,17 +366,8 @@ amlogic_bs_barrier(void *t, bus_space_ha
{
flags = BUS_SPACE_BARRIER_READ|BUS_SPACE_BARRIER_WRITE;
- if (flags) {
- /* Issue an ARM11 Data Syncronisation Barrier (DSB) */
-#ifdef _ARM_ARCH_7
- __asm __volatile(dsb);
-#else
- __asm__ __volatile__ (mcr p15, 0, %0, c7, c10, 4 : : r (0)
- : memory);
-#endif
- return;
- }
-
+ if (flags)
+ arm_dsb();
}
void *
Index: src/sys/arch/arm/arm/cpufunc.c
diff -u src/sys/arch/arm/arm/cpufunc.c:1.150 src/sys/arch/arm/arm/cpufunc.c:1.151
--- src/sys/arch/arm/arm/cpufunc.c:1.150 Thu Jul 31 07:14:42 2014
+++ src/sys/arch/arm/arm/cpufunc.c Wed Feb 25 13:52:42 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: cpufunc.c,v 1.150 2014/07/31 07:14:42 skrll Exp $ */
+/* $NetBSD: cpufunc.c,v 1.151 2015/02/25 13:52:42 joerg Exp $ */
/*
* arm7tdmi support code Copyright (c) 2001 John Fremlin
@@ -49,7 +49,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: cpufunc.c,v 1.150 2014/07/31 07:14:42 skrll Exp $);
+__KERNEL_RCSID(0, $NetBSD:
CVS commit: src/sys
Module Name:src
Committed By: roy
Date: Wed Feb 25 12:45:34 UTC 2015
Modified Files:
src/sys/net: route.c route.h
src/sys/netinet6: nd6.c nd6.h nd6_nbr.c nd6_rtr.c
Log Message:
Rename nd6_rtmsg() to rt_newmsg() and move into the generic routing code
as it's not IPv6 specific and will be used elsewhere.
To generate a diff of this commit:
cvs rdiff -u -r1.134 -r1.135 src/sys/net/route.c
cvs rdiff -u -r1.85 -r1.86 src/sys/net/route.h
cvs rdiff -u -r1.159 -r1.160 src/sys/netinet6/nd6.c
cvs rdiff -u -r1.63 -r1.64 src/sys/netinet6/nd6.h
cvs rdiff -u -r1.105 -r1.106 src/sys/netinet6/nd6_nbr.c
cvs rdiff -u -r1.97 -r1.98 src/sys/netinet6/nd6_rtr.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/net/route.c
diff -u src/sys/net/route.c:1.134 src/sys/net/route.c:1.135
--- src/sys/net/route.c:1.134 Tue Dec 2 19:57:11 2014
+++ src/sys/net/route.c Wed Feb 25 12:45:34 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: route.c,v 1.134 2014/12/02 19:57:11 christos Exp $ */
+/* $NetBSD: route.c,v 1.135 2015/02/25 12:45:34 roy Exp $ */
/*-
* Copyright (c) 1998, 2008 The NetBSD Foundation, Inc.
@@ -93,7 +93,7 @@
#include opt_route.h
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: route.c,v 1.134 2014/12/02 19:57:11 christos Exp $);
+__KERNEL_RCSID(0, $NetBSD: route.c,v 1.135 2015/02/25 12:45:34 roy Exp $);
#include sys/param.h
#include sys/kmem.h
@@ -891,6 +891,26 @@ rt_maskedcopy(const struct sockaddr *src
}
/*
+ * Inform the routing socket of a route change.
+ */
+void
+rt_newmsg(int cmd, struct rtentry *rt)
+{
+ struct rt_addrinfo info;
+
+ memset((void *)info, 0, sizeof(info));
+ info.rti_info[RTAX_DST] = rt_getkey(rt);
+ info.rti_info[RTAX_GATEWAY] = rt-rt_gateway;
+ info.rti_info[RTAX_NETMASK] = rt_mask(rt);
+ if (rt-rt_ifp) {
+ info.rti_info[RTAX_IFP] = rt-rt_ifp-if_dl-ifa_addr;
+ info.rti_info[RTAX_IFA] = rt-rt_ifa-ifa_addr;
+ }
+
+ rt_missmsg(cmd, info, rt-rt_flags, 0);
+}
+
+/*
* Set up or tear down a routing table entry, normally
* for an interface.
*/
Index: src/sys/net/route.h
diff -u src/sys/net/route.h:1.85 src/sys/net/route.h:1.86
--- src/sys/net/route.h:1.85 Tue Feb 24 20:06:09 2015
+++ src/sys/net/route.h Wed Feb 25 12:45:34 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: route.h,v 1.85 2015/02/24 20:06:09 roy Exp $ */
+/* $NetBSD: route.h,v 1.86 2015/02/25 12:45:34 roy Exp $ */
/*
* Copyright (c) 1980, 1986, 1993
@@ -386,6 +386,7 @@ struct rtentry *
rtalloc1(const struct sockaddr *, int);
void rtfree(struct rtentry *);
int rt_getifa(struct rt_addrinfo *);
+void rt_newmsg(int, struct rtentry *);
int rtinit(struct ifaddr *, int, int);
void rtredirect(const struct sockaddr *, const struct sockaddr *,
const struct sockaddr *, int, const struct sockaddr *,
Index: src/sys/netinet6/nd6.c
diff -u src/sys/netinet6/nd6.c:1.159 src/sys/netinet6/nd6.c:1.160
--- src/sys/netinet6/nd6.c:1.159 Wed Feb 25 00:26:58 2015
+++ src/sys/netinet6/nd6.c Wed Feb 25 12:45:34 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: nd6.c,v 1.159 2015/02/25 00:26:58 roy Exp $ */
+/* $NetBSD: nd6.c,v 1.160 2015/02/25 12:45:34 roy Exp $ */
/* $KAME: nd6.c,v 1.279 2002/06/08 11:16:51 itojun Exp $ */
/*
@@ -31,7 +31,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: nd6.c,v 1.159 2015/02/25 00:26:58 roy Exp $);
+__KERNEL_RCSID(0, $NetBSD: nd6.c,v 1.160 2015/02/25 12:45:34 roy Exp $);
#include bridge.h
#include carp.h
@@ -1150,7 +1150,7 @@ nd6_free(struct rtentry *rt, int gc)
oldrt = NULL;
rtrequest(RTM_DELETE, rt_getkey(rt), NULL, rt_mask(rt), 0, oldrt);
if (oldrt) {
- nd6_rtmsg(RTM_DELETE, oldrt); /* tell user process */
+ rt_newmsg(RTM_DELETE, oldrt); /* tell user process */
if (oldrt-rt_refcnt = 0) {
oldrt-rt_refcnt++;
rtfree(oldrt);
@@ -2086,7 +2086,7 @@ fail:
}
if (do_update)
- nd6_rtmsg(RTM_CHANGE, rt); /* tell user process */
+ rt_newmsg(RTM_CHANGE, rt); /* tell user process */
/*
* When the link-layer address of a router changes, select the
Index: src/sys/netinet6/nd6.h
diff -u src/sys/netinet6/nd6.h:1.63 src/sys/netinet6/nd6.h:1.64
--- src/sys/netinet6/nd6.h:1.63 Wed Feb 25 00:26:58 2015
+++ src/sys/netinet6/nd6.h Wed Feb 25 12:45:34 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: nd6.h,v 1.63 2015/02/25 00:26:58 roy Exp $ */
+/* $NetBSD: nd6.h,v 1.64 2015/02/25 12:45:34 roy Exp $ */
/* $KAME: nd6.h,v 1.95 2002/06/08 11:31:06 itojun Exp $ */
/*
@@ -413,7 +413,6 @@ void nd6_option_init(void *, int, union
struct nd_opt_hdr *nd6_option(union nd_opts *);
int nd6_options(union nd_opts *);
struct rtentry *nd6_lookup(const struct in6_addr *, int, struct ifnet *);
-void nd6_rtmsg(int, struct rtentry *);
void nd6_setmtu(struct ifnet *);
void nd6_llinfo_settimer(struct llinfo_nd6 *, long);
void nd6_timer(void *);
Index: src/sys/netinet6/nd6_nbr.c
diff -u src/sys/netinet6/nd6_nbr.c:1.105 src/sys/netinet6/nd6_nbr.c:1.106
--- src/sys/netinet6/nd6_nbr.c:1.105 Wed
CVS commit: src/sys/external/bsd/drm2/dist/drm/i915
Module Name:src
Committed By: riastradh
Date: Wed Feb 25 13:06:13 UTC 2015
Modified Files:
src/sys/external/bsd/drm2/dist/drm/i915: i915_dma.c intel_pm.c
Log Message:
Initialize mchdev_lock earlier. Fixes i915drmkms boot on Ironlake.
Derived from a patch sent to me by degroote@ longer ago than I care
to admit.
To generate a diff of this commit:
cvs rdiff -u -r1.12 -r1.13 src/sys/external/bsd/drm2/dist/drm/i915/i915_dma.c
cvs rdiff -u -r1.5 -r1.6 src/sys/external/bsd/drm2/dist/drm/i915/intel_pm.c
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/i915_dma.c
diff -u src/sys/external/bsd/drm2/dist/drm/i915/i915_dma.c:1.12 src/sys/external/bsd/drm2/dist/drm/i915/i915_dma.c:1.13
--- src/sys/external/bsd/drm2/dist/drm/i915/i915_dma.c:1.12 Wed Nov 5 23:46:09 2014
+++ src/sys/external/bsd/drm2/dist/drm/i915/i915_dma.c Wed Feb 25 13:06:13 2015
@@ -1650,6 +1650,10 @@ int i915_driver_load(struct drm_device *
mutex_init(dev_priv-modeset_restore_lock);
#endif
+#ifdef __NetBSD__
+ spin_lock_init(mchdev_lock);
+#endif
+
intel_pm_setup(dev);
intel_display_crc_init(dev);
@@ -1865,6 +1869,7 @@ free_priv:
if (dev_priv-slab)
kmem_cache_destroy(dev_priv-slab);
#ifdef __NetBSD__
+ spin_lock_destroy(mchdev_lock);
linux_mutex_destroy(dev_priv-modeset_restore_lock);
linux_mutex_destroy(dev_priv-dpio_lock);
spin_lock_destroy(dev_priv-mm.object_stat_lock);
@@ -1985,6 +1990,7 @@ int i915_driver_unload(struct drm_device
DRM_DESTROY_WAITQUEUE(dev_priv-pending_flip_queue);
spin_lock_destroy(dev_priv-pending_flip_lock);
DRM_DESTROY_WAITQUEUE(dev_priv-gpu_error.reset_queue);
+ spin_lock_destroy(mchdev_lock);
linux_mutex_destroy(dev_priv-modeset_restore_lock);
linux_mutex_destroy(dev_priv-dpio_lock);
spin_lock_destroy(dev_priv-mm.object_stat_lock);
Index: src/sys/external/bsd/drm2/dist/drm/i915/intel_pm.c
diff -u src/sys/external/bsd/drm2/dist/drm/i915/intel_pm.c:1.5 src/sys/external/bsd/drm2/dist/drm/i915/intel_pm.c:1.6
--- src/sys/external/bsd/drm2/dist/drm/i915/intel_pm.c:1.5 Sun Sep 7 23:03:11 2014
+++ src/sys/external/bsd/drm2/dist/drm/i915/intel_pm.c Wed Feb 25 13:06:13 2015
@@ -4426,14 +4426,6 @@ ips_ping_for_i915_load(void)
void intel_gpu_ips_init(struct drm_i915_private *dev_priv)
{
-#ifdef __NetBSD__ /* XXX */
- /*
- * This seems as good a place as any to initialize mchdev_lock.
- * Taking the lock in the rest of this routine is silly, but...
- */
- spin_lock_init(mchdev_lock);
-#endif
-
/* We only register the i915 ips part with intel-ips once everything is
* set up, to avoid intel-ips sneaking in and reading bogus values. */
spin_lock_irq(mchdev_lock);
@@ -4445,18 +4437,9 @@ void intel_gpu_ips_init(struct drm_i915_
void intel_gpu_ips_teardown(void)
{
-#ifdef __NetBSD__
- if (i915_mch_dev == NULL)
- return;
-#endif
-
spin_lock_irq(mchdev_lock);
i915_mch_dev = NULL;
spin_unlock_irq(mchdev_lock);
-
-#ifdef __NetBSD__
- spin_lock_destroy(mchdev_lock);
-#endif
}
static void intel_init_emon(struct drm_device *dev)
CVS commit: src/sys/rump/librump/rumpkern
Module Name:src
Committed By: christos
Date: Wed Feb 25 13:20:05 UTC 2015
Modified Files:
src/sys/rump/librump/rumpkern: rump_syscalls.c
Log Message:
belated regen (posix_fallocate, readlinkat)
To generate a diff of this commit:
cvs rdiff -u -r1.104 -r1.105 src/sys/rump/librump/rumpkern/rump_syscalls.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/rump/librump/rumpkern/rump_syscalls.c
diff -u src/sys/rump/librump/rumpkern/rump_syscalls.c:1.104 src/sys/rump/librump/rumpkern/rump_syscalls.c:1.105
--- src/sys/rump/librump/rumpkern/rump_syscalls.c:1.104 Fri Jul 25 04:27:36 2014
+++ src/sys/rump/librump/rumpkern/rump_syscalls.c Wed Feb 25 08:20:05 2015
@@ -1,10 +1,10 @@
-/* $NetBSD: rump_syscalls.c,v 1.104 2014/07/25 08:27:36 dholland Exp $ */
+/* $NetBSD: rump_syscalls.c,v 1.105 2015/02/25 13:20:05 christos Exp $ */
/*
* System call vector and marshalling for rump.
*
* DO NOT EDIT-- this file is automatically generated.
- * created from NetBSD: syscalls.master,v 1.270 2014/07/25 08:25:47 dholland Exp
+ * created from NetBSD: syscalls.master,v 1.272 2015/02/22 00:50:30 christos Exp
*/
#ifdef RUMP_CLIENT
@@ -15,7 +15,7 @@
#ifdef __NetBSD__
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: rump_syscalls.c,v 1.104 2014/07/25 08:27:36 dholland Exp $);
+__KERNEL_RCSID(0, $NetBSD: rump_syscalls.c,v 1.105 2015/02/25 13:20:05 christos Exp $);
#include sys/fstypes.h
#include sys/proc.h
@@ -6072,13 +6072,13 @@ __weak_alias(_openat,rump___sysimpl_open
__strong_alias(_sys_openat,rump___sysimpl_openat);
#endif /* RUMP_KERNEL_IS_LIBC */
-int rump___sysimpl_readlinkat(int, const char *, char *, size_t);
-int
+ssize_t rump___sysimpl_readlinkat(int, const char *, char *, size_t);
+ssize_t
rump___sysimpl_readlinkat(int fd, const char * path, char * buf, size_t bufsize)
{
register_t retval[2];
int error = 0;
- int rv = -1;
+ ssize_t rv = -1;
struct sys_readlinkat_args callarg;
memset(callarg, 0, sizeof(callarg));
@@ -6090,8 +6090,8 @@ rump___sysimpl_readlinkat(int fd, const
error = rsys_syscall(SYS_readlinkat, callarg, sizeof(callarg), retval);
rsys_seterrno(error);
if (error == 0) {
- if (sizeof(int) sizeof(register_t))
- rv = *(int *)retval;
+ if (sizeof(ssize_t) sizeof(register_t))
+ rv = *(ssize_t *)retval;
else
rv = *retval;
}
@@ -6320,7 +6320,6 @@ int
rump___sysimpl_posix_fallocate(int fd, off_t pos, off_t len)
{
register_t retval[2];
- int error = 0;
int rv = -1;
struct sys_posix_fallocate_args callarg;
@@ -6330,14 +6329,11 @@ rump___sysimpl_posix_fallocate(int fd, o
SPARG(callarg, pos) = pos;
SPARG(callarg, len) = len;
- error = rsys_syscall(SYS_posix_fallocate, callarg, sizeof(callarg), retval);
- rsys_seterrno(error);
- if (error == 0) {
- if (sizeof(int) sizeof(register_t))
- rv = *(int *)retval;
- else
- rv = *retval;
- }
+ rsys_syscall(SYS_posix_fallocate, callarg, sizeof(callarg), retval);
+ if (sizeof(int) sizeof(register_t))
+ rv = *(int *)retval;
+ else
+ rv = *retval;
return rv;
}
#ifdef RUMP_KERNEL_IS_LIBC
CVS commit: src/sys/compat/netbsd32
Module Name:src
Committed By: christos
Date: Wed Feb 25 13:16:33 UTC 2015
Modified Files:
src/sys/compat/netbsd32: syscalls.master
Log Message:
readlinkat returns ssize_t
To generate a diff of this commit:
cvs rdiff -u -r1.101 -r1.102 src/sys/compat/netbsd32/syscalls.master
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/compat/netbsd32/syscalls.master
diff -u src/sys/compat/netbsd32/syscalls.master:1.101 src/sys/compat/netbsd32/syscalls.master:1.102
--- src/sys/compat/netbsd32/syscalls.master:1.101 Fri Jun 13 06:36:18 2014
+++ src/sys/compat/netbsd32/syscalls.master Wed Feb 25 08:16:33 2015
@@ -1,4 +1,4 @@
- $NetBSD: syscalls.master,v 1.101 2014/06/13 10:36:18 joerg Exp $
+ $NetBSD: syscalls.master,v 1.102 2015/02/25 13:16:33 christos Exp $
; from: NetBSD: syscalls.master,v 1.81 1998/07/05 08:49:50 jonathan Exp
; @(#)syscalls.master 8.2 (Berkeley) 1/13/94
@@ -1008,7 +1008,7 @@
const netbsd32_charp path, \
int oflags, ... \
mode_t mode); }
-469 STD { int|netbsd32||readlinkat(int fd, \
+469 STD { netbsd32_ssize_t|netbsd32||readlinkat(int fd, \
const netbsd32_charp path, \
netbsd32_charp buf, \
size_t bufsize); }
CVS commit: src/sys/compat/netbsd32
Module Name:src Committed By: christos Date: Wed Feb 25 13:16:58 UTC 2015 Modified Files: src/sys/compat/netbsd32: netbsd32_syscall.h netbsd32_syscallargs.h netbsd32_syscalls.c netbsd32_sysent.c Log Message: regen To generate a diff of this commit: cvs rdiff -u -r1.109 -r1.110 src/sys/compat/netbsd32/netbsd32_syscall.h \ src/sys/compat/netbsd32/netbsd32_syscallargs.h cvs rdiff -u -r1.108 -r1.109 src/sys/compat/netbsd32/netbsd32_syscalls.c \ src/sys/compat/netbsd32/netbsd32_sysent.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/compat/netbsd32/netbsd32_syscall.h diff -u src/sys/compat/netbsd32/netbsd32_syscall.h:1.109 src/sys/compat/netbsd32/netbsd32_syscall.h:1.110 --- src/sys/compat/netbsd32/netbsd32_syscall.h:1.109 Fri Jun 13 06:37:22 2014 +++ src/sys/compat/netbsd32/netbsd32_syscall.h Wed Feb 25 08:16:58 2015 @@ -1,10 +1,10 @@ -/* $NetBSD: netbsd32_syscall.h,v 1.109 2014/06/13 10:37:22 joerg Exp $ */ +/* $NetBSD: netbsd32_syscall.h,v 1.110 2015/02/25 13:16:58 christos Exp $ */ /* * System call numbers. * * DO NOT EDIT-- this file is automatically generated. - * created from NetBSD: syscalls.master,v 1.101 2014/06/13 10:36:18 joerg Exp + * created from NetBSD: syscalls.master,v 1.102 2015/02/25 13:16:33 christos Exp */ #ifndef _NETBSD32_SYS_SYSCALL_H_ @@ -1224,7 +1224,7 @@ /* syscall: netbsd32_openat ret: int args: int const netbsd32_charp int ... */ #define NETBSD32_SYS_netbsd32_openat 468 -/* syscall: netbsd32_readlinkat ret: int args: int const netbsd32_charp netbsd32_charp size_t */ +/* syscall: netbsd32_readlinkat ret: netbsd32_ssize_t args: int const netbsd32_charp netbsd32_charp size_t */ #define NETBSD32_SYS_netbsd32_readlinkat 469 /* syscall: netbsd32_symlinkat ret: int args: const netbsd32_charp int const netbsd32_charp */ Index: src/sys/compat/netbsd32/netbsd32_syscallargs.h diff -u src/sys/compat/netbsd32/netbsd32_syscallargs.h:1.109 src/sys/compat/netbsd32/netbsd32_syscallargs.h:1.110 --- src/sys/compat/netbsd32/netbsd32_syscallargs.h:1.109 Fri Jun 13 06:37:22 2014 +++ src/sys/compat/netbsd32/netbsd32_syscallargs.h Wed Feb 25 08:16:58 2015 @@ -1,10 +1,10 @@ -/* $NetBSD: netbsd32_syscallargs.h,v 1.109 2014/06/13 10:37:22 joerg Exp $ */ +/* $NetBSD: netbsd32_syscallargs.h,v 1.110 2015/02/25 13:16:58 christos Exp $ */ /* * System call argument lists. * * DO NOT EDIT-- this file is automatically generated. - * created from NetBSD: syscalls.master,v 1.101 2014/06/13 10:36:18 joerg Exp + * created from NetBSD: syscalls.master,v 1.102 2015/02/25 13:16:33 christos Exp */ #ifndef _NETBSD32_SYS_SYSCALLARGS_H_ Index: src/sys/compat/netbsd32/netbsd32_syscalls.c diff -u src/sys/compat/netbsd32/netbsd32_syscalls.c:1.108 src/sys/compat/netbsd32/netbsd32_syscalls.c:1.109 --- src/sys/compat/netbsd32/netbsd32_syscalls.c:1.108 Fri Jun 13 06:37:22 2014 +++ src/sys/compat/netbsd32/netbsd32_syscalls.c Wed Feb 25 08:16:58 2015 @@ -1,14 +1,14 @@ -/* $NetBSD: netbsd32_syscalls.c,v 1.108 2014/06/13 10:37:22 joerg Exp $ */ +/* $NetBSD: netbsd32_syscalls.c,v 1.109 2015/02/25 13:16:58 christos Exp $ */ /* * System call names. * * DO NOT EDIT-- this file is automatically generated. - * created from NetBSD: syscalls.master,v 1.101 2014/06/13 10:36:18 joerg Exp + * created from NetBSD: syscalls.master,v 1.102 2015/02/25 13:16:33 christos Exp */ #include sys/cdefs.h -__KERNEL_RCSID(0, $NetBSD: netbsd32_syscalls.c,v 1.108 2014/06/13 10:37:22 joerg Exp $); +__KERNEL_RCSID(0, $NetBSD: netbsd32_syscalls.c,v 1.109 2015/02/25 13:16:58 christos Exp $); #if defined(_KERNEL_OPT) #if defined(_KERNEL_OPT) Index: src/sys/compat/netbsd32/netbsd32_sysent.c diff -u src/sys/compat/netbsd32/netbsd32_sysent.c:1.108 src/sys/compat/netbsd32/netbsd32_sysent.c:1.109 --- src/sys/compat/netbsd32/netbsd32_sysent.c:1.108 Fri Jun 13 06:37:22 2014 +++ src/sys/compat/netbsd32/netbsd32_sysent.c Wed Feb 25 08:16:58 2015 @@ -1,14 +1,14 @@ -/* $NetBSD: netbsd32_sysent.c,v 1.108 2014/06/13 10:37:22 joerg Exp $ */ +/* $NetBSD: netbsd32_sysent.c,v 1.109 2015/02/25 13:16:58 christos Exp $ */ /* * System call switch table. * * DO NOT EDIT-- this file is automatically generated. - * created from NetBSD: syscalls.master,v 1.101 2014/06/13 10:36:18 joerg Exp + * created from NetBSD: syscalls.master,v 1.102 2015/02/25 13:16:33 christos Exp */ #include sys/cdefs.h -__KERNEL_RCSID(0, $NetBSD: netbsd32_sysent.c,v 1.108 2014/06/13 10:37:22 joerg Exp $); +__KERNEL_RCSID(0, $NetBSD: netbsd32_sysent.c,v 1.109 2015/02/25 13:16:58 christos Exp $); #if defined(_KERNEL_OPT) #include opt_compat_netbsd.h @@ -108,6 +108,12 @@ __KERNEL_RCSID(0, $NetBSD: netbsd32_sys #define compat_60(func) sys_nosys #endif +#ifdef COMPAT_70 +#define compat_70(func) __CONCAT(compat_70_,func) +#else +#define compat_70(func) sys_nosys +#endif + #define s(type) sizeof(type)
CVS commit: src/sys/external/bsd/drm2
Module Name:src
Committed By: riastradh
Date: Wed Feb 25 14:00:52 UTC 2015
Modified Files:
src/sys/external/bsd/drm2/drm: drm_sysctl.c
src/sys/external/bsd/drm2/include/linux: moduleparam.h
Log Message:
Add string Linux module parameters.
Needed by nouveau.
From chs@.
To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 src/sys/external/bsd/drm2/drm/drm_sysctl.c
cvs rdiff -u -r1.4 -r1.5 \
src/sys/external/bsd/drm2/include/linux/moduleparam.h
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/drm/drm_sysctl.c
diff -u src/sys/external/bsd/drm2/drm/drm_sysctl.c:1.4 src/sys/external/bsd/drm2/drm/drm_sysctl.c:1.5
--- src/sys/external/bsd/drm2/drm/drm_sysctl.c:1.4 Mon Nov 24 17:29:02 2014
+++ src/sys/external/bsd/drm2/drm/drm_sysctl.c Wed Feb 25 14:00:52 2015
@@ -27,7 +27,7 @@
* POSSIBILITY OF SUCH DAMAGE.
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: drm_sysctl.c,v 1.4 2014/11/24 17:29:02 prlw1 Exp $);
+__KERNEL_RCSID(0, $NetBSD: drm_sysctl.c,v 1.5 2015/02/25 14:00:52 riastradh Exp $);
#include sys/param.h
#include sys/types.h
@@ -96,6 +96,8 @@ drm_sysctl_get_type(const struct linux_m
return CTLTYPE_BOOL;
case MTYPE_int:
return CTLTYPE_INT;
+ case MTYPE_charp:
+ return CTLTYPE_STRING;
default:
aprint_error(unhandled module param type %d for %s\n,
p-type, p-name);
Index: src/sys/external/bsd/drm2/include/linux/moduleparam.h
diff -u src/sys/external/bsd/drm2/include/linux/moduleparam.h:1.4 src/sys/external/bsd/drm2/include/linux/moduleparam.h:1.5
--- src/sys/external/bsd/drm2/include/linux/moduleparam.h:1.4 Wed Nov 12 04:53:14 2014
+++ src/sys/external/bsd/drm2/include/linux/moduleparam.h Wed Feb 25 14:00:52 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: moduleparam.h,v 1.4 2014/11/12 04:53:14 christos Exp $ */
+/* $NetBSD: moduleparam.h,v 1.5 2015/02/25 14:00:52 riastradh Exp $ */
/*-
* Copyright (c) 2013 The NetBSD Foundation, Inc.
@@ -44,6 +44,7 @@ struct linux_module_param_info {
#define MTYPE_int 0
#define MTYPE_bool 1
+#define MTYPE_charp 2
#define module_param_named(NAME, VAR, TYPE, MODE) \
static __attribute__((__used__)) struct linux_module_param_info info_ ## NAME = { \
CVS commit: src/sys/fs/puffs
Module Name:src
Committed By: manu
Date: Wed Feb 25 14:08:45 UTC 2015
Modified Files:
src/sys/fs/puffs: puffs_vnops.c
Log Message:
Update file size after write without metadata flush
If we do not use metadata flush, we must make sure the size is updated
in the filesystem after a write, otherwise the next GETATTR will get us
a stale value and the file will be truncated.
To generate a diff of this commit:
cvs rdiff -u -r1.200 -r1.201 src/sys/fs/puffs/puffs_vnops.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/fs/puffs/puffs_vnops.c
diff -u src/sys/fs/puffs/puffs_vnops.c:1.200 src/sys/fs/puffs/puffs_vnops.c:1.201
--- src/sys/fs/puffs/puffs_vnops.c:1.200 Sun Feb 15 20:21:29 2015
+++ src/sys/fs/puffs/puffs_vnops.c Wed Feb 25 14:08:45 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: puffs_vnops.c,v 1.200 2015/02/15 20:21:29 manu Exp $ */
+/* $NetBSD: puffs_vnops.c,v 1.201 2015/02/25 14:08:45 manu Exp $ */
/*
* Copyright (c) 2005, 2006, 2007 Antti Kantee. All Rights Reserved.
@@ -30,7 +30,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: puffs_vnops.c,v 1.200 2015/02/15 20:21:29 manu Exp $);
+__KERNEL_RCSID(0, $NetBSD: puffs_vnops.c,v 1.201 2015/02/25 14:08:45 manu Exp $);
#include sys/param.h
#include sys/buf.h
@@ -2551,6 +2551,23 @@ puffs_vnop_write(void *v)
uflags |= PUFFS_UPDATEMTIME;
puffs_updatenode(VPTOPP(vp), uflags, vp-v_size);
+ /*
+ * If we do not use meta flush, we need to update the
+ * filesystem now, otherwise we will get a stale value
+ * on the next GETATTR
+ */
+ if (!PUFFS_USE_METAFLUSH(pmp) (uflags PUFFS_UPDATESIZE)) {
+ struct vattr va;
+ int ret;
+
+ vattr_null(va);
+ va.va_size = vp-v_size;
+ ret = dosetattr(vp, va, FSCRED, 0);
+ if (ret) {
+ DPRINTF((dosetattr set size to %lld failed: %d\n,
+ vp-v_size, ret));
+ }
+ }
mutex_exit(pn-pn_sizemtx);
return error;
}
CVS commit: src/sys/external/bsd/drm2/include/asm
Module Name:src
Committed By: riastradh
Date: Wed Feb 25 14:36:58 UTC 2015
Modified Files:
src/sys/external/bsd/drm2/include/asm: unaligned.h
Log Message:
Add put_unaligned_le32 to Linux asm/unaligned.h.
To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 src/sys/external/bsd/drm2/include/asm/unaligned.h
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/include/asm/unaligned.h
diff -u src/sys/external/bsd/drm2/include/asm/unaligned.h:1.1 src/sys/external/bsd/drm2/include/asm/unaligned.h:1.2
--- src/sys/external/bsd/drm2/include/asm/unaligned.h:1.1 Wed Jul 16 20:59:58 2014
+++ src/sys/external/bsd/drm2/include/asm/unaligned.h Wed Feb 25 14:36:58 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: unaligned.h,v 1.1 2014/07/16 20:59:58 riastradh Exp $ */
+/* $NetBSD: unaligned.h,v 1.2 2015/02/25 14:36:58 riastradh Exp $ */
/*-
* Copyright (c) 2014 The NetBSD Foundation, Inc.
@@ -41,4 +41,11 @@ get_unaligned_le32(const void *p)
return le32dec(p);
}
+static inline void
+put_unaligned_le32(uint32_t v, void *p)
+{
+
+ return le32enc(p, v);
+}
+
#endif /* _ASM_UNALIGNED_H_ */
CVS commit: src/sys/dev/pci
Module Name:src Committed By: nonaka Date: Wed Feb 25 12:41:15 UTC 2015 Modified Files: src/sys/dev/pci: if_iwm.c Log Message: Display code number of unhandled packet. To generate a diff of this commit: cvs rdiff -u -r1.14 -r1.15 src/sys/dev/pci/if_iwm.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/dev/pci/if_iwm.c diff -u src/sys/dev/pci/if_iwm.c:1.14 src/sys/dev/pci/if_iwm.c:1.15 --- src/sys/dev/pci/if_iwm.c:1.14 Tue Feb 24 12:57:58 2015 +++ src/sys/dev/pci/if_iwm.c Wed Feb 25 12:41:15 2015 @@ -1,4 +1,4 @@ -/* $NetBSD: if_iwm.c,v 1.14 2015/02/24 12:57:58 christos Exp $ */ +/* $NetBSD: if_iwm.c,v 1.15 2015/02/25 12:41:15 nonaka Exp $ */ /* OpenBSD: if_iwm.c,v 1.18 2015/02/11 01:12:42 brad Exp */ /* @@ -105,7 +105,7 @@ */ #include sys/cdefs.h -__KERNEL_RCSID(0, $NetBSD: if_iwm.c,v 1.14 2015/02/24 12:57:58 christos Exp $); +__KERNEL_RCSID(0, $NetBSD: if_iwm.c,v 1.15 2015/02/25 12:41:15 nonaka Exp $); #include sys/param.h #include sys/conf.h @@ -6296,8 +6296,9 @@ iwm_notif_intr(struct iwm_softc *sc) default: aprint_error_dev(sc-sc_dev, - frame %d/%d %x UNHANDLED (this should - not happen)\n, qid, idx, pkt-len_n_flags); + code %02x frame %d/%d %x UNHANDLED + (this should not happen)\n, + pkt-hdr.code, qid, idx, pkt-len_n_flags); break; }
CVS commit: src/sys/external/bsd/drm2/include/linux
Module Name:src
Committed By: riastradh
Date: Wed Feb 25 14:49:01 UTC 2015
Modified Files:
src/sys/external/bsd/drm2/include/linux: pci.h
Log Message:
Add pci_enable_rom/pci_disable_rom to linux/pci.h.
To generate a diff of this commit:
cvs rdiff -u -r1.11 -r1.12 src/sys/external/bsd/drm2/include/linux/pci.h
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/include/linux/pci.h
diff -u src/sys/external/bsd/drm2/include/linux/pci.h:1.11 src/sys/external/bsd/drm2/include/linux/pci.h:1.12
--- src/sys/external/bsd/drm2/include/linux/pci.h:1.11 Tue Nov 11 11:30:21 2014
+++ src/sys/external/bsd/drm2/include/linux/pci.h Wed Feb 25 14:49:01 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: pci.h,v 1.11 2014/11/11 11:30:21 nonaka Exp $ */
+/* $NetBSD: pci.h,v 1.12 2015/02/25 14:49:01 riastradh Exp $ */
/*-
* Copyright (c) 2013 The NetBSD Foundation, Inc.
@@ -444,6 +444,7 @@ static inline void
pci_unmap_rom(struct pci_dev *pdev, void __pci_rom_iomem *vaddr __unused)
{
+ /* XXX Disable the ROM address decoder. */
KASSERT(ISSET(pdev-pd_kludges, NBPCI_KLUDGE_MAP_ROM));
KASSERT(vaddr == pdev-pd_rom_vaddr);
bus_space_unmap(pdev-pd_rom_bst, pdev-pd_rom_bsh, pdev-pd_rom_size);
@@ -510,6 +511,40 @@ pci_map_rom(struct pci_dev *pdev, size_t
return pdev-pd_rom_vaddr;
}
+static inline int
+pci_enable_rom(struct pci_dev *pdev)
+{
+ const pci_chipset_tag_t pc = pdev-pd_pa.pa_pc;
+ const pcitag_t tag = pdev-pd_pa.pa_tag;
+ pcireg_t addr;
+ int s;
+
+ /* XXX Don't do anything if the ROM isn't there. */
+
+ s = splhigh();
+ addr = pci_conf_read(pc, tag, PCI_MAPREG_ROM);
+ addr |= PCI_MAPREG_ROM_ENABLE;
+ pci_conf_write(pc, tag, PCI_MAPREG_ROM, addr);
+ splx(s);
+
+ return 0;
+}
+
+static inline void
+pci_disable_rom(struct pci_dev *pdev)
+{
+ const pci_chipset_tag_t pc = pdev-pd_pa.pa_pc;
+ const pcitag_t tag = pdev-pd_pa.pa_tag;
+ pcireg_t addr;
+ int s;
+
+ s = splhigh();
+ addr = pci_conf_read(pc, tag, PCI_MAPREG_ROM);
+ addr = ~(pcireg_t)PCI_MAPREG_ROM_ENABLE;
+ pci_conf_write(pc, tag, PCI_MAPREG_ROM, addr);
+ splx(s);
+}
+
static inline bus_addr_t
pci_resource_start(struct pci_dev *pdev, unsigned i)
{
CVS commit: src/sys/external/bsd/drm2/include/linux
Module Name:src
Committed By: riastradh
Date: Wed Feb 25 14:51:22 UTC 2015
Modified Files:
src/sys/external/bsd/drm2/include/linux: pci.h
Log Message:
Add sizep argument to pci_platform_rom stub.
To generate a diff of this commit:
cvs rdiff -u -r1.13 -r1.14 src/sys/external/bsd/drm2/include/linux/pci.h
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/include/linux/pci.h
diff -u src/sys/external/bsd/drm2/include/linux/pci.h:1.13 src/sys/external/bsd/drm2/include/linux/pci.h:1.14
--- src/sys/external/bsd/drm2/include/linux/pci.h:1.13 Wed Feb 25 14:50:51 2015
+++ src/sys/external/bsd/drm2/include/linux/pci.h Wed Feb 25 14:51:22 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: pci.h,v 1.13 2015/02/25 14:50:51 riastradh Exp $ */
+/* $NetBSD: pci.h,v 1.14 2015/02/25 14:51:22 riastradh Exp $ */
/*-
* Copyright (c) 2013 The NetBSD Foundation, Inc.
@@ -512,9 +512,10 @@ pci_map_rom(struct pci_dev *pdev, size_t
}
static inline void __pci_rom_iomem *
-pci_platform_rom(struct pci_dev *pdev __unused)
+pci_platform_rom(struct pci_dev *pdev __unused, size_t *sizep)
{
+ *sizep = 0;
return NULL;
}
CVS commit: src/sys/external/bsd/drm2/include/linux
Module Name:src
Committed By: riastradh
Date: Wed Feb 25 14:55:57 UTC 2015
Modified Files:
src/sys/external/bsd/drm2/include/linux: string.h
Log Message:
Add kstrndup.
To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 src/sys/external/bsd/drm2/include/linux/string.h
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/include/linux/string.h
diff -u src/sys/external/bsd/drm2/include/linux/string.h:1.3 src/sys/external/bsd/drm2/include/linux/string.h:1.4
--- src/sys/external/bsd/drm2/include/linux/string.h:1.3 Wed Jul 16 20:56:25 2014
+++ src/sys/external/bsd/drm2/include/linux/string.h Wed Feb 25 14:55:57 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: string.h,v 1.3 2014/07/16 20:56:25 riastradh Exp $ */
+/* $NetBSD: string.h,v 1.4 2015/02/25 14:55:57 riastradh Exp $ */
/*-
* Copyright (c) 2013 The NetBSD Foundation, Inc.
@@ -64,4 +64,24 @@ kmemdup(const void *src, size_t len, gfp
return dst;
}
+static inline char *
+kstrndup(const char *src, size_t maxlen, gfp_t gfp)
+{
+ char *dst;
+ size_t len;
+
+ if (src == NULL)
+ return NULL;
+
+ len = strnlen(src, maxlen);
+ dst = kmalloc(len + 1, gfp);
+ if (dst == NULL)
+ return NULL;
+
+ (void)memcpy(dst, src, len);
+ dst[len] = '\0';
+
+ return dst;
+}
+
#endif /* _LINUX_STRING_H_ */
CVS commit: src/sys/external/bsd/drm2/include/asm
Module Name:src Committed By: riastradh Date: Wed Feb 25 14:56:18 UTC 2015 Modified Files: src/sys/external/bsd/drm2/include/asm: io.h Log Message: Linux's asm/io.h includes linux/string.h, so do so here. To generate a diff of this commit: cvs rdiff -u -r1.3 -r1.4 src/sys/external/bsd/drm2/include/asm/io.h 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/include/asm/io.h diff -u src/sys/external/bsd/drm2/include/asm/io.h:1.3 src/sys/external/bsd/drm2/include/asm/io.h:1.4 --- src/sys/external/bsd/drm2/include/asm/io.h:1.3 Wed Jul 16 20:56:25 2014 +++ src/sys/external/bsd/drm2/include/asm/io.h Wed Feb 25 14:56:17 2015 @@ -1,4 +1,4 @@ -/* $NetBSD: io.h,v 1.3 2014/07/16 20:56:25 riastradh Exp $ */ +/* $NetBSD: io.h,v 1.4 2015/02/25 14:56:17 riastradh Exp $ */ /*- * Copyright (c) 2013 The NetBSD Foundation, Inc. @@ -35,6 +35,8 @@ #include sys/cdefs.h #include sys/systm.h +#include linux/string.h + /* * XXX This is bollocks, and is wrong on various architectures (should * work for x86; who knows what else), but bus_space_barrier won't work
CVS commit: src/sys/external/bsd/common/include/linux
Module Name:src Committed By: riastradh Date: Wed Feb 25 15:50:16 UTC 2015 Modified Files: src/sys/external/bsd/common/include/linux: kernel.h Log Message: Add clamp to linux/kernel.h. To generate a diff of this commit: cvs rdiff -u -r1.5 -r1.6 src/sys/external/bsd/common/include/linux/kernel.h 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/common/include/linux/kernel.h diff -u src/sys/external/bsd/common/include/linux/kernel.h:1.5 src/sys/external/bsd/common/include/linux/kernel.h:1.6 --- src/sys/external/bsd/common/include/linux/kernel.h:1.5 Wed Feb 25 15:11:07 2015 +++ src/sys/external/bsd/common/include/linux/kernel.h Wed Feb 25 15:50:16 2015 @@ -1,4 +1,4 @@ -/* $NetBSD: kernel.h,v 1.5 2015/02/25 15:11:07 riastradh Exp $ */ +/* $NetBSD: kernel.h,v 1.6 2015/02/25 15:50:16 riastradh Exp $ */ /*- * Copyright (c) 2013 The NetBSD Foundation, Inc. @@ -61,6 +61,7 @@ #define min_t(T, X, Y) MIN(X, Y) #define clamp_t(T, X, MIN, MAX) min_t(T, max_t(T, X, MIN), MAX) +#define clamp(X, MN, MX) MIN(MAX(X, MN), MX) /* * Rounding to nearest.
CVS commit: src/sys/external/bsd/drm2/include/linux
Module Name:src
Committed By: riastradh
Date: Wed Feb 25 14:50:51 UTC 2015
Modified Files:
src/sys/external/bsd/drm2/include/linux: pci.h
Log Message:
Add pci_platform_rom stub to linux/pci.h.
To generate a diff of this commit:
cvs rdiff -u -r1.12 -r1.13 src/sys/external/bsd/drm2/include/linux/pci.h
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/include/linux/pci.h
diff -u src/sys/external/bsd/drm2/include/linux/pci.h:1.12 src/sys/external/bsd/drm2/include/linux/pci.h:1.13
--- src/sys/external/bsd/drm2/include/linux/pci.h:1.12 Wed Feb 25 14:49:01 2015
+++ src/sys/external/bsd/drm2/include/linux/pci.h Wed Feb 25 14:50:51 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: pci.h,v 1.12 2015/02/25 14:49:01 riastradh Exp $ */
+/* $NetBSD: pci.h,v 1.13 2015/02/25 14:50:51 riastradh Exp $ */
/*-
* Copyright (c) 2013 The NetBSD Foundation, Inc.
@@ -511,6 +511,13 @@ pci_map_rom(struct pci_dev *pdev, size_t
return pdev-pd_rom_vaddr;
}
+static inline void __pci_rom_iomem *
+pci_platform_rom(struct pci_dev *pdev __unused)
+{
+
+ return NULL;
+}
+
static inline int
pci_enable_rom(struct pci_dev *pdev)
{
CVS commit: src/sys/external/bsd/drm2
Module Name:src
Committed By: riastradh
Date: Wed Feb 25 14:57:05 UTC 2015
Modified Files:
src/sys/external/bsd/drm2/dist/drm/nouveau: nouveau_nv50_display.c
nouveau_nv84_fence.c
src/sys/external/bsd/drm2/dist/drm/nouveau/core: os.h
src/sys/external/bsd/drm2/dist/drm/nouveau/core/subdev/bios:
nouveau_subdev_bios_base.c
src/sys/external/bsd/drm2/nouveau: files.nouveau
Log Message:
Another round of nouveau whack-a-mole.
Derived from a patch by chs@.
To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 \
src/sys/external/bsd/drm2/dist/drm/nouveau/nouveau_nv50_display.c
cvs rdiff -u -r1.1.1.1 -r1.2 \
src/sys/external/bsd/drm2/dist/drm/nouveau/nouveau_nv84_fence.c
cvs rdiff -u -r1.3 -r1.4 src/sys/external/bsd/drm2/dist/drm/nouveau/core/os.h
cvs rdiff -u -r1.1.1.1 -r1.2 \
src/sys/external/bsd/drm2/dist/drm/nouveau/core/subdev/bios/nouveau_subdev_bios_base.c
cvs rdiff -u -r1.4 -r1.5 src/sys/external/bsd/drm2/nouveau/files.nouveau
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/nouveau/nouveau_nv50_display.c
diff -u src/sys/external/bsd/drm2/dist/drm/nouveau/nouveau_nv50_display.c:1.2 src/sys/external/bsd/drm2/dist/drm/nouveau/nouveau_nv50_display.c:1.3
--- src/sys/external/bsd/drm2/dist/drm/nouveau/nouveau_nv50_display.c:1.2 Sat Aug 23 08:03:33 2014
+++ src/sys/external/bsd/drm2/dist/drm/nouveau/nouveau_nv50_display.c Wed Feb 25 14:57:04 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: nouveau_nv50_display.c,v 1.2 2014/08/23 08:03:33 riastradh Exp $ */
+/* $NetBSD: nouveau_nv50_display.c,v 1.3 2015/02/25 14:57:04 riastradh Exp $ */
/*
* Copyright 2011 Red Hat Inc.
@@ -25,7 +25,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: nouveau_nv50_display.c,v 1.2 2014/08/23 08:03:33 riastradh Exp $);
+__KERNEL_RCSID(0, $NetBSD: nouveau_nv50_display.c,v 1.3 2015/02/25 14:57:04 riastradh Exp $);
#include linux/dma-mapping.h
#include linux/err.h
@@ -51,6 +51,37 @@ __KERNEL_RCSID(0, $NetBSD: nouveau_nv50
#include subdev/fb.h
#include subdev/i2c.h
+#ifdef __NetBSD__
+/*
+ * XXX Can't use bus_space here because this is all mapped through the
+ * nvbo_kmap abstraction. Can't assume we're x86 because this is
+ * Nouveau, not Intel.
+ */
+
+# define __iomem volatile
+# define readw fake_readw
+# define writew fake_writew
+
+static inline uint32_t
+fake_readw(const void __iomem *ptr)
+{
+ uint16_t v;
+
+ v = *(const uint16_t __iomem *)ptr;
+ membar_consumer();
+
+ return v;
+}
+
+static inline void
+fake_writew(uint16_t v, void __iomem *ptr)
+{
+
+ membar_producer();
+ *(uint16_t __iomem *)ptr = v;
+}
+#endif
+
#define EVO_DMA_NR 9
#define EVO_MASTER (0x00)
@@ -151,17 +182,18 @@ static void
nv50_dmac_destroy(struct nouveau_object *core, struct nv50_dmac *dmac)
{
if (dmac-ptr) {
+ struct pci_dev *pdev = nv_device(core)-pdev;
#ifdef __NetBSD__
- const bus_dma_tag_t dmat = nv_device(core)-dmat;
+ /* XXX pa_dmat or pa_dmat64? */
+ const bus_dma_tag_t dmat = pdev-pd_pa.pa_dmat64;
- bus_dmamem_unload(dmat, dmac-dmamap);
+ bus_dmamap_unload(dmat, dmac-dmamap);
bus_dmamem_unmap(dmat, dmac-dmakva, PAGE_SIZE);
bus_dmamap_destroy(dmat, dmac-dmamap);
bus_dmamem_free(dmat, dmac-dmaseg, 1);
dmac-handle = 0;
dmac-ptr = NULL;
#else
- struct pci_dev *pdev = nv_device(core)-pdev;
pci_free_consistent(pdev, PAGE_SIZE, dmac-ptr, dmac-handle);
#endif
}
@@ -311,7 +343,7 @@ nv50_dmac_create(struct nouveau_object *
#ifdef __NetBSD__
{
- const bus_dma_tag_t dmat = nv_device(core)-dmat;
+ const bus_dma_tag_t dmat = nv_device(core)-pdev-pd_pa.pa_dmat64;
int rsegs;
/* XXX errno NetBSD-Linux */
@@ -336,7 +368,7 @@ nv50_dmac_create(struct nouveau_object *
return ret;
}
ret = -bus_dmamap_load(dmat, dmac-dmamap, dmac-dmakva, PAGE_SIZE,
- BUS_DMA_WAITOK);
+ NULL, BUS_DMA_WAITOK);
if (ret) {
bus_dmamem_unmap(dmat, dmac-dmakva, PAGE_SIZE);
bus_dmamap_destroy(dmat, dmac-dmamap);
@@ -1262,13 +1294,13 @@ nv50_crtc_lut_load(struct drm_crtc *crtc
u16 b = nv_crtc-lut.b[i] 2;
if (nv_mclass(disp-core) NVD0_DISP_CLASS) {
- writew(r + 0x, lut + (i * 0x08) + 0);
- writew(g + 0x, lut + (i * 0x08) + 2);
- writew(b + 0x, lut + (i * 0x08) + 4);
+ writew(r + 0x, (char __iomem *)lut + (i * 0x08) + 0);
+ writew(g + 0x, (char __iomem *)lut + (i * 0x08) + 2);
+ writew(b + 0x, (char __iomem *)lut + (i * 0x08) + 4);
} else {
- writew(r + 0x6000, lut + (i * 0x20) + 0);
- writew(g + 0x6000, lut + (i * 0x20) + 2);
- writew(b + 0x6000, lut + (i * 0x20) + 4);
+ writew(r + 0x6000, (char __iomem *)lut + (i * 0x20) + 0);
+ writew(g + 0x6000, (char __iomem *)lut + (i * 0x20) + 2);
+ writew(b + 0x6000, (char __iomem *)lut + (i * 0x20) + 4);
}
}
}
Index: src/sys/external/bsd/drm2/dist/drm/nouveau/nouveau_nv84_fence.c
CVS commit: src/sys/external/bsd/drm2/include/asm
Module Name:src
Committed By: riastradh
Date: Wed Feb 25 15:01:03 UTC 2015
Modified Files:
src/sys/external/bsd/drm2/include/asm: unaligned.h
Log Message:
Add get_unaligned_le16, put_unaligned_le16.
To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 src/sys/external/bsd/drm2/include/asm/unaligned.h
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/include/asm/unaligned.h
diff -u src/sys/external/bsd/drm2/include/asm/unaligned.h:1.2 src/sys/external/bsd/drm2/include/asm/unaligned.h:1.3
--- src/sys/external/bsd/drm2/include/asm/unaligned.h:1.2 Wed Feb 25 14:36:58 2015
+++ src/sys/external/bsd/drm2/include/asm/unaligned.h Wed Feb 25 15:01:03 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: unaligned.h,v 1.2 2015/02/25 14:36:58 riastradh Exp $ */
+/* $NetBSD: unaligned.h,v 1.3 2015/02/25 15:01:03 riastradh Exp $ */
/*-
* Copyright (c) 2014 The NetBSD Foundation, Inc.
@@ -34,6 +34,20 @@
#include sys/endian.h
+static inline uint16_t
+get_unaligned_le16(const void *p)
+{
+
+ return le16dec(p);
+}
+
+static inline void
+put_unaligned_le16(uint16_t v, void *p)
+{
+
+ return le16enc(p, v);
+}
+
static inline uint32_t
get_unaligned_le32(const void *p)
{
CVS commit: src/sys/external/bsd/common/include/linux
Module Name:src
Committed By: riastradh
Date: Wed Feb 25 15:11:08 UTC 2015
Modified Files:
src/sys/external/bsd/common/include/linux: kernel.h
Log Message:
Add kstrtol.
To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 src/sys/external/bsd/common/include/linux/kernel.h
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/common/include/linux/kernel.h
diff -u src/sys/external/bsd/common/include/linux/kernel.h:1.4 src/sys/external/bsd/common/include/linux/kernel.h:1.5
--- src/sys/external/bsd/common/include/linux/kernel.h:1.4 Wed Jul 16 20:59:57 2014
+++ src/sys/external/bsd/common/include/linux/kernel.h Wed Feb 25 15:11:07 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: kernel.h,v 1.4 2014/07/16 20:59:57 riastradh Exp $ */
+/* $NetBSD: kernel.h,v 1.5 2015/02/25 15:11:07 riastradh Exp $ */
/*-
* Copyright (c) 2013 The NetBSD Foundation, Inc.
@@ -164,4 +164,16 @@ scnprintf(char *buf, size_t size, const
return ret;
}
+static inline int
+kstrtol(const char *s, unsigned base, long *vp)
+{
+ long long v;
+
+ v = strtoll(s, NULL, base);
+ if (v LONG_MIN || LONG_MAX v)
+ return -ERANGE;
+ *vp = v;
+ return 0;
+}
+
#endif /* _LINUX_KERNEL_H_ */
CVS commit: src/sys/external/bsd/drm2/include/linux
Module Name:src
Committed By: riastradh
Date: Wed Feb 25 15:40:20 UTC 2015
Modified Files:
src/sys/external/bsd/drm2/include/linux: bitops.h
Log Message:
Add hweight8 (hamming weight of 8-bit quantity).
To generate a diff of this commit:
cvs rdiff -u -r1.8 -r1.9 src/sys/external/bsd/drm2/include/linux/bitops.h
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/include/linux/bitops.h
diff -u src/sys/external/bsd/drm2/include/linux/bitops.h:1.8 src/sys/external/bsd/drm2/include/linux/bitops.h:1.9
--- src/sys/external/bsd/drm2/include/linux/bitops.h:1.8 Sat Aug 23 08:03:33 2014
+++ src/sys/external/bsd/drm2/include/linux/bitops.h Wed Feb 25 15:40:20 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: bitops.h,v 1.8 2014/08/23 08:03:33 riastradh Exp $ */
+/* $NetBSD: bitops.h,v 1.9 2015/02/25 15:40:20 riastradh Exp $ */
/*-
* Copyright (c) 2013 The NetBSD Foundation, Inc.
@@ -167,4 +167,11 @@ find_first_zero_bit(const unsigned long
return result;
}
+static inline unsigned
+hweight8(unsigned w)
+{
+
+ return popcount(w 0xff);
+}
+
#endif /* _LINUX_BITOPS_H_ */
CVS commit: src/sys/external/bsd/drm2
Module Name:src
Committed By: riastradh
Date: Wed Feb 25 17:29:43 UTC 2015
Modified Files:
src/sys/external/bsd/drm2/dist/drm/nouveau/core: os.h
src/sys/external/bsd/drm2/dist/drm/nouveau/core/include/subdev: mc.h
pwr.h
src/sys/external/bsd/drm2/dist/drm/nouveau/core/subdev/bios:
nouveau_subdev_bios_pll.c
src/sys/external/bsd/drm2/dist/drm/nouveau/core/subdev/clock:
nouveau_subdev_clock_base.c nouveau_subdev_clock_nv50.c
src/sys/external/bsd/drm2/dist/drm/nouveau/core/subdev/devinit: fbmem.h
nouveau_subdev_devinit_nv04.c
src/sys/external/bsd/drm2/dist/drm/nouveau/core/subdev/fb:
nouveau_subdev_fb_nv50.c nouveau_subdev_fb_nvc0.c nv50.h nvc0.h
src/sys/external/bsd/drm2/dist/drm/nouveau/core/subdev/mc:
nouveau_subdev_mc_base.c
src/sys/external/bsd/drm2/dist/drm/nouveau/core/subdev/mxm:
nouveau_subdev_mxm_nv50.c
src/sys/external/bsd/drm2/dist/drm/nouveau/core/subdev/pwr:
nouveau_subdev_pwr_base.c
src/sys/external/bsd/drm2/nouveau: files.nouveau
Log Message:
Another round of whack-a-mole with nouveau.
To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 src/sys/external/bsd/drm2/dist/drm/nouveau/core/os.h
cvs rdiff -u -r1.1.1.1 -r1.2 \
src/sys/external/bsd/drm2/dist/drm/nouveau/core/include/subdev/mc.h
cvs rdiff -u -r1.2 -r1.3 \
src/sys/external/bsd/drm2/dist/drm/nouveau/core/include/subdev/pwr.h
cvs rdiff -u -r1.1.1.1 -r1.2 \
src/sys/external/bsd/drm2/dist/drm/nouveau/core/subdev/bios/nouveau_subdev_bios_pll.c
cvs rdiff -u -r1.1.1.1 -r1.2 \
src/sys/external/bsd/drm2/dist/drm/nouveau/core/subdev/clock/nouveau_subdev_clock_base.c
\
src/sys/external/bsd/drm2/dist/drm/nouveau/core/subdev/clock/nouveau_subdev_clock_nv50.c
cvs rdiff -u -r1.1.1.1 -r1.2 \
src/sys/external/bsd/drm2/dist/drm/nouveau/core/subdev/devinit/fbmem.h \
src/sys/external/bsd/drm2/dist/drm/nouveau/core/subdev/devinit/nouveau_subdev_devinit_nv04.c
cvs rdiff -u -r1.1.1.1 -r1.2 \
src/sys/external/bsd/drm2/dist/drm/nouveau/core/subdev/fb/nouveau_subdev_fb_nv50.c
\
src/sys/external/bsd/drm2/dist/drm/nouveau/core/subdev/fb/nouveau_subdev_fb_nvc0.c
\
src/sys/external/bsd/drm2/dist/drm/nouveau/core/subdev/fb/nv50.h \
src/sys/external/bsd/drm2/dist/drm/nouveau/core/subdev/fb/nvc0.h
cvs rdiff -u -r1.1.1.1 -r1.2 \
src/sys/external/bsd/drm2/dist/drm/nouveau/core/subdev/mc/nouveau_subdev_mc_base.c
cvs rdiff -u -r1.1.1.1 -r1.2 \
src/sys/external/bsd/drm2/dist/drm/nouveau/core/subdev/mxm/nouveau_subdev_mxm_nv50.c
cvs rdiff -u -r1.2 -r1.3 \
src/sys/external/bsd/drm2/dist/drm/nouveau/core/subdev/pwr/nouveau_subdev_pwr_base.c
cvs rdiff -u -r1.5 -r1.6 src/sys/external/bsd/drm2/nouveau/files.nouveau
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/nouveau/core/os.h
diff -u src/sys/external/bsd/drm2/dist/drm/nouveau/core/os.h:1.4 src/sys/external/bsd/drm2/dist/drm/nouveau/core/os.h:1.5
--- src/sys/external/bsd/drm2/dist/drm/nouveau/core/os.h:1.4 Wed Feb 25 14:57:05 2015
+++ src/sys/external/bsd/drm2/dist/drm/nouveau/core/os.h Wed Feb 25 17:29:42 2015
@@ -27,6 +27,11 @@
#include linux/kref.h
#include linux/list.h
#include linux/spinlock.h
+#include linux/math64.h
+#include linux/io-mapping.h
+#include linux/jiffies.h
+#include linux/errno.h
+#include linux/workqueue.h
#include asm/byteorder.h
#include asm/io.h
Index: src/sys/external/bsd/drm2/dist/drm/nouveau/core/include/subdev/mc.h
diff -u src/sys/external/bsd/drm2/dist/drm/nouveau/core/include/subdev/mc.h:1.1.1.1 src/sys/external/bsd/drm2/dist/drm/nouveau/core/include/subdev/mc.h:1.2
--- src/sys/external/bsd/drm2/dist/drm/nouveau/core/include/subdev/mc.h:1.1.1.1 Thu Jul 17 01:50:59 2014
+++ src/sys/external/bsd/drm2/dist/drm/nouveau/core/include/subdev/mc.h Wed Feb 25 17:29:43 2015
@@ -13,6 +13,9 @@ struct nouveau_mc {
struct nouveau_subdev base;
bool use_msi;
unsigned int irq;
+#ifdef __NetBSD__
+ void *irq_cookie;
+#endif
};
static inline struct nouveau_mc *
Index: src/sys/external/bsd/drm2/dist/drm/nouveau/core/include/subdev/pwr.h
diff -u src/sys/external/bsd/drm2/dist/drm/nouveau/core/include/subdev/pwr.h:1.2 src/sys/external/bsd/drm2/dist/drm/nouveau/core/include/subdev/pwr.h:1.3
--- src/sys/external/bsd/drm2/dist/drm/nouveau/core/include/subdev/pwr.h:1.2 Sat Aug 23 08:03:34 2014
+++ src/sys/external/bsd/drm2/dist/drm/nouveau/core/include/subdev/pwr.h Wed Feb 25 17:29:43 2015
@@ -32,7 +32,6 @@ struct nouveau_pwr {
struct work_struct work;
#ifdef __NetBSD__
- struct mutex lock;
drm_waitqueue_t wait;
#else
wait_queue_head_t wait;
Index: src/sys/external/bsd/drm2/dist/drm/nouveau/core/subdev/bios/nouveau_subdev_bios_pll.c
diff -u
CVS commit: src/lib/libc/gen
Module Name:src
Committed By: wiz
Date: Wed Feb 25 16:23:40 UTC 2015
Modified Files:
src/lib/libc/gen: ctype.3
Log Message:
Remove sentence about casting to int (also from example).
Bump date.
ok joerg@
To generate a diff of this commit:
cvs rdiff -u -r1.21 -r1.22 src/lib/libc/gen/ctype.3
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/lib/libc/gen/ctype.3
diff -u src/lib/libc/gen/ctype.3:1.21 src/lib/libc/gen/ctype.3:1.22
--- src/lib/libc/gen/ctype.3:1.21 Thu May 6 11:46:11 2010
+++ src/lib/libc/gen/ctype.3 Wed Feb 25 16:23:40 2015
@@ -1,4 +1,4 @@
-.\ $NetBSD: ctype.3,v 1.21 2010/05/06 11:46:11 jruoho Exp $
+.\ $NetBSD: ctype.3,v 1.22 2015/02/25 16:23:40 wiz Exp $
.\
.\ Copyright (c) 1991 Regents of the University of California.
.\ All rights reserved.
@@ -30,7 +30,7 @@
.\
.\ @(#)ctype.3 6.5 (Berkeley) 4/19/91
.\
-.Dd May 6, 2010
+.Dd February 25, 2015
.Dt CTYPE 3
.Os
.Sh NAME
@@ -80,7 +80,7 @@ the following code can be used:
const char *s = xyz;
while (*s != '\e0') {
-putchar(toupper((int)(unsigned char)*s));
+putchar(toupper((unsigned char)*s));
s++;
}
.Ed
@@ -137,9 +137,6 @@ or
must first be cast to
.Vt unsigned char ,
to ensure that the values are within the correct range.
-The result should then be cast to
-.Vt int
-to avoid warnings from some compilers.
Casting a negative-valued
.Vt char
or
CVS commit: src/share/man/man9
Module Name:src Committed By: riastradh Date: Wed Feb 25 17:03:42 UTC 2015 Modified Files: src/share/man/man9: pci_intr.9 Log Message: Fix type of pc argument in pci_intr(9) man page. To generate a diff of this commit: cvs rdiff -u -r1.17 -r1.18 src/share/man/man9/pci_intr.9 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/share/man/man9/pci_intr.9 diff -u src/share/man/man9/pci_intr.9:1.17 src/share/man/man9/pci_intr.9:1.18 --- src/share/man/man9/pci_intr.9:1.17 Sun Mar 30 23:28:14 2014 +++ src/share/man/man9/pci_intr.9 Wed Feb 25 17:03:42 2015 @@ -1,4 +1,4 @@ -.\ $NetBSD: pci_intr.9,v 1.17 2014/03/30 23:28:14 christos Exp $ +.\ $NetBSD: pci_intr.9,v 1.18 2015/02/25 17:03:42 riastradh Exp $ .\ .\ Copyright (c) 2000 The NetBSD Foundation, Inc. .\ All rights reserved. @@ -27,7 +27,7 @@ .\ ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE .\ POSSIBILITY OF SUCH DAMAGE. .\ -.Dd March 30, 2014 +.Dd February 25, 2015 .Dt PCI_INTR 9 .Os .Sh NAME @@ -42,12 +42,12 @@ .Ft int .Fn pci_intr_map const struct pci_attach_args *pa pci_intr_handle_t *ih .Ft const char * -.Fn pci_intr_string pci_chipset_t *pc pci_intr_handle_t ih char *buf size_t len +.Fn pci_intr_string pci_chipset_tag_t pc pci_intr_handle_t ih char *buf size_t len .Ft void * -.Fn pci_intr_establish pci_chipset_t *pc pci_intr_handle_t ih \ +.Fn pci_intr_establish pci_chipset_tag_t pc pci_intr_handle_t ih \ int ipl int (*intrhand)(void *) void *intrarg .Ft void -.Fn pci_intr_disestablish pci_chipset_t *pc void *ih +.Fn pci_intr_disestablish pci_chipset_tag_t pc void *ih .Sh DESCRIPTION The .Nm
CVS import: xsrc/external/mit/fontsproto/dist
Module Name:xsrc Committed By: snj Date: Wed Feb 25 19:50:40 UTC 2015 Update of /cvsroot/xsrc/external/mit/fontsproto/dist In directory ivanova.netbsd.org:/tmp/cvs-serv8903 Log Message: initial import of fontsproto-2.1.3 Status: Vendor Tag: xorg Release Tags: fontsproto-2-1-3 U xsrc/external/mit/fontsproto/dist/README U xsrc/external/mit/fontsproto/dist/config.sub U xsrc/external/mit/fontsproto/dist/configure U xsrc/external/mit/fontsproto/dist/font.h U xsrc/external/mit/fontsproto/dist/fontsproto.pc.in U xsrc/external/mit/fontsproto/dist/INSTALL U xsrc/external/mit/fontsproto/dist/fsmasks.h U xsrc/external/mit/fontsproto/dist/compile U xsrc/external/mit/fontsproto/dist/ChangeLog U xsrc/external/mit/fontsproto/dist/Makefile.am U xsrc/external/mit/fontsproto/dist/FSproto.h U xsrc/external/mit/fontsproto/dist/fontstruct.h U xsrc/external/mit/fontsproto/dist/install-sh U xsrc/external/mit/fontsproto/dist/fontproto.h U xsrc/external/mit/fontsproto/dist/config.guess U xsrc/external/mit/fontsproto/dist/COPYING U xsrc/external/mit/fontsproto/dist/aclocal.m4 U xsrc/external/mit/fontsproto/dist/missing U xsrc/external/mit/fontsproto/dist/FS.h U xsrc/external/mit/fontsproto/dist/docbook.am U xsrc/external/mit/fontsproto/dist/configure.ac U xsrc/external/mit/fontsproto/dist/Makefile.in U xsrc/external/mit/fontsproto/dist/specs/Makefile.am U xsrc/external/mit/fontsproto/dist/specs/fsproto.xml U xsrc/external/mit/fontsproto/dist/specs/Makefile.in No conflicts created by this import
CVS import: xsrc/external/mit/libXfont/dist
Module Name:xsrc Committed By: snj Date: Wed Feb 25 19:54:42 UTC 2015 Update of /cvsroot/xsrc/external/mit/libXfont/dist In directory ivanova.netbsd.org:/tmp/cvs-serv8261 Log Message: initial import of libXfont-1.5.0 Status: Vendor Tag: xorg Release Tags: libXfont-1-5-0 U xsrc/external/mit/libXfont/dist/configure.ac U xsrc/external/mit/libXfont/dist/ltmain.sh U xsrc/external/mit/libXfont/dist/install-sh U xsrc/external/mit/libXfont/dist/config.h.in U xsrc/external/mit/libXfont/dist/xfont.pc.in U xsrc/external/mit/libXfont/dist/aclocal.m4 U xsrc/external/mit/libXfont/dist/INSTALL U xsrc/external/mit/libXfont/dist/README U xsrc/external/mit/libXfont/dist/ChangeLog U xsrc/external/mit/libXfont/dist/Makefile.am U xsrc/external/mit/libXfont/dist/depcomp U xsrc/external/mit/libXfont/dist/missing U xsrc/external/mit/libXfont/dist/configure U xsrc/external/mit/libXfont/dist/devbook.am U xsrc/external/mit/libXfont/dist/COPYING U xsrc/external/mit/libXfont/dist/config.guess U xsrc/external/mit/libXfont/dist/AUTHORS U xsrc/external/mit/libXfont/dist/compile U xsrc/external/mit/libXfont/dist/Makefile.in U xsrc/external/mit/libXfont/dist/config.sub U xsrc/external/mit/libXfont/dist/src/Makefile.in U xsrc/external/mit/libXfont/dist/src/Makefile.am U xsrc/external/mit/libXfont/dist/src/dummy.c U xsrc/external/mit/libXfont/dist/src/bitmap/Makefile.am U xsrc/external/mit/libXfont/dist/src/bitmap/pcfwrite.c U xsrc/external/mit/libXfont/dist/src/bitmap/Makefile.in U xsrc/external/mit/libXfont/dist/src/bitmap/snfread.c U xsrc/external/mit/libXfont/dist/src/bitmap/fontink.c U xsrc/external/mit/libXfont/dist/src/bitmap/bdfutils.c U xsrc/external/mit/libXfont/dist/src/bitmap/bdfread.c U xsrc/external/mit/libXfont/dist/src/bitmap/snfstr.h U xsrc/external/mit/libXfont/dist/src/bitmap/bitscale.c U xsrc/external/mit/libXfont/dist/src/bitmap/bitmapfunc.c U xsrc/external/mit/libXfont/dist/src/bitmap/bitmap.c U xsrc/external/mit/libXfont/dist/src/bitmap/pcfread.c U xsrc/external/mit/libXfont/dist/src/bitmap/bitmaputil.c U xsrc/external/mit/libXfont/dist/src/fontfile/fileio.c U xsrc/external/mit/libXfont/dist/src/fontfile/renderers.c U xsrc/external/mit/libXfont/dist/src/fontfile/Makefile.in U xsrc/external/mit/libXfont/dist/src/fontfile/catalogue.c U xsrc/external/mit/libXfont/dist/src/fontfile/fontfile.c U xsrc/external/mit/libXfont/dist/src/fontfile/bunzip2.c U xsrc/external/mit/libXfont/dist/src/fontfile/bufio.c U xsrc/external/mit/libXfont/dist/src/fontfile/Makefile.am U xsrc/external/mit/libXfont/dist/src/fontfile/defaults.c U xsrc/external/mit/libXfont/dist/src/fontfile/register.c U xsrc/external/mit/libXfont/dist/src/fontfile/bitsource.c U xsrc/external/mit/libXfont/dist/src/fontfile/gunzip.c U xsrc/external/mit/libXfont/dist/src/fontfile/filewr.c C xsrc/external/mit/libXfont/dist/src/fontfile/dirfile.c U xsrc/external/mit/libXfont/dist/src/fontfile/fontscale.c U xsrc/external/mit/libXfont/dist/src/fontfile/fontencc.c U xsrc/external/mit/libXfont/dist/src/fontfile/decompress.c U xsrc/external/mit/libXfont/dist/src/fontfile/fontdir.c U xsrc/external/mit/libXfont/dist/src/builtins/fpe.c U xsrc/external/mit/libXfont/dist/src/builtins/fonts.c U xsrc/external/mit/libXfont/dist/src/builtins/render.c U xsrc/external/mit/libXfont/dist/src/builtins/dir.c U xsrc/external/mit/libXfont/dist/src/builtins/file.c U xsrc/external/mit/libXfont/dist/src/builtins/Makefile.am U xsrc/external/mit/libXfont/dist/src/builtins/buildfont U xsrc/external/mit/libXfont/dist/src/builtins/Makefile.in U xsrc/external/mit/libXfont/dist/src/builtins/builtin.h U xsrc/external/mit/libXfont/dist/src/util/fontxlfd.c U xsrc/external/mit/libXfont/dist/src/util/Makefile.am U xsrc/external/mit/libXfont/dist/src/util/fontaccel.c U xsrc/external/mit/libXfont/dist/src/util/format.c U xsrc/external/mit/libXfont/dist/src/util/patcache.c U xsrc/external/mit/libXfont/dist/src/util/Makefile.in U xsrc/external/mit/libXfont/dist/src/util/atom.c U xsrc/external/mit/libXfont/dist/src/util/fontutil.c U xsrc/external/mit/libXfont/dist/src/util/fontnames.c U xsrc/external/mit/libXfont/dist/src/util/utilbitmap.c U xsrc/external/mit/libXfont/dist/src/util/miscutil.c U xsrc/external/mit/libXfont/dist/src/util/private.c U xsrc/external/mit/libXfont/dist/src/fc/fserve.h U xsrc/external/mit/libXfont/dist/src/fc/Makefile.in U xsrc/external/mit/libXfont/dist/src/fc/Makefile.am U xsrc/external/mit/libXfont/dist/src/fc/fslibos.h U xsrc/external/mit/libXfont/dist/src/fc/fsio.c C xsrc/external/mit/libXfont/dist/src/fc/fserve.c C xsrc/external/mit/libXfont/dist/src/fc/fsconvert.c U xsrc/external/mit/libXfont/dist/src/fc/fsio.h U xsrc/external/mit/libXfont/dist/src/fc/fservestr.h U xsrc/external/mit/libXfont/dist/src/fc/fstrans.c U xsrc/external/mit/libXfont/dist/src/stubs/rmfshdl.c U xsrc/external/mit/libXfont/dist/src/stubs/regfpefunc.c U xsrc/external/mit/libXfont/dist/src/stubs/stfntcfnt.c U xsrc/external/mit/libXfont/dist/src/stubs/getcres.c U
CVS commit: xsrc/external/mit/libXfont/dist/src
Module Name:xsrc
Committed By: snj
Date: Wed Feb 25 19:59:36 UTC 2015
Modified Files:
xsrc/external/mit/libXfont/dist/src/FreeType: ftfuncs.c
xsrc/external/mit/libXfont/dist/src/fc: fsconvert.c fserve.c
xsrc/external/mit/libXfont/dist/src/fontfile: dirfile.c
Removed Files:
xsrc/external/mit/libXfont/dist/src/stubs: fatalerror.c
Log Message:
merge libXfont-1.5.0
To generate a diff of this commit:
cvs rdiff -u -r1.5 -r1.6 \
xsrc/external/mit/libXfont/dist/src/FreeType/ftfuncs.c
cvs rdiff -u -r1.3 -r1.4 xsrc/external/mit/libXfont/dist/src/fc/fsconvert.c \
xsrc/external/mit/libXfont/dist/src/fc/fserve.c
cvs rdiff -u -r1.3 -r1.4 \
xsrc/external/mit/libXfont/dist/src/fontfile/dirfile.c
cvs rdiff -u -r1.1.1.1 -r0 \
xsrc/external/mit/libXfont/dist/src/stubs/fatalerror.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: xsrc/external/mit/libXfont/dist/src/FreeType/ftfuncs.c
diff -u xsrc/external/mit/libXfont/dist/src/FreeType/ftfuncs.c:1.5 xsrc/external/mit/libXfont/dist/src/FreeType/ftfuncs.c:1.6
--- xsrc/external/mit/libXfont/dist/src/FreeType/ftfuncs.c:1.5 Fri Jul 11 18:55:42 2014
+++ xsrc/external/mit/libXfont/dist/src/FreeType/ftfuncs.c Wed Feb 25 19:59:36 2015
@@ -1069,6 +1069,8 @@ FT_Do_SBit_Metrics( FT_Face ft_face, FT_
#endif
}
+#pragma GCC diagnostic ignored -Wbad-function-cast
+
int
FreeTypeRasteriseGlyph(unsigned idx, int flags, CharInfoPtr tgp,
FTInstancePtr instance, int hasMetrics)
Index: xsrc/external/mit/libXfont/dist/src/fc/fsconvert.c
diff -u xsrc/external/mit/libXfont/dist/src/fc/fsconvert.c:1.3 xsrc/external/mit/libXfont/dist/src/fc/fsconvert.c:1.4
--- xsrc/external/mit/libXfont/dist/src/fc/fsconvert.c:1.3 Fri Jul 11 18:55:42 2014
+++ xsrc/external/mit/libXfont/dist/src/fc/fsconvert.c Wed Feb 25 19:59:36 2015
@@ -643,7 +643,7 @@ _fs_unload_font(FontPtr pfont)
FontPtr
fs_create_font (FontPathElementPtr fpe,
- char *name,
+ const char *name,
int namelen,
fsBitmapFormat format,
fsBitmapFormatMask fmask)
Index: xsrc/external/mit/libXfont/dist/src/fc/fserve.c
diff -u xsrc/external/mit/libXfont/dist/src/fc/fserve.c:1.3 xsrc/external/mit/libXfont/dist/src/fc/fserve.c:1.4
--- xsrc/external/mit/libXfont/dist/src/fc/fserve.c:1.3 Fri Jul 11 18:55:42 2014
+++ xsrc/external/mit/libXfont/dist/src/fc/fserve.c Wed Feb 25 19:59:36 2015
@@ -147,7 +147,7 @@ static void
_fs_close_server (FSFpePtr conn);
static FSFpePtr
-_fs_init_conn (char *servername);
+_fs_init_conn (const char *servername);
static int
_fs_wait_connect (FSFpePtr conn);
@@ -235,7 +235,7 @@ _fs_add_rep_log (FSFpePtr conn, fsGeneri
#endif
static Bool
-fs_name_check(char *name)
+fs_name_check(const char *name)
{
/* Just make sure there is a protocol/ prefix */
return (name *name != '/' strchr(name, '/'));
@@ -293,7 +293,7 @@ static int
fs_init_fpe(FontPathElementPtr fpe)
{
FSFpePtrconn;
-char *name;
+const char *name;
int err;
int ret;
@@ -1615,7 +1615,7 @@ _fs_do_blocked (FSFpePtr conn)
/* ARGSUSED */
static int
fs_send_open_font(pointer client, FontPathElementPtr fpe, Mask flags,
- char *name, int namelen,
+ const char *name, int namelen,
fsBitmapFormat format, fsBitmapFormatMask fmask,
XID id, FontPtr *ppfont)
{
@@ -1633,7 +1633,7 @@ fs_send_open_font(pointer client, FontPa
if (conn-blockState FS_GIVE_UP)
return BadFontName;
-if (namelen = 0 || namelen sizeof (buf) - 1)
+if (namelen 0 || namelen sizeof (buf) - 1)
return BadFontName;
/*
@@ -1807,7 +1807,7 @@ fs_send_query_bitmaps(FontPathElementPtr
/* ARGSUSED */
static int
fs_open_font(pointer client, FontPathElementPtr fpe, Mask flags,
- char *name, int namelen,
+ const char *name, int namelen,
fsBitmapFormat format, fsBitmapFormatMask fmask,
XID id, FontPtr *ppfont,
char **alias, FontPtr non_cachable_font)
@@ -1956,19 +1956,6 @@ fs_read_glyphs(FontPathElementPtr fpe, F
buf += SIZEOF (fsOffset32) * (rep-num_chars);
bufleft -= SIZEOF (fsOffset32) * (rep-num_chars);
-#if 0
-if (bufleft rep-nbytes)
-{
-#ifdef DEBUG
-fprintf(stderr,
-fsQueryXBitmaps16: nbytes (%d) bufleft (%ld)\n,
-rep-nbytes, bufleft);
-#endif
-err = AllocError;
-goto bail;
-}
-#endif
-
if (bufleft rep-nbytes)
{
#ifdef DEBUG
@@ -2174,7 +2161,7 @@ fs_send_load_glyphs(pointer client, Font
}
-extern pointer serverClient; /* This could be any number that
+extern pointer __GetServerClient(void); /* This could be any number that
doesn't conflict with existing
client values. */
@@ -2346,17 +2333,17 @@ fs_load_all_glyphs(FontPtr pfont)
* perform an unpleasant job that, we hope, will never be required.
*/
-while ((err = _fs_load_glyphs(serverClient,
CVS commit: src/external/mit/xorg/lib/libXfont
Module Name:src Committed By: snj Date: Wed Feb 25 20:01:39 UTC 2015 Modified Files: src/external/mit/xorg/lib/libXfont: Makefile Log Message: update for 1.5.0 To generate a diff of this commit: cvs rdiff -u -r1.9 -r1.10 src/external/mit/xorg/lib/libXfont/Makefile Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/external/mit/xorg/lib/libXfont/Makefile diff -u src/external/mit/xorg/lib/libXfont/Makefile:1.9 src/external/mit/xorg/lib/libXfont/Makefile:1.10 --- src/external/mit/xorg/lib/libXfont/Makefile:1.9 Wed Apr 4 10:59:45 2012 +++ src/external/mit/xorg/lib/libXfont/Makefile Wed Feb 25 20:01:39 2015 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.9 2012/04/04 10:59:45 joerg Exp $ +# $NetBSD: Makefile,v 1.10 2015/02/25 20:01:39 snj Exp $ .include bsd.own.mk @@ -25,11 +25,11 @@ SRCS= ftenc.c ftfuncs.c fttools.c xttcap bitsource.c bufio.c catalogue.c decompress.c defaults.c \ dirfile.c fileio.c filewr.c fontdir.c fontencc.c fontfile.c \ fontscale.c gunzip.c register.c renderers.c bunzip2.c cauthgen.c \ - csignal.c delfntcid.c errorf.c fatalerror.c findoldfnt.c \ + csignal.c delfntcid.c errorf.c findoldfnt.c \ getcres.c getdefptsize.c getnewfntcid.c gettime.c initfshdl.c \ regfpefunc.c rmfshdl.c servclient.c setfntauth.c stfntcfnt.c \ atom.c fontaccel.c fontnames.c fontutil.c fontxlfd.c \ - format.c miscutil.c patcache.c private.c utilbitmap.c + format.c miscutil.c patcache.c private.c utilbitmap.c stubsinit.c INCS= bdfint.h bitmap.h bufio.h fntfil.h fntfilio.h fntfilst.h \ fontconf.h fontencc.h fontmisc.h fontshow.h \
CVS import: xsrc/external/mit/xfs/dist
Module Name:xsrc Committed By: snj Date: Wed Feb 25 20:02:39 UTC 2015 Update of /cvsroot/xsrc/external/mit/xfs/dist In directory ivanova.netbsd.org:/tmp/cvs-serv12352 Log Message: initial import of xfs-1.1.4 Status: Vendor Tag: xorg Release Tags: xfs-1-1-4 U xsrc/external/mit/xfs/dist/missing U xsrc/external/mit/xfs/dist/depcomp U xsrc/external/mit/xfs/dist/config.guess U xsrc/external/mit/xfs/dist/Makefile.am U xsrc/external/mit/xfs/dist/README N xsrc/external/mit/xfs/dist/compile U xsrc/external/mit/xfs/dist/Makefile.in U xsrc/external/mit/xfs/dist/configure U xsrc/external/mit/xfs/dist/devbook.am U xsrc/external/mit/xfs/dist/ChangeLog U xsrc/external/mit/xfs/dist/config.sub U xsrc/external/mit/xfs/dist/COPYING U xsrc/external/mit/xfs/dist/INSTALL U xsrc/external/mit/xfs/dist/aclocal.m4 U xsrc/external/mit/xfs/dist/install-sh U xsrc/external/mit/xfs/dist/config.h.in U xsrc/external/mit/xfs/dist/configure.ac U xsrc/external/mit/xfs/dist/difs/fonts.c U xsrc/external/mit/xfs/dist/difs/initfonts.c U xsrc/external/mit/xfs/dist/difs/tables.c U xsrc/external/mit/xfs/dist/difs/fontinfo.c U xsrc/external/mit/xfs/dist/difs/swaprep.c U xsrc/external/mit/xfs/dist/difs/main.c U xsrc/external/mit/xfs/dist/difs/events.c U xsrc/external/mit/xfs/dist/difs/swapreq.c U xsrc/external/mit/xfs/dist/difs/atom.c U xsrc/external/mit/xfs/dist/difs/resource.c U xsrc/external/mit/xfs/dist/difs/globals.c U xsrc/external/mit/xfs/dist/difs/dispatch.c U xsrc/external/mit/xfs/dist/difs/extensions.c U xsrc/external/mit/xfs/dist/difs/charinfo.c U xsrc/external/mit/xfs/dist/difs/difsutils.c U xsrc/external/mit/xfs/dist/os/access.c U xsrc/external/mit/xfs/dist/os/waitfor.c U xsrc/external/mit/xfs/dist/os/error.c U xsrc/external/mit/xfs/dist/os/osinit.c U xsrc/external/mit/xfs/dist/os/config.c U xsrc/external/mit/xfs/dist/os/osdep.h U xsrc/external/mit/xfs/dist/os/configstr.h U xsrc/external/mit/xfs/dist/os/utils.c U xsrc/external/mit/xfs/dist/os/osglue.c U xsrc/external/mit/xfs/dist/os/connection.c U xsrc/external/mit/xfs/dist/os/io.c U xsrc/external/mit/xfs/dist/os/xfstrans.c U xsrc/external/mit/xfs/dist/os/daemon.c U xsrc/external/mit/xfs/dist/config/config.cpp U xsrc/external/mit/xfs/dist/config/Makefile.am U xsrc/external/mit/xfs/dist/config/Makefile.in U xsrc/external/mit/xfs/dist/doc/Makefile.in U xsrc/external/mit/xfs/dist/doc/Makefile.am U xsrc/external/mit/xfs/dist/doc/xfs-design.xml U xsrc/external/mit/xfs/dist/include/site.h U xsrc/external/mit/xfs/dist/include/globals.h U xsrc/external/mit/xfs/dist/include/access.h U xsrc/external/mit/xfs/dist/include/osstruct.h U xsrc/external/mit/xfs/dist/include/auth.h U xsrc/external/mit/xfs/dist/include/os.h U xsrc/external/mit/xfs/dist/include/clientstr.h U xsrc/external/mit/xfs/dist/include/authstr.h U xsrc/external/mit/xfs/dist/include/servermd.h U xsrc/external/mit/xfs/dist/include/difsutils.h U xsrc/external/mit/xfs/dist/include/dispatch.h U xsrc/external/mit/xfs/dist/include/assert.h U xsrc/external/mit/xfs/dist/include/extentst.h U xsrc/external/mit/xfs/dist/include/misc.h U xsrc/external/mit/xfs/dist/include/difsfn.h U xsrc/external/mit/xfs/dist/include/fsevents.h U xsrc/external/mit/xfs/dist/include/fsresource.h U xsrc/external/mit/xfs/dist/include/difs.h U xsrc/external/mit/xfs/dist/include/closestr.h U xsrc/external/mit/xfs/dist/include/closure.h U xsrc/external/mit/xfs/dist/include/swapreq.h U xsrc/external/mit/xfs/dist/include/client.h U xsrc/external/mit/xfs/dist/include/swaprep.h U xsrc/external/mit/xfs/dist/include/difsfnst.h U xsrc/external/mit/xfs/dist/man/Makefile.am U xsrc/external/mit/xfs/dist/man/xfs.man U xsrc/external/mit/xfs/dist/man/Makefile.in U xsrc/external/mit/xfs/dist/m4/ax_define_dir.m4 No conflicts created by this import
CVS commit: xsrc/external/mit/fontsproto/dist
Module Name:xsrc Committed By: snj Date: Wed Feb 25 19:53:10 UTC 2015 Removed Files: xsrc/external/mit/fontsproto/dist: autogen.sh mkinstalldirs Log Message: delete old files To generate a diff of this commit: cvs rdiff -u -r1.1.1.1 -r0 xsrc/external/mit/fontsproto/dist/autogen.sh \ xsrc/external/mit/fontsproto/dist/mkinstalldirs Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: xsrc/external/mit/libXfont/include
Module Name:xsrc Committed By: snj Date: Wed Feb 25 20:00:49 UTC 2015 Modified Files: xsrc/external/mit/libXfont/include: config.h Log Message: update for 1.5.0 To generate a diff of this commit: cvs rdiff -u -r1.5 -r1.6 xsrc/external/mit/libXfont/include/config.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: xsrc/external/mit/libXfont/include/config.h diff -u xsrc/external/mit/libXfont/include/config.h:1.5 xsrc/external/mit/libXfont/include/config.h:1.6 --- xsrc/external/mit/libXfont/include/config.h:1.5 Fri Jul 11 18:55:42 2014 +++ xsrc/external/mit/libXfont/include/config.h Wed Feb 25 20:00:49 2015 @@ -26,7 +26,7 @@ #define HAVE_POLL_H 1 /* Define to 1 if you have the `readlink' function. */ -#undef HAVE_READLINK +#define HAVE_READLINK 1 /* Define to 1 if the system has the type `socklen_t'. */ #define HAVE_SOCKLEN_T 1 @@ -75,7 +75,7 @@ #define PACKAGE_NAME libXfont /* Define to the full name and version of this package. */ -#define PACKAGE_STRING libXfont 1.4.8 +#define PACKAGE_STRING libXfont 1.5.0 /* Define to the one symbol short name of this package. */ #define PACKAGE_TARNAME libXfont @@ -84,16 +84,16 @@ #undef PACKAGE_URL /* Define to the version of this package. */ -#define PACKAGE_VERSION 1.4.8 +#define PACKAGE_VERSION 1.5.0 /* Major version of this package */ #define PACKAGE_VERSION_MAJOR 1 /* Minor version of this package */ -#define PACKAGE_VERSION_MINOR 4 +#define PACKAGE_VERSION_MINOR 5 /* Patch version of this package */ -#define PACKAGE_VERSION_PATCHLEVEL 8 +#define PACKAGE_VERSION_PATCHLEVEL 0 /* Define to 1 if you have the ANSI C header files. */ #define STDC_HEADERS 1 @@ -127,7 +127,7 @@ /* Version number of package */ -#define VERSION 1.4.1 +#define VERSION 1.5.0 /* Support bdf format bitmap font files */ #define XFONT_BDFFORMAT 1 @@ -160,14 +160,14 @@ #define X_GZIP_FONT_COMPRESSION 1 /* Define to 1 if on MINIX. */ -#undef _MINIX +/* #undef _MINIX */ /* Define to 2 if the system does not provide POSIX.1 features except with this defined. */ -#undef _POSIX_1_SOURCE +/* #undef _POSIX_1_SOURCE */ /* Define to 1 if you need to in order for `stat' and other things to work. */ -#undef _POSIX_SOURCE +/* #undef _POSIX_SOURCE */ /* Defined if needed to expose struct msghdr.msg_control */ -#undef _XOPEN_SOURCE +/* #undef _XOPEN_SOURCE */
CVS commit: xsrc/external/mit/xfs/include
Module Name:xsrc Committed By: snj Date: Wed Feb 25 20:04:02 UTC 2015 Modified Files: xsrc/external/mit/xfs/include: config.h Log Message: update for 1.1.4 To generate a diff of this commit: cvs rdiff -u -r1.1 -r1.2 xsrc/external/mit/xfs/include/config.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: xsrc/external/mit/xfs/include/config.h diff -u xsrc/external/mit/xfs/include/config.h:1.1 xsrc/external/mit/xfs/include/config.h:1.2 --- xsrc/external/mit/xfs/include/config.h:1.1 Fri May 31 01:49:13 2013 +++ xsrc/external/mit/xfs/include/config.h Wed Feb 25 20:04:02 2015 @@ -1,13 +1,11 @@ -/* xfs-config.h. Generated from xfs-config.h.in by configure. */ -/* xfs-config.h.in. Generated from configure.ac by autoheader. */ +/* config.h. Generated from config.h.in by configure. */ +/* config.h.in. Generated from configure.ac by autoheader. */ /* Define to 1 if `struct sockaddr_in' has a `sin_len' member */ #define BSD44SOCKETS 1 /* comma-separated list of strings for config file paths when not specified */ -#ifndef DEFAULT_CONFIG_FILE #define DEFAULT_CONFIG_FILE /etc/X11/fs/config -#endif /* Define to 1 if you have the `daemon' function. */ #define HAVE_DAEMON 1 @@ -61,13 +59,16 @@ #define PACKAGE_NAME xfs /* Define to the full name and version of this package. */ -#define PACKAGE_STRING xfs 1.1.3 +#define PACKAGE_STRING xfs 1.1.4 /* Define to the one symbol short name of this package. */ #define PACKAGE_TARNAME xfs +/* Define to the home page for this package. */ +#define PACKAGE_URL + /* Define to the version of this package. */ -#define PACKAGE_VERSION 1.1.3 +#define PACKAGE_VERSION 1.1.4 /* Major version of this package */ #define PACKAGE_VERSION_MAJOR 1 @@ -76,10 +77,7 @@ #define PACKAGE_VERSION_MINOR 1 /* Patch version of this package */ -#define PACKAGE_VERSION_PATCHLEVEL 3 - -/* Define as the return type of signal handlers (`int' or `void'). */ -#define RETSIGTYPE void +#define PACKAGE_VERSION_PATCHLEVEL 4 /* Define to 1 if you have the ANSI C header files. */ #define STDC_HEADERS 1 @@ -93,23 +91,33 @@ /* Build support for logging via syslog */ #define USE_SYSLOG 1 -/* Version number of package */ -#define VERSION 1.1.3 - -/* Build support for starting from inetd */ -#define XFS_INETD 1 - -/* Define to 1 if on AIX 3. - System headers sometimes define this. - We just want to avoid a redefinition error message. */ +/* Enable extensions on AIX 3, Interix. */ #ifndef _ALL_SOURCE -/* # undef _ALL_SOURCE */ +# define _ALL_SOURCE 1 #endif - /* Enable GNU extensions on systems that have them. */ #ifndef _GNU_SOURCE # define _GNU_SOURCE 1 #endif +/* Enable threading extensions on Solaris. */ +#ifndef _POSIX_PTHREAD_SEMANTICS +# define _POSIX_PTHREAD_SEMANTICS 1 +#endif +/* Enable extensions on HP NonStop. */ +#ifndef _TANDEM_SOURCE +# define _TANDEM_SOURCE 1 +#endif +/* Enable general extensions on Solaris. */ +#ifndef __EXTENSIONS__ +# define __EXTENSIONS__ 1 +#endif + + +/* Version number of package */ +#define VERSION 1.1.4 + +/* Build support for starting from inetd */ +#define XFS_INETD 1 /* Define to 1 if on MINIX. */ /* #undef _MINIX */ @@ -121,13 +129,5 @@ /* Define to 1 if you need to in order for `stat' and other things to work. */ /* #undef _POSIX_SOURCE */ -/* Enable extensions on Solaris. */ -#ifndef __EXTENSIONS__ -# define __EXTENSIONS__ 1 -#endif -#ifndef _POSIX_PTHREAD_SEMANTICS -# define _POSIX_PTHREAD_SEMANTICS 1 -#endif -#ifndef _TANDEM_SOURCE -# define _TANDEM_SOURCE 1 -#endif +/* Defined if needed to expose struct msghdr.msg_control */ +/* #undef _XOPEN_SOURCE */
CVS commit: xsrc/external/mit/fontsproto/dist
Module Name:xsrc
Committed By: snj
Date: Wed Feb 25 20:17:27 UTC 2015
Added Files:
xsrc/external/mit/fontsproto/dist: compile docbook.am
Log Message:
re-add these two useless files from fontsproto-2.1.3.
To generate a diff of this commit:
cvs rdiff -u -r0 -r1.3 xsrc/external/mit/fontsproto/dist/compile \
xsrc/external/mit/fontsproto/dist/docbook.am
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Added files:
Index: xsrc/external/mit/fontsproto/dist/compile
diff -u /dev/null xsrc/external/mit/fontsproto/dist/compile:1.3
--- /dev/null Wed Feb 25 20:17:27 2015
+++ xsrc/external/mit/fontsproto/dist/compile Wed Feb 25 20:17:27 2015
@@ -0,0 +1,347 @@
+#! /bin/sh
+# Wrapper for compilers which do not understand '-c -o'.
+
+scriptversion=2012-10-14.11; # UTC
+
+# Copyright (C) 1999-2013 Free Software Foundation, Inc.
+# Written by Tom Tromey tro...@cygnus.com.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program. If not, see http://www.gnu.org/licenses/.
+
+# As a special exception to the GNU General Public License, if you
+# distribute this file as part of a program that contains a
+# configuration script generated by Autoconf, you may include it under
+# the same distribution terms that you use for the rest of that program.
+
+# This file is maintained in Automake, please report
+# bugs to bug-autom...@gnu.org or send patches to
+# automake-patc...@gnu.org.
+
+nl='
+'
+
+# We need space, tab and new line, in precisely that order. Quoting is
+# there to prevent tools from complaining about whitespace usage.
+IFS= $nl
+
+file_conv=
+
+# func_file_conv build_file lazy
+# Convert a $build file to $host form and store it in $file
+# Currently only supports Windows hosts. If the determined conversion
+# type is listed in (the comma separated) LAZY, no conversion will
+# take place.
+func_file_conv ()
+{
+ file=$1
+ case $file in
+/ | /[!/]*) # absolute file, and not a UNC file
+ if test -z $file_conv; then
+ # lazily determine how to convert abs files
+ case `uname -s` in
+ MINGW*)
+ file_conv=mingw
+ ;;
+ CYGWIN*)
+ file_conv=cygwin
+ ;;
+ *)
+ file_conv=wine
+ ;;
+ esac
+ fi
+ case $file_conv/,$2, in
+ *,$file_conv,*)
+ ;;
+ mingw/*)
+ file=`cmd //C echo $file | sed -e 's/\(.*\) *$/\1/'`
+ ;;
+ cygwin/*)
+ file=`cygpath -m $file || echo $file`
+ ;;
+ wine/*)
+ file=`winepath -w $file || echo $file`
+ ;;
+ esac
+ ;;
+ esac
+}
+
+# func_cl_dashL linkdir
+# Make cl look for libraries in LINKDIR
+func_cl_dashL ()
+{
+ func_file_conv $1
+ if test -z $lib_path; then
+lib_path=$file
+ else
+lib_path=$lib_path;$file
+ fi
+ linker_opts=$linker_opts -LIBPATH:$file
+}
+
+# func_cl_dashl library
+# Do a library search-path lookup for cl
+func_cl_dashl ()
+{
+ lib=$1
+ found=no
+ save_IFS=$IFS
+ IFS=';'
+ for dir in $lib_path $LIB
+ do
+IFS=$save_IFS
+if $shared test -f $dir/$lib.dll.lib; then
+ found=yes
+ lib=$dir/$lib.dll.lib
+ break
+fi
+if test -f $dir/$lib.lib; then
+ found=yes
+ lib=$dir/$lib.lib
+ break
+fi
+if test -f $dir/lib$lib.a; then
+ found=yes
+ lib=$dir/lib$lib.a
+ break
+fi
+ done
+ IFS=$save_IFS
+
+ if test $found != yes; then
+lib=$lib.lib
+ fi
+}
+
+# func_cl_wrapper cl arg...
+# Adjust compile command to suit cl
+func_cl_wrapper ()
+{
+ # Assume a capable shell
+ lib_path=
+ shared=:
+ linker_opts=
+ for arg
+ do
+if test -n $eat; then
+ eat=
+else
+ case $1 in
+ -o)
+ # configure might choose to run compile as 'compile cc -o foo foo.c'.
+ eat=1
+ case $2 in
+ *.o | *.[oO][bB][jJ])
+ func_file_conv $2
+ set x $@ -Fo$file
+ shift
+ ;;
+ *)
+ func_file_conv $2
+ set x $@ -Fe$file
+ shift
+ ;;
+ esac
+ ;;
+ -I)
+ eat=1
+ func_file_conv $2 mingw
+ set x $@ -I$file
+ shift
+ ;;
+ -I*)
+ func_file_conv ${1#-I} mingw
+ set x $@ -I$file
+ shift
+ ;;
+ -l)
+ eat=1
+ func_cl_dashl $2
+ set x $@ $lib
+ shift
+ ;;
+ -l*)
+ func_cl_dashl ${1#-l}
+ set x $@ $lib
+ shift
+ ;;
+ -L)
+ eat=1
+ func_cl_dashL $2
+ ;;
+ -L*)
+ func_cl_dashL ${1#-L}
+ ;;
+ -static)
+ shared=false
+ ;;
+ -Wl,*)
+ arg=${1#-Wl,}
+ save_ifs=$IFS; IFS=','
+ for flag in $arg; do
+ IFS=$save_ifs
+
CVS commit: xsrc/external/mit/libXext/dist
Module Name:xsrc Committed By: snj Date: Wed Feb 25 21:41:20 UTC 2015 Removed Files: xsrc/external/mit/libXext/dist: autogen.sh Log Message: remove file that was last included in libXext-1.0.4 To generate a diff of this commit: cvs rdiff -u -r1.1.1.1 -r0 xsrc/external/mit/libXext/dist/autogen.sh Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/external/bsd/drm2/include/linux
Module Name:src Committed By: riastradh Date: Wed Feb 25 21:55:30 UTC 2015 Modified Files: src/sys/external/bsd/drm2/include/linux: vgaarb.h Log Message: linux/vgaarb.h needs sys/types.h and sys/errno.h. To generate a diff of this commit: cvs rdiff -u -r1.2 -r1.3 src/sys/external/bsd/drm2/include/linux/vgaarb.h 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/include/linux/vgaarb.h diff -u src/sys/external/bsd/drm2/include/linux/vgaarb.h:1.2 src/sys/external/bsd/drm2/include/linux/vgaarb.h:1.3 --- src/sys/external/bsd/drm2/include/linux/vgaarb.h:1.2 Tue Mar 18 18:20:43 2014 +++ src/sys/external/bsd/drm2/include/linux/vgaarb.h Wed Feb 25 21:55:30 2015 @@ -1,4 +1,4 @@ -/* $NetBSD: vgaarb.h,v 1.2 2014/03/18 18:20:43 riastradh Exp $ */ +/* $NetBSD: vgaarb.h,v 1.3 2015/02/25 21:55:30 riastradh Exp $ */ /*- * Copyright (c) 2013 The NetBSD Foundation, Inc. @@ -32,6 +32,9 @@ #ifndef _LINUX_VGAARB_H_ #define _LINUX_VGAARB_H_ +#include sys/types.h +#include sys/errno.h + struct pci_dev; static inline int
CVS commit: src/sys/external/bsd/drm2
Module Name:src
Committed By: riastradh
Date: Wed Feb 25 22:12:00 UTC 2015
Modified Files:
src/sys/external/bsd/drm2/dist/drm/nouveau: nouveau_ttm.c nouveau_ttm.h
src/sys/external/bsd/drm2/dist/drm/nouveau/core/include/subdev: pwr.h
src/sys/external/bsd/drm2/dist/drm/nouveau/core/subdev/pwr:
nouveau_subdev_pwr_base.c
src/sys/external/bsd/drm2/dist/drm/nouveau/core/subdev/therm:
nouveau_subdev_therm_ic.c
src/sys/external/bsd/drm2/dist/drm/nouveau/core/subdev/timer:
nouveau_subdev_timer_nv04.c
src/sys/external/bsd/drm2/dist/drm/nouveau/core/subdev/vm:
nouveau_subdev_vm_base.c nouveau_subdev_vm_nv04.c
nouveau_subdev_vm_nv44.c nv04.h
src/sys/external/bsd/drm2/nouveau: files.nouveau
Log Message:
Another round of nouveau whack-a-mole.
Nouveau compiles now, though it doesn't link yet.
Need to write driver attachment, wscons framebuffer, c. Probably
also some i2c stuff.
To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 \
src/sys/external/bsd/drm2/dist/drm/nouveau/nouveau_ttm.c
cvs rdiff -u -r1.1.1.1 -r1.2 \
src/sys/external/bsd/drm2/dist/drm/nouveau/nouveau_ttm.h
cvs rdiff -u -r1.3 -r1.4 \
src/sys/external/bsd/drm2/dist/drm/nouveau/core/include/subdev/pwr.h
cvs rdiff -u -r1.3 -r1.4 \
src/sys/external/bsd/drm2/dist/drm/nouveau/core/subdev/pwr/nouveau_subdev_pwr_base.c
cvs rdiff -u -r1.1.1.1 -r1.2 \
src/sys/external/bsd/drm2/dist/drm/nouveau/core/subdev/therm/nouveau_subdev_therm_ic.c
cvs rdiff -u -r1.1.1.1 -r1.2 \
src/sys/external/bsd/drm2/dist/drm/nouveau/core/subdev/timer/nouveau_subdev_timer_nv04.c
cvs rdiff -u -r1.1.1.1 -r1.2 \
src/sys/external/bsd/drm2/dist/drm/nouveau/core/subdev/vm/nouveau_subdev_vm_base.c
\
src/sys/external/bsd/drm2/dist/drm/nouveau/core/subdev/vm/nouveau_subdev_vm_nv04.c
\
src/sys/external/bsd/drm2/dist/drm/nouveau/core/subdev/vm/nouveau_subdev_vm_nv44.c
\
src/sys/external/bsd/drm2/dist/drm/nouveau/core/subdev/vm/nv04.h
cvs rdiff -u -r1.6 -r1.7 src/sys/external/bsd/drm2/nouveau/files.nouveau
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/nouveau/nouveau_ttm.c
diff -u src/sys/external/bsd/drm2/dist/drm/nouveau/nouveau_ttm.c:1.2 src/sys/external/bsd/drm2/dist/drm/nouveau/nouveau_ttm.c:1.3
--- src/sys/external/bsd/drm2/dist/drm/nouveau/nouveau_ttm.c:1.2 Wed Aug 6 13:35:13 2014
+++ src/sys/external/bsd/drm2/dist/drm/nouveau/nouveau_ttm.c Wed Feb 25 22:12:00 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: nouveau_ttm.c,v 1.2 2014/08/06 13:35:13 riastradh Exp $ */
+/* $NetBSD: nouveau_ttm.c,v 1.3 2015/02/25 22:12:00 riastradh Exp $ */
/*
* Copyright (c) 2007-2008 Tungsten Graphics, Inc., Cedar Park, TX., USA,
@@ -27,7 +27,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: nouveau_ttm.c,v 1.2 2014/08/06 13:35:13 riastradh Exp $);
+__KERNEL_RCSID(0, $NetBSD: nouveau_ttm.c,v 1.3 2015/02/25 22:12:00 riastradh Exp $);
#include subdev/fb.h
#include subdev/vm.h
@@ -118,7 +118,7 @@ nouveau_vram_manager_debug(struct ttm_me
mutex_lock(nv_subdev(pfb)-mutex);
list_for_each_entry(r, mm-nodes, nl_entry) {
- printk(KERN_DEBUG %s %d: 0x%010llx 0x%010llx\n,
+ printk(KERN_DEBUG %s %d: 0x%010PRIx64 0x%010PRIx64\n,
prefix, r-type, ((u64)r-offset 12),
(((u64)r-offset + r-length) 12));
@@ -128,7 +128,7 @@ nouveau_vram_manager_debug(struct ttm_me
}
mutex_unlock(nv_subdev(pfb)-mutex);
- printk(KERN_DEBUG %s total: 0x%010llx free: 0x%010llx\n,
+ printk(KERN_DEBUG %s total: 0x%010PRIx64 free: 0x%010PRIx64\n,
prefix, (u64)total 12, (u64)free 12);
printk(KERN_DEBUG %s block: 0x%08x\n,
prefix, mm-block_size 12);
@@ -283,6 +283,27 @@ const struct ttm_mem_type_manager_func n
nv04_gart_manager_debug
};
+#ifdef __NetBSD__
+
+int
+nouveau_ttm_mmap_object(struct drm_device *dev, off_t offset, size_t size,
+vm_prot_t prot, struct uvm_object **uobjp, voff_t *uoffsetp,
+struct file *file)
+{
+ struct nouveau_drm *const drm = nouveau_drm(dev);
+
+ KASSERT(0 == (offset (PAGE_SIZE - 1)));
+
+ if (__predict_false((offset PAGE_SHIFT) DRM_FILE_PAGE_OFFSET))
+ return drm_mmap_object(dev, offset, size, prot, uobjp,
+ uoffsetp, file);
+ else
+ return ttm_bo_mmap_object(drm-ttm.bdev, offset, size, prot,
+ uobjp, uoffsetp, file);
+}
+
+#else
+
int
nouveau_ttm_mmap(struct file *filp, struct vm_area_struct *vma)
{
@@ -295,6 +316,8 @@ nouveau_ttm_mmap(struct file *filp, stru
return ttm_bo_mmap(filp, vma, drm-ttm.bdev);
}
+#endif
+
static int
nouveau_ttm_mem_global_init(struct drm_global_reference *ref)
{
Index: src/sys/external/bsd/drm2/dist/drm/nouveau/nouveau_ttm.h
diff -u src/sys/external/bsd/drm2/dist/drm/nouveau/nouveau_ttm.h:1.1.1.1 src/sys/external/bsd/drm2/dist/drm/nouveau/nouveau_ttm.h:1.2
---
CVS commit: src/sys/arch/powerpc/include/booke
Module Name:src
Committed By: nonaka
Date: Thu Feb 26 02:21:38 UTC 2015
Modified Files:
src/sys/arch/powerpc/include/booke: etsecreg.h
Log Message:
fix offset value of RBASEn.
To generate a diff of this commit:
cvs rdiff -u -r1.6 -r1.7 src/sys/arch/powerpc/include/booke/etsecreg.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/powerpc/include/booke/etsecreg.h
diff -u src/sys/arch/powerpc/include/booke/etsecreg.h:1.6 src/sys/arch/powerpc/include/booke/etsecreg.h:1.7
--- src/sys/arch/powerpc/include/booke/etsecreg.h:1.6 Tue Feb 17 01:53:21 2015
+++ src/sys/arch/powerpc/include/booke/etsecreg.h Thu Feb 26 02:21:38 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: etsecreg.h,v 1.6 2015/02/17 01:53:21 nonaka Exp $ */
+/* $NetBSD: etsecreg.h,v 1.7 2015/02/26 02:21:38 nonaka Exp $ */
/*-
* Copyright (c) 2010, 2011 The NetBSD Foundation, Inc.
* All rights reserved.
@@ -355,7 +355,7 @@ struct rxfcb {
#define RBASE5 0x42C /* RxBD base address of ring 5 [TSEC3] */
#define RBASE6 0x434 /* RxBD base address of ring 6 [TSEC3] */
#define RBASE7 0x43C /* RxBD base address of ring 7 [TSEC3] */
-#define RBASEn(n) (RBASE0 + 4*(n))
+#define RBASEn(n) (RBASE0 + 8*(n))
#define TMR_RXTS_H 0x4C0 /* Rx timer time stamp register high [TSEC3] */
#define TMR_RXTS_L 0x4C4 /* Rx timer time stamp register low [TSEC3] */
CVS commit: src
Module Name:src Committed By: snj Date: Thu Feb 26 04:11:32 UTC 2015 Modified Files: src/distrib/sets/lists/xcomp: mi src/external/mit/xorg/lib/libXaw: Makefile Log Message: don't install X11/Xaw/Print.h and X11/Xaw/PrintSP.h. they haven't been included upstream since libXaw 1.0.5 (released in 2008) and are useless in this Xprint-less world. To generate a diff of this commit: cvs rdiff -u -r1.161 -r1.162 src/distrib/sets/lists/xcomp/mi cvs rdiff -u -r1.9 -r1.10 src/external/mit/xorg/lib/libXaw/Makefile Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/distrib/sets/lists/xcomp/mi diff -u src/distrib/sets/lists/xcomp/mi:1.161 src/distrib/sets/lists/xcomp/mi:1.162 --- src/distrib/sets/lists/xcomp/mi:1.161 Mon Feb 23 11:40:57 2015 +++ src/distrib/sets/lists/xcomp/mi Thu Feb 26 04:11:32 2015 @@ -1,4 +1,4 @@ -# $NetBSD: mi,v 1.161 2015/02/23 11:40:57 jmcneill Exp $ +# $NetBSD: mi,v 1.162 2015/02/26 04:11:32 snj Exp $ # # Note: don't delete entries from here - mark them as obsolete instead. # @@ -5240,8 +5240,8 @@ ./usr/X11R7/include/X11/Xaw/PannerP.h -unknown- xorg ./usr/X11R7/include/X11/Xaw/Porthole.h -unknown- xorg ./usr/X11R7/include/X11/Xaw/PortholeP.h -unknown- xorg -./usr/X11R7/include/X11/Xaw/Print.h -unknown- xorg -./usr/X11R7/include/X11/Xaw/PrintSP.h -unknown- xorg +./usr/X11R7/include/X11/Xaw/Print.h -obsoltete- obsolete +./usr/X11R7/include/X11/Xaw/PrintSP.h -obsolete- obsolete ./usr/X11R7/include/X11/Xaw/Repeater.h -unknown- xorg ./usr/X11R7/include/X11/Xaw/RepeaterP.h -unknown- xorg ./usr/X11R7/include/X11/Xaw/Reports.h -unknown- xorg Index: src/external/mit/xorg/lib/libXaw/Makefile diff -u src/external/mit/xorg/lib/libXaw/Makefile:1.9 src/external/mit/xorg/lib/libXaw/Makefile:1.10 --- src/external/mit/xorg/lib/libXaw/Makefile:1.9 Thu Aug 11 23:15:38 2011 +++ src/external/mit/xorg/lib/libXaw/Makefile Thu Feb 26 04:11:32 2015 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.9 2011/08/11 23:15:38 joerg Exp $ +# $NetBSD: Makefile,v 1.10 2015/02/26 04:11:32 snj Exp $ .include bsd.own.mk @@ -38,7 +38,7 @@ INCS= AllWidgets.h AsciiSink.h AsciiSink Form.h FormP.h Grip.h GripP.h Label.h LabelP.h List.h \ ListP.h MenuButton.h MenuButtoP.h MultiSrc.h MultiSrcP.h \ MultiSink.h MultiSinkP.h Paned.h PanedP.h Panner.h \ - PannerP.h Porthole.h PortholeP.h Print.h PrintSP.h \ + PannerP.h Porthole.h PortholeP.h \ Repeater.h RepeaterP.h Reports.h Scrollbar.h ScrollbarP.h \ Simple.h SimpleP.h SimpleMenu.h SimpleMenP.h Sme.h SmeP.h \ SmeBSB.h SmeBSBP.h SmeLine.h SmeLineP.h StripChart.h \
CVS commit: xsrc/external/mit/libXaw/dist
Module Name:xsrc Committed By: snj Date: Thu Feb 26 04:12:24 UTC 2015 Removed Files: xsrc/external/mit/libXaw/dist: xaw.m4 xaw8.pc.in xsrc/external/mit/libXaw/dist/include/X11/Xaw: Print.h PrintSP.h xsrc/external/mit/libXaw/dist/src: PrintShell.c Log Message: nuke old files that disappeared upstream in 1.0.5. To generate a diff of this commit: cvs rdiff -u -r1.1.1.1 -r0 xsrc/external/mit/libXaw/dist/xaw.m4 \ xsrc/external/mit/libXaw/dist/xaw8.pc.in cvs rdiff -u -r1.1.1.1 -r0 \ xsrc/external/mit/libXaw/dist/include/X11/Xaw/Print.h \ xsrc/external/mit/libXaw/dist/include/X11/Xaw/PrintSP.h cvs rdiff -u -r1.1.1.1 -r0 xsrc/external/mit/libXaw/dist/src/PrintShell.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/sys
Module Name:src
Committed By: dholland
Date: Thu Feb 26 02:05:54 UTC 2015
Modified Files:
src/sys/sys: dirent.h
Log Message:
fix inadequate parens in macro (my fault originally)
To generate a diff of this commit:
cvs rdiff -u -r1.28 -r1.29 src/sys/sys/dirent.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/sys/dirent.h
diff -u src/sys/sys/dirent.h:1.28 src/sys/sys/dirent.h:1.29
--- src/sys/sys/dirent.h:1.28 Tue Sep 27 01:40:32 2011
+++ src/sys/sys/dirent.h Thu Feb 26 02:05:54 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: dirent.h,v 1.28 2011/09/27 01:40:32 christos Exp $ */
+/* $NetBSD: dirent.h,v 1.29 2015/02/26 02:05:54 dholland Exp $ */
/*-
* Copyright (c) 1989, 1993
@@ -91,7 +91,7 @@ struct dirent {
* struct dirent
*/
#if __GNUC_PREREQ__(4, 0)
-#define _DIRENT_NAMEOFF(dp) __builtin_offsetof(__typeof__(*dp), d_name)
+#define _DIRENT_NAMEOFF(dp) __builtin_offsetof(__typeof__(*(dp)), d_name)
#else
#define _DIRENT_NAMEOFF(dp) \
((char *)(void *)(dp)-d_name - (char *)(void *)dp)
CVS commit: src/sys/arch/powerpc/include/booke
Module Name:src
Committed By: nonaka
Date: Thu Feb 26 02:27:40 UTC 2015
Modified Files:
src/sys/arch/powerpc/include/booke: etsecreg.h
Log Message:
Added some register definitions for multi-queue.
To generate a diff of this commit:
cvs rdiff -u -r1.7 -r1.8 src/sys/arch/powerpc/include/booke/etsecreg.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/powerpc/include/booke/etsecreg.h
diff -u src/sys/arch/powerpc/include/booke/etsecreg.h:1.7 src/sys/arch/powerpc/include/booke/etsecreg.h:1.8
--- src/sys/arch/powerpc/include/booke/etsecreg.h:1.7 Thu Feb 26 02:21:38 2015
+++ src/sys/arch/powerpc/include/booke/etsecreg.h Thu Feb 26 02:27:40 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: etsecreg.h,v 1.7 2015/02/26 02:21:38 nonaka Exp $ */
+/* $NetBSD: etsecreg.h,v 1.8 2015/02/26 02:27:40 nonaka Exp $ */
/*-
* Copyright (c) 2010, 2011 The NetBSD Foundation, Inc.
* All rights reserved.
@@ -109,15 +109,16 @@ struct rxbd {
#define RXFCB_CTU 0x0400 /* TCP or UDP checksum checked */
#define RXFCB_EIP 0x0200 /* IPv4 header checksum error */
#define RXFCB_ETU 0x0100 /* TCP or UDP header checksum error */
+#define RXFCB_HASH_VAL 0x0010 /* FLR_HASH value is valid */
#define RXFCB_PERR 0x000c /* Parse Error */
#define RXFCB_PERR_L3 0x0008 /* L3 Parse Error */
struct rxfcb {
uint16_t rxfcb_flags;
- uint8_t rxfcb_rq; /* receive queue index */
- uint8_t rxfcb_pro; /* IP Protocol received */
- uint16_t rxfcb__mbz1;
- uint16_t rxfcb_vlctl; /* VLAN control field */
+ uint8_t rxfcb_rq; /* receive queue index */
+ uint8_t rxfcb_pro; /* IP Protocol received */
+ uint16_t rxfcb_flr_hash; /* filer hash value */
+ uint16_t rxfcb_vlctl; /* VLAN control field */
};
/* 0x000-0x0ff eTSEC general control/status registers */
@@ -139,7 +140,8 @@ struct rxfcb {
#define IEVENT_CRL __PPCBIT(14) /* collision retry limit */
#define IEVENT_XFUN __PPCBIT(15) /* transmit fifo underrun */
#define IEVENT_RXB __PPCBIT(16) /* receive buffer */
-#define IEVENT_MAG __PPCBIT(29) /* magic packet detected */
+#define IEVENT_TWK __PPCBIT(19) /* timer wakeup */
+#define IEVENT_MAG __PPCBIT(20) /* magic packet detected */
#define IEVENT_MMRD __PPCBIT(21) /* MMI manangement read complete */
#define IEVENT_MMWR __PPCBIT(22) /* MMI manangement write complete */
#define IEVENT_GRSC __PPCBIT(23) /* graceful receive stop complete */
@@ -188,7 +190,10 @@ struct rxfcb {
#define TCTRL_THDF __PPCBIT(29) /* Transmit half duplex */
#define TCTRL_RFC_PAUSE __PPCBIT(27) /* receive flow control pause frame */
#define TCTRL_TFC_PAUSE __PPCBIT(28) /* transmit flow control pause frame */
-#define TXSCHED __PPCBITS(29,30) /* transmit ring scheduling algorithm */
+#define TCTRL_TXSCHED __PPCBITS(29,30) /* transmit ring scheduling algorithm */
+#define TCTRL_TXSCHED_SINGLE __SHIFTIN(0,TCTRL_TXSCHED)
+#define TCTRL_TXSCHED_PRIO __SHIFTIN(1,TCTRL_TXSCHED)
+#define TCTRL_TXSCHED_MWRR __SHIFTIN(2,TCTRL_TXSCHED)
#define TSTAT 0x104 /* Transmit status register */
#define TSTAT_THLT0 __PPCBIT(0) /* transmit halt of ring 0 */
@@ -264,6 +269,10 @@ struct rxfcb {
/* 0x300-0x4ff eTSEC receive control/status registers */
#define RCTRL 0x300 /* Receive control register */
+#define RCTRL_L2OFF __PPCBITS(0,6)
+#define RCTRL_L2OFF_SET(n) __SHIFTIN((n),RCTRL_L2OFF)
+#define RCTRL_TS __PPCBIT(7)
+#define RCTRL_RR __PPCBIT(10)
#define RCTRL_PAL __PPCBITS(11,15)
#define RCTRL_VLEX __PPCBIT(18)
#define RCTRL_FILREN __PPCBIT(19)
@@ -321,7 +330,7 @@ struct rxfcb {
#define RQUEUE_EX6 __PPCBIT(14)
#define RQUEUE_EX7 __PPCBIT(15)
#define RQUEUE_EXn(n) (RQUEUE_EX0 (n))
-#define RQUEUE_EX __PPCBITS(0,7)
+#define RQUEUE_EX __PPCBITS(8,15)
#define RQUEUE_EN0 __PPCBIT(24) /* ring is queried for reception */
#define RQUEUE_EN1 __PPCBIT(25)
#define RQUEUE_EN2 __PPCBIT(26)
@@ -332,10 +341,65 @@ struct rxfcb {
#define RQUEUE_EN7 __PPCBIT(31)
#define RQUEUE_EN __PPCBITS(24,31)
#define RQUEUE_ENn(n) (RQUEUE_EN0 (n))
+#define RIR0 0x318 /* Ring mapping register 0 */
+#define RIR1 0x31c /* Ring mapping register 1 */
+#define RIR2 0x320 /* Ring mapping register 2 */
+#define RIR3 0x324 /* Ring mapping register 3 */
+#define RIRn(n) (RIR0 + 4*(n))
#define RBIFX 0x330 /* Receive bit field extract control register [TSEC3] */
#define RQFAR 0x334 /* Receive queue filing table address register [TSEC3] */
#define RQFCR 0x338 /* Receive queue filing table control register [TSEC3] */
+#define RQFCR_GPI __PPCBIT(0) /* General purpose interrupt */
+#define RQFCR_HASHTBL __PPCBITS(12,14) /* Select between filer Q value and RIR fileds. */
+#define RQFCR_HASHTBL_Q __SHIFTIN(0,RQFCR_HASHTBL)
+#define RQFCR_HASHTBL_0 __SHIFTIN(1,RQFCR_HASHTBL)
+#define RQFCR_HASHTBL_1 __SHIFTIN(2,RQFCR_HASHTBL)
+#define RQFCR_HASHTBL_2 __SHIFTIN(3,RQFCR_HASHTBL)
+#define RQFCR_HASHTBL_3 __SHIFTIN(4,RQFCR_HASHTBL)
+#define RQFCR_HASH __PPCBIT(15) /* Include parser results in
CVS commit: src/sys/dev/pci
Module Name:src
Committed By: riastradh
Date: Thu Feb 26 00:42:10 UTC 2015
Modified Files:
src/sys/dev/pci: agp_i810.c
Log Message:
Issue a write barrier after updating the GTT.
Linux never used to do this...until a month:
https://bugs.freedesktop.org/show_bug.cgi?id=88191
commit 983d308cb8f602d1920a8c40196eb2ab6cc07bd2
Author: Chris Wilson ch...@chris-wilson.co.uk
Date: Mon Jan 26 10:47:10 2015 +
agp/intel: Serialise after GTT updates
To generate a diff of this commit:
cvs rdiff -u -r1.114 -r1.115 src/sys/dev/pci/agp_i810.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/dev/pci/agp_i810.c
diff -u src/sys/dev/pci/agp_i810.c:1.114 src/sys/dev/pci/agp_i810.c:1.115
--- src/sys/dev/pci/agp_i810.c:1.114 Sun Aug 24 22:56:18 2014
+++ src/sys/dev/pci/agp_i810.c Thu Feb 26 00:42:10 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: agp_i810.c,v 1.114 2014/08/24 22:56:18 riastradh Exp $ */
+/* $NetBSD: agp_i810.c,v 1.115 2015/02/26 00:42:10 riastradh Exp $ */
/*-
* Copyright (c) 2000 Doug Rabson
@@ -30,7 +30,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: agp_i810.c,v 1.114 2014/08/24 22:56:18 riastradh Exp $);
+__KERNEL_RCSID(0, $NetBSD: agp_i810.c,v 1.115 2015/02/26 00:42:10 riastradh Exp $);
#include sys/param.h
#include sys/systm.h
@@ -156,6 +156,13 @@ void
agp_i810_post_gtt_entry(struct agp_i810_softc *isc, off_t off)
{
+ /*
+ * See https://bugs.freedesktop.org/show_bug.cgi?id=88191.
+ * Out of paranoia, let's do the write barrier and posting
+ * read, because I don't have enough time or hardware to
+ * conduct conclusive tests.
+ */
+ membar_producer();
(void)bus_space_read_4(isc-gtt_bst, isc-gtt_bsh,
4*(off AGP_PAGE_SHIFT));
}
CVS commit: src/sys/fs/puffs
Module Name:src
Committed By: christos
Date: Wed Feb 25 23:14:59 UTC 2015
Modified Files:
src/sys/fs/puffs: puffs_vnops.c
Log Message:
make this compile again.
To generate a diff of this commit:
cvs rdiff -u -r1.201 -r1.202 src/sys/fs/puffs/puffs_vnops.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/fs/puffs/puffs_vnops.c
diff -u src/sys/fs/puffs/puffs_vnops.c:1.201 src/sys/fs/puffs/puffs_vnops.c:1.202
--- src/sys/fs/puffs/puffs_vnops.c:1.201 Wed Feb 25 09:08:45 2015
+++ src/sys/fs/puffs/puffs_vnops.c Wed Feb 25 18:14:59 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: puffs_vnops.c,v 1.201 2015/02/25 14:08:45 manu Exp $ */
+/* $NetBSD: puffs_vnops.c,v 1.202 2015/02/25 23:14:59 christos Exp $ */
/*
* Copyright (c) 2005, 2006, 2007 Antti Kantee. All Rights Reserved.
@@ -30,7 +30,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: puffs_vnops.c,v 1.201 2015/02/25 14:08:45 manu Exp $);
+__KERNEL_RCSID(0, $NetBSD: puffs_vnops.c,v 1.202 2015/02/25 23:14:59 christos Exp $);
#include sys/param.h
#include sys/buf.h
@@ -2564,8 +2564,8 @@ puffs_vnop_write(void *v)
va.va_size = vp-v_size;
ret = dosetattr(vp, va, FSCRED, 0);
if (ret) {
- DPRINTF((dosetattr set size to %lld failed: %d\n,
- vp-v_size, ret));
+ DPRINTF((dosetattr set size to %jd failed: %d\n,
+ (intmax_t)vp-v_size, ret));
}
}
mutex_exit(pn-pn_sizemtx);
CVS commit: src/sys/dev/pci
Module Name:src Committed By: riastradh Date: Thu Feb 26 00:58:17 UTC 2015 Modified Files: src/sys/dev/pci: agp_i810.c Log Message: Include sys/atomic.h for membar_producer. (Why didn't this fail in my build?) To generate a diff of this commit: cvs rdiff -u -r1.115 -r1.116 src/sys/dev/pci/agp_i810.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/dev/pci/agp_i810.c diff -u src/sys/dev/pci/agp_i810.c:1.115 src/sys/dev/pci/agp_i810.c:1.116 --- src/sys/dev/pci/agp_i810.c:1.115 Thu Feb 26 00:42:10 2015 +++ src/sys/dev/pci/agp_i810.c Thu Feb 26 00:58:17 2015 @@ -1,4 +1,4 @@ -/* $NetBSD: agp_i810.c,v 1.115 2015/02/26 00:42:10 riastradh Exp $ */ +/* $NetBSD: agp_i810.c,v 1.116 2015/02/26 00:58:17 riastradh Exp $ */ /*- * Copyright (c) 2000 Doug Rabson @@ -30,10 +30,11 @@ */ #include sys/cdefs.h -__KERNEL_RCSID(0, $NetBSD: agp_i810.c,v 1.115 2015/02/26 00:42:10 riastradh Exp $); +__KERNEL_RCSID(0, $NetBSD: agp_i810.c,v 1.116 2015/02/26 00:58:17 riastradh Exp $); #include sys/param.h #include sys/systm.h +#include sys/atomic.h #include sys/malloc.h #include sys/kernel.h #include sys/proc.h
CVS commit: xsrc/external/mit/MesaDemos/dist/src/xdemos
Module Name:xsrc Committed By: snj Date: Thu Feb 26 04:46:36 UTC 2015 Removed Files: xsrc/external/mit/MesaDemos/dist/src/xdemos: glxgears.c glxinfo.c Log Message: delete MesaDemos (8.1.0), which is no longer used. To generate a diff of this commit: cvs rdiff -u -r1.1.1.1 -r0 \ xsrc/external/mit/MesaDemos/dist/src/xdemos/glxgears.c \ xsrc/external/mit/MesaDemos/dist/src/xdemos/glxinfo.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: xsrc/external/mit/xproto/dist
Module Name:xsrc Committed By: snj Date: Thu Feb 26 06:11:54 UTC 2015 Removed Files: xsrc/external/mit/xproto/dist: autogen.sh Log Message: remove file that disappeared upstream in xproto-7.0.15 To generate a diff of this commit: cvs rdiff -u -r1.1.1.1 -r0 xsrc/external/mit/xproto/dist/autogen.sh Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: xsrc/external/mit/luit/dist
Module Name:xsrc Committed By: snj Date: Thu Feb 26 06:06:58 UTC 2015 Removed Files: xsrc/external/mit/luit/dist: AUTHORS NEWS Log Message: remove empty files that disappeared in luit-1.0.5 To generate a diff of this commit: cvs rdiff -u -r1.1.1.1 -r0 xsrc/external/mit/luit/dist/AUTHORS \ xsrc/external/mit/luit/dist/NEWS Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: xsrc/external/mit/xorg-server/dist/Xext
Module Name:xsrc Committed By: snj Date: Thu Feb 26 07:17:00 UTC 2015 Removed Files: xsrc/external/mit/xorg-server/dist/Xext: sync_old.h syncstr_old.h Log Message: remove two local headers that have been unused since revision 1.7 of sync.c (nov 2010). To generate a diff of this commit: cvs rdiff -u -r1.1 -r0 xsrc/external/mit/xorg-server/dist/Xext/sync_old.h \ xsrc/external/mit/xorg-server/dist/Xext/syncstr_old.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/share/mk
Module Name:src
Committed By: snj
Date: Thu Feb 26 04:49:16 UTC 2015
Modified Files:
src/share/mk: bsd.own.mk
Log Message:
prune a number of now-nonexistent xorg components
To generate a diff of this commit:
cvs rdiff -u -r1.842 -r1.843 src/share/mk/bsd.own.mk
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/share/mk/bsd.own.mk
diff -u src/share/mk/bsd.own.mk:1.842 src/share/mk/bsd.own.mk:1.843
--- src/share/mk/bsd.own.mk:1.842 Fri Jan 23 03:43:24 2015
+++ src/share/mk/bsd.own.mk Thu Feb 26 04:49:16 2015
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.own.mk,v 1.842 2015/01/23 03:43:24 chs Exp $
+# $NetBSD: bsd.own.mk,v 1.843 2015/02/26 04:49:16 snj Exp $
# This needs to be before bsd.init.mk
.if defined(BSD_MK_COMPAT_FILE)
@@ -1251,7 +1251,7 @@ X11SRCDIRMIT?= ${X11SRCDIR}/external/mi
FS ICE SM X11 XScrnSaver XTrap Xau Xcomposite Xcursor Xdamage \
Xdmcp Xevie Xext Xfixes Xfont Xft Xi Xinerama Xmu Xpm \
Xrandr Xrender Xres Xt Xtst Xv XvMC Xxf86dga Xxf86misc Xxf86vm drm \
- fontenc xkbfile xkbui Xaw lbxutil Xfontcache pciaccess xcb \
+ fontenc xkbfile xkbui Xaw Xfontcache pciaccess xcb \
pthread-stubs
X11SRCDIR.${_lib}?= ${X11SRCDIRMIT}/lib${_lib}/dist
.endfor
@@ -1265,21 +1265,21 @@ X11SRCDIR.${_proto}proto?= ${X11SRCDIRM
.endfor
.for _dir in \
- xtrans fontconfig expat freetype evieext mkfontscale bdftopcf \
- xkbcomp xorg-cf-files imake xorg-server xbiff xkbdata xkeyboard-config \
+ xtrans fontconfig freetype evieext mkfontscale bdftopcf \
+ xkbcomp xorg-cf-files imake xorg-server xbiff xkeyboard-config \
xbitmaps appres xeyes xev xedit sessreg pixman \
beforelight bitmap editres makedepend fonttosfnt fslsfonts fstobdf \
- glu glw mesa-demos MesaDemos MesaGLUT MesaLib MesaLib7 \
- ico iceauth lbxproxy listres lndir \
+ glu glw mesa-demos MesaGLUT MesaLib MesaLib7 \
+ ico iceauth listres lndir \
luit xproxymanagementprotocol mkfontdir oclock proxymngr rgb \
setxkbmap smproxy twm viewres x11perf xauth xcalc xclipboard \
- xclock xcmsdb xconsole xcutsel xditview xdpyinfo xdriinfo xdm \
+ xclock xcmsdb xconsole xditview xdpyinfo xdriinfo xdm \
xfd xf86dga xfindproxy xfontsel xfwp xgamma xgc xhost xinit \
xkill xload xlogo xlsatoms xlsclients xlsfonts xmag xmessage \
xmh xmodmap xmore xman xprop xrandr xrdb xrefresh xset \
xsetmode xsetpointer xsetroot xsm xstdcmap xvidtune xvinfo \
- xwininfo xwud xprehashprinterlist xplsprinters xkbprint xkbevd \
- xterm xwd xfs xfsinfo xphelloworld xtrap xkbutils xkbcomp \
+ xwininfo xwud xkbprint xkbevd \
+ xterm xwd xfs xfsinfo xtrap xkbutils xkbcomp \
xkeyboard-config xinput xcb-util xorg-docs \
font-adobe-100dpi font-adobe-75dpi font-adobe-utopia-100dpi \
font-adobe-utopia-75dpi font-adobe-utopia-type1 \
@@ -1305,7 +1305,7 @@ X11SRCDIR.xf86-input-${_i}?= ${X11SRCDIR
r128 radeonhd rendition \
s3 s3virge savage siliconmotion sis suncg14 \
suncg6 sunffb sunleo suntcx \
- tdfx tga trident tseng vesa vga via vmware wsfb xgi
+ tdfx tga trident tseng vesa vga vmware wsfb xgi
X11SRCDIR.xf86-video-${_v}?= ${X11SRCDIRMIT}/xf86-video-${_v}/dist
.endfor
CVS commit: src/sbin/drvctl
Module Name:src Committed By: wiz Date: Wed Feb 25 09:01:08 UTC 2015 Modified Files: src/sbin/drvctl: drvctl.8 Log Message: Bump date for previous. New sentence, new line. To generate a diff of this commit: cvs rdiff -u -r1.14 -r1.15 src/sbin/drvctl/drvctl.8 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sbin/drvctl/drvctl.8 diff -u src/sbin/drvctl/drvctl.8:1.14 src/sbin/drvctl/drvctl.8:1.15 --- src/sbin/drvctl/drvctl.8:1.14 Tue Feb 24 18:15:29 2015 +++ src/sbin/drvctl/drvctl.8 Wed Feb 25 09:01:08 2015 @@ -1,4 +1,4 @@ -.\ $NetBSD: drvctl.8,v 1.14 2015/02/24 18:15:29 mlelstv Exp $ +.\ $NetBSD: drvctl.8,v 1.15 2015/02/25 09:01:08 wiz Exp $ .\ .\ Copyright (c) 2004 .\ Matthias Drochner. All rights reserved. @@ -24,7 +24,7 @@ .\ OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\ SUCH DAMAGE. .\ -.Dd January 16, 2012 +.Dd February 25, 2015 .Dt DRVCTL 8 .Os .Sh NAME @@ -114,8 +114,8 @@ argument. If .Ar property is specified, the value of that property is printed, otherwise -the properties are displayed as an XML property list. The -property can be given as a path of dictionary keys and numeric +the properties are displayed as an XML property list. +The property can be given as a path of dictionary keys and numeric array indexes separated by slashes. .It Fl Q Resume the ancestors of
CVS commit: src/sys/arch/evbarm
Module Name:src
Committed By: ryo
Date: Wed Feb 25 08:11:49 UTC 2015
Modified Files:
src/sys/arch/evbarm/conf: std.nitrogen6
src/sys/arch/evbarm/nitrogen6: nitrogen6_machdep.c
Log Message:
on iMX6, disable __HAVE_MM_MD_DIRECT_MAPPED_PHYS and PMAP_NEED_ALLOC_POOLPAGE
by default.
To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 src/sys/arch/evbarm/conf/std.nitrogen6
cvs rdiff -u -r1.1 -r1.2 src/sys/arch/evbarm/nitrogen6/nitrogen6_machdep.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/evbarm/conf/std.nitrogen6
diff -u src/sys/arch/evbarm/conf/std.nitrogen6:1.1 src/sys/arch/evbarm/conf/std.nitrogen6:1.2
--- src/sys/arch/evbarm/conf/std.nitrogen6:1.1 Thu Sep 25 05:05:28 2014
+++ src/sys/arch/evbarm/conf/std.nitrogen6 Wed Feb 25 08:11:48 2015
@@ -1,4 +1,4 @@
-# $NetBSD: std.nitrogen6,v 1.1 2014/09/25 05:05:28 ryo Exp $
+# $NetBSD: std.nitrogen6,v 1.2 2015/02/25 08:11:48 ryo Exp $
#
# standard NetBSD/evbarm options for Nitrogen6X
@@ -11,10 +11,8 @@ include arch/evbarm/conf/files.nitroge
options NITROGEN6
options ARM_HAS_VBAR
-options PMAP_NEED_ALLOC_POOLPAGE
options __HAVE_CPU_COUNTER
options __HAVE_FAST_SOFTINTS # should be in types.h
-options __HAVE_MM_MD_DIRECT_MAPPED_PHYS
options TPIDRPRW_IS_CURCPU
makeoptions CPUFLAGS=-mcpu=cortex-a9
Index: src/sys/arch/evbarm/nitrogen6/nitrogen6_machdep.c
diff -u src/sys/arch/evbarm/nitrogen6/nitrogen6_machdep.c:1.1 src/sys/arch/evbarm/nitrogen6/nitrogen6_machdep.c:1.2
--- src/sys/arch/evbarm/nitrogen6/nitrogen6_machdep.c:1.1 Thu Sep 25 05:05:28 2014
+++ src/sys/arch/evbarm/nitrogen6/nitrogen6_machdep.c Wed Feb 25 08:11:49 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: nitrogen6_machdep.c,v 1.1 2014/09/25 05:05:28 ryo Exp $ */
+/* $NetBSD: nitrogen6_machdep.c,v 1.2 2015/02/25 08:11:49 ryo Exp $ */
/*-
* Copyright (c) 2012 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: nitrogen6_machdep.c,v 1.1 2014/09/25 05:05:28 ryo Exp $);
+__KERNEL_RCSID(0, $NetBSD: nitrogen6_machdep.c,v 1.2 2015/02/25 08:11:49 ryo Exp $);
#include opt_evbarm_boardtype.h
#include opt_arm_debug.h
@@ -134,6 +134,15 @@ static const struct pmap_devmap devmap[]
{ 0, 0, 0, 0, 0 }
};
+#ifdef PMAP_NEED_ALLOC_POOLPAGE
+static struct boot_physmem bp_highgig = {
+ .bp_start = IMX6_MEM_BASE / NBPG,
+ .bp_pages = (KERNEL_VM_BASE - KERNEL_BASE) / NBPG,
+ .bp_freelist = VM_FREELIST_ISADMA,
+ .bp_flags = 0,
+};
+#endif
+
/*
* u_int initarm(...)
*
@@ -213,24 +222,40 @@ initarm(void *arg)
bootconfig.dram[0].address = KERN_VTOPHYS(KERNEL_BASE);
bootconfig.dram[0].pages = memsize / PAGE_SIZE;
- arm32_bootmem_init(bootconfig.dram[0].address,
- bootconfig.dram[0].pages * PAGE_SIZE, (paddr_t)KERNEL_BASE_phys);
+#ifdef __HAVE_MM_MD_DIRECT_MAPPED_PHYS
+ const bool mapallmem_p = true;
+#ifndef PMAP_NEED_ALLOC_POOLPAGE
+ if (memsize KERNEL_VM_BASE - KERNEL_BASE) {
+ printf(%s: dropping RAM size from %luMB to %uMB\n,
+ __func__, (unsigned long) (memsize 20),
+ (KERNEL_VM_BASE - KERNEL_BASE) 20);
+ memsize = KERNEL_VM_BASE - KERNEL_BASE;
+ }
+#endif
+#else /* !__HAVE_MM_MD_DIRECT_MAPPED_PHYS */
+ const bool mapallmem_p = false;
+#endif /* __HAVE_MM_MD_DIRECT_MAPPED_PHYS */
- /*
- * This is going to do all the hard work of setting up the first and
- * and second level page tables. Pages of memory will be allocated
- * and mapped for other structures that are required for system
- * operation. When it returns, physical_freestart and free_pages will
- * have been updated to reflect the allocations that were made. In
- * addition, kernel_l1pt, kernel_pt_table[], systempage, irqstack,
- * abtstack, undstack, kernelstack, msgbufphys will be set to point to
- * the memory that was allocated for them.
- */
- arm32_kernel_vm_init(KERNEL_VM_BASE, ARM_VECTORS_HIGH, 0, devmap, true);
+ arm32_bootmem_init(bootconfig.dram[0].address,
+ memsize, (paddr_t)KERNEL_BASE_phys);
+ arm32_kernel_vm_init(KERNEL_VM_BASE, ARM_VECTORS_LOW, 0, devmap,
+ mapallmem_p);
/* we've a specific device_register routine */
evbarm_device_register = imx6_device_register;
+#ifdef PMAP_NEED_ALLOC_POOLPAGE
+ /*
+ * If we couldn't map all of memory via TTBR1, limit the memory the
+ * kernel can allocate from to be from the highest available 1GB.
+ */
+ if (atop(memsize) bp_highgig.bp_pages) {
+ bp_highgig.bp_start += atop(memsize) - bp_highgig.bp_pages;
+ arm_poolpage_vmfreelist = bp_highgig.bp_freelist;
+ return initarm_common(KERNEL_VM_BASE, KERNEL_VM_SIZE,
+ bp_highgig, 1);
+ }
+#endif
return initarm_common(KERNEL_VM_BASE, KERNEL_VM_SIZE, NULL, 0);
}
