Module Name: src Committed By: snj Date: Thu Feb 11 22:52:58 UTC 2016
Modified Files: src/sys/external/bsd/drm2/dist/drm/i915 [netbsd-7]: intel_i2c.c intel_pm.c intel_sdvo.c src/sys/external/bsd/drm2/dist/drm/nouveau [netbsd-7]: nouveau_drm.c src/sys/external/bsd/drm2/dist/drm/nouveau/core/include/core [netbsd-7]: device.h src/sys/external/bsd/drm2/dist/drm/nouveau/core/subdev/bios [netbsd-7]: nouveau_subdev_bios_base.c src/sys/external/bsd/drm2/dist/drm/radeon [netbsd-7]: radeon_display.c radeon_gem.c radeon_i2c.c radeon_kms.c src/sys/external/bsd/drm2/include/linux [netbsd-7]: pci.h platform_device.h src/sys/external/bsd/drm2/nouveau [netbsd-7]: nouveau_pci.c Log Message: Pull up following revision(s) (requested by riastradh in ticket #1080): sys/external/bsd/drm2/dist/drm/i915/intel_i2c.c: revision 1.14 sys/external/bsd/drm2/dist/drm/i915/intel_pm.c: revision 1.8 sys/external/bsd/drm2/dist/drm/i915/intel_sdvo.c: revision 1.7 sys/external/bsd/drm2/dist/drm/nouveau/nouveau_drm.c: revision 1.7 sys/external/bsd/drm2/dist/drm/nouveau/core/include/core/device.h: revision 1.5 sys/external/bsd/drm2/dist/drm/nouveau/core/subdev/bios/nouveau_subdev_bios_base.c: revision 1.3 sys/external/bsd/drm2/dist/drm/radeon/radeon_display.c: revision 1.5 sys/external/bsd/drm2/dist/drm/radeon/radeon_gem.c: revision 1.3 sys/external/bsd/drm2/dist/drm/radeon/radeon_i2c.c: revision 1.3 sys/external/bsd/drm2/dist/drm/radeon/radeon_kms.c: revision 1.3 sys/external/bsd/drm2/include/linux/pci.h: revision 1.21 sys/external/bsd/drm2/include/linux/platform_device.h: revision 1.7 sys/external/bsd/drm2/nouveau/nouveau_pci.c: revision 1.5 Use nv_device_base(dev) like other callers, not dev->pdev->dev. First step in fixing the struct device nonsense. This won't actually fix anything yet until we also fix nv_device_base. -- dev->dev, not &dev->pdev->dev. Latter is a charlatan, soon to meet judgment for its sins. -- dev->dev, not &dev->pdev->dev. Latter is a mistake that is all my fault. Oops. -- Eliminate Linux struct pci_dev::dev, struct platform_device::dev. To generate a diff of this commit: cvs rdiff -u -r1.4.2.2 -r1.4.2.3 \ src/sys/external/bsd/drm2/dist/drm/i915/intel_i2c.c cvs rdiff -u -r1.4.2.3 -r1.4.2.4 \ src/sys/external/bsd/drm2/dist/drm/i915/intel_pm.c cvs rdiff -u -r1.5.2.1 -r1.5.2.2 \ src/sys/external/bsd/drm2/dist/drm/i915/intel_sdvo.c cvs rdiff -u -r1.2.4.3 -r1.2.4.4 \ src/sys/external/bsd/drm2/dist/drm/nouveau/nouveau_drm.c cvs rdiff -u -r1.2.4.2 -r1.2.4.3 \ src/sys/external/bsd/drm2/dist/drm/nouveau/core/include/core/device.h cvs rdiff -u -r1.1.1.1.4.1 -r1.1.1.1.4.2 \ src/sys/external/bsd/drm2/dist/drm/nouveau/core/subdev/bios/nouveau_subdev_bios_base.c cvs rdiff -u -r1.2.4.2 -r1.2.4.3 \ src/sys/external/bsd/drm2/dist/drm/radeon/radeon_display.c cvs rdiff -u -r1.2 -r1.2.4.1 \ src/sys/external/bsd/drm2/dist/drm/radeon/radeon_gem.c \ src/sys/external/bsd/drm2/dist/drm/radeon/radeon_i2c.c \ src/sys/external/bsd/drm2/dist/drm/radeon/radeon_kms.c cvs rdiff -u -r1.7.2.8 -r1.7.2.9 \ src/sys/external/bsd/drm2/include/linux/pci.h cvs rdiff -u -r1.4 -r1.4.2.1 \ src/sys/external/bsd/drm2/include/linux/platform_device.h cvs rdiff -u -r1.3.2.3 -r1.3.2.4 \ src/sys/external/bsd/drm2/nouveau/nouveau_pci.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.