Module Name: src Committed By: riastradh Date: Mon Aug 27 14:47:53 UTC 2018
Modified Files: src/sys/external/bsd/drm2/dist/drm/nouveau: nouveau_drm.c nouveau_nvif.c src/sys/external/bsd/drm2/dist/drm/nouveau/include/nvif: driver.h object.h src/sys/external/bsd/drm2/dist/drm/nouveau/include/nvkm/core: client.h device.h src/sys/external/bsd/drm2/dist/drm/nouveau/nvif: nouveau_nvif_object.c src/sys/external/bsd/drm2/dist/drm/nouveau/nvkm/engine/device: nouveau_nvkm_engine_device_base.c Log Message: Allow nvkm_client_map to map subregions. Linux ioremap does not care about overlapping mapped regions, but bus_space_map does. Since nouveau ioremaps the entire register space of BAR 0, and separately some subregions of it, we need to convey the bus addresses in question to it in order to bus_space_subregion. Kinda kludgey, but we don't care about running this in userland or anything. While here: initialize object->map.tag. Not physically necessary on x86 as long as the x86_io_mem_tag is nonull, so this won't fix any symptoms on x86, but it is wrong to leave it null. To generate a diff of this commit: cvs rdiff -u -r1.13 -r1.14 \ src/sys/external/bsd/drm2/dist/drm/nouveau/nouveau_drm.c cvs rdiff -u -r1.3 -r1.4 \ src/sys/external/bsd/drm2/dist/drm/nouveau/nouveau_nvif.c cvs rdiff -u -r1.4 -r1.5 \ src/sys/external/bsd/drm2/dist/drm/nouveau/include/nvif/driver.h cvs rdiff -u -r1.6 -r1.7 \ src/sys/external/bsd/drm2/dist/drm/nouveau/include/nvif/object.h cvs rdiff -u -r1.4 -r1.5 \ src/sys/external/bsd/drm2/dist/drm/nouveau/include/nvkm/core/client.h cvs rdiff -u -r1.5 -r1.6 \ src/sys/external/bsd/drm2/dist/drm/nouveau/include/nvkm/core/device.h cvs rdiff -u -r1.3 -r1.4 \ src/sys/external/bsd/drm2/dist/drm/nouveau/nvif/nouveau_nvif_object.c cvs rdiff -u -r1.6 -r1.7 \ src/sys/external/bsd/drm2/dist/drm/nouveau/nvkm/engine/device/nouveau_nvkm_engine_device_base.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.