CVS commit: src/external/bsd/am-utils
Module Name:src Committed By: joerg Date: Wed Jan 21 21:48:44 UTC 2015 Modified Files: src/external/bsd/am-utils: Makefile.inc Log Message: Don't bail out on implicit enum casts. To generate a diff of this commit: cvs rdiff -u -r1.5 -r1.6 src/external/bsd/am-utils/Makefile.inc Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/external/bsd/am-utils/Makefile.inc diff -u src/external/bsd/am-utils/Makefile.inc:1.5 src/external/bsd/am-utils/Makefile.inc:1.6 --- src/external/bsd/am-utils/Makefile.inc:1.5 Thu Feb 14 01:57:42 2013 +++ src/external/bsd/am-utils/Makefile.inc Wed Jan 21 21:48:43 2015 @@ -1,8 +1,9 @@ -# $NetBSD: Makefile.inc,v 1.5 2013/02/14 01:57:42 christos Exp $ +# $NetBSD: Makefile.inc,v 1.6 2015/01/21 21:48:43 joerg Exp $ .ifndef AMU_MAKEFILE_INC AMU_MAKEFILE_INC= WARNS?= 1 +CWARNFLAGS.clang+= -Wno-error=enum-conversion .include bsd.own.mk
CVS commit: src/external/bsd/am-utils
Module Name:src Committed By: joerg Date: Wed Jan 21 21:48:44 UTC 2015 Modified Files: src/external/bsd/am-utils: Makefile.inc Log Message: Don't bail out on implicit enum casts. To generate a diff of this commit: cvs rdiff -u -r1.5 -r1.6 src/external/bsd/am-utils/Makefile.inc Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/external/bsd/am-utils/dist/amd
Module Name:src
Committed By: joerg
Date: Wed Jan 21 21:48:23 UTC 2015
Modified Files:
src/external/bsd/am-utils/dist/amd: map.c
Log Message:
Checking flags with binary ops is likely to create better results.
To generate a diff of this commit:
cvs rdiff -u -r1.1.1.3 -r1.2 src/external/bsd/am-utils/dist/amd/map.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/bsd/am-utils/dist/amd/map.c
diff -u src/external/bsd/am-utils/dist/amd/map.c:1.1.1.3 src/external/bsd/am-utils/dist/amd/map.c:1.2
--- src/external/bsd/am-utils/dist/amd/map.c:1.1.1.3 Sat Jan 17 16:34:15 2015
+++ src/external/bsd/am-utils/dist/amd/map.c Wed Jan 21 21:48:23 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: map.c,v 1.1.1.3 2015/01/17 16:34:15 christos Exp $ */
+/* $NetBSD: map.c,v 1.2 2015/01/21 21:48:23 joerg Exp $ */
/*
* Copyright (c) 1997-2014 Erez Zadok
@@ -754,7 +754,7 @@ umount_exported(void)
} else {
am_unmounted(mp);
}
- if (!(mf-mf_flags (MFF_UNMOUNTING|MFF_MOUNTED)))
+ if (!(mf-mf_flags (MFF_UNMOUNTING|MFF_MOUNTED)))
exported_ap[i] = NULL;
} else {
/*
CVS commit: src/external/bsd/am-utils/dist/amd
Module Name:src Committed By: joerg Date: Wed Jan 21 21:48:23 UTC 2015 Modified Files: src/external/bsd/am-utils/dist/amd: map.c Log Message: Checking flags with binary ops is likely to create better results. To generate a diff of this commit: cvs rdiff -u -r1.1.1.3 -r1.2 src/external/bsd/am-utils/dist/amd/map.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/external/bsd/am-utils/dist/amd
Module Name:src
Committed By: joerg
Date: Wed Jan 21 21:47:44 UTC 2015
Modified Files:
src/external/bsd/am-utils/dist/amd: nfs_subr.c
Log Message:
Don't use uninitialised variables.
To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 src/external/bsd/am-utils/dist/amd/nfs_subr.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/bsd/am-utils/dist/amd/nfs_subr.c
diff -u src/external/bsd/am-utils/dist/amd/nfs_subr.c:1.2 src/external/bsd/am-utils/dist/amd/nfs_subr.c:1.3
--- src/external/bsd/am-utils/dist/amd/nfs_subr.c:1.2 Sun Jan 18 15:54:38 2015
+++ src/external/bsd/am-utils/dist/amd/nfs_subr.c Wed Jan 21 21:47:44 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: nfs_subr.c,v 1.2 2015/01/18 15:54:38 christos Exp $ */
+/* $NetBSD: nfs_subr.c,v 1.3 2015/01/21 21:47:44 joerg Exp $ */
/*
* Copyright (c) 1997-2014 Erez Zadok
@@ -1713,6 +1713,9 @@ am_nfs3_fsstat_3_svc(am_FSSTAT3args *arg
if ((gopt.flags CFM_SHOW_STATFS_ENTRIES)
mp-am_al-al_mnt mp-am_al-al_mnt-mf_mopts) {
mnt.mnt_opts = mp-am_al-al_mnt-mf_mopts;
+ blocks = 0;
+ bfree = 0;
+ bavail = 0;
if (amu_hasmntopt(mnt, browsable)) {
count_map_entries(mp, blocks, bfree, bavail);
}
CVS commit: src/external/bsd/am-utils/dist/amd
Module Name:src Committed By: joerg Date: Wed Jan 21 21:47:44 UTC 2015 Modified Files: src/external/bsd/am-utils/dist/amd: nfs_subr.c Log Message: Don't use uninitialised variables. To generate a diff of this commit: cvs rdiff -u -r1.2 -r1.3 src/external/bsd/am-utils/dist/amd/nfs_subr.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
Re: CVS commit: src/sbin/ifconfig
Also RFC4941 related change (depends on ticket #441) /P On 20 Jan 2015, at 23:13 , Roy Marples r...@netbsd.org wrote: Module Name: src Committed By: roy Date: Tue Jan 20 22:13:19 UTC 2015 Modified Files: src/sbin/ifconfig: af_inet6.c Log Message: Display the IPv6 address flags autoconf and temporary To generate a diff of this commit: cvs rdiff -u -r1.30 -r1.31 src/sbin/ifconfig/af_inet6.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/MesaLib/dist/src/mapi
Module Name:xsrc Committed By: mrg Date: Thu Jan 22 06:01:18 UTC 2015 Modified Files: xsrc/external/mit/MesaLib/dist/src/mapi: entry.c Log Message: disable the use of 32 bit x86 asm code here, it (like the 64 bit code), does not work on netbsd and probably needs an x86 guru to fix. To generate a diff of this commit: cvs rdiff -u -r1.1.1.1 -r1.2 xsrc/external/mit/MesaLib/dist/src/mapi/entry.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/MesaLib/dist/src/mapi/entry.c diff -u xsrc/external/mit/MesaLib/dist/src/mapi/entry.c:1.1.1.1 xsrc/external/mit/MesaLib/dist/src/mapi/entry.c:1.2 --- xsrc/external/mit/MesaLib/dist/src/mapi/entry.c:1.1.1.1 Thu Dec 18 06:02:08 2014 +++ xsrc/external/mit/MesaLib/dist/src/mapi/entry.c Thu Jan 22 06:01:17 2015 @@ -39,7 +39,7 @@ #define ENTRY_CURRENT_TABLE_GET U_STRINGIFY(u_current_get_table_internal) #endif -#if defined(USE_X86_ASM) defined(__GNUC__) +#if defined(USE_X86_ASM) defined(__GNUC__) !defined(__NetBSD__) # ifdef GLX_USE_TLS # include entry_x86_tls.h # else
CVS commit: xsrc/external/mit/MesaLib/dist/src/mapi
Module Name:xsrc Committed By: mrg Date: Thu Jan 22 06:01:18 UTC 2015 Modified Files: xsrc/external/mit/MesaLib/dist/src/mapi: entry.c Log Message: disable the use of 32 bit x86 asm code here, it (like the 64 bit code), does not work on netbsd and probably needs an x86 guru to fix. To generate a diff of this commit: cvs rdiff -u -r1.1.1.1 -r1.2 xsrc/external/mit/MesaLib/dist/src/mapi/entry.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/distrib/notes/common
Module Name:src Committed By: sevan Date: Thu Jan 22 02:07:28 UTC 2015 Modified Files: src/distrib/notes/common: main Log Message: Jan comes after Jac Noticed by bcallah AT OpenBSD Dot org To generate a diff of this commit: cvs rdiff -u -r1.516 -r1.517 src/distrib/notes/common/main Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/distrib/notes/common/main diff -u src/distrib/notes/common/main:1.516 src/distrib/notes/common/main:1.517 --- src/distrib/notes/common/main:1.516 Mon Jan 19 20:25:29 2015 +++ src/distrib/notes/common/main Thu Jan 22 02:07:28 2015 @@ -1,4 +1,4 @@ -.\ $NetBSD: main,v 1.516 2015/01/19 20:25:29 sevan Exp $ +.\ $NetBSD: main,v 1.517 2015/01/22 02:07:28 sevan Exp $ .\ .\ Copyright (c) 1999-2012 The NetBSD Foundation, Inc. .\ All rights reserved. @@ -1243,9 +1243,9 @@ If you're one of them, and would like to .It Ta Tetsuya Isaki Ta Mt is...@netbsd.org .It Ta ITOH Yasufumi Ta Mt it...@netbsd.org .It Ta IWAMOTO Toshihiro Ta Mt tos...@netbsd.org -.It Ta Sevan Janiyan Ta Mt se...@netbsd.org .It Ta Matthew Jacob Ta Mt mja...@netbsd.org .It Ta Soren Jacobsen Ta Mt s...@netbsd.org +.It Ta Sevan Janiyan Ta Mt se...@netbsd.org .It Ta Lonhyn T. Jasinskyj Ta Mt lon...@netbsd.org .It Ta Darrin Jewell Ta Mt d...@netbsd.org .It Ta Nicolas Joly Ta Mt nj...@netbsd.org
CVS commit: src/distrib/notes/common
Module Name:src Committed By: sevan Date: Thu Jan 22 02:07:28 UTC 2015 Modified Files: src/distrib/notes/common: main Log Message: Jan comes after Jac Noticed by bcallah AT OpenBSD Dot org To generate a diff of this commit: cvs rdiff -u -r1.516 -r1.517 src/distrib/notes/common/main Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/arch/evbsh3/evbsh3
Module Name:src Committed By: nonaka Date: Thu Jan 22 03:43:24 UTC 2015 Modified Files: src/sys/arch/evbsh3/evbsh3: bus_dma.c Log Message: Sync with sys/arch/landisk/landisk/bus_dma.c rev.1.15. Don't call sh_dcache_inv_range() on BUS_DMASYNC_POSTREAD ops as other mips and arm ports. All cached data is cared on BUS_DMASYNC_PREREAD and invalidating cache without writeback could cause unexpected data loss if specified sync region is not cacheline aligned. This may fix ffs_alloccg: map corrupted panic on acardide IDE disks, which didn't happen on USB HDD. To generate a diff of this commit: cvs rdiff -u -r1.3 -r1.4 src/sys/arch/evbsh3/evbsh3/bus_dma.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/evbsh3/evbsh3/bus_dma.c diff -u src/sys/arch/evbsh3/evbsh3/bus_dma.c:1.3 src/sys/arch/evbsh3/evbsh3/bus_dma.c:1.4 --- src/sys/arch/evbsh3/evbsh3/bus_dma.c:1.3 Tue Jul 19 15:44:52 2011 +++ src/sys/arch/evbsh3/evbsh3/bus_dma.c Thu Jan 22 03:43:24 2015 @@ -1,4 +1,4 @@ -/* $NetBSD: bus_dma.c,v 1.3 2011/07/19 15:44:52 dyoung Exp $ */ +/* $NetBSD: bus_dma.c,v 1.4 2015/01/22 03:43:24 nonaka Exp $ */ /* * Copyright (c) 2005 NONAKA Kimihiro non...@netbsd.org @@ -26,7 +26,7 @@ */ #include sys/cdefs.h -__KERNEL_RCSID(0, $NetBSD: bus_dma.c,v 1.3 2011/07/19 15:44:52 dyoung Exp $); +__KERNEL_RCSID(0, $NetBSD: bus_dma.c,v 1.4 2015/01/22 03:43:24 nonaka Exp $); #include sys/param.h #include sys/systm.h @@ -545,11 +545,6 @@ _bus_dmamap_sync(bus_dma_tag_t t, bus_dm if (SH_HAS_WRITEBACK_CACHE) sh_dcache_wb_range(naddr, minlen); break; - - case BUS_DMASYNC_POSTREAD: - case BUS_DMASYNC_POSTREAD|BUS_DMASYNC_POSTWRITE: - sh_dcache_inv_range(naddr, minlen); - break; } offset = 0; len -= minlen;
CVS commit: src/sys/arch/evbsh3/evbsh3
Module Name:src Committed By: nonaka Date: Thu Jan 22 03:43:24 UTC 2015 Modified Files: src/sys/arch/evbsh3/evbsh3: bus_dma.c Log Message: Sync with sys/arch/landisk/landisk/bus_dma.c rev.1.15. Don't call sh_dcache_inv_range() on BUS_DMASYNC_POSTREAD ops as other mips and arm ports. All cached data is cared on BUS_DMASYNC_PREREAD and invalidating cache without writeback could cause unexpected data loss if specified sync region is not cacheline aligned. This may fix ffs_alloccg: map corrupted panic on acardide IDE disks, which didn't happen on USB HDD. To generate a diff of this commit: cvs rdiff -u -r1.3 -r1.4 src/sys/arch/evbsh3/evbsh3/bus_dma.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: [netbsd-7] xsrc/external/mit/xf86-video-intel/dist
Module Name:xsrc Committed By: martin Date: Wed Jan 21 11:23:15 UTC 2015 Modified Files: xsrc/external/mit/xf86-video-intel/dist [netbsd-7]: AUTHORS ChangeLog Makefile.am Makefile.in NEWS README aclocal.m4 compile config.guess config.h.in config.sub configure configure.ac depcomp install-sh ltmain.sh missing xsrc/external/mit/xf86-video-intel/dist/m4 [netbsd-7]: libtool.m4 ltoptions.m4 xsrc/external/mit/xf86-video-intel/dist/man [netbsd-7]: Makefile.in intel.man xsrc/external/mit/xf86-video-intel/dist/src [netbsd-7]: Makefile.am Makefile.in compat-api.h i915_pciids.h intel_device.c intel_driver.h intel_list.h intel_module.c intel_options.c intel_options.h xsrc/external/mit/xf86-video-intel/dist/src/legacy [netbsd-7]: Makefile.am Makefile.in xsrc/external/mit/xf86-video-intel/dist/src/legacy/i810 [netbsd-7]: Makefile.am Makefile.in i810_accel.c i810_common.h i810_cursor.c i810_dga.c i810_dri.c i810_driver.c i810_hwmc.c i810_memory.c i810_ring.h i810_video.c i810_wmark.c i810_xaa.c xsrc/external/mit/xf86-video-intel/dist/src/legacy/i810/xvmc [netbsd-7]: Makefile.am Makefile.in xsrc/external/mit/xf86-video-intel/dist/src/render_program [netbsd-7]: Makefile.am Makefile.in xsrc/external/mit/xf86-video-intel/dist/src/sna [netbsd-7]: Makefile.am Makefile.in blt.c gen2_render.c gen3_render.c gen4_render.c gen4_render.h gen4_vertex.c gen4_vertex.h gen5_render.c gen6_render.c gen7_render.c kgem.c kgem.h kgem_debug.c kgem_debug_gen2.c sna.h sna_accel.c sna_blt.c sna_composite.c sna_cpu.c sna_cpuid.h sna_damage.c sna_damage.h sna_display.c sna_display_fake.c sna_driver.c sna_glyphs.c sna_gradient.c sna_io.c sna_reg.h sna_render.c sna_render.h sna_render_inline.h sna_stream.c sna_threads.c sna_tiling.c sna_transform.c sna_trapezoids.c sna_vertex.c sna_video.c sna_video.h sna_video_hwmc.c sna_video_overlay.c sna_video_sprite.c sna_video_textured.c xsrc/external/mit/xf86-video-intel/dist/src/sna/brw [netbsd-7]: Makefile.am Makefile.in brw_eu.c brw_eu.h brw_eu_emit.c brw_test_gen4.c brw_test_gen5.c brw_test_gen6.c brw_test_gen7.c brw_wm.c xsrc/external/mit/xf86-video-intel/dist/src/sna/fb [netbsd-7]: Makefile.in fb.h fbbitmap.c fbclip.c fbgc.c fbline.c fblinebits.h fbpict.c fbpict.h fbpoint.c fbpointbits.h fbpush.c fbseg.c xsrc/external/mit/xf86-video-intel/dist/src/uxa [netbsd-7]: Makefile.am Makefile.in i830_3d.c i830_reg.h i830_render.c i915_3d.c i915_render.c i915_video.c i965_3d.c i965_render.c i965_video.c intel.h intel_batchbuffer.c intel_batchbuffer.h intel_display.c intel_dri.c intel_driver.c intel_hwmc.c intel_memory.c intel_uxa.c intel_video.c intel_video.h uxa-accel.c uxa-glyphs.c uxa-priv.h uxa-render.c uxa-unaccel.c uxa.c uxa.h xsrc/external/mit/xf86-video-intel/dist/test [netbsd-7]: Makefile.am Makefile.in README basic-copyarea-size.c basic-copyarea.c basic-fillrect.c basic-lines.c basic-putimage.c basic-rectangle.c basic-stress.c basic-string.c dri2-race.c dri2-swap.c lowlevel-blt-bench.c mixed-stress.c render-composite-solid.c render-copy-alphaless.c render-copyarea-size.c render-copyarea.c render-fill-copy.c render-fill.c render-trapezoid-image.c render-trapezoid.c test.h test_display.c test_image.c test_render.c xsrc/external/mit/xf86-video-intel/dist/xvmc [netbsd-7]: Makefile.am Makefile.in i915_xvmc.c i965_xvmc.c intel_batchbuffer.c intel_batchbuffer.h intel_xvmc.c intel_xvmc_private.h xvmc_vld.c xsrc/external/mit/xf86-video-intel/dist/xvmc/shader [netbsd-7]: Makefile.in xsrc/external/mit/xf86-video-intel/dist/xvmc/shader/mc [netbsd-7]: Makefile.in xsrc/external/mit/xf86-video-intel/dist/xvmc/shader/vld [netbsd-7]: Makefile.in Added Files: xsrc/external/mit/xf86-video-intel/dist/libobj [netbsd-7]: Makefile.am Makefile.in getline.c ignore.c xsrc/external/mit/xf86-video-intel/dist/src [netbsd-7]: backlight.c backlight.h fd.c fd.h xsrc/external/mit/xf86-video-intel/dist/src/render_program [netbsd-7]: exa_wm_src_affine.g8a exa_wm_src_affine.g8b exa_wm_src_sample_argb.g8a exa_wm_src_sample_argb.g8b exa_wm_src_sample_planar.g8a exa_wm_src_sample_planar.g8b exa_wm_write.g8a exa_wm_write.g8b exa_wm_yuv_rgb.g8a exa_wm_yuv_rgb.g8b xsrc/external/mit/xf86-video-intel/dist/src/sna
CVS commit: [netbsd-7] xsrc/external/mit/xf86-video-intel/dist
Module Name:xsrc Committed By: martin Date: Wed Jan 21 11:23:15 UTC 2015 Modified Files: xsrc/external/mit/xf86-video-intel/dist [netbsd-7]: AUTHORS ChangeLog Makefile.am Makefile.in NEWS README aclocal.m4 compile config.guess config.h.in config.sub configure configure.ac depcomp install-sh ltmain.sh missing xsrc/external/mit/xf86-video-intel/dist/m4 [netbsd-7]: libtool.m4 ltoptions.m4 xsrc/external/mit/xf86-video-intel/dist/man [netbsd-7]: Makefile.in intel.man xsrc/external/mit/xf86-video-intel/dist/src [netbsd-7]: Makefile.am Makefile.in compat-api.h i915_pciids.h intel_device.c intel_driver.h intel_list.h intel_module.c intel_options.c intel_options.h xsrc/external/mit/xf86-video-intel/dist/src/legacy [netbsd-7]: Makefile.am Makefile.in xsrc/external/mit/xf86-video-intel/dist/src/legacy/i810 [netbsd-7]: Makefile.am Makefile.in i810_accel.c i810_common.h i810_cursor.c i810_dga.c i810_dri.c i810_driver.c i810_hwmc.c i810_memory.c i810_ring.h i810_video.c i810_wmark.c i810_xaa.c xsrc/external/mit/xf86-video-intel/dist/src/legacy/i810/xvmc [netbsd-7]: Makefile.am Makefile.in xsrc/external/mit/xf86-video-intel/dist/src/render_program [netbsd-7]: Makefile.am Makefile.in xsrc/external/mit/xf86-video-intel/dist/src/sna [netbsd-7]: Makefile.am Makefile.in blt.c gen2_render.c gen3_render.c gen4_render.c gen4_render.h gen4_vertex.c gen4_vertex.h gen5_render.c gen6_render.c gen7_render.c kgem.c kgem.h kgem_debug.c kgem_debug_gen2.c sna.h sna_accel.c sna_blt.c sna_composite.c sna_cpu.c sna_cpuid.h sna_damage.c sna_damage.h sna_display.c sna_display_fake.c sna_driver.c sna_glyphs.c sna_gradient.c sna_io.c sna_reg.h sna_render.c sna_render.h sna_render_inline.h sna_stream.c sna_threads.c sna_tiling.c sna_transform.c sna_trapezoids.c sna_vertex.c sna_video.c sna_video.h sna_video_hwmc.c sna_video_overlay.c sna_video_sprite.c sna_video_textured.c xsrc/external/mit/xf86-video-intel/dist/src/sna/brw [netbsd-7]: Makefile.am Makefile.in brw_eu.c brw_eu.h brw_eu_emit.c brw_test_gen4.c brw_test_gen5.c brw_test_gen6.c brw_test_gen7.c brw_wm.c xsrc/external/mit/xf86-video-intel/dist/src/sna/fb [netbsd-7]: Makefile.in fb.h fbbitmap.c fbclip.c fbgc.c fbline.c fblinebits.h fbpict.c fbpict.h fbpoint.c fbpointbits.h fbpush.c fbseg.c xsrc/external/mit/xf86-video-intel/dist/src/uxa [netbsd-7]: Makefile.am Makefile.in i830_3d.c i830_reg.h i830_render.c i915_3d.c i915_render.c i915_video.c i965_3d.c i965_render.c i965_video.c intel.h intel_batchbuffer.c intel_batchbuffer.h intel_display.c intel_dri.c intel_driver.c intel_hwmc.c intel_memory.c intel_uxa.c intel_video.c intel_video.h uxa-accel.c uxa-glyphs.c uxa-priv.h uxa-render.c uxa-unaccel.c uxa.c uxa.h xsrc/external/mit/xf86-video-intel/dist/test [netbsd-7]: Makefile.am Makefile.in README basic-copyarea-size.c basic-copyarea.c basic-fillrect.c basic-lines.c basic-putimage.c basic-rectangle.c basic-stress.c basic-string.c dri2-race.c dri2-swap.c lowlevel-blt-bench.c mixed-stress.c render-composite-solid.c render-copy-alphaless.c render-copyarea-size.c render-copyarea.c render-fill-copy.c render-fill.c render-trapezoid-image.c render-trapezoid.c test.h test_display.c test_image.c test_render.c xsrc/external/mit/xf86-video-intel/dist/xvmc [netbsd-7]: Makefile.am Makefile.in i915_xvmc.c i965_xvmc.c intel_batchbuffer.c intel_batchbuffer.h intel_xvmc.c intel_xvmc_private.h xvmc_vld.c xsrc/external/mit/xf86-video-intel/dist/xvmc/shader [netbsd-7]: Makefile.in xsrc/external/mit/xf86-video-intel/dist/xvmc/shader/mc [netbsd-7]: Makefile.in xsrc/external/mit/xf86-video-intel/dist/xvmc/shader/vld [netbsd-7]: Makefile.in Added Files: xsrc/external/mit/xf86-video-intel/dist/libobj [netbsd-7]: Makefile.am Makefile.in getline.c ignore.c xsrc/external/mit/xf86-video-intel/dist/src [netbsd-7]: backlight.c backlight.h fd.c fd.h xsrc/external/mit/xf86-video-intel/dist/src/render_program [netbsd-7]: exa_wm_src_affine.g8a exa_wm_src_affine.g8b exa_wm_src_sample_argb.g8a exa_wm_src_sample_argb.g8b exa_wm_src_sample_planar.g8a exa_wm_src_sample_planar.g8b exa_wm_write.g8a exa_wm_write.g8b exa_wm_yuv_rgb.g8a exa_wm_yuv_rgb.g8b xsrc/external/mit/xf86-video-intel/dist/src/sna
CVS commit: [netbsd-7] src/doc
Module Name:src Committed By: martin Date: Wed Jan 21 11:38:41 UTC 2015 Modified Files: src/doc [netbsd-7]: CHANGES-7.0 Log Message: Tickets #439 and #440 To generate a diff of this commit: cvs rdiff -u -r1.1.2.175 -r1.1.2.176 src/doc/CHANGES-7.0 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/doc/CHANGES-7.0 diff -u src/doc/CHANGES-7.0:1.1.2.175 src/doc/CHANGES-7.0:1.1.2.176 --- src/doc/CHANGES-7.0:1.1.2.175 Wed Jan 21 08:21:11 2015 +++ src/doc/CHANGES-7.0 Wed Jan 21 11:38:41 2015 @@ -1,4 +1,4 @@ -# $NetBSD: CHANGES-7.0,v 1.1.2.175 2015/01/21 08:21:11 martin Exp $ +# $NetBSD: CHANGES-7.0,v 1.1.2.176 2015/01/21 11:38:41 martin Exp $ A complete list of changes from the initial NetBSD 7.0 branch on 11 Aug 2014 until the 7.0 release: @@ -14128,3 +14128,271 @@ external/bsd/ipf/bin/ipftest/Makefile 1 Don't compile md5.c; just use the libc version. PR bin/49580. [martin, ticket #431] +xsrc/external/mit/xf86-video-intel/dist/man/Makefile.in up to 1.1.1.5 +xsrc/external/mit/xf86-video-intel/dist/man/intel.man up to 1.1.1.5 +xsrc/external/mit/xf86-video-intel/dist/src/backlight.c 1.1-1.3 +xsrc/external/mit/xf86-video-intel/dist/src/backlight.h 1.1-1.1.1.2 +xsrc/external/mit/xf86-video-intel/dist/src/fd.c 1.1.1.1 +xsrc/external/mit/xf86-video-intel/dist/src/fd.h 1.1.1.1 +xsrc/external/mit/xf86-video-intel/dist/src/Makefile.am up to 1.1.1.4 +xsrc/external/mit/xf86-video-intel/dist/src/Makefile.in up to 1.1.1.5 +xsrc/external/mit/xf86-video-intel/dist/src/sna/brw/Makefile.am up to 1.1.1.2 +xsrc/external/mit/xf86-video-intel/dist/src/sna/brw/Makefile.in up to 1.1.1.3 +xsrc/external/mit/xf86-video-intel/dist/src/sna/brw/brw_eu.c up to 1.1.1.2 +xsrc/external/mit/xf86-video-intel/dist/src/sna/brw/brw_eu.h up to 1.1.1.2 +xsrc/external/mit/xf86-video-intel/dist/src/sna/brw/brw_eu_emit.c up to 1.1.1.2 +xsrc/external/mit/xf86-video-intel/dist/src/sna/brw/brw_test_gen4.c up to 1.1.1.2 +xsrc/external/mit/xf86-video-intel/dist/src/sna/brw/brw_test_gen5.c up to 1.1.1.2 +xsrc/external/mit/xf86-video-intel/dist/src/sna/brw/brw_test_gen6.c up to 1.1.1.2 +xsrc/external/mit/xf86-video-intel/dist/src/sna/brw/brw_test_gen7.c up to 1.1.1.2 +xsrc/external/mit/xf86-video-intel/dist/src/sna/brw/brw_wm.c up to 1.1.1.3 +xsrc/external/mit/xf86-video-intel/dist/src/sna/fb/Makefile.in up to 1.1.1.3 +xsrc/external/mit/xf86-video-intel/dist/src/sna/fb/fb.h up to 1.1.1.3 +xsrc/external/mit/xf86-video-intel/dist/src/sna/fb/fbbitmap.c up to 1.1.1.2 +xsrc/external/mit/xf86-video-intel/dist/src/sna/fb/fbclip.c up to 1.1.1.2 +xsrc/external/mit/xf86-video-intel/dist/src/sna/fb/fbgc.c up to 1.1.1.2 +xsrc/external/mit/xf86-video-intel/dist/src/sna/fb/fbline.c up to 1.1.1.2 +xsrc/external/mit/xf86-video-intel/dist/src/sna/fb/fblinebits.h up to 1.1.1.2 +xsrc/external/mit/xf86-video-intel/dist/src/sna/fb/fbpict.c up to 1.1.1.2 +xsrc/external/mit/xf86-video-intel/dist/src/sna/fb/fbpict.h up to 1.1.1.2 +xsrc/external/mit/xf86-video-intel/dist/src/sna/fb/fbpoint.c up to 1.1.1.2 +xsrc/external/mit/xf86-video-intel/dist/src/sna/fb/fbpointbits.h up to 1.1.1.2 +xsrc/external/mit/xf86-video-intel/dist/src/sna/fb/fbpush.c up to 1.1.1.2 +xsrc/external/mit/xf86-video-intel/dist/src/sna/fb/fbseg.c up to 1.1.1.2 +xsrc/external/mit/xf86-video-intel/dist/src/sna/Makefile.am up to 1.1.1.3 +xsrc/external/mit/xf86-video-intel/dist/src/sna/Makefile.in up to 1.1.1.3 +xsrc/external/mit/xf86-video-intel/dist/src/sna/blt.c up to 1.1.1.2 +xsrc/external/mit/xf86-video-intel/dist/src/sna/gen2_render.c up to 1.1.1.2 +xsrc/external/mit/xf86-video-intel/dist/src/sna/gen3_render.c up to 1.1.1.2 +xsrc/external/mit/xf86-video-intel/dist/src/sna/gen4_render.c up to 1.1.1.3 +xsrc/external/mit/xf86-video-intel/dist/src/sna/gen4_render.h up to 1.1.1.2 +xsrc/external/mit/xf86-video-intel/dist/src/sna/gen4_vertex.c up to 1.1.1.3 +xsrc/external/mit/xf86-video-intel/dist/src/sna/gen4_vertex.h up to 1.1.1.2 +xsrc/external/mit/xf86-video-intel/dist/src/sna/gen5_render.c up to 1.1.1.3 +xsrc/external/mit/xf86-video-intel/dist/src/sna/gen6_render.c up to 1.1.1.3 +xsrc/external/mit/xf86-video-intel/dist/src/sna/gen7_render.c up to 1.1.1.3 +xsrc/external/mit/xf86-video-intel/dist/src/sna/kgem.c up to 1.4 +xsrc/external/mit/xf86-video-intel/dist/src/sna/kgem.h up to 1.1.1.3 +xsrc/external/mit/xf86-video-intel/dist/src/sna/kgem_debug.c up to 1.1.1.2 +xsrc/external/mit/xf86-video-intel/dist/src/sna/kgem_debug_gen2.c up to 1.1.1.2 +xsrc/external/mit/xf86-video-intel/dist/src/sna/sna.h up to 1.1.1.3 +xsrc/external/mit/xf86-video-intel/dist/src/sna/sna_accel.c up to 1.1.1.3 +xsrc/external/mit/xf86-video-intel/dist/src/sna/sna_blt.c up to 1.1.1.3 +xsrc/external/mit/xf86-video-intel/dist/src/sna/sna_composite.c up to 1.1.1.3 +xsrc/external/mit/xf86-video-intel/dist/src/sna/sna_cpu.c up to 1.1.1.2 +xsrc/external/mit/xf86-video-intel/dist/src/sna/sna_cpuid.h up to 1.1.1.2
CVS commit: [netbsd-7] src/doc
Module Name:src Committed By: martin Date: Wed Jan 21 11:38:41 UTC 2015 Modified Files: src/doc [netbsd-7]: CHANGES-7.0 Log Message: Tickets #439 and #440 To generate a diff of this commit: cvs rdiff -u -r1.1.2.175 -r1.1.2.176 src/doc/CHANGES-7.0 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/arch/evbarm/rpi
Module Name:src
Committed By: jmcneill
Date: Wed Jan 21 11:02:55 UTC 2015
Modified Files:
src/sys/arch/evbarm/rpi: rpi_machdep.c
Log Message:
Newer Raspberry Pi firmware has changed the framebuffer from BGR to RGB.
The method we use to set the pixel order (vcprop set pixel order) does
not seem to work, nor does querying the pixel order (vcprop get pixel order).
The firmware passes this information to the kernel by adding a
bcm2708_fb.fbswap kernel cmdline arg. 0=BGR, 1=RGB. If the parameter is
absent, assume we are running on old firmware and use BGR mode.
To generate a diff of this commit:
cvs rdiff -u -r1.55 -r1.56 src/sys/arch/evbarm/rpi/rpi_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/rpi/rpi_machdep.c
diff -u src/sys/arch/evbarm/rpi/rpi_machdep.c:1.55 src/sys/arch/evbarm/rpi/rpi_machdep.c:1.56
--- src/sys/arch/evbarm/rpi/rpi_machdep.c:1.55 Tue Oct 7 08:37:18 2014
+++ src/sys/arch/evbarm/rpi/rpi_machdep.c Wed Jan 21 11:02:55 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: rpi_machdep.c,v 1.55 2014/10/07 08:37:18 mlelstv Exp $ */
+/* $NetBSD: rpi_machdep.c,v 1.56 2015/01/21 11:02:55 jmcneill Exp $ */
/*-
* Copyright (c) 2012 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: rpi_machdep.c,v 1.55 2014/10/07 08:37:18 mlelstv Exp $);
+__KERNEL_RCSID(0, $NetBSD: rpi_machdep.c,v 1.56 2015/01/21 11:02:55 jmcneill Exp $);
#include opt_evbarm_boardtype.h
#include opt_ddb.h
@@ -296,7 +296,6 @@ static struct __aligned(16) {
struct vcprop_tag_fbres vbt_res;
struct vcprop_tag_fbres vbt_vres;
struct vcprop_tag_fbdepth vbt_depth;
- struct vcprop_tag_fbpixelorder vbt_pixelorder;
struct vcprop_tag_fbalpha vbt_alpha;
struct vcprop_tag_allocbuf vbt_allocbuf;
struct vcprop_tag_blankscreen vbt_blank;
@@ -334,14 +333,6 @@ static struct __aligned(16) {
},
.bpp = 32,
},
- .vbt_pixelorder = {
- .tag = {
- .vpt_tag = VCPROPTAG_SET_FB_PIXEL_ORDER,
- .vpt_len = VCPROPTAG_LEN(vb_setfb.vbt_pixelorder),
- .vpt_rcode = VCPROPTAG_REQUEST,
- },
- .state = VCPROP_PIXEL_BGR,
- },
.vbt_alpha = {
.tag = {
.vpt_tag = VCPROPTAG_SET_FB_ALPHA_MODE,
@@ -750,6 +741,7 @@ rpi_fb_init(prop_dictionary_t dict, void
char *ptr;
int integer;
int error;
+ bool is_bgr = true;
if (get_bootconf_option(boot_args, fb,
BOOTOPT_TYPE_STRING, ptr)) {
@@ -779,7 +771,6 @@ rpi_fb_init(prop_dictionary_t dict, void
!vcprop_tag_success_p(vb_setfb.vbt_res.tag) ||
!vcprop_tag_success_p(vb_setfb.vbt_vres.tag) ||
!vcprop_tag_success_p(vb_setfb.vbt_depth.tag) ||
- !vcprop_tag_success_p(vb_setfb.vbt_pixelorder.tag) ||
!vcprop_tag_success_p(vb_setfb.vbt_allocbuf.tag) ||
!vcprop_tag_success_p(vb_setfb.vbt_blank.tag) ||
!vcprop_tag_success_p(vb_setfb.vbt_pitch.tag)) {
@@ -798,8 +789,6 @@ rpi_fb_init(prop_dictionary_t dict, void
vb_setfb.vbt_res.width, vb_setfb.vbt_res.height);
printf(%s: vwidth = %d vheight = %d\n, __func__,
vb_setfb.vbt_vres.width, vb_setfb.vbt_vres.height);
- printf(%s: pixelorder = %d\n, __func__,
- vb_setfb.vbt_pixelorder.state);
#endif
if (vb_setfb.vbt_allocbuf.address == 0 ||
@@ -821,8 +810,20 @@ rpi_fb_init(prop_dictionary_t dict, void
vb_setfb.vbt_pitch.linebytes);
prop_dictionary_set_uint32(dict, address,
vb_setfb.vbt_allocbuf.address);
- if (vb_setfb.vbt_pixelorder.state == VCPROP_PIXEL_BGR)
- prop_dictionary_set_bool(dict, is_bgr, true);
+
+ /*
+ * Old firmware uses BGR. New firmware uses RGB. The get and set
+ * pixel order mailbox properties don't seem to work. The firmware
+ * adds a kernel cmdline option bcm2708_fb.fbswap=0|1, so use it
+ * to determine pixel order. 0 means BGR, 1 means RGB.
+ *
+ * See https://github.com/raspberrypi/linux/issues/514
+ */
+ if (get_bootconf_option(boot_args, bcm2708_fb.fbswap,
+BOOTOPT_TYPE_INT, integer)) {
+ is_bgr = integer == 0;
+ }
+ prop_dictionary_set_bool(dict, is_bgr, is_bgr);
/* if genfb.type=n is passed in cmdline, override wsdisplay type */
if (get_bootconf_option(boot_args, genfb.type,
CVS commit: src/sys/arch/evbarm/rpi
Module Name:src Committed By: jmcneill Date: Wed Jan 21 11:02:55 UTC 2015 Modified Files: src/sys/arch/evbarm/rpi: rpi_machdep.c Log Message: Newer Raspberry Pi firmware has changed the framebuffer from BGR to RGB. The method we use to set the pixel order (vcprop set pixel order) does not seem to work, nor does querying the pixel order (vcprop get pixel order). The firmware passes this information to the kernel by adding a bcm2708_fb.fbswap kernel cmdline arg. 0=BGR, 1=RGB. If the parameter is absent, assume we are running on old firmware and use BGR mode. To generate a diff of this commit: cvs rdiff -u -r1.55 -r1.56 src/sys/arch/evbarm/rpi/rpi_machdep.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: [netbsd-7] src/external/mit/xorg/server/drivers/xf86-video-intel
Module Name:src Committed By: martin Date: Wed Jan 21 11:32:07 UTC 2015 Modified Files: src/external/mit/xorg/server/drivers/xf86-video-intel [netbsd-7]: Makefile Log Message: Pull up following revision(s) (requested by snj in ticket #439): external/mit/xorg/server/drivers/xf86-video-intel/Makefile: revision 1.17-1.20 Update for 2.99.917 To generate a diff of this commit: cvs rdiff -u -r1.15.2.1 -r1.15.2.2 \ src/external/mit/xorg/server/drivers/xf86-video-intel/Makefile Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: [netbsd-7] src/external/mit/xorg/server/drivers/xf86-video-intel
Module Name:src
Committed By: martin
Date: Wed Jan 21 11:32:07 UTC 2015
Modified Files:
src/external/mit/xorg/server/drivers/xf86-video-intel [netbsd-7]:
Makefile
Log Message:
Pull up following revision(s) (requested by snj in ticket #439):
external/mit/xorg/server/drivers/xf86-video-intel/Makefile: revision
1.17-1.20
Update for 2.99.917
To generate a diff of this commit:
cvs rdiff -u -r1.15.2.1 -r1.15.2.2 \
src/external/mit/xorg/server/drivers/xf86-video-intel/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/server/drivers/xf86-video-intel/Makefile
diff -u src/external/mit/xorg/server/drivers/xf86-video-intel/Makefile:1.15.2.1 src/external/mit/xorg/server/drivers/xf86-video-intel/Makefile:1.15.2.2
--- src/external/mit/xorg/server/drivers/xf86-video-intel/Makefile:1.15.2.1 Sun Sep 21 18:34:50 2014
+++ src/external/mit/xorg/server/drivers/xf86-video-intel/Makefile Wed Jan 21 11:32:07 2015
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.15.2.1 2014/09/21 18:34:50 snj Exp $
+# $NetBSD: Makefile,v 1.15.2.2 2015/01/21 11:32:07 martin Exp $
.include bsd.own.mk
@@ -9,59 +9,71 @@ DRIVER_NAME= intel_drv
SRCS+= intel_device.c
SRCS+= intel_options.c
SRCS+= intel_module.c
+SRCS+= backlight.c
+SRCS+= fd.c
# legacy/i810
.PATH: ${X11SRCDIR.${DRIVER}}/src/legacy/i810
SRCS+= i810_accel.c
SRCS+= i810_cursor.c
+SRCS+= i810_dga.c
+SRCS+= i810_dri.c
SRCS+= i810_driver.c
+SRCS+= i810_hwmc.c
SRCS+= i810_memory.c
SRCS+= i810_video.c
SRCS+= i810_wmark.c
-
SRCS+= i810_xaa.c
-SRCS+= i810_dga.c
-SRCS+= i810_dri.c
-SRCS+= i810_hwmc.c
# sna
.PATH: ${X11SRCDIR.${DRIVER}}/src/sna
SRCS+= blt.c
SRCS+= kgem.c
+SRCS+= gen2_render.c
+SRCS+= gen3_render.c
+SRCS+= gen4_common.c
+SRCS+= gen4_render.c
+SRCS+= gen4_source.c
+SRCS+= gen4_vertex.c
+SRCS+= gen5_render.c
+SRCS+= gen6_common.c
+SRCS+= gen6_render.c
+SRCS+= gen7_render.c
+SRCS+= gen8_eu.c
+SRCS+= gen8_render.c
+SRCS+= gen8_vertex.c
+
SRCS+= sna_accel.c
+SRCS+= sna_acpi.c
SRCS+= sna_blt.c
SRCS+= sna_composite.c
SRCS+= sna_cpu.c
SRCS+= sna_damage.c
SRCS+= sna_display.c
SRCS+= sna_display_fake.c
+SRCS+= sna_dri2.c
+#SRCS+= sna_dri3.c
SRCS+= sna_driver.c
SRCS+= sna_glyphs.c
SRCS+= sna_gradient.c
SRCS+= sna_io.c
+#SRCS+= sna_present.c
SRCS+= sna_render.c
SRCS+= sna_stream.c
-SRCS+= sna_trapezoids.c
+SRCS+= sna_threads.c
SRCS+= sna_tiling.c
SRCS+= sna_transform.c
-SRCS+= sna_threads.c
+SRCS+= sna_trapezoids.c
+SRCS+= sna_trapezoids_boxes.c
+SRCS+= sna_trapezoids_imprecise.c
+SRCS+= sna_trapezoids_mono.c
+SRCS+= sna_trapezoids_precise.c
SRCS+= sna_vertex.c
SRCS+= sna_video.c
+SRCS+= sna_video_hwmc.c
SRCS+= sna_video_overlay.c
SRCS+= sna_video_sprite.c
SRCS+= sna_video_textured.c
-SRCS+= gen2_render.c
-SRCS+= gen3_render.c
-SRCS+= gen4_render.c
-SRCS+= gen4_source.c
-SRCS+= gen4_vertex.c
-SRCS+= gen5_render.c
-SRCS+= gen6_render.c
-SRCS+= gen7_render.c
-
-SRCS+= sna_dri.c
-
-SRCS+= sna_video_hwmc.c
# sna/brw
.PATH: ${X11SRCDIR.${DRIVER}}/src/sna/brw
@@ -95,31 +107,31 @@ SRCS+= fbutil.c
# uxa
.PATH: ${X11SRCDIR.${DRIVER}}/src/uxa
-SRCS+= intel_batchbuffer.c
-SRCS+= intel_display.c
-SRCS+= intel_driver.c
-SRCS+= intel_memory.c
-SRCS+= intel_uxa.c
-SRCS+= intel_video.c
SRCS+= i830_3d.c
SRCS+= i830_render.c
SRCS+= i915_3d.c
SRCS+= i915_render.c
SRCS+= i915_video.c
SRCS+= i965_3d.c
-SRCS+= i965_video.c
SRCS+= i965_render.c
-SRCS+= uxa.c
+SRCS+= i965_video.c
+SRCS+= intel_batchbuffer.c
+SRCS+= intel_display.c
+SRCS+= intel_dri.c
+SRCS+= intel_driver.c
+SRCS+= intel_hwmc.c
+SRCS+= intel_memory.c
+#SRCS+= intel_present.c
+#SRCS+= intel_sync.c
+SRCS+= intel_uxa.c
+SRCS+= intel_uxa_video.c
+SRCS+= intel_video.c
+SRCS+= intel_video_overlay.c
SRCS+= uxa-accel.c
SRCS+= uxa-glyphs.c
SRCS+= uxa-render.c
SRCS+= uxa-unaccel.c
-
-#SRCS+= intel_glamor.c
-
-SRCS+= intel_dri.c
-
-SRCS+= intel_hwmc.c
+SRCS+= uxa.c
MAN= intel.4
@@ -131,18 +143,43 @@ CPPFLAGS+= -I${X11SRCDIR.${DRIVER}}/src/
CPPFLAGS+= -I${X11SRCDIR.${DRIVER}}/xvmc
# Use the Intel-style __sync_* atomic primitives.
-CPPFLAGS+= -DHAVE_ATOMIC_PRIMITIVES
-CPPFLAGS+= -DENABLE_XVMC
-CPPFLAGS+= -DUSE_UXA
-CPPFLAGS+= -DUSE_SNA
CPPFLAGS+= -DDEFAULT_ACCEL_METHOD=UXA
+CPPFLAGS+= -DENABLE_XVMC=1
CPPFLAGS+= -DHAS_PIXMAN_GLYPHS=1
CPPFLAGS+= -DHAS_PIXMAN_TRIANGLES=1
-
-CPPFLAGS+= -DHAVE_DRI1
-CPPFLAGS+= -DHAVE_DRI2_H
-CPPFLAGS+= -DHAVE_XAA_H
+CPPFLAGS+= -DHAVE_ATOMIC_PRIMITIVES=1
+CPPFLAGS+= -DHAVE_CPUID_H=1
+CPPFLAGS+= -DHAVE_DGAPROC_H=1
+CPPFLAGS+= -DHAVE_DLFCN_H=1
+CPPFLAGS+= -DHAVE_DRI1=1
+CPPFLAGS+= -DHAVE_DRI2=1
+CPPFLAGS+= -DHAVE_DRI2_H=1
+CPPFLAGS+= -DHAVE_DRISTRUCT_H=1
+CPPFLAGS+= -DHAVE_DRI_H=1
+CPPFLAGS+= -DHAVE_GETLINE=1
+CPPFLAGS+= -DHAVE_INTTYPES_H=1
+CPPFLAGS+= -DHAVE_MEMORY_H=1
+CPPFLAGS+=
CVS commit: [netbsd-7] src/sys/arch/evbarm/rpi
Module Name:src
Committed By: martin
Date: Wed Jan 21 11:37:04 UTC 2015
Modified Files:
src/sys/arch/evbarm/rpi [netbsd-7]: rpi_machdep.c
Log Message:
Pull up following revision(s) (requested by jmcneill in ticket #440):
sys/arch/evbarm/rpi/rpi_machdep.c: revision 1.56
Newer Raspberry Pi firmware has changed the framebuffer from BGR to RGB.
The method we use to set the pixel order (vcprop set pixel order) does
not seem to work, nor does querying the pixel order (vcprop get pixel order).
The firmware passes this information to the kernel by adding a
bcm2708_fb.fbswap kernel cmdline arg. 0=BGR, 1=RGB. If the parameter is
absent, assume we are running on old firmware and use BGR mode.
To generate a diff of this commit:
cvs rdiff -u -r1.43.2.2 -r1.43.2.3 src/sys/arch/evbarm/rpi/rpi_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/rpi/rpi_machdep.c
diff -u src/sys/arch/evbarm/rpi/rpi_machdep.c:1.43.2.2 src/sys/arch/evbarm/rpi/rpi_machdep.c:1.43.2.3
--- src/sys/arch/evbarm/rpi/rpi_machdep.c:1.43.2.2 Fri Oct 3 18:53:56 2014
+++ src/sys/arch/evbarm/rpi/rpi_machdep.c Wed Jan 21 11:37:04 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: rpi_machdep.c,v 1.43.2.2 2014/10/03 18:53:56 martin Exp $ */
+/* $NetBSD: rpi_machdep.c,v 1.43.2.3 2015/01/21 11:37:04 martin Exp $ */
/*-
* Copyright (c) 2012 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: rpi_machdep.c,v 1.43.2.2 2014/10/03 18:53:56 martin Exp $);
+__KERNEL_RCSID(0, $NetBSD: rpi_machdep.c,v 1.43.2.3 2015/01/21 11:37:04 martin Exp $);
#include opt_evbarm_boardtype.h
#include opt_ddb.h
@@ -295,7 +295,6 @@ static struct __aligned(16) {
struct vcprop_tag_fbres vbt_res;
struct vcprop_tag_fbres vbt_vres;
struct vcprop_tag_fbdepth vbt_depth;
- struct vcprop_tag_fbpixelorder vbt_pixelorder;
struct vcprop_tag_fbalpha vbt_alpha;
struct vcprop_tag_allocbuf vbt_allocbuf;
struct vcprop_tag_blankscreen vbt_blank;
@@ -333,14 +332,6 @@ static struct __aligned(16) {
},
.bpp = 32,
},
- .vbt_pixelorder = {
- .tag = {
- .vpt_tag = VCPROPTAG_SET_FB_PIXEL_ORDER,
- .vpt_len = VCPROPTAG_LEN(vb_setfb.vbt_pixelorder),
- .vpt_rcode = VCPROPTAG_REQUEST,
- },
- .state = VCPROP_PIXEL_BGR,
- },
.vbt_alpha = {
.tag = {
.vpt_tag = VCPROPTAG_SET_FB_ALPHA_MODE,
@@ -733,6 +724,7 @@ rpi_fb_init(prop_dictionary_t dict)
char *ptr;
int integer;
int error;
+ bool is_bgr = true;
if (get_bootconf_option(boot_args, fb,
BOOTOPT_TYPE_STRING, ptr)) {
@@ -762,7 +754,6 @@ rpi_fb_init(prop_dictionary_t dict)
!vcprop_tag_success_p(vb_setfb.vbt_res.tag) ||
!vcprop_tag_success_p(vb_setfb.vbt_vres.tag) ||
!vcprop_tag_success_p(vb_setfb.vbt_depth.tag) ||
- !vcprop_tag_success_p(vb_setfb.vbt_pixelorder.tag) ||
!vcprop_tag_success_p(vb_setfb.vbt_allocbuf.tag) ||
!vcprop_tag_success_p(vb_setfb.vbt_blank.tag) ||
!vcprop_tag_success_p(vb_setfb.vbt_pitch.tag)) {
@@ -781,8 +772,6 @@ rpi_fb_init(prop_dictionary_t dict)
vb_setfb.vbt_res.width, vb_setfb.vbt_res.height);
printf(%s: vwidth = %d vheight = %d\n, __func__,
vb_setfb.vbt_vres.width, vb_setfb.vbt_vres.height);
- printf(%s: pixelorder = %d\n, __func__,
- vb_setfb.vbt_pixelorder.state);
#endif
if (vb_setfb.vbt_allocbuf.address == 0 ||
@@ -804,8 +793,20 @@ rpi_fb_init(prop_dictionary_t dict)
vb_setfb.vbt_pitch.linebytes);
prop_dictionary_set_uint32(dict, address,
vb_setfb.vbt_allocbuf.address);
- if (vb_setfb.vbt_pixelorder.state == VCPROP_PIXEL_BGR)
- prop_dictionary_set_bool(dict, is_bgr, true);
+
+ /*
+ * Old firmware uses BGR. New firmware uses RGB. The get and set
+ * pixel order mailbox properties don't seem to work. The firmware
+ * adds a kernel cmdline option bcm2708_fb.fbswap=0|1, so use it
+ * to determine pixel order. 0 means BGR, 1 means RGB.
+ *
+ * See https://github.com/raspberrypi/linux/issues/514
+ */
+ if (get_bootconf_option(boot_args, bcm2708_fb.fbswap,
+BOOTOPT_TYPE_INT, integer)) {
+ is_bgr = integer == 0;
+ }
+ prop_dictionary_set_bool(dict, is_bgr, is_bgr);
/* if genfb.type=n is passed in cmdline, override wsdisplay type */
if (get_bootconf_option(boot_args, genfb.type,
CVS commit: [netbsd-7] src/sys/arch/evbarm/rpi
Module Name:src Committed By: martin Date: Wed Jan 21 11:37:04 UTC 2015 Modified Files: src/sys/arch/evbarm/rpi [netbsd-7]: rpi_machdep.c Log Message: Pull up following revision(s) (requested by jmcneill in ticket #440): sys/arch/evbarm/rpi/rpi_machdep.c: revision 1.56 Newer Raspberry Pi firmware has changed the framebuffer from BGR to RGB. The method we use to set the pixel order (vcprop set pixel order) does not seem to work, nor does querying the pixel order (vcprop get pixel order). The firmware passes this information to the kernel by adding a bcm2708_fb.fbswap kernel cmdline arg. 0=BGR, 1=RGB. If the parameter is absent, assume we are running on old firmware and use BGR mode. To generate a diff of this commit: cvs rdiff -u -r1.43.2.2 -r1.43.2.3 src/sys/arch/evbarm/rpi/rpi_machdep.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: [netbsd-7] src/sys/arch
Module Name:src Committed By: martin Date: Wed Jan 21 08:19:35 UTC 2015 Modified Files: src/sys/arch/amd64/conf [netbsd-7]: NO_DRM src/sys/arch/i386/conf [netbsd-7]: NO_DRM Log Message: After removing i915drm from GENERIC, also remove the corresponding no i915drm* statements to make (old) config(1) happy. Requested by snj in ticket #438 To generate a diff of this commit: cvs rdiff -u -r1.2 -r1.2.8.1 src/sys/arch/amd64/conf/NO_DRM cvs rdiff -u -r1.1 -r1.1.8.1 src/sys/arch/i386/conf/NO_DRM 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/amd64/conf/NO_DRM diff -u src/sys/arch/amd64/conf/NO_DRM:1.2 src/sys/arch/amd64/conf/NO_DRM:1.2.8.1 --- src/sys/arch/amd64/conf/NO_DRM:1.2 Tue Mar 18 18:20:40 2014 +++ src/sys/arch/amd64/conf/NO_DRM Wed Jan 21 08:19:34 2015 @@ -1,6 +1,5 @@ include arch/amd64/conf/GENERIC -no i915drm* at drm? no mach64drm* at drm? no mgadrm* at drm? no r128drm* at drm? Index: src/sys/arch/i386/conf/NO_DRM diff -u src/sys/arch/i386/conf/NO_DRM:1.1 src/sys/arch/i386/conf/NO_DRM:1.1.8.1 --- src/sys/arch/i386/conf/NO_DRM:1.1 Thu Apr 3 19:18:51 2014 +++ src/sys/arch/i386/conf/NO_DRM Wed Jan 21 08:19:34 2015 @@ -1,6 +1,5 @@ include arch/i386/conf/GENERIC -no i915drm* at drm? no mach64drm* at drm? no mgadrm* at drm? no r128drm* at drm?
CVS commit: [netbsd-7] src/sys/arch
Module Name:src Committed By: martin Date: Wed Jan 21 08:19:35 UTC 2015 Modified Files: src/sys/arch/amd64/conf [netbsd-7]: NO_DRM src/sys/arch/i386/conf [netbsd-7]: NO_DRM Log Message: After removing i915drm from GENERIC, also remove the corresponding no i915drm* statements to make (old) config(1) happy. Requested by snj in ticket #438 To generate a diff of this commit: cvs rdiff -u -r1.2 -r1.2.8.1 src/sys/arch/amd64/conf/NO_DRM cvs rdiff -u -r1.1 -r1.1.8.1 src/sys/arch/i386/conf/NO_DRM Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/lib/libc/gen
Module Name:src Committed By: wiz Date: Wed Jan 21 08:35:31 UTC 2015 Modified Files: src/lib/libc/gen: popen.3 Log Message: Whitespace fixes. Remove duplicate Pp. To generate a diff of this commit: cvs rdiff -u -r1.19 -r1.20 src/lib/libc/gen/popen.3 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/lib/libc/gen
Module Name:src Committed By: wiz Date: Wed Jan 21 08:35:31 UTC 2015 Modified Files: src/lib/libc/gen: popen.3 Log Message: Whitespace fixes. Remove duplicate Pp. To generate a diff of this commit: cvs rdiff -u -r1.19 -r1.20 src/lib/libc/gen/popen.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/popen.3 diff -u src/lib/libc/gen/popen.3:1.19 src/lib/libc/gen/popen.3:1.20 --- src/lib/libc/gen/popen.3:1.19 Tue Jan 20 17:28:00 2015 +++ src/lib/libc/gen/popen.3 Wed Jan 21 08:35:31 2015 @@ -1,4 +1,4 @@ -.\ $NetBSD: popen.3,v 1.19 2015/01/20 17:28:00 christos Exp $ +.\ $NetBSD: popen.3,v 1.20 2015/01/21 08:35:31 wiz Exp $ .\ .\ Copyright (c) 1991, 1993 .\ The Regents of the University of California. All rights reserved. @@ -96,8 +96,7 @@ using the .Fl c flag; interpretation, if any, is performed by the shell. .Pp -.Pp -The +The .Fn popenve function is similar to .Fn popen @@ -163,12 +162,12 @@ command, if .Fa stream has already been .Dq pclosed , -setting errno to -.Dv ESRCH +setting errno to +.Dv ESRCH or if .Xr wait4 2 returns an error, preserving the errno returned by -.Xr wait4 2. +.Xr wait4 2 . .Sh SEE ALSO .Xr sh 1 , .Xr execve 2 ,
CVS commit: [netbsd-7] src/doc
Module Name:src Committed By: martin Date: Wed Jan 21 08:21:12 UTC 2015 Modified Files: src/doc [netbsd-7]: CHANGES-7.0 Log Message: Update #438 To generate a diff of this commit: cvs rdiff -u -r1.1.2.174 -r1.1.2.175 src/doc/CHANGES-7.0 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/doc/CHANGES-7.0 diff -u src/doc/CHANGES-7.0:1.1.2.174 src/doc/CHANGES-7.0:1.1.2.175 --- src/doc/CHANGES-7.0:1.1.2.174 Tue Jan 20 21:14:32 2015 +++ src/doc/CHANGES-7.0 Wed Jan 21 08:21:11 2015 @@ -1,4 +1,4 @@ -# $NetBSD: CHANGES-7.0,v 1.1.2.174 2015/01/20 21:14:32 snj Exp $ +# $NetBSD: CHANGES-7.0,v 1.1.2.175 2015/01/21 08:21:11 martin Exp $ A complete list of changes from the initial NetBSD 7.0 branch on 11 Aug 2014 until the 7.0 release: @@ -14096,7 +14096,9 @@ distrib/utils/embedded/mkimage 1.50 sets in the variable xsets. [skrll, ticket #437] +sys/arch/i386/conf/NO_DRM patch sys/arch/i386/conf/GENERIC patch +sys/arch/amd64/conf/NO_DRM patch sys/arch/amd64/conf/GENERIC patch Remove the i915drm driver since the version we use doesn't support UMS
CVS commit: [netbsd-7] src/doc
Module Name:src Committed By: martin Date: Wed Jan 21 08:21:12 UTC 2015 Modified Files: src/doc [netbsd-7]: CHANGES-7.0 Log Message: Update #438 To generate a diff of this commit: cvs rdiff -u -r1.1.2.174 -r1.1.2.175 src/doc/CHANGES-7.0 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/tests/rump/rumpkern
Module Name:src Committed By: pooka Date: Wed Jan 21 15:00:50 UTC 2015 Modified Files: src/tests/rump/rumpkern: t_lwproc.c Log Message: check that setuid() works for procs with 1 lwp To generate a diff of this commit: cvs rdiff -u -r1.5 -r1.6 src/tests/rump/rumpkern/t_lwproc.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/tests/rump/rumpkern
Module Name:src Committed By: pooka Date: Wed Jan 21 15:00:50 UTC 2015 Modified Files: src/tests/rump/rumpkern: t_lwproc.c Log Message: check that setuid() works for procs with 1 lwp To generate a diff of this commit: cvs rdiff -u -r1.5 -r1.6 src/tests/rump/rumpkern/t_lwproc.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/tests/rump/rumpkern/t_lwproc.c diff -u src/tests/rump/rumpkern/t_lwproc.c:1.5 src/tests/rump/rumpkern/t_lwproc.c:1.6 --- src/tests/rump/rumpkern/t_lwproc.c:1.5 Sun Jan 2 12:58:17 2011 +++ src/tests/rump/rumpkern/t_lwproc.c Wed Jan 21 15:00:50 2015 @@ -1,4 +1,4 @@ -/* $NetBSD: t_lwproc.c,v 1.5 2011/01/02 12:58:17 pooka Exp $ */ +/* $NetBSD: t_lwproc.c,v 1.6 2015/01/21 15:00:50 pooka Exp $ */ /* * Copyright (c) 2010 The NetBSD Foundation, Inc. @@ -88,6 +88,7 @@ ATF_TC_BODY(proccreds, tc) rump_init(); RZ(rump_pub_lwproc_rfork(RUMP_RFCFDG)); l1 = rump_pub_lwproc_curlwp(); + RZ(rump_pub_lwproc_newlwp()); RZ(rump_pub_lwproc_rfork(RUMP_RFCFDG)); l2 = rump_pub_lwproc_curlwp();
CVS commit: src/sys/rump/librump/rumpkern
Module Name:src
Committed By: pooka
Date: Wed Jan 21 14:39:37 UTC 2015
Modified Files:
src/sys/rump/librump/rumpkern: lwproc.c
Log Message:
Account for lwps so that rump_sys_setuid() doesn't hit a KASSERT when
it tries to reaccount a switching procs lwps.
from Mato Lucina
To generate a diff of this commit:
cvs rdiff -u -r1.31 -r1.32 src/sys/rump/librump/rumpkern/lwproc.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/lwproc.c
diff -u src/sys/rump/librump/rumpkern/lwproc.c:1.31 src/sys/rump/librump/rumpkern/lwproc.c:1.32
--- src/sys/rump/librump/rumpkern/lwproc.c:1.31 Fri Apr 25 13:20:45 2014
+++ src/sys/rump/librump/rumpkern/lwproc.c Wed Jan 21 14:39:37 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: lwproc.c,v 1.31 2014/04/25 13:20:45 pooka Exp $ */
+/* $NetBSD: lwproc.c,v 1.32 2015/01/21 14:39:37 pooka Exp $ */
/*
* Copyright (c) 2010, 2011 Antti Kantee. All Rights Reserved.
@@ -28,7 +28,7 @@
#define RUMP__CURLWP_PRIVATE
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: lwproc.c,v 1.31 2014/04/25 13:20:45 pooka Exp $);
+__KERNEL_RCSID(0, $NetBSD: lwproc.c,v 1.32 2015/01/21 14:39:37 pooka Exp $);
#include sys/param.h
#include sys/atomic.h
@@ -246,6 +246,8 @@ lwproc_freelwp(struct lwp *l)
if (--p-p_nlwps == 0) {
KASSERT(p != proc0);
p-p_stat = SDEAD;
+ } else {
+ chglwpcnt(kauth_cred_getuid(p-p_cred), -1);
}
cv_broadcast(p-p_lwpcv); /* nobody sleeps on this in a rump kernel? */
kauth_cred_free(l-l_cred);
@@ -276,7 +278,15 @@ static void
lwproc_makelwp(struct proc *p, struct lwp *l, bool doswitch, bool procmake)
{
- p-p_nlwps++;
+ /*
+ * Account the new lwp to the owner of the process.
+ * For some reason, NetBSD doesn't count the first lwp
+ * in a process as a lwp, so skip that.
+ */
+ if (p-p_nlwps++) {
+ chglwpcnt(kauth_cred_getuid(p-p_cred), 1);
+ }
+
l-l_refcnt = 1;
l-l_proc = p;
CVS commit: src/sys/rump/librump/rumpkern
Module Name:src Committed By: pooka Date: Wed Jan 21 14:39:37 UTC 2015 Modified Files: src/sys/rump/librump/rumpkern: lwproc.c Log Message: Account for lwps so that rump_sys_setuid() doesn't hit a KASSERT when it tries to reaccount a switching procs lwps. from Mato Lucina To generate a diff of this commit: cvs rdiff -u -r1.31 -r1.32 src/sys/rump/librump/rumpkern/lwproc.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/tests/rump/rumpkern
Module Name:src Committed By: pooka Date: Wed Jan 21 15:19:01 UTC 2015 Modified Files: src/tests/rump/rumpkern: t_lwproc.c Log Message: call previous with the correct args too To generate a diff of this commit: cvs rdiff -u -r1.6 -r1.7 src/tests/rump/rumpkern/t_lwproc.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/tests/rump/rumpkern
Module Name:src Committed By: pooka Date: Wed Jan 21 15:19:01 UTC 2015 Modified Files: src/tests/rump/rumpkern: t_lwproc.c Log Message: call previous with the correct args too To generate a diff of this commit: cvs rdiff -u -r1.6 -r1.7 src/tests/rump/rumpkern/t_lwproc.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/tests/rump/rumpkern/t_lwproc.c diff -u src/tests/rump/rumpkern/t_lwproc.c:1.6 src/tests/rump/rumpkern/t_lwproc.c:1.7 --- src/tests/rump/rumpkern/t_lwproc.c:1.6 Wed Jan 21 15:00:50 2015 +++ src/tests/rump/rumpkern/t_lwproc.c Wed Jan 21 15:19:01 2015 @@ -1,4 +1,4 @@ -/* $NetBSD: t_lwproc.c,v 1.6 2015/01/21 15:00:50 pooka Exp $ */ +/* $NetBSD: t_lwproc.c,v 1.7 2015/01/21 15:19:01 pooka Exp $ */ /* * Copyright (c) 2010 The NetBSD Foundation, Inc. @@ -88,7 +88,7 @@ ATF_TC_BODY(proccreds, tc) rump_init(); RZ(rump_pub_lwproc_rfork(RUMP_RFCFDG)); l1 = rump_pub_lwproc_curlwp(); - RZ(rump_pub_lwproc_newlwp()); + RZ(rump_pub_lwproc_newlwp(rump_sys_getpid())); RZ(rump_pub_lwproc_rfork(RUMP_RFCFDG)); l2 = rump_pub_lwproc_curlwp();
