xiaomi-sm8450/android_kernel_xiaomi_sm8450
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

agp: kill agp_flush_chipset and corresponding ioctl

Browse Source 
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>
This commit is contained in:
Daniel Vetter
2010-11-05 18:40:56 +01:00
committed by Chris Wilson
parent 4af72e2865
commit f050a8abbd
7 changed files with 0 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
drivers/char/agp/agp.h
View File

@@ -120,7 +120,6 @@ struct agp_bridge_driver {
void (*agp_destroy_page)(struct page *, int flags); void (*agp_destroy_page)(struct page *, int flags);
void (*agp_destroy_pages)(struct agp_memory *); void (*agp_destroy_pages)(struct agp_memory *);
int (*agp_type_to_mask_type) (struct agp_bridge_data *, int); int (*agp_type_to_mask_type) (struct agp_bridge_data *, int);
void (*chipset_flush)(struct agp_bridge_data *);
}; };
struct agp_bridge_data { struct agp_bridge_data {

1
drivers/char/agp/compat_ioctl.c
View File

@@ -276,7 +276,6 @@ long compat_agp_ioctl(struct file *file, unsigned int cmd, unsigned long arg)
break; break;
case AGPIOC_CHIPSET_FLUSH32: case AGPIOC_CHIPSET_FLUSH32:
ret_val = agpioc_chipset_flush_wrap(curr_priv);
break; break;
} }

1
drivers/char/agp/compat_ioctl.h
View File

@@ -102,6 +102,5 @@ void agp_free_memory_wrap(struct agp_memory *memory);
struct agp_memory *agp_allocate_memory_wrap(size_t pg_count, u32 type); struct agp_memory *agp_allocate_memory_wrap(size_t pg_count, u32 type);
struct agp_memory *agp_find_mem_by_key(int key); struct agp_memory *agp_find_mem_by_key(int key);
struct agp_client *agp_find_client_by_pid(pid_t id); struct agp_client *agp_find_client_by_pid(pid_t id);
int agpioc_chipset_flush_wrap(struct agp_file_private *priv);
#endif /* _AGP_COMPAT_H */ #endif /* _AGP_COMPAT_H */

8
drivers/char/agp/frontend.c
View File

@@ -957,13 +957,6 @@ static int agpioc_unbind_wrap(struct agp_file_private *priv, void __user *arg)
return agp_unbind_memory(memory); return agp_unbind_memory(memory);
} }
int agpioc_chipset_flush_wrap(struct agp_file_private *priv)
{
DBG("");
agp_flush_chipset(agp_bridge);
return 0;
}
static long agp_ioctl(struct file *file, static long agp_ioctl(struct file *file,
unsigned int cmd, unsigned long arg) unsigned int cmd, unsigned long arg)
{ {
@@ -1039,7 +1032,6 @@ static long agp_ioctl(struct file *file,
break; break;
case AGPIOC_CHIPSET_FLUSH: case AGPIOC_CHIPSET_FLUSH:
ret_val = agpioc_chipset_flush_wrap(curr_priv);
break; break;
} }

7
drivers/char/agp/generic.c
View File

@@ -81,13 +81,6 @@ static int agp_get_key(void)
return -1; return -1;
} }
void agp_flush_chipset(struct agp_bridge_data *bridge)
{
if (bridge->driver->chipset_flush)
bridge->driver->chipset_flush(bridge);
}
EXPORT_SYMBOL(agp_flush_chipset);
/* /*
* Use kmalloc if possible for the page list. Otherwise fall back to * Use kmalloc if possible for the page list. Otherwise fall back to
* vmalloc. This speeds things up and also saves memory for small AGP * vmalloc. This speeds things up and also saves memory for small AGP

6
drivers/char/agp/intel-gtt.c
View File

@@ -984,11 +984,6 @@ static int intel_fake_agp_remove_entries(struct agp_memory *mem,
return 0; return 0;
} }
static void intel_fake_agp_chipset_flush(struct agp_bridge_data *bridge)
{
intel_private.driver->chipset_flush();
}
static struct agp_memory *intel_fake_agp_alloc_by_type(size_t pg_count, static struct agp_memory *intel_fake_agp_alloc_by_type(size_t pg_count,
int type) int type)
{ {
@@ -1222,7 +1217,6 @@ static const struct agp_bridge_driver intel_fake_agp_driver = {
.agp_alloc_pages = agp_generic_alloc_pages, .agp_alloc_pages = agp_generic_alloc_pages,
.agp_destroy_page = agp_generic_destroy_page, .agp_destroy_page = agp_generic_destroy_page,
.agp_destroy_pages = agp_generic_destroy_pages, .agp_destroy_pages = agp_generic_destroy_pages,
.chipset_flush = intel_fake_agp_chipset_flush,
}; };
static const struct intel_gtt_driver i81x_gtt_driver = { static const struct intel_gtt_driver i81x_gtt_driver = {

1
include/linux/agp_backend.h
View File

@@ -106,6 +106,5 @@ extern int agp_rebind_memory(void);
extern void agp_enable(struct agp_bridge_data *, u32); extern void agp_enable(struct agp_bridge_data *, u32);
extern struct agp_bridge_data *agp_backend_acquire(struct pci_dev *); extern struct agp_bridge_data *agp_backend_acquire(struct pci_dev *);
extern void agp_backend_release(struct agp_bridge_data *); extern void agp_backend_release(struct agp_bridge_data *);
extern void agp_flush_chipset(struct agp_bridge_data *);
#endif /* _AGP_BACKEND_H */ #endif /* _AGP_BACKEND_H */