Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit f050a8ab authored by Daniel Vetter's avatar Daniel Vetter Committed by Chris Wilson
Browse files

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: default avatarDaniel Vetter <daniel.vetter@ffwll.ch>
Signed-off-by: default avatarChris Wilson <chris@chris-wilson.co.uk>
parent 4af72e28

drivers/char/agp/agp.h

+0 −1
Original line number Diff line number Diff line
@@ -120,7 +120,6 @@ struct agp_bridge_driver { 
	void (*agp_destroy_page)(struct page *, int flags);

	void (*agp_destroy_pages)(struct agp_memory *);

	int (*agp_type_to_mask_type) (struct agp_bridge_data *, int);

	void (*chipset_flush)(struct agp_bridge_data *);

};



struct agp_bridge_data {

drivers/char/agp/compat_ioctl.c

+0 −1
Original line number Diff line number Diff line
@@ -276,7 +276,6 @@ long compat_agp_ioctl(struct file *file, unsigned int cmd, unsigned long arg) 
		break;



	case AGPIOC_CHIPSET_FLUSH32:

		ret_val = agpioc_chipset_flush_wrap(curr_priv);

		break;

	}

drivers/char/agp/compat_ioctl.h

+0 −1
Original line number Diff line number Diff line
@@ -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_find_mem_by_key(int key);

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 */

drivers/char/agp/frontend.c

+0 −8
Original line number Diff line number Diff line
@@ -957,13 +957,6 @@ static int agpioc_unbind_wrap(struct agp_file_private *priv, void __user *arg) 
	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,

		     unsigned int cmd, unsigned long arg)

{
@@ -1039,7 +1032,6 @@ static long agp_ioctl(struct file *file, 
		break;

	       

	case AGPIOC_CHIPSET_FLUSH:

		ret_val = agpioc_chipset_flush_wrap(curr_priv);

		break;

	}

drivers/char/agp/generic.c

+0 −7
Original line number Diff line number Diff line
@@ -81,13 +81,6 @@ static int agp_get_key(void) 
	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

 * vmalloc. This speeds things up and also saves memory for small AGP