On Fri, Jun 21, 2019 at 03:48:24PM +0200, Christian König wrote: > One little comment on patch #8: > > + /* base.vma_node */ > Is that really useful? I would just drop it. > > Apart from that Patches #1, #2, #4, #5, #7 - #12, #14, #15, #18 are > Reviewed-by: Christian König <christian.koenig@xxxxxxx>. > > Patches #3, #6, #13, #16, #17 are Acked-by: Christian König > <christian.koenig@xxxxxxx>. > > You should try to get an rb for the respective maintainer for patches #3 and > #6. > > When that's done I think we can merge it. Any preference for the tree where > this goes upstream? If not I suggest to use drm-misc-next. I think -misc would be good, since this will conflict with my pile of cleanups in dma-buf and especially simplifying where we find the resv_obj pointer. So need to figure out which one goes in first. -Daniel > > Thanks for the nice cleanup, > Christian. > > Am 21.06.19 um 13:57 schrieb Gerd Hoffmann: > > v2: > > - build fixes. > > - also drop ttm_buffer_object->resv > > > > Gerd Hoffmann (18): > > drm/ttm: add gem base object > > drm/vram: use embedded gem object > > drm/qxl: use embedded gem object > > drm/radeon: use embedded gem object > > drm/amdgpu: use embedded gem object > > drm/nouveau: use embedded gem object > > drm/ttm: use gem reservation object > > drm/ttm: use gem vma_node > > drm/vram: drop drm_gem_vram_driver_gem_prime_mmap > > drm/ttm: set both resv and base.resv pointers > > drm/ttm: switch ttm core from bo->resv to bo->base.resv > > drm/radeon: switch driver from bo->resv to bo->base.resv > > drm/vmwgfx: switch driver from bo->resv to bo->base.resv > > drm/amdgpu: switch driver from bo->resv to bo->base.resv > > drm/nouveau: switch driver from bo->resv to bo->base.resv > > drm/qxl: switch driver from bo->resv to bo->base.resv > > drm/virtio: switch driver from bo->resv to bo->base.resv > > drm/ttm: drop ttm_buffer_object->resv > > > > drivers/gpu/drm/amd/amdgpu/amdgpu_gem.h | 2 +- > > drivers/gpu/drm/amd/amdgpu/amdgpu_object.h | 3 +- > > drivers/gpu/drm/nouveau/nouveau_bo.h | 5 - > > drivers/gpu/drm/nouveau/nouveau_gem.h | 2 +- > > drivers/gpu/drm/qxl/qxl_drv.h | 6 +- > > drivers/gpu/drm/qxl/qxl_object.h | 6 +- > > drivers/gpu/drm/radeon/radeon.h | 3 +- > > drivers/gpu/drm/radeon/radeon_object.h | 2 +- > > drivers/gpu/drm/virtio/virtgpu_drv.h | 2 +- > > include/drm/drm_gem_vram_helper.h | 7 +- > > include/drm/ttm/ttm_bo_api.h | 25 +++- > > include/drm/ttm/ttm_bo_driver.h | 12 +- > > .../gpu/drm/amd/amdgpu/amdgpu_amdkfd_gpuvm.c | 6 +- > > drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c | 6 +- > > drivers/gpu/drm/amd/amdgpu/amdgpu_display.c | 2 +- > > drivers/gpu/drm/amd/amdgpu/amdgpu_dma_buf.c | 6 +- > > drivers/gpu/drm/amd/amdgpu/amdgpu_gem.c | 14 +- > > drivers/gpu/drm/amd/amdgpu/amdgpu_kms.c | 2 +- > > drivers/gpu/drm/amd/amdgpu/amdgpu_mn.c | 2 +- > > drivers/gpu/drm/amd/amdgpu/amdgpu_object.c | 28 ++-- > > drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c | 8 +- > > drivers/gpu/drm/amd/amdgpu/amdgpu_uvd.c | 4 +- > > drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c | 30 ++-- > > drivers/gpu/drm/amd/amdgpu/amdgpu_vm_sdma.c | 2 +- > > .../gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c | 2 +- > > drivers/gpu/drm/ast/ast_main.c | 2 +- > > drivers/gpu/drm/drm_gem_vram_helper.c | 36 ++--- > > drivers/gpu/drm/hisilicon/hibmc/hibmc_ttm.c | 2 +- > > drivers/gpu/drm/mgag200/mgag200_main.c | 2 +- > > drivers/gpu/drm/nouveau/dispnv50/wndw.c | 2 +- > > drivers/gpu/drm/nouveau/nouveau_abi16.c | 4 +- > > drivers/gpu/drm/nouveau/nouveau_bo.c | 8 +- > > drivers/gpu/drm/nouveau/nouveau_display.c | 10 +- > > drivers/gpu/drm/nouveau/nouveau_fence.c | 2 +- > > drivers/gpu/drm/nouveau/nouveau_gem.c | 19 +-- > > drivers/gpu/drm/nouveau/nouveau_prime.c | 6 +- > > drivers/gpu/drm/qxl/qxl_cmd.c | 4 +- > > drivers/gpu/drm/qxl/qxl_debugfs.c | 4 +- > > drivers/gpu/drm/qxl/qxl_display.c | 8 +- > > drivers/gpu/drm/qxl/qxl_gem.c | 2 +- > > drivers/gpu/drm/qxl/qxl_object.c | 20 +-- > > drivers/gpu/drm/qxl/qxl_release.c | 8 +- > > drivers/gpu/drm/qxl/qxl_ttm.c | 4 +- > > drivers/gpu/drm/radeon/radeon_benchmark.c | 4 +- > > drivers/gpu/drm/radeon/radeon_cs.c | 4 +- > > drivers/gpu/drm/radeon/radeon_display.c | 6 +- > > drivers/gpu/drm/radeon/radeon_gem.c | 8 +- > > drivers/gpu/drm/radeon/radeon_mn.c | 2 +- > > drivers/gpu/drm/radeon/radeon_object.c | 22 +-- > > drivers/gpu/drm/radeon/radeon_prime.c | 4 +- > > drivers/gpu/drm/radeon/radeon_test.c | 8 +- > > drivers/gpu/drm/radeon/radeon_ttm.c | 4 +- > > drivers/gpu/drm/radeon/radeon_uvd.c | 2 +- > > drivers/gpu/drm/radeon/radeon_vm.c | 6 +- > > drivers/gpu/drm/ttm/ttm_bo.c | 136 +++++++++--------- > > drivers/gpu/drm/ttm/ttm_bo_util.c | 18 +-- > > drivers/gpu/drm/ttm/ttm_bo_vm.c | 15 +- > > drivers/gpu/drm/ttm/ttm_execbuf_util.c | 20 +-- > > drivers/gpu/drm/ttm/ttm_tt.c | 2 +- > > drivers/gpu/drm/vboxvideo/vbox_main.c | 2 +- > > drivers/gpu/drm/virtio/virtgpu_ioctl.c | 4 +- > > drivers/gpu/drm/virtio/virtgpu_plane.c | 2 +- > > drivers/gpu/drm/virtio/virtgpu_prime.c | 3 - > > drivers/gpu/drm/vmwgfx/vmwgfx_blit.c | 4 +- > > drivers/gpu/drm/vmwgfx/vmwgfx_bo.c | 12 +- > > drivers/gpu/drm/vmwgfx/vmwgfx_cotable.c | 4 +- > > drivers/gpu/drm/vmwgfx/vmwgfx_resource.c | 6 +- > > drivers/gpu/drm/vmwgfx/vmwgfx_surface.c | 4 +- > > 68 files changed, 311 insertions(+), 321 deletions(-) > > > > _______________________________________________ > dri-devel mailing list > dri-devel@xxxxxxxxxxxxxxxxxxxxx > https://lists.freedesktop.org/mailman/listinfo/dri-devel -- Daniel Vetter Software Engineer, Intel Corporation http://blog.ffwll.ch _______________________________________________ dri-devel mailing list dri-devel@xxxxxxxxxxxxxxxxxxxxx https://lists.freedesktop.org/mailman/listinfo/dri-devel
