From: Maxime Ripard Date: Thu, 3 Oct 2019 14:38:50 +0000 (+0200) Subject: Merge drm/drm-next into drm-misc-next X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=4092de1ba34eb376791809fb366bc15f8a9e0b7c;p=linux.git Merge drm/drm-next into drm-misc-next We haven't done any backmerge for a while due to the merge window, and it starts to become an issue for komeda. Let's bring 5.4-rc1 in. Signed-off-by: Maxime Ripard --- 4092de1ba34eb376791809fb366bc15f8a9e0b7c diff --cc MAINTAINERS index 6372c434793a8,296de2b51c832..94fb077c08177 --- a/MAINTAINERS +++ b/MAINTAINERS @@@ -5324,8 -5375,7 +5377,8 @@@ F: include/uapi/drm/drm F: include/linux/vga* DRM DRIVERS FOR ALLWINNER A10 - M: Maxime Ripard + M: Maxime Ripard +M: Chen-Yu Tsai L: dri-devel@lists.freedesktop.org S: Supported F: drivers/gpu/drm/sun4i/ diff --cc drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c index 513dd84569451,dff41d0a85fe9..8e867b8b432f3 --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c @@@ -1728,8 -1731,7 +1731,8 @@@ int amdgpu_ttm_init(struct amdgpu_devic r = ttm_bo_device_init(&adev->mman.bdev, &amdgpu_bo_driver, adev->ddev->anon_inode->i_mapping, + adev->ddev->vma_offset_manager, - adev->need_dma32); + dma_addressing_limited(adev->dev)); if (r) { DRM_ERROR("failed initializing buffer object driver(%d).\n", r); return r; diff --cc drivers/gpu/drm/bridge/synopsys/dw-hdmi.c index aa7efd4da1c88,521d689413c8c..d77fb8af61b8a --- a/drivers/gpu/drm/bridge/synopsys/dw-hdmi.c +++ b/drivers/gpu/drm/bridge/synopsys/dw-hdmi.c @@@ -26,9 -26,7 +26,8 @@@ #include #include +#include #include - #include #include #include #include diff --cc drivers/gpu/drm/etnaviv/etnaviv_buffer.c index 803086cfb9241,7e4e2959bf4f7..32d9fac587f9a --- a/drivers/gpu/drm/etnaviv/etnaviv_buffer.c +++ b/drivers/gpu/drm/etnaviv/etnaviv_buffer.c @@@ -314,10 -326,11 +326,11 @@@ void etnaviv_buffer_queue(struct etnavi lockdep_assert_held(&gpu->lock); - if (drm_debug & DRM_UT_DRIVER) + if (drm_debug_enabled(DRM_UT_DRIVER)) etnaviv_buffer_dump(gpu, buffer, 0, 0x50); - link_target = etnaviv_cmdbuf_get_va(cmdbuf); + link_target = etnaviv_cmdbuf_get_va(cmdbuf, + &gpu->mmu_context->cmdbuf_mapping); link_dwords = cmdbuf->size / 8; /* @@@ -410,15 -455,17 +455,17 @@@ CMD_LOAD_STATE(buffer, VIVS_GL_EVENT, VIVS_GL_EVENT_EVENT_ID(event) | VIVS_GL_EVENT_FROM_PE); CMD_WAIT(buffer); - CMD_LINK(buffer, 2, etnaviv_cmdbuf_get_va(buffer) + - buffer->user_size - 4); + CMD_LINK(buffer, 2, + etnaviv_cmdbuf_get_va(buffer, &gpu->mmu_context->cmdbuf_mapping) + + buffer->user_size - 4); - if (drm_debug & DRM_UT_DRIVER) + if (drm_debug_enabled(DRM_UT_DRIVER)) pr_info("stream link to 0x%08x @ 0x%08x %p\n", - return_target, etnaviv_cmdbuf_get_va(cmdbuf), + return_target, + etnaviv_cmdbuf_get_va(cmdbuf, &gpu->mmu_context->cmdbuf_mapping), cmdbuf->vaddr); - if (drm_debug & DRM_UT_DRIVER) { + if (drm_debug_enabled(DRM_UT_DRIVER)) { print_hex_dump(KERN_INFO, "cmd ", DUMP_PREFIX_OFFSET, 16, 4, cmdbuf->vaddr, cmdbuf->size, 0); diff --cc drivers/gpu/drm/hisilicon/hibmc/Kconfig index 8ad9a5b12e40e,35a3c5f0c38cc..dfc5aef62f7ba --- a/drivers/gpu/drm/hisilicon/hibmc/Kconfig +++ b/drivers/gpu/drm/hisilicon/hibmc/Kconfig @@@ -1,11 -1,10 +1,11 @@@ # SPDX-License-Identifier: GPL-2.0-only config DRM_HISI_HIBMC tristate "DRM Support for Hisilicon Hibmc" - depends on DRM && PCI && MMU + depends on DRM && PCI && MMU && ARM64 select DRM_KMS_HELPER select DRM_VRAM_HELPER - + select DRM_TTM + select DRM_TTM_HELPER help Choose this option if you have a Hisilicon Hibmc soc chipset. If M is selected the module will be called hibmc-drm. diff --cc drivers/gpu/drm/msm/hdmi/hdmi.h index 4aba397a889be,bdac452b00fb3..d0b84f0abee17 --- a/drivers/gpu/drm/msm/hdmi/hdmi.h +++ b/drivers/gpu/drm/msm/hdmi/hdmi.h @@@ -11,10 -11,9 +11,11 @@@ #include #include #include + #include #include +#include + #include "msm_drv.h" #include "hdmi.xml.h" diff --cc drivers/gpu/drm/radeon/radeon_ttm.c index a46bb3067863b,a05e10724d465..098bc9f40b983 --- a/drivers/gpu/drm/radeon/radeon_ttm.c +++ b/drivers/gpu/drm/radeon/radeon_ttm.c @@@ -794,8 -794,7 +794,8 @@@ int radeon_ttm_init(struct radeon_devic r = ttm_bo_device_init(&rdev->mman.bdev, &radeon_bo_driver, rdev->ddev->anon_inode->i_mapping, + rdev->ddev->vma_offset_manager, - rdev->need_dma32); + dma_addressing_limited(&rdev->pdev->dev)); if (r) { DRM_ERROR("failed initializing buffer object driver(%d).\n", r); return r; diff --cc drivers/gpu/drm/ttm/ttm_bo.c index 881cf26d698ea,20ff56f27aa4a..c7f86499165f9 --- a/drivers/gpu/drm/ttm/ttm_bo.c +++ b/drivers/gpu/drm/ttm/ttm_bo.c @@@ -672,7 -672,10 +672,10 @@@ static void ttm_bo_release(struct kref struct ttm_bo_device *bdev = bo->bdev; struct ttm_mem_type_manager *man = &bdev->man[bo->mem.mem_type]; + if (bo->bdev->driver->release_notify) + bo->bdev->driver->release_notify(bo); + - drm_vma_offset_remove(&bdev->vma_manager, &bo->base.vma_node); + drm_vma_offset_remove(bdev->vma_manager, &bo->base.vma_node); ttm_mem_io_lock(man, false); ttm_mem_io_free_vm(bo); ttm_mem_io_unlock(man);