Skip to content

Commit e69acf1

Browse files
drm: remove optional dummy function from drivers using TTM
Implementing those is completely unnecessary. Signed-off-by: Christian König <[email protected]> Reviewed-by: Daniel Vetter <[email protected]> Reviewed-by: Madhav Chauhan <[email protected]> Link: https://patchwork.freedesktop.org/patch/378236/
1 parent 72b6ede commit e69acf1

File tree

5 files changed

+0
-32
lines changed

5 files changed

+0
-32
lines changed

drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -836,10 +836,6 @@ static int amdgpu_ttm_io_mem_reserve(struct ttm_bo_device *bdev, struct ttm_mem_
836836
return 0;
837837
}
838838

839-
static void amdgpu_ttm_io_mem_free(struct ttm_bo_device *bdev, struct ttm_mem_reg *mem)
840-
{
841-
}
842-
843839
static unsigned long amdgpu_ttm_io_mem_pfn(struct ttm_buffer_object *bo,
844840
unsigned long page_offset)
845841
{
@@ -1754,7 +1750,6 @@ static struct ttm_bo_driver amdgpu_bo_driver = {
17541750
.release_notify = &amdgpu_bo_release_notify,
17551751
.fault_reserve_notify = &amdgpu_bo_fault_reserve_notify,
17561752
.io_mem_reserve = &amdgpu_ttm_io_mem_reserve,
1757-
.io_mem_free = &amdgpu_ttm_io_mem_free,
17581753
.io_mem_pfn = amdgpu_ttm_io_mem_pfn,
17591754
.access_memory = &amdgpu_ttm_access_memory,
17601755
.del_from_lru_notify = &amdgpu_vm_del_from_lru_notify

drivers/gpu/drm/drm_gem_vram_helper.c

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1081,10 +1081,6 @@ static int bo_driver_io_mem_reserve(struct ttm_bo_device *bdev,
10811081
return 0;
10821082
}
10831083

1084-
static void bo_driver_io_mem_free(struct ttm_bo_device *bdev,
1085-
struct ttm_mem_reg *mem)
1086-
{ }
1087-
10881084
static struct ttm_bo_driver bo_driver = {
10891085
.ttm_tt_create = bo_driver_ttm_tt_create,
10901086
.ttm_tt_populate = ttm_pool_populate,
@@ -1094,7 +1090,6 @@ static struct ttm_bo_driver bo_driver = {
10941090
.evict_flags = bo_driver_evict_flags,
10951091
.move_notify = bo_driver_move_notify,
10961092
.io_mem_reserve = bo_driver_io_mem_reserve,
1097-
.io_mem_free = bo_driver_io_mem_free,
10981093
};
10991094

11001095
/*

drivers/gpu/drm/qxl/qxl_ttm.c

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -129,11 +129,6 @@ int qxl_ttm_io_mem_reserve(struct ttm_bo_device *bdev,
129129
return 0;
130130
}
131131

132-
static void qxl_ttm_io_mem_free(struct ttm_bo_device *bdev,
133-
struct ttm_mem_reg *mem)
134-
{
135-
}
136-
137132
/*
138133
* TTM backend functions.
139134
*/
@@ -247,7 +242,6 @@ static struct ttm_bo_driver qxl_bo_driver = {
247242
.evict_flags = &qxl_evict_flags,
248243
.move = &qxl_bo_move,
249244
.io_mem_reserve = &qxl_ttm_io_mem_reserve,
250-
.io_mem_free = &qxl_ttm_io_mem_free,
251245
.move_notify = &qxl_bo_move_notify,
252246
};
253247

drivers/gpu/drm/radeon/radeon_ttm.c

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -457,10 +457,6 @@ static int radeon_ttm_io_mem_reserve(struct ttm_bo_device *bdev, struct ttm_mem_
457457
return 0;
458458
}
459459

460-
static void radeon_ttm_io_mem_free(struct ttm_bo_device *bdev, struct ttm_mem_reg *mem)
461-
{
462-
}
463-
464460
/*
465461
* TTM backend functions.
466462
*/
@@ -774,7 +770,6 @@ static struct ttm_bo_driver radeon_bo_driver = {
774770
.move_notify = &radeon_bo_move_notify,
775771
.fault_reserve_notify = &radeon_bo_fault_reserve_notify,
776772
.io_mem_reserve = &radeon_ttm_io_mem_reserve,
777-
.io_mem_free = &radeon_ttm_io_mem_free,
778773
};
779774

780775
int radeon_ttm_init(struct radeon_device *rdev)

drivers/gpu/drm/vmwgfx/vmwgfx_ttm_buffer.c

Lines changed: 0 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -815,15 +815,6 @@ static int vmw_ttm_io_mem_reserve(struct ttm_bo_device *bdev, struct ttm_mem_reg
815815
return 0;
816816
}
817817

818-
static void vmw_ttm_io_mem_free(struct ttm_bo_device *bdev, struct ttm_mem_reg *mem)
819-
{
820-
}
821-
822-
static int vmw_ttm_fault_reserve_notify(struct ttm_buffer_object *bo)
823-
{
824-
return 0;
825-
}
826-
827818
/**
828819
* vmw_move_notify - TTM move_notify_callback
829820
*
@@ -866,7 +857,5 @@ struct ttm_bo_driver vmw_bo_driver = {
866857
.verify_access = vmw_verify_access,
867858
.move_notify = vmw_move_notify,
868859
.swap_notify = vmw_swap_notify,
869-
.fault_reserve_notify = &vmw_ttm_fault_reserve_notify,
870860
.io_mem_reserve = &vmw_ttm_io_mem_reserve,
871-
.io_mem_free = &vmw_ttm_io_mem_free,
872861
};

0 commit comments

Comments
 (0)