Hi guys,
anyone has already a patch to get the fglrx / catalyst drivers to work with 2.6.36-rc* kernels ?
anyone has already a patch to get the fglrx / catalyst drivers to work with 2.6.36-rc* kernels ?
diff -aur work.orig/common/lib/modules/fglrx/build_mod/firegl_public.c work/common/lib/modules/fglrx/build_mod/firegl_public.c --- work.orig/common/lib/modules/fglrx/build_mod/firegl_public.c 2010-08-20 21:51:48.000000000 +0200 +++ work/common/lib/modules/fglrx/build_mod/firegl_public.c 2010-08-20 22:02:32.000000000 +0200 @@ -320,7 +320,7 @@ return firegl_release((KCL_IO_FILE_Handle)filp); } -int ip_firegl_ioctl(struct inode* inode, struct file* filp, unsigned int cmd, unsigned long arg) +int ip_firegl_ioctl(struct file* filp, unsigned int cmd, unsigned long arg) { return firegl_ioctl((KCL_IO_FILE_Handle)filp, cmd, arg); } @@ -407,7 +407,7 @@ #endif open: ip_firegl_open, release: ip_firegl_release, - ioctl: ip_firegl_ioctl, + unlocked_ioctl: ip_firegl_ioctl, mmap: ip_firegl_mmap, write: ip_firegl_write,
diff -aur work.orig/common/lib/modules/fglrx/build_mod/firegl_public.c work/common/lib/modules/fglrx/build_mod/firegl_public.c --- work.orig/common/lib/modules/fglrx/build_mod/firegl_public.c 2010-08-20 21:51:48.000000000 +0200 +++ work/common/lib/modules/fglrx/build_mod/firegl_public.c 2010-08-20 23:46:37.000000000 +0200 @@ -320,7 +320,11 @@ return firegl_release((KCL_IO_FILE_Handle)filp); } +#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,36) +int ip_firegl_ioctl(struct file* filp, unsigned int cmd, unsigned long arg) +#else int ip_firegl_ioctl(struct inode* inode, struct file* filp, unsigned int cmd, unsigned long arg) +#endif { return firegl_ioctl((KCL_IO_FILE_Handle)filp, cmd, arg); } @@ -407,7 +411,11 @@ #endif open: ip_firegl_open, release: ip_firegl_release, +#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,36) + unlocked_ioctl: ip_firegl_ioctl, +#else ioctl: ip_firegl_ioctl, +#endif mmap: ip_firegl_mmap, write: ip_firegl_write,
--- kcl_ioctl.c.old 2010-09-15 16:38:39.399690030 +0200 +++ kcl_ioctl.c 2010-09-15 16:39:55.632689146 +0200 @@ -193,7 +193,7 @@ */ void* ATI_API_CALL KCL_IOCTL_AllocUserSpace32(long size) { - return compat_alloc_user_space(size); + return KCL_IOCTL_AllocUserSpace32(size); } #endif // __x86_64__
Comment