Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

agp: kill agp_flush_chipset and corresponding ioctl

The intel drm calls the chipset functions now directly. Userspace
never called the corresponding ioctl, hence it can be killed, too.

Cc: Dave Airlie <airlied@gmail.com>
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>

authored by

Daniel Vetter and committed by
Chris Wilson
f050a8ab 4af72e28

-25
-1
drivers/char/agp/agp.h
··· 120 120 void (*agp_destroy_page)(struct page *, int flags); 121 121 void (*agp_destroy_pages)(struct agp_memory *); 122 122 int (*agp_type_to_mask_type) (struct agp_bridge_data *, int); 123 - void (*chipset_flush)(struct agp_bridge_data *); 124 123 }; 125 124 126 125 struct agp_bridge_data {
-1
drivers/char/agp/compat_ioctl.c
··· 276 276 break; 277 277 278 278 case AGPIOC_CHIPSET_FLUSH32: 279 - ret_val = agpioc_chipset_flush_wrap(curr_priv); 280 279 break; 281 280 } 282 281
-1
drivers/char/agp/compat_ioctl.h
··· 102 102 struct agp_memory *agp_allocate_memory_wrap(size_t pg_count, u32 type); 103 103 struct agp_memory *agp_find_mem_by_key(int key); 104 104 struct agp_client *agp_find_client_by_pid(pid_t id); 105 - int agpioc_chipset_flush_wrap(struct agp_file_private *priv); 106 105 107 106 #endif /* _AGP_COMPAT_H */
-8
drivers/char/agp/frontend.c
··· 957 957 return agp_unbind_memory(memory); 958 958 } 959 959 960 - int agpioc_chipset_flush_wrap(struct agp_file_private *priv) 961 - { 962 - DBG(""); 963 - agp_flush_chipset(agp_bridge); 964 - return 0; 965 - } 966 - 967 960 static long agp_ioctl(struct file *file, 968 961 unsigned int cmd, unsigned long arg) 969 962 { ··· 1032 1039 break; 1033 1040 1034 1041 case AGPIOC_CHIPSET_FLUSH: 1035 - ret_val = agpioc_chipset_flush_wrap(curr_priv); 1036 1042 break; 1037 1043 } 1038 1044
-7
drivers/char/agp/generic.c
··· 81 81 return -1; 82 82 } 83 83 84 - void agp_flush_chipset(struct agp_bridge_data *bridge) 85 - { 86 - if (bridge->driver->chipset_flush) 87 - bridge->driver->chipset_flush(bridge); 88 - } 89 - EXPORT_SYMBOL(agp_flush_chipset); 90 - 91 84 /* 92 85 * Use kmalloc if possible for the page list. Otherwise fall back to 93 86 * vmalloc. This speeds things up and also saves memory for small AGP
-6
drivers/char/agp/intel-gtt.c
··· 984 984 return 0; 985 985 } 986 986 987 - static void intel_fake_agp_chipset_flush(struct agp_bridge_data *bridge) 988 - { 989 - intel_private.driver->chipset_flush(); 990 - } 991 - 992 987 static struct agp_memory *intel_fake_agp_alloc_by_type(size_t pg_count, 993 988 int type) 994 989 { ··· 1217 1222 .agp_alloc_pages = agp_generic_alloc_pages, 1218 1223 .agp_destroy_page = agp_generic_destroy_page, 1219 1224 .agp_destroy_pages = agp_generic_destroy_pages, 1220 - .chipset_flush = intel_fake_agp_chipset_flush, 1221 1225 }; 1222 1226 1223 1227 static const struct intel_gtt_driver i81x_gtt_driver = {
-1
include/linux/agp_backend.h
··· 106 106 extern void agp_enable(struct agp_bridge_data *, u32); 107 107 extern struct agp_bridge_data *agp_backend_acquire(struct pci_dev *); 108 108 extern void agp_backend_release(struct agp_bridge_data *); 109 - extern void agp_flush_chipset(struct agp_bridge_data *); 110 109 111 110 #endif /* _AGP_BACKEND_H */