mirror of
https://github.com/torvalds/linux.git
synced 2026-04-18 14:53:58 -04:00
Merge tag 'drm-misc-next-2025-11-05-1' of https://gitlab.freedesktop.org/drm/misc/kernel into drm-next
drm-misc-next for v6.19-rc1: UAPI Changes: - Add userptr support to ivpu. - Add IOCTL's for resource and telemetry data in amdxdna. Core Changes: - Improve some atomic state checking handling. - drm/client updates. - Use forward declarations instead of including drm_print.h - RUse allocation flags in ttm_pool/device_init and allow specifying max useful pool size and propagate ENOSPC. - Updates and fixes to scheduler and bridge code. - Add support for quirking DisplayID checksum errors. Driver Changes: - Assorted cleanups and fixes in rcar-du, accel/ivpu, panel/nv3052cf, sti, imxm, accel/qaic, accel/amdxdna, imagination, tidss, sti, panthor, vkms. - Add Samsung S6E3FC2X01 DDIC/AMS641RW, Synaptics TDDI series DSI, TL121BVMS07-00 (IL79900A) panels. - Add mali MediaTek MT8196 SoC gpu support. - Add etnaviv GC8000 Nano Ultra VIP r6205 support. - Document powervr ge7800 support in the devicetree. Signed-off-by: Dave Airlie <airlied@redhat.com> From: Maarten Lankhorst <maarten.lankhorst@linux.intel.com> Link: https://patch.msgid.link/5afae707-c9aa-4a47-b726-5e1f1aa7a106@linux.intel.com
This commit is contained in:
@@ -1798,7 +1798,7 @@ static int amdgpu_ttm_pools_init(struct amdgpu_device *adev)
|
||||
for (i = 0; i < adev->gmc.num_mem_partitions; i++) {
|
||||
ttm_pool_init(&adev->mman.ttm_pools[i], adev->dev,
|
||||
adev->gmc.mem_partitions[i].numa.node,
|
||||
false, false);
|
||||
TTM_ALLOCATION_POOL_BENEFICIAL_ORDER(get_order(SZ_2M)));
|
||||
}
|
||||
return 0;
|
||||
}
|
||||
@@ -1891,8 +1891,11 @@ int amdgpu_ttm_init(struct amdgpu_device *adev)
|
||||
r = ttm_device_init(&adev->mman.bdev, &amdgpu_bo_driver, adev->dev,
|
||||
adev_to_drm(adev)->anon_inode->i_mapping,
|
||||
adev_to_drm(adev)->vma_offset_manager,
|
||||
adev->need_swiotlb,
|
||||
dma_addressing_limited(adev->dev));
|
||||
(adev->need_swiotlb ?
|
||||
TTM_ALLOCATION_POOL_USE_DMA_ALLOC : 0) |
|
||||
(dma_addressing_limited(adev->dev) ?
|
||||
TTM_ALLOCATION_POOL_USE_DMA32 : 0) |
|
||||
TTM_ALLOCATION_POOL_BENEFICIAL_ORDER(get_order(SZ_2M)));
|
||||
if (r) {
|
||||
dev_err(adev->dev,
|
||||
"failed initializing buffer object driver(%d).\n", r);
|
||||
|
||||
Reference in New Issue
Block a user