Module Name: src Committed By: riastradh Date: Sun Dec 19 11:33:31 UTC 2021
Modified Files: src/sys/external/bsd/drm2/dist/drm: drm_prime.c src/sys/external/bsd/drm2/dist/drm/i915: i915_gem_gtt.c i915_gem_gtt.h i915_scatterlist.h i915_vma.h i915_vma_types.h src/sys/external/bsd/drm2/dist/drm/i915/gem: i915_gem_clflush.c i915_gem_dmabuf.c i915_gem_execbuffer.c i915_gem_internal.c i915_gem_mman.c i915_gem_mman.h i915_gem_object.c i915_gem_object.h i915_gem_object_types.h i915_gem_pages.c i915_gem_phys.c i915_gem_pm.c i915_gem_shmem.c i915_gem_stolen.c src/sys/external/bsd/drm2/dist/drm/i915/gt: intel_gtt.h src/sys/external/bsd/drm2/dist/include/drm: drm_cache.h drm_prime.h src/sys/external/bsd/drm2/drm: drm_cache.c src/sys/external/bsd/drm2/include/asm: uaccess.h src/sys/external/bsd/drm2/include/drm: bus_dma_hacks.h src/sys/external/bsd/drm2/include/linux: bitmap.h dma-buf.h dma-mapping.h mutex.h radix-tree.h scatterlist.h src/sys/external/bsd/drm2/linux: files.drmkms_linux linux_dma_buf.c Added Files: src/sys/external/bsd/drm2/linux: linux_sg.c Log Message: drm: Another pass over i915 and some supporting logic. This makes a shim around sg_table, which essentially represents two things: 1. an array of pages (roughly corresponding to bus_dma_segment_t[]) 2. an array of DMA addresses stored in a bus_dmamap_t Both parts are optional; different parts of i915 use sg_tables to pass around one or both of the two parts. This helps to reduce the ifdefs by quite a bit, although it's not always clear which part of an sg_table any particular interface is actually using which is why I was reluctant to do this before. To generate a diff of this commit: cvs rdiff -u -r1.15 -r1.16 src/sys/external/bsd/drm2/dist/drm/drm_prime.c cvs rdiff -u -r1.22 -r1.23 \ src/sys/external/bsd/drm2/dist/drm/i915/i915_gem_gtt.c cvs rdiff -u -r1.10 -r1.11 \ src/sys/external/bsd/drm2/dist/drm/i915/i915_gem_gtt.h cvs rdiff -u -r1.5 -r1.6 \ src/sys/external/bsd/drm2/dist/drm/i915/i915_scatterlist.h \ src/sys/external/bsd/drm2/dist/drm/i915/i915_vma.h cvs rdiff -u -r1.3 -r1.4 \ src/sys/external/bsd/drm2/dist/drm/i915/i915_vma_types.h cvs rdiff -u -r1.4 -r1.5 \ src/sys/external/bsd/drm2/dist/drm/i915/gem/i915_gem_clflush.c \ src/sys/external/bsd/drm2/dist/drm/i915/gem/i915_gem_object.h \ src/sys/external/bsd/drm2/dist/drm/i915/gem/i915_gem_pages.c cvs rdiff -u -r1.5 -r1.6 \ src/sys/external/bsd/drm2/dist/drm/i915/gem/i915_gem_dmabuf.c \ src/sys/external/bsd/drm2/dist/drm/i915/gem/i915_gem_mman.h \ src/sys/external/bsd/drm2/dist/drm/i915/gem/i915_gem_object_types.h cvs rdiff -u -r1.3 -r1.4 \ src/sys/external/bsd/drm2/dist/drm/i915/gem/i915_gem_execbuffer.c \ src/sys/external/bsd/drm2/dist/drm/i915/gem/i915_gem_internal.c \ src/sys/external/bsd/drm2/dist/drm/i915/gem/i915_gem_object.c \ src/sys/external/bsd/drm2/dist/drm/i915/gem/i915_gem_phys.c \ src/sys/external/bsd/drm2/dist/drm/i915/gem/i915_gem_stolen.c cvs rdiff -u -r1.6 -r1.7 \ src/sys/external/bsd/drm2/dist/drm/i915/gem/i915_gem_mman.c \ src/sys/external/bsd/drm2/dist/drm/i915/gem/i915_gem_shmem.c cvs rdiff -u -r1.2 -r1.3 \ src/sys/external/bsd/drm2/dist/drm/i915/gem/i915_gem_pm.c cvs rdiff -u -r1.10 -r1.11 \ src/sys/external/bsd/drm2/dist/drm/i915/gt/intel_gtt.h cvs rdiff -u -r1.9 -r1.10 \ src/sys/external/bsd/drm2/dist/include/drm/drm_cache.h cvs rdiff -u -r1.6 -r1.7 \ src/sys/external/bsd/drm2/dist/include/drm/drm_prime.h cvs rdiff -u -r1.17 -r1.18 src/sys/external/bsd/drm2/drm/drm_cache.c cvs rdiff -u -r1.9 -r1.10 src/sys/external/bsd/drm2/include/asm/uaccess.h cvs rdiff -u -r1.21 -r1.22 \ src/sys/external/bsd/drm2/include/drm/bus_dma_hacks.h cvs rdiff -u -r1.11 -r1.12 src/sys/external/bsd/drm2/include/linux/bitmap.h cvs rdiff -u -r1.10 -r1.11 src/sys/external/bsd/drm2/include/linux/dma-buf.h cvs rdiff -u -r1.8 -r1.9 \ src/sys/external/bsd/drm2/include/linux/dma-mapping.h cvs rdiff -u -r1.16 -r1.17 src/sys/external/bsd/drm2/include/linux/mutex.h cvs rdiff -u -r1.4 -r1.5 src/sys/external/bsd/drm2/include/linux/radix-tree.h cvs rdiff -u -r1.3 -r1.4 \ src/sys/external/bsd/drm2/include/linux/scatterlist.h cvs rdiff -u -r1.31 -r1.32 src/sys/external/bsd/drm2/linux/files.drmkms_linux cvs rdiff -u -r1.9 -r1.10 src/sys/external/bsd/drm2/linux/linux_dma_buf.c cvs rdiff -u -r0 -r1.1 src/sys/external/bsd/drm2/linux/linux_sg.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.