From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: Iouri Tarassov Date: Thu, 26 Jan 2023 10:49:41 -0800 Subject: drivers: hv: dxgkrnl: Fixed dxgkrnl to build for the 6.1 kernel Definition for GPADL was changed from u32 to struct vmbus_gpadl. Signed-off-by: Iouri Tarassov --- drivers/hv/dxgkrnl/dxgadapter.c | 8 -------- drivers/hv/dxgkrnl/dxgkrnl.h | 4 ---- drivers/hv/dxgkrnl/dxgvmbus.c | 8 -------- 3 files changed, 20 deletions(-) diff --git a/drivers/hv/dxgkrnl/dxgadapter.c b/drivers/hv/dxgkrnl/dxgadapter.c index d9d45bd4a31e..bcd19b7267d1 100644 --- a/drivers/hv/dxgkrnl/dxgadapter.c +++ b/drivers/hv/dxgkrnl/dxgadapter.c @@ -927,19 +927,11 @@ void dxgallocation_destroy(struct dxgallocation *alloc) alloc->owner.device, &args, &alloc->alloc_handle); } -#ifdef _MAIN_KERNEL_ if (alloc->gpadl.gpadl_handle) { DXG_TRACE("Teardown gpadl %d", alloc->gpadl.gpadl_handle); vmbus_teardown_gpadl(dxgglobal_get_vmbus(), &alloc->gpadl); alloc->gpadl.gpadl_handle = 0; } -#else - if (alloc->gpadl) { - DXG_TRACE("Teardown gpadl %d", alloc->gpadl); - vmbus_teardown_gpadl(dxgglobal_get_vmbus(), alloc->gpadl); - alloc->gpadl = 0; - } -#endif if (alloc->priv_drv_data) vfree(alloc->priv_drv_data); if (alloc->cpu_address_mapped) diff --git a/drivers/hv/dxgkrnl/dxgkrnl.h b/drivers/hv/dxgkrnl/dxgkrnl.h index 1b40d6e39085..c5ed23cb90df 100644 --- a/drivers/hv/dxgkrnl/dxgkrnl.h +++ b/drivers/hv/dxgkrnl/dxgkrnl.h @@ -728,11 +728,7 @@ struct dxgallocation { u32 cached:1; u32 handle_valid:1; /* GPADL address list for existing sysmem allocations */ -#ifdef _MAIN_KERNEL_ struct vmbus_gpadl gpadl; -#else - u32 gpadl; -#endif /* Number of pages in the 'pages' array */ u32 num_pages; /* diff --git a/drivers/hv/dxgkrnl/dxgvmbus.c b/drivers/hv/dxgkrnl/dxgvmbus.c index 8c99f141482e..eb3f4c5153a6 100644 --- a/drivers/hv/dxgkrnl/dxgvmbus.c +++ b/drivers/hv/dxgkrnl/dxgvmbus.c @@ -1493,22 +1493,14 @@ int create_existing_sysmem(struct dxgdevice *device, ret = -ENOMEM; goto cleanup; } -#ifdef _MAIN_KERNEL_ DXG_TRACE("New gpadl %d", dxgalloc->gpadl.gpadl_handle); -#else - DXG_TRACE("New gpadl %d", dxgalloc->gpadl); -#endif command_vgpu_to_host_init2(&set_store_command->hdr, DXGK_VMBCOMMAND_SETEXISTINGSYSMEMSTORE, device->process->host_handle); set_store_command->device = device->handle; set_store_command->allocation = host_alloc->allocation; -#ifdef _MAIN_KERNEL_ set_store_command->gpadl = dxgalloc->gpadl.gpadl_handle; -#else - set_store_command->gpadl = dxgalloc->gpadl; -#endif ret = dxgvmb_send_sync_msg_ntstatus(msg.channel, msg.hdr, msg.size); if (ret < 0) -- Armbian