[2.6 patch] DRM: misc cleanup
I've seen that part of this is already in recent kernels. Below is as a FYI a version against 2.6.13-rc1-mm1. <-- snip --> This patch contains the following cleanups: - make needlessly global functions static - remove the following unused global functions: - drm_fops.c: drm_read - i915_dma.c: i915_do_cleanup_pageflip Signed-off-by: Adrian Bunk <[EMAIL PROTECTED]> --- drivers/char/drm/ati_pcigart.c |2 drivers/char/drm/drmP.h| 22 --- drivers/char/drm/drm_auth.c|4 - drivers/char/drm/drm_bufs.c| 12 ++-- drivers/char/drm/drm_context.c |6 +- drivers/char/drm/drm_drv.c |9 ++- drivers/char/drm/drm_fops.c| 10 +-- drivers/char/drm/drm_irq.c |2 drivers/char/drm/drm_lock.c| 12 +++- drivers/char/drm/drm_proc.c|2 drivers/char/drm/drm_stub.c| 92 - drivers/char/drm/drm_vm.c | 10 ++- drivers/char/drm/i810_dma.c| 24 drivers/char/drm/i810_drv.h|1 drivers/char/drm/i830_dma.c| 20 +++ drivers/char/drm/i830_drv.c|2 drivers/char/drm/i830_drv.h|2 drivers/char/drm/i830_irq.c|4 - drivers/char/drm/i915_dma.c| 60 - drivers/char/drm/i915_drv.c|2 drivers/char/drm/i915_drv.h| 10 --- drivers/char/drm/i915_irq.c|4 - drivers/char/drm/r128_state.c |2 drivers/char/drm/via_ds.c |1 24 files changed, 137 insertions(+), 178 deletions(-) --- linux-2.6.12-rc2-mm3-full/drivers/char/drm/drmP.h.old 2005-04-18 03:54:16.0 +0200 +++ linux-2.6.12-rc2-mm3-full/drivers/char/drm/drmP.h 2005-04-18 03:54:49.0 +0200 @@ -774,8 +774,6 @@ /* Driver support (drm_drv.h) */ extern int drm_init(struct drm_driver *driver); extern void drm_exit(struct drm_driver *driver); -extern int drm_version(struct inode *inode, struct file *filp, - unsigned int cmd, unsigned long arg); extern int drm_ioctl(struct inode *inode, struct file *filp, unsigned int cmd, unsigned long arg); extern long drm_compat_ioctl(struct file *filp, @@ -785,21 +783,13 @@ /* Device support (drm_fops.h) */ extern int drm_open(struct inode *inode, struct file *filp); extern int drm_stub_open(struct inode *inode, struct file *filp); -extern int drm_open_helper(struct inode *inode, struct file *filp, - drm_device_t *dev); extern int drm_flush(struct file *filp); extern int drm_fasync(int fd, struct file *filp, int on); extern int drm_release(struct inode *inode, struct file *filp); /* Mapping support (drm_vm.h) */ -extern void drm_vm_open(struct vm_area_struct *vma); -extern void drm_vm_close(struct vm_area_struct *vma); -extern void drm_vm_shm_close(struct vm_area_struct *vma); -extern int drm_mmap_dma(struct file *filp, - struct vm_area_struct *vma); extern int drm_mmap(struct file *filp, struct vm_area_struct *vma); extern unsigned int drm_poll(struct file *filp, struct poll_table_struct *wait); -extern ssize_t drm_read(struct file *filp, char __user *buf, size_t count, loff_t *off); /* Memory management support (drm_memory.h) */ #include "drm_memory.h" @@ -854,9 +844,6 @@ extern int drm_rmctx( struct inode *inode, struct file *filp, unsigned int cmd, unsigned long arg ); -extern int drm_context_switch(drm_device_t *dev, int old, int new); -extern int drm_context_switch_complete(drm_device_t *dev, int new); - extern int drm_ctxbitmap_init( drm_device_t *dev ); extern void drm_ctxbitmap_cleanup( drm_device_t *dev ); extern void drm_ctxbitmap_free( drm_device_t *dev, int ctx_handle ); @@ -874,9 +861,6 @@ /* Authentication IOCTL support (drm_auth.h) */ -extern int drm_add_magic(drm_device_t *dev, drm_file_t *priv, - drm_magic_t magic); -extern int drm_remove_magic(drm_device_t *dev, drm_magic_t magic); extern int drm_getmagic(struct inode *inode, struct file *filp, unsigned int cmd, unsigned long arg); extern int drm_authmagic(struct inode *inode, struct file *filp, @@ -893,13 +877,9 @@ unsigned int cmd, unsigned long arg); extern int drm_lock_take(__volatile__ unsigned int *lock, unsigned int context); -extern int drm_lock_transfer(drm_device_t *dev, - __volatile__ unsigned int *lock, -
[2.6 patch] DRM: misc cleanup
On Tue, Feb 01, 2005 at 09:16:16PM +1100, Dave Airlie wrote: > > I'll nack this patch for now Adrian, but I'm going to bring all these > changes into the DRM tree as soon as I can.. one of the functions you > removed pointed out a bug in the i810/i830/i915 drivers (granted > no-one uses pageflip in those drivers but still should fix it..), I'm > going to put the through drm CVS first... I've seen that part of this is already in recent kernels. Below is as a FYI a version against 2.6.12-rc5-mm1. > Thanks, > Dave. cu Adrian <-- snip --> This patch contains the following cleanups: - make needlessly global functions static - remove the following unused global functions: - drm_fops.c: drm_read - i915_dma.c: i915_do_cleanup_pageflip - via_ds.c: via_mmDumpMemInfo - via_ds.c: via_mmAddRange - via_ds.c: via_mmReserveMem - via_ds.c: via_mmFreeReserved - via_ds.c: via_mmDestroy - remove the followig unused global variable: - via_mm.c: VIA_DEBUG Signed-off-by: Adrian Bunk <[EMAIL PROTECTED]> --- drivers/char/drm/ati_pcigart.c |2 drivers/char/drm/drmP.h| 22 -- drivers/char/drm/drm_auth.c|4 - drivers/char/drm/drm_bufs.c| 12 +-- drivers/char/drm/drm_context.c |6 - drivers/char/drm/drm_drv.c |9 +- drivers/char/drm/drm_fops.c| 10 --- drivers/char/drm/drm_irq.c |2 drivers/char/drm/drm_lock.c| 12 ++- drivers/char/drm/drm_proc.c|2 drivers/char/drm/drm_stub.c| 92 ++-- drivers/char/drm/drm_vm.c | 10 +-- drivers/char/drm/i810_dma.c| 24 +++ drivers/char/drm/i810_drv.h|1 drivers/char/drm/i830_dma.c| 20 +++--- drivers/char/drm/i830_drv.c|2 drivers/char/drm/i830_drv.h|2 drivers/char/drm/i830_irq.c|4 - drivers/char/drm/i915_dma.c| 60 +++--- drivers/char/drm/i915_drv.c|2 drivers/char/drm/i915_drv.h| 10 --- drivers/char/drm/i915_irq.c|4 - drivers/char/drm/r128_state.c |2 drivers/char/drm/via_dma.c |4 - drivers/char/drm/via_drv.h |2 drivers/char/drm/via_ds.c | 108 - drivers/char/drm/via_ds.h |8 -- drivers/char/drm/via_map.c |2 drivers/char/drm/via_mm.c | 14 ++-- drivers/char/drm/via_mm.h |5 - 30 files changed, 149 insertions(+), 308 deletions(-) --- linux-2.6.12-rc2-mm3-full/drivers/char/drm/drmP.h.old 2005-04-18 03:54:16.0 +0200 +++ linux-2.6.12-rc2-mm3-full/drivers/char/drm/drmP.h 2005-04-18 03:54:49.0 +0200 @@ -774,8 +774,6 @@ /* Driver support (drm_drv.h) */ extern int drm_init(struct drm_driver *driver); extern void drm_exit(struct drm_driver *driver); -extern int drm_version(struct inode *inode, struct file *filp, - unsigned int cmd, unsigned long arg); extern int drm_ioctl(struct inode *inode, struct file *filp, unsigned int cmd, unsigned long arg); extern long drm_compat_ioctl(struct file *filp, @@ -785,21 +783,13 @@ /* Device support (drm_fops.h) */ extern int drm_open(struct inode *inode, struct file *filp); extern int drm_stub_open(struct inode *inode, struct file *filp); -extern int drm_open_helper(struct inode *inode, struct file *filp, - drm_device_t *dev); extern int drm_flush(struct file *filp); extern int drm_fasync(int fd, struct file *filp, int on); extern int drm_release(struct inode *inode, struct file *filp); /* Mapping support (drm_vm.h) */ -extern void drm_vm_open(struct vm_area_struct *vma); -extern void drm_vm_close(struct vm_area_struct *vma); -extern void drm_vm_shm_close(struct vm_area_struct *vma); -extern int drm_mmap_dma(struct file *filp, - struct vm_area_struct *vma); extern int drm_mmap(struct file *filp, struct vm_area_struct *vma); extern unsigned int drm_poll(struct file *filp, struct poll_table_struct *wait); -extern ssize_t drm_read(struct file *filp, char __user *buf, size_t count, loff_t *off); /* Memory management support (drm_memory.h) */ #include "drm_memory.h" @@ -854,9 +844,6 @@ extern int drm_rmctx( struct inode *inode, struct file *filp, unsigned int cmd, unsigned long arg ); -extern int drm_context_switch(drm_device_t *dev, int old, int new); -extern int drm_context_switch_complete(drm_device_t *dev, int new); - extern int drm_ctxbitmap_init( drm_device_t *dev ); extern void drm_ctxbitmap_cleanup( drm_device_t *dev ); extern void drm_ctxbitmap_free( drm_device_t *dev, int ctx_handle ); @@ -87
[2.6 patch] DRM: misc cleanup
On Tue, Feb 01, 2005 at 09:16:16PM +1100, Dave Airlie wrote: > > I'll nack this patch for now Adrian, but I'm going to bring all these > changes into the DRM tree as soon as I can.. one of the functions you > removed pointed out a bug in the i810/i830/i915 drivers (granted > no-one uses pageflip in those drivers but still should fix it..), I'm > going to put the through drm CVS first... I've seen that part of this is already in recent kernels. Below is as a FYI a version against 2.6.12-rc2-mm3. > Thanks, > Dave. cu Adrian <-- snip --> This patch contains the following cleanups: - make needlessly global functions static - remove the following unused global functions: - drm_fops.c: drm_read - i915_dma.c: i915_do_cleanup_pageflip - via_ds.c: via_mmDumpMemInfo - via_ds.c: via_mmAddRange - via_ds.c: via_mmReserveMem - via_ds.c: via_mmFreeReserved - via_ds.c: via_mmDestroy - remove the followig unused global variable: - via_mm.c: VIA_DEBUG Signed-off-by: Adrian Bunk <[EMAIL PROTECTED]> --- drivers/char/drm/ati_pcigart.c |2 drivers/char/drm/drmP.h| 22 -- drivers/char/drm/drm_auth.c|4 - drivers/char/drm/drm_bufs.c| 12 +-- drivers/char/drm/drm_context.c |6 - drivers/char/drm/drm_drv.c |9 +- drivers/char/drm/drm_fops.c| 10 --- drivers/char/drm/drm_irq.c |2 drivers/char/drm/drm_lock.c| 12 ++- drivers/char/drm/drm_proc.c|2 drivers/char/drm/drm_stub.c| 92 ++-- drivers/char/drm/drm_vm.c | 10 +-- drivers/char/drm/i810_dma.c| 24 +++ drivers/char/drm/i810_drv.h|1 drivers/char/drm/i830_dma.c| 20 +++--- drivers/char/drm/i830_drv.c|2 drivers/char/drm/i830_drv.h|2 drivers/char/drm/i830_irq.c|4 - drivers/char/drm/i915_dma.c| 60 +++--- drivers/char/drm/i915_drv.c|2 drivers/char/drm/i915_drv.h| 10 --- drivers/char/drm/i915_irq.c|4 - drivers/char/drm/r128_state.c |2 drivers/char/drm/via_dma.c |4 - drivers/char/drm/via_drv.h |2 drivers/char/drm/via_ds.c | 108 - drivers/char/drm/via_ds.h |8 -- drivers/char/drm/via_map.c |2 drivers/char/drm/via_mm.c | 14 ++-- drivers/char/drm/via_mm.h |5 - 30 files changed, 149 insertions(+), 308 deletions(-) --- linux-2.6.12-rc2-mm3-full/drivers/char/drm/drmP.h.old 2005-04-18 03:54:16.0 +0200 +++ linux-2.6.12-rc2-mm3-full/drivers/char/drm/drmP.h 2005-04-18 03:54:49.0 +0200 @@ -774,8 +774,6 @@ /* Driver support (drm_drv.h) */ extern int drm_init(struct drm_driver *driver); extern void drm_exit(struct drm_driver *driver); -extern int drm_version(struct inode *inode, struct file *filp, - unsigned int cmd, unsigned long arg); extern int drm_ioctl(struct inode *inode, struct file *filp, unsigned int cmd, unsigned long arg); extern long drm_compat_ioctl(struct file *filp, @@ -785,21 +783,13 @@ /* Device support (drm_fops.h) */ extern int drm_open(struct inode *inode, struct file *filp); extern int drm_stub_open(struct inode *inode, struct file *filp); -extern int drm_open_helper(struct inode *inode, struct file *filp, - drm_device_t *dev); extern int drm_flush(struct file *filp); extern int drm_fasync(int fd, struct file *filp, int on); extern int drm_release(struct inode *inode, struct file *filp); /* Mapping support (drm_vm.h) */ -extern void drm_vm_open(struct vm_area_struct *vma); -extern void drm_vm_close(struct vm_area_struct *vma); -extern void drm_vm_shm_close(struct vm_area_struct *vma); -extern int drm_mmap_dma(struct file *filp, - struct vm_area_struct *vma); extern int drm_mmap(struct file *filp, struct vm_area_struct *vma); extern unsigned int drm_poll(struct file *filp, struct poll_table_struct *wait); -extern ssize_t drm_read(struct file *filp, char __user *buf, size_t count, loff_t *off); /* Memory management support (drm_memory.h) */ #include "drm_memory.h" @@ -854,9 +844,6 @@ extern int drm_rmctx( struct inode *inode, struct file *filp, unsigned int cmd, unsigned long arg ); -extern int drm_context_switch(drm_device_t *dev, int old, int new); -extern int drm_context_switch_complete(drm_device_t *dev, int new); - extern int drm_ctxbitmap_init( drm_device_t *dev ); extern void drm_ctxbitmap_cleanup( drm_device_t *dev ); extern void drm_ctxbitmap_free( drm_device_t *dev, int ctx_handle ); @@ -87
Re: [2.6 patch] DRM: misc cleanup
On Mon, 31 Jan 2005 01:36:50 +0100, Adrian Bunk <[EMAIL PROTECTED]> wrote: > This patch contains the following cleanups: > - make needlessly global functions static > - remove the following unused global functions: > - drm_fops.c: drm_read > - i810_dma.c: i810_do_cleanup_pageflip > - i830_dma.c: i830_do_cleanup_pageflip > - i915_dma.c: i915_do_cleanup_pageflip > - mga_dma.c: mga_do_dma_idle > - mga_dma.c: mga_do_engine_reset > - radeon_irq.c: radeon_emit_and_wait_irq > - sis_ds.c: mmAddRange > - sis_ds.c: mmReserveMem > - sis_ds.c: mmFreeReserved > - sis_ds.c: mmDestroy > - via_ds.c: via_mmDumpMemInfo > - via_ds.c: via_mmAddRange > - via_ds.c: via_mmReserveMem > - via_ds.c: via_mmFreeReserved > - via_ds.c: via_mmDestroy > - remove the followig unused global variable: > - via_mm.c: VIA_DEBUG I'll nack this patch for now Adrian, but I'm going to bring all these changes into the DRM tree as soon as I can.. one of the functions you removed pointed out a bug in the i810/i830/i915 drivers (granted no-one uses pageflip in those drivers but still should fix it..), I'm going to put the through drm CVS first... Thanks, Dave. - To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to [EMAIL PROTECTED] More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/ --- This SF.Net email is sponsored by: IntelliVIEW -- Interactive Reporting Tool for open source databases. Create drag-&-drop reports. Save time by over 75%! Publish reports on the web. Export to DOC, XLS, RTF, etc. Download a FREE copy at http://www.intelliview.com/go/osdn_nl -- ___ Dri-devel mailing list Dri-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/dri-devel
