Module Name: src Committed By: thorpej Date: Thu Aug 5 00:39:17 UTC 2021
Modified Files: src/sys/external/bsd/drm2/dist/drm/amd/amdgpu [thorpej-cfargs2]: amdgpu_fb.c src/sys/external/bsd/drm2/dist/drm/i915 [thorpej-cfargs2]: intel_fbdev.c src/sys/external/bsd/drm2/dist/drm/nouveau [thorpej-cfargs2]: nouveau_fbcon.c src/sys/external/bsd/drm2/dist/drm/radeon [thorpej-cfargs2]: radeon_fb.c src/sys/external/bsd/vchiq/dist/interface/vchiq_arm [thorpej-cfargs2]: vchiq_netbsd_acpi.c vchiq_netbsd_fdt.c Log Message: Adapt to CFARGS(). To generate a diff of this commit: cvs rdiff -u -r1.6 -r1.6.8.1 \ src/sys/external/bsd/drm2/dist/drm/amd/amdgpu/amdgpu_fb.c cvs rdiff -u -r1.14 -r1.14.8.1 \ src/sys/external/bsd/drm2/dist/drm/i915/intel_fbdev.c cvs rdiff -u -r1.10 -r1.10.8.1 \ src/sys/external/bsd/drm2/dist/drm/nouveau/nouveau_fbcon.c cvs rdiff -u -r1.9 -r1.9.8.1 \ src/sys/external/bsd/drm2/dist/drm/radeon/radeon_fb.c cvs rdiff -u -r1.4 -r1.4.8.1 \ src/sys/external/bsd/vchiq/dist/interface/vchiq_arm/vchiq_netbsd_acpi.c cvs rdiff -u -r1.6 -r1.6.8.1 \ src/sys/external/bsd/vchiq/dist/interface/vchiq_arm/vchiq_netbsd_fdt.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/amd/amdgpu/amdgpu_fb.c diff -u src/sys/external/bsd/drm2/dist/drm/amd/amdgpu/amdgpu_fb.c:1.6 src/sys/external/bsd/drm2/dist/drm/amd/amdgpu/amdgpu_fb.c:1.6.8.1 --- src/sys/external/bsd/drm2/dist/drm/amd/amdgpu/amdgpu_fb.c:1.6 Sat Apr 24 23:37:00 2021 +++ src/sys/external/bsd/drm2/dist/drm/amd/amdgpu/amdgpu_fb.c Thu Aug 5 00:39:16 2021 @@ -1,4 +1,4 @@ -/* $NetBSD: amdgpu_fb.c,v 1.6 2021/04/24 23:37:00 thorpej Exp $ */ +/* $NetBSD: amdgpu_fb.c,v 1.6.8.1 2021/08/05 00:39:16 thorpej Exp $ */ /* * Copyright © 2007 David Airlie @@ -26,7 +26,7 @@ * David Airlie */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: amdgpu_fb.c,v 1.6 2021/04/24 23:37:00 thorpej Exp $"); +__KERNEL_RCSID(0, "$NetBSD: amdgpu_fb.c,v 1.6.8.1 2021/08/05 00:39:16 thorpej Exp $"); #include <linux/module.h> #include <linux/slab.h> @@ -235,8 +235,7 @@ static int amdgpufb_create(struct drm_fb afa.afa_fb_linebytes = mode_cmd.pitches[0]; helper->fbdev = config_found(adev->ddev->dev, &afa, NULL, - CFARG_IATTR, "amdgpufbbus", - CFARG_EOL); + CFARGS(.iattr = "amdgpufbbus")); if (helper->fbdev == NULL) { DRM_ERROR("failed to attach amdgpufb\n"); goto out_unref; Index: src/sys/external/bsd/drm2/dist/drm/i915/intel_fbdev.c diff -u src/sys/external/bsd/drm2/dist/drm/i915/intel_fbdev.c:1.14 src/sys/external/bsd/drm2/dist/drm/i915/intel_fbdev.c:1.14.8.1 --- src/sys/external/bsd/drm2/dist/drm/i915/intel_fbdev.c:1.14 Sat Apr 24 23:37:00 2021 +++ src/sys/external/bsd/drm2/dist/drm/i915/intel_fbdev.c Thu Aug 5 00:39:17 2021 @@ -1,4 +1,4 @@ -/* $NetBSD: intel_fbdev.c,v 1.14 2021/04/24 23:37:00 thorpej Exp $ */ +/* $NetBSD: intel_fbdev.c,v 1.14.8.1 2021/08/05 00:39:17 thorpej Exp $ */ /* * Copyright © 2007 David Airlie @@ -27,7 +27,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: intel_fbdev.c,v 1.14 2021/04/24 23:37:00 thorpej Exp $"); +__KERNEL_RCSID(0, "$NetBSD: intel_fbdev.c,v 1.14.8.1 2021/08/05 00:39:17 thorpej Exp $"); #include <linux/async.h> #include <linux/module.h> @@ -254,8 +254,7 @@ static int intelfb_create(struct drm_fb_ * dev->struct_mutex. */ helper->fbdev = config_found(dev->dev, &ifa, NULL, - CFARG_IATTR, "intelfbbus", - CFARG_EOL); + CFARGS(.iattr = "intelfbbus")); if (helper->fbdev == NULL) { DRM_ERROR("unable to attach intelfb\n"); ret = -ENXIO; Index: src/sys/external/bsd/drm2/dist/drm/nouveau/nouveau_fbcon.c diff -u src/sys/external/bsd/drm2/dist/drm/nouveau/nouveau_fbcon.c:1.10 src/sys/external/bsd/drm2/dist/drm/nouveau/nouveau_fbcon.c:1.10.8.1 --- src/sys/external/bsd/drm2/dist/drm/nouveau/nouveau_fbcon.c:1.10 Sat Apr 24 23:37:00 2021 +++ src/sys/external/bsd/drm2/dist/drm/nouveau/nouveau_fbcon.c Thu Aug 5 00:39:17 2021 @@ -1,4 +1,4 @@ -/* $NetBSD: nouveau_fbcon.c,v 1.10 2021/04/24 23:37:00 thorpej Exp $ */ +/* $NetBSD: nouveau_fbcon.c,v 1.10.8.1 2021/08/05 00:39:17 thorpej Exp $ */ /* * Copyright © 2007 David Airlie @@ -27,7 +27,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: nouveau_fbcon.c,v 1.10 2021/04/24 23:37:00 thorpej Exp $"); +__KERNEL_RCSID(0, "$NetBSD: nouveau_fbcon.c,v 1.10.8.1 2021/08/05 00:39:17 thorpej Exp $"); #include <linux/module.h> #include <linux/kernel.h> @@ -443,8 +443,7 @@ nouveau_fbcon_create(struct drm_fb_helpe nfa.nfa_fb_linebytes = mode_cmd.pitches[0]; helper->fbdev = config_found(dev->dev, &nfa, nouveau_fbcon_print, - CFARG_IATTR, "nouveaufbbus", - CFARG_EOL); + CFARGS(.iattr = "nouveaufbbus")); if (helper->fbdev == NULL) { goto out_unlock; } Index: src/sys/external/bsd/drm2/dist/drm/radeon/radeon_fb.c diff -u src/sys/external/bsd/drm2/dist/drm/radeon/radeon_fb.c:1.9 src/sys/external/bsd/drm2/dist/drm/radeon/radeon_fb.c:1.9.8.1 --- src/sys/external/bsd/drm2/dist/drm/radeon/radeon_fb.c:1.9 Sat Apr 24 23:37:00 2021 +++ src/sys/external/bsd/drm2/dist/drm/radeon/radeon_fb.c Thu Aug 5 00:39:17 2021 @@ -1,4 +1,4 @@ -/* $NetBSD: radeon_fb.c,v 1.9 2021/04/24 23:37:00 thorpej Exp $ */ +/* $NetBSD: radeon_fb.c,v 1.9.8.1 2021/08/05 00:39:17 thorpej Exp $ */ /* * Copyright © 2007 David Airlie @@ -26,7 +26,7 @@ * David Airlie */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: radeon_fb.c,v 1.9 2021/04/24 23:37:00 thorpej Exp $"); +__KERNEL_RCSID(0, "$NetBSD: radeon_fb.c,v 1.9.8.1 2021/08/05 00:39:17 thorpej Exp $"); #include <linux/module.h> #include <linux/slab.h> @@ -254,8 +254,7 @@ static int radeonfb_create(struct drm_fb rfa.rfa_fb_linebytes = mode_cmd.pitches[0]; helper->fbdev = config_found(rdev->ddev->dev, &rfa, NULL, - CFARG_IATTR, "radeonfbbus", - CFARG_EOL); + CFARGS(.iattr = "radeonfbbus")); if (helper->fbdev == NULL) { DRM_ERROR("failed to attach genfb\n"); goto out_unref; Index: src/sys/external/bsd/vchiq/dist/interface/vchiq_arm/vchiq_netbsd_acpi.c diff -u src/sys/external/bsd/vchiq/dist/interface/vchiq_arm/vchiq_netbsd_acpi.c:1.4 src/sys/external/bsd/vchiq/dist/interface/vchiq_arm/vchiq_netbsd_acpi.c:1.4.8.1 --- src/sys/external/bsd/vchiq/dist/interface/vchiq_arm/vchiq_netbsd_acpi.c:1.4 Sat Apr 24 23:37:00 2021 +++ src/sys/external/bsd/vchiq/dist/interface/vchiq_arm/vchiq_netbsd_acpi.c Thu Aug 5 00:39:17 2021 @@ -1,4 +1,4 @@ -/* $NetBSD: vchiq_netbsd_acpi.c,v 1.4 2021/04/24 23:37:00 thorpej Exp $ */ +/* $NetBSD: vchiq_netbsd_acpi.c,v 1.4.8.1 2021/08/05 00:39:17 thorpej Exp $ */ /*- * Copyright (c) 2013 The NetBSD Foundation, Inc. @@ -30,7 +30,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: vchiq_netbsd_acpi.c,v 1.4 2021/04/24 23:37:00 thorpej Exp $"); +__KERNEL_RCSID(0, "$NetBSD: vchiq_netbsd_acpi.c,v 1.4.8.1 2021/08/05 00:39:17 thorpej Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -143,5 +143,5 @@ vchiq_acpi_defer(device_t self) vchiq_init(); vaa.vaa_name = "AUDS"; - config_found(self, &vaa, vchiq_print, CFARG_EOL); + config_found(self, &vaa, vchiq_print, CFARGS_NONE); } Index: src/sys/external/bsd/vchiq/dist/interface/vchiq_arm/vchiq_netbsd_fdt.c diff -u src/sys/external/bsd/vchiq/dist/interface/vchiq_arm/vchiq_netbsd_fdt.c:1.6 src/sys/external/bsd/vchiq/dist/interface/vchiq_arm/vchiq_netbsd_fdt.c:1.6.8.1 --- src/sys/external/bsd/vchiq/dist/interface/vchiq_arm/vchiq_netbsd_fdt.c:1.6 Sat Apr 24 23:37:00 2021 +++ src/sys/external/bsd/vchiq/dist/interface/vchiq_arm/vchiq_netbsd_fdt.c Thu Aug 5 00:39:17 2021 @@ -1,4 +1,4 @@ -/* $NetBSD: vchiq_netbsd_fdt.c,v 1.6 2021/04/24 23:37:00 thorpej Exp $ */ +/* $NetBSD: vchiq_netbsd_fdt.c,v 1.6.8.1 2021/08/05 00:39:17 thorpej Exp $ */ /*- * Copyright (c) 2013 The NetBSD Foundation, Inc. @@ -30,7 +30,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: vchiq_netbsd_fdt.c,v 1.6 2021/04/24 23:37:00 thorpej Exp $"); +__KERNEL_RCSID(0, "$NetBSD: vchiq_netbsd_fdt.c,v 1.6.8.1 2021/08/05 00:39:17 thorpej Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -146,5 +146,5 @@ vchiq_fdt_defer(device_t self) vchiq_init(); vaa.vaa_name = "AUDS"; - config_found(self, &vaa, vchiq_print, CFARG_EOL); + config_found(self, &vaa, vchiq_print, CFARGS_NONE); }