Hi Dave & Daniel, Here's the last -misc-next pull request for 5.5. Lots of refactoring going on this week which results in a negative diffstat. Only thing to highlight is the dma-buf heap introduction and revert, which you are already aware of, so hopefully no other surprises here.
drm-misc-next-2019-10-31: drm-misc-next for 5.5:
UAPI Changes: -dma-buf: Introduce and revert dma-buf heap (Andrew/John/Sean)
Cross-subsystem Changes: - None
Core Changes: -dma-buf: add dynamic mapping to allow exporters to choose dma_resv lock state on mmap/munmap (Christian) -vram: add prepare/cleanup fb helpers to vram helpers (Thomas) -ttm: always keep bo's on the lru + ttm cleanups (Christian) -sched: allow a free_job routine to sleep (Steven) -fb_helper: remove unused drm_fb_helper_defio_init() (Thomas)
Driver Changes: -bochs/hibmc/vboxvideo: Use new vram helpers for prepare/cleanup fb (Thomas) -amdgpu: Implement dma-buf import/export without drm helpers (Christian) -panfrost: Simplify devfreq integration in driver (Steven)
Cc: Christian König christian.koenig@amd.com Cc: Thomas Zimmermann tzimmermann@suse.de Cc: Steven Price steven.price@arm.com Cc: Andrew F. Davis afd@ti.com Cc: John Stultz john.stultz@linaro.org Cc: Sean Paul seanpaul@chromium.org
Cheers, Sean
The following changes since commit 9a42c7c647a9ad0f7ebb147a52eda3dcb7c84292:
drm/tegra: Move drm_dp_link helpers to Tegra DRM (2019-10-23 18:22:10 +0200)
are available in the Git repository at:
git://anongit.freedesktop.org/drm/drm-misc tags/drm-misc-next-2019-10-31
for you to fetch changes up to fae7d7d5f374eadbb0b5dd31b39162e7176e9c3d:
Revert "dma-buf: Add dma-buf heaps framework" (2019-10-30 16:41:49 -0400)
---------------------------------------------------------------- drm-misc-next for 5.5:
UAPI Changes: -dma-buf: Introduce and revert dma-buf heap (Andrew/John/Sean)
Cross-subsystem Changes: - None
Core Changes: -dma-buf: add dynamic mapping to allow exporters to choose dma_resv lock state on mmap/munmap (Christian) -vram: add prepare/cleanup fb helpers to vram helpers (Thomas) -ttm: always keep bo's on the lru + ttm cleanups (Christian) -sched: allow a free_job routine to sleep (Steven) -fb_helper: remove unused drm_fb_helper_defio_init() (Thomas)
Driver Changes: -bochs/hibmc/vboxvideo: Use new vram helpers for prepare/cleanup fb (Thomas) -amdgpu: Implement dma-buf import/export without drm helpers (Christian) -panfrost: Simplify devfreq integration in driver (Steven)
Cc: Christian König christian.koenig@amd.com Cc: Thomas Zimmermann tzimmermann@suse.de Cc: Steven Price steven.price@arm.com Cc: Andrew F. Davis afd@ti.com Cc: John Stultz john.stultz@linaro.org Cc: Sean Paul seanpaul@chromium.org
---------------------------------------------------------------- Andrew F. Davis (1): dma-buf: Add dma-buf heaps framework
Anna Karas (1): doc: drm: Update references to previously renamed files
Bhanusree (3): drm/gpu: Add comment for memory barrier drm/gpu: Fix Missing blank line after declarations drm/gpu: Fix Memory barrier without comment Issue
Christian König (10): dma-buf: change DMA-buf locking convention v3 dma-buf: stop using the dmabuf->lock so much v2 drm/ttm, drm/vmwgfx: move cpu_writers handling into vmwgfx drm/ttm: always keep BOs on the LRU drm/ttm: remove pointers to globals drm/ttm: use the parent resv for ghost objects v3 drm/qxl: stop using TTM to call driver internal functions drm/ttm: stop exporting ttm_mem_io_* functions drm/amdgpu: add independent DMA-buf export v8 drm/amdgpu: add independent DMA-buf import v9
Daniel Vetter (1): drm/simple-kms: Standardize arguments for callbacks
Geert Uytterhoeven (1): drm: Spelling s/connet/connect/
Hans de Goede (1): drm/vboxvideo: Use drm_gem_fb_create_with_dirty instead of drm_gem_fb_create
John Stultz (4): dma-buf: heaps: Add heap helpers dma-buf: heaps: Add system heap to dmabuf heaps dma-buf: heaps: Add CMA heap to dmabuf heaps kselftests: Add dma-heap test
Rob Herring (1): drm/gem: Fix mmap fake offset handling for drm_gem_object_funcs.mmap
Sean Paul (5): Revert "kselftests: Add dma-heap test" Revert "dma-buf: heaps: Add CMA heap to dmabuf heaps" Revert "dma-buf: heaps: Add system heap to dmabuf heaps" Revert "dma-buf: heaps: Add heap helpers" Revert "dma-buf: Add dma-buf heaps framework"
Steven Price (3): drm: Don't free jobs in wait_event_interruptible() drm/panfrost: Use generic code for devfreq drm/panfrost: Simplify devfreq utilisation tracking
Thomas Zimmermann (6): drm/vram-helpers: Add helpers for prepare_fb() and cleanup_fb() drm/bochs: Replace prepare_fb()/cleanup_fb() with GEM VRAM helpers drm/hisilicon/hibmc: Use GEM VRAM's prepare_fb() and cleanup_fb() helpers drm/vboxvideo: Replace prepare_fb()/cleanup_fb() with GEM VRAM helpers drm/fb-helper: Remove drm_fb_helper_defio_init() and update docs drm/todo: Clarify situation around fbdev and defio
Wambui Karuga (1): drm/mediatek: remove cast to pointers passed to kfree
Documentation/driver-api/dma-buf.rst | 6 +- Documentation/gpu/todo.rst | 8 +- drivers/dma-buf/dma-buf.c | 120 +++++++++--- drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gpuvm.c | 9 +- drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c | 2 +- drivers/gpu/drm/amd/amdgpu/amdgpu_csa.c | 2 +- drivers/gpu/drm/amd/amdgpu/amdgpu_dma_buf.c | 215 ++++++++++++---------- drivers/gpu/drm/amd/amdgpu/amdgpu_dma_buf.h | 5 - drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c | 2 - drivers/gpu/drm/amd/amdgpu/amdgpu_gart.c | 2 +- drivers/gpu/drm/amd/amdgpu/amdgpu_gem.c | 4 +- drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c | 32 +++- drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c | 9 +- drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c | 2 +- drivers/gpu/drm/bochs/bochs_kms.c | 26 +-- drivers/gpu/drm/cirrus/cirrus.c | 2 +- drivers/gpu/drm/drm_cache.c | 14 +- drivers/gpu/drm/drm_fb_helper.c | 61 ++---- drivers/gpu/drm/drm_gem.c | 3 + drivers/gpu/drm/drm_gem_shmem_helper.c | 3 - drivers/gpu/drm/drm_gem_vram_helper.c | 131 ++++++++++++- drivers/gpu/drm/drm_simple_kms_helper.c | 2 +- drivers/gpu/drm/gma500/mdfld_dsi_output.c | 2 +- drivers/gpu/drm/hisilicon/hibmc/hibmc_drm_de.c | 14 +- drivers/gpu/drm/mediatek/mtk_drm_gem.c | 4 +- drivers/gpu/drm/panfrost/panfrost_devfreq.c | 124 ++++--------- drivers/gpu/drm/panfrost/panfrost_devfreq.h | 3 +- drivers/gpu/drm/panfrost/panfrost_device.h | 14 +- drivers/gpu/drm/panfrost/panfrost_job.c | 15 +- drivers/gpu/drm/pl111/pl111_display.c | 4 +- drivers/gpu/drm/qxl/qxl_drv.h | 2 + drivers/gpu/drm/qxl/qxl_object.c | 11 +- drivers/gpu/drm/qxl/qxl_release.c | 11 +- drivers/gpu/drm/qxl/qxl_ttm.c | 11 +- drivers/gpu/drm/radeon/radeon_gem.c | 2 +- drivers/gpu/drm/radeon/radeon_object.c | 2 +- drivers/gpu/drm/scheduler/sched_main.c | 43 +++-- drivers/gpu/drm/ttm/ttm_agp_backend.c | 2 +- drivers/gpu/drm/ttm/ttm_bo.c | 132 ++++--------- drivers/gpu/drm/ttm/ttm_bo_util.c | 27 ++- drivers/gpu/drm/ttm/ttm_bo_vm.c | 11 +- drivers/gpu/drm/ttm/ttm_execbuf_util.c | 57 +----- drivers/gpu/drm/ttm/ttm_memory.c | 2 +- drivers/gpu/drm/ttm/ttm_page_alloc.c | 4 +- drivers/gpu/drm/ttm/ttm_page_alloc_dma.c | 4 +- drivers/gpu/drm/vboxvideo/vbox_mode.c | 63 +------ drivers/gpu/drm/vmwgfx/vmwgfx_bo.c | 17 +- drivers/gpu/drm/vmwgfx/vmwgfx_drv.h | 3 + drivers/gpu/drm/vmwgfx/vmwgfx_resource.c | 3 +- drivers/gpu/drm/vmwgfx/vmwgfx_validation.c | 3 + drivers/gpu/drm/vmwgfx/vmwgfx_validation.h | 2 +- drivers/gpu/drm/xen/xen_drm_front_kms.c | 7 +- include/drm/drm_fb_helper.h | 1 - include/drm/drm_gem.h | 5 +- include/drm/drm_gem_vram_helper.h | 25 +++ include/drm/drm_simple_kms_helper.h | 2 +- include/drm/ttm/ttm_bo_api.h | 56 ------ include/drm/ttm/ttm_bo_driver.h | 26 +-- include/drm/ttm/ttm_execbuf_util.h | 2 +- include/drm/ttm/ttm_memory.h | 1 - include/linux/dma-buf.h | 63 ++++++- include/uapi/drm/exynos_drm.h | 2 +- 62 files changed, 709 insertions(+), 733 deletions(-)