12:07 a.m.
Author: leigh123linux
Update of /cvs/nonfree/rpms/catalyst-kmod/F-19
In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv20618
Modified Files:
.cvsignore catalyst-kmod.spec fix_proc_perms.patch sources
Log Message:
* Thu Oct 03 2013 Leigh Scott <leigh123linux(a)googlemail.com> - 13.9-1
- Update to Catalyst 13.9 (internal version 13.152)
- redo patch
Index: .cvsignore
===================================================================
RCS file: /cvs/nonfree/rpms/catalyst-kmod/F-19/.cvsignore,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- .cvsignore 3 Aug 2013 11:54:19 -0000 1.8
+++ .cvsignore 4 Oct 2013 00:07:39 -0000 1.9
@@ -1 +1 @@
-catalyst-kmod-data-13.8.tar.bz2
+catalyst-kmod-data-13.9.tar.bz2
Index: catalyst-kmod.spec
===================================================================
RCS file: /cvs/nonfree/rpms/catalyst-kmod/F-19/catalyst-kmod.spec,v
retrieving revision 1.40
retrieving revision 1.41
diff -u -r1.40 -r1.41
--- catalyst-kmod.spec 1 Oct 2013 09:41:38 -0000 1.40
+++ catalyst-kmod.spec 4 Oct 2013 00:07:39 -0000 1.41
@@ -12,8 +12,8 @@
%endif
Name: catalyst-kmod
-Version: 13.8
-Release: 0.2.beta1%{?dist}.8
+Version: 13.9
+Release: 1%{?dist}
# Taken over by kmodtool
Summary: AMD display driver kernel module
Group: System Environment/Kernel
@@ -99,6 +99,10 @@
%changelog
+* Thu Oct 03 2013 Leigh Scott <leigh123linux(a)googlemail.com> - 13.9-1
+- Update to Catalyst 13.9 (internal version 13.152)
+- redo patch
+
* Tue Oct 01 2013 Nicolas Chauvet <kwizart(a)gmail.com> - 13.8-0.2.beta1.8
- Rebuilt for kernel
@@ -156,7 +160,6 @@
* Wed Jun 12 2013 Nicolas Chauvet <kwizart(a)gmail.com> - 13.6-0.1.beta.1
- Rebuilt for kernel
-%changelog
* Wed May 29 2013 Leigh Scott <leigh123linux(a)googlemail.com> - 13.6-0.1.beta
- Update to Catalyst 13.6beta (internal version 13.101)
fix_proc_perms.patch:
drm_proc.h | 15 +++++++++
firegl_public.c | 86 ++++++++++++++++++++++++++++++++++++++++++++++++++++++--
2 files changed, 98 insertions(+), 3 deletions(-)
Index: fix_proc_perms.patch
===================================================================
RCS file: /cvs/nonfree/rpms/catalyst-kmod/F-19/fix_proc_perms.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- fix_proc_perms.patch 7 Aug 2013 15:09:37 -0000 1.1
+++ fix_proc_perms.patch 4 Oct 2013 00:07:39 -0000 1.2
@@ -1,11 +1,259 @@
---- lib/modules/fglrx/build_mod/firegl_public.c 2013-07-29 18:54:07.000000000 +0300
-+++ lib/modules/fglrx/build_mod/firegl_public.c 2013-08-07 11:43:54.465936476 +0300
-@@ -821,7 +821,7 @@
+--- lib/modules/fglrx/build_mod/drm_proc.h
++++ lib/modules/fglrx/build_mod/drm_proc.h
+@@ -95,22 +95,35 @@ struct proc_dir_entry *DRM(proc_init)(dr
+ int i, j;
+ char name[64];
+
++#if LINUX_VERSION_CODE < KERNEL_VERSION(3,10,0)
+ if (!minor) root = create_proc_entry("dri", S_IFDIR, NULL);
++#else
++ if (!minor) root = proc_mkdir("dri", NULL);
++#endif
+ if (!root) {
+ DRM_ERROR("Cannot create /proc/ati\n");
+ return NULL;
+ }
+
+ sprintf(name, "%d", minor);
++#if LINUX_VERSION_CODE < KERNEL_VERSION(3,10,0)
+ *dev_root = create_proc_entry(name, S_IFDIR, root);
++#else
++ *dev_root = proc_mkdir(name, root);
++#endif
+ if (!*dev_root) {
+ DRM_ERROR("Cannot create /proc/ati/%s\n", name);
+ return NULL;
+ }
+
+ for (i = 0; i < DRM_PROC_ENTRIES; i++) {
++#if LINUX_VERSION_CODE < KERNEL_VERSION(3,10,0)
+ ent = create_proc_entry(DRM(proc_list)[i].name,
+ S_IFREG|S_IRUGO, *dev_root);
++#else
++ ent = proc_create_data(DRM(proc_list)[i].name,
++ S_IFREG|S_IRUGO, *dev_root, &firegl_fops, dev);
++#endif
+ if (!ent) {
+ DRM_ERROR("Cannot create /proc/ati/%s/%s\n",
+ name, DRM(proc_list)[i].name);
+@@ -121,8 +134,10 @@ struct proc_dir_entry *DRM(proc_init)(dr
+ if (!minor) remove_proc_entry("dri", NULL);
+ return NULL;
+ }
++#if LINUX_VERSION_CODE < KERNEL_VERSION(3,10,0)
+ ent->read_proc = DRM(proc_list)[i].f;
+ ent->data = dev;
++#endif
+ }
+
+ return root;
+--- lib/modules/fglrx/build_mod/firegl_public.c
++++ lib/modules/fglrx/build_mod/firegl_public.c
+@@ -520,13 +526,24 @@ READ_PROC_WRAP(firegl_lock_info)
+ #ifdef DEBUG
+ READ_PROC_WRAP(drm_bq_info)
+ #endif
++#if LINUX_VERSION_CODE < KERNEL_VERSION(3,10,0)
+ READ_PROC_WRAP(firegl_debug_proc_read)
++#endif
+ READ_PROC_WRAP(firegl_bios_version)
+ READ_PROC_WRAP(firegl_interrupt_info)
+ READ_PROC_WRAP(firegl_ptm_info)
+
++#if LINUX_VERSION_CODE < KERNEL_VERSION(3,10,0)
+ static int firegl_debug_proc_write_wrap(void* file, const char *buffer, unsigned long
count, void *data)
++#else
++static int firegl_debug_proc_read_wrap(struct seq_file *m, void* data)
+ {
++ return firegl_debug_proc_read(m->buf, m->from, m->index, m->size,
m->size - m->count, data);
++}
++
++static ssize_t firegl_debug_proc_write_wrap(struct file *file, const char *buffer,
size_t count, void *data)
++#endif
++{
+ return firegl_debug_proc_write(file, buffer, count, data);
+ }
+
+@@ -543,9 +560,14 @@ static int firegl_debug_proc_write_wrap(
+ *
+ * \return number of bytes written
+ */
++#if LINUX_VERSION_CODE < KERNEL_VERSION(3,10,0)
+ static int firegl_major_proc_read(char *buf, char **start, kcl_off_t offset,
+ int request, int* eof, void* data)
++#else
++static int firegl_major_proc_read(struct seq_file *m, void* data)
++#endif
+ {
++#if LINUX_VERSION_CODE < KERNEL_VERSION(3,10,0)
+ int len = 0; // For ProcFS: fill buf from the beginning
+
+ KCL_DEBUG1(FN_FIREGL_PROC, "offset %d\n", (int)offset);
+@@ -561,6 +583,9 @@ static int firegl_major_proc_read(char *
+
+ len = snprintf(buf, request, "%d\n", major);
+
++#else
++ int len = seq_printf(m, "%d\n", major);
++#endif
+ KCL_DEBUG1(FN_FIREGL_PROC, "return len=%i\n",len);
+
+ return len;
+@@ -583,6 +608,29 @@ kcl_proc_list_t KCL_PROC_FileList[] =
+ { "NULL", NULL, NULL} // Terminate
List!!!
+ };
+
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(3,10,0)
++static int firegl_major_proc_open(struct inode *inode, struct file *file){
++ return single_open(file, firegl_major_proc_read, NULL);
++}
++
++static const struct file_operations firegl_major_fops = {
++ .open = firegl_major_proc_open,
++ .read = seq_read,
++ .llseek = seq_lseek,
++};
++
++static int firegl_debug_proc_open(struct inode *inode, struct file *file){
++ return single_open(file, firegl_debug_proc_read_wrap, NULL);
++}
++
++static const struct file_operations firegl_debug_fops = {
++ .open = firegl_debug_proc_open,
++ .write = firegl_debug_proc_write_wrap,
++ .read = seq_read,
++ .llseek = seq_lseek,
++};
++#endif
++
+ static struct proc_dir_entry *firegl_proc_init( device_t *dev,
+ int minor,
+ struct proc_dir_entry *root,
+@@ -595,7 +643,11 @@ static struct proc_dir_entry *firegl_pro
KCL_DEBUG1(FN_FIREGL_PROC, "minor %d, proc_list 0x%08lx\n", minor,
(unsigned long)proc_list);
if (!minor)
{
-- root = KCL_create_proc_dir(NULL, "ati", S_IFDIR);
-+ root = KCL_create_proc_dir(NULL, "ati", S_IFDIR|S_IRUGO|S_IXUGO);
++#if LINUX_VERSION_CODE < KERNEL_VERSION(3,10,0)
+ root = create_proc_entry("ati", S_IFDIR, NULL);
++#else
++ root = proc_mkdir("ati", NULL);
++#endif
}
if (!root)
+@@ -607,18 +659,28 @@ static struct proc_dir_entry *firegl_pro
+ if (minor == 0)
+ {
+ // Global major debice number entry
++#if LINUX_VERSION_CODE < KERNEL_VERSION(3,10,0)
+ ent = create_proc_entry("major", S_IFREG|S_IRUGO, root);
++#else
++ ent = proc_create("major", S_IFREG|S_IRUGO, root,
&firegl_major_fops);
++#endif
+ if (!ent)
+ {
+ remove_proc_entry("ati", NULL);
+ KCL_DEBUG_ERROR("Cannot create /proc/ati/major\n");
+ return NULL;
+ }
++#if LINUX_VERSION_CODE < KERNEL_VERSION(3,10,0)
+ ent->read_proc = (read_proc_t*)firegl_major_proc_read;
++#endif
+ }
+
+ sprintf(name, "%d", minor);
++#if LINUX_VERSION_CODE < KERNEL_VERSION(3,10,0)
+ *dev_root = create_proc_entry(name, S_IFDIR, root);
++#else
++ *dev_root = proc_mkdir(name, root);
++#endif
+ if (!*dev_root) {
+ remove_proc_entry("major", root);
+ remove_proc_entry("ati", NULL);
+@@ -628,7 +690,12 @@ static struct proc_dir_entry *firegl_pro
+
+ while (list->f || list->fops)
+ {
++#if LINUX_VERSION_CODE < KERNEL_VERSION(3,10,0)
+ ent = create_proc_entry(list->name, S_IFREG|S_IRUGO, *dev_root);
++#else
++ ent = proc_create_data(list->name, S_IFREG|S_IRUGO, *dev_root,
&firegl_fops,
++ (dev->pubdev.signature == FGL_DEVICE_SIGNATURE)? firegl_find_device(minor) :
(dev));
++#endif
+ if (!ent)
+ {
+ KCL_DEBUG_ERROR("Cannot create /proc/ati/%s/%s\n", name,
list->name);
+@@ -646,6 +713,7 @@ static struct proc_dir_entry *firegl_pro
+ return NULL;
+ }
+
++#if LINUX_VERSION_CODE < KERNEL_VERSION(3,10,0)
+ if (list->f)
+ {
+ ent->read_proc = (read_proc_t*)list->f;
+@@ -659,19 +727,25 @@ static struct proc_dir_entry *firegl_pro
+ {
+ ent->data = (dev->pubdev.signature == FGL_DEVICE_SIGNATURE)?
firegl_find_device(minor) : (dev);
+ }
+-
++#endif
+ list++;
+ }
+
+ if (minor == 0)
+ {
+ // Global debug entry, only create it once
++#if LINUX_VERSION_CODE < KERNEL_VERSION(3,10,0)
+ ent = create_proc_entry("debug", S_IFREG|S_IRUGO, root);
++#else
++ ent = proc_create_data("debug", S_IFREG|S_IRUGO, root,
&firegl_debug_fops, dev);
++#endif
+ if (ent)
+ {
++#if LINUX_VERSION_CODE < KERNEL_VERSION(3,10,0)
+ ent->read_proc = (read_proc_t*)firegl_debug_proc_read_wrap;
+ ent->write_proc = (write_proc_t*)firegl_debug_proc_write_wrap;
+ ent->data = dev;
++#endif
+ }
+ }
+
+@@ -6148,10 +6222,17 @@ void * KCL_create_proc_dir(void *root_di
+ struct proc_dir_entry *dir = NULL;
+
+ if (root_dir == NULL)
++#if LINUX_VERSION_CODE < KERNEL_VERSION(3,10,0)
+ dir = create_proc_entry(name, S_IFDIR | access, firegl_stub_root);
++#else
++ dir = proc_mkdir(name, firegl_stub_root);
++#endif
+ else
++#if LINUX_VERSION_CODE < KERNEL_VERSION(3,10,0)
+ dir = create_proc_entry(name, S_IFDIR | access, (struct proc_dir_entry
*)root_dir);
+-
++#else
++ dir = proc_mkdir(name, (struct proc_dir_entry *)root_dir);
++#endif
+ return dir;
+ }
+
+@@ -6180,13 +6261,18 @@ void KCL_create_proc_entry(void *root_di
+ if (root_dir == NULL || name == NULL)
+ return;
+
++#if LINUX_VERSION_CODE < KERNEL_VERSION(3,10,0)
+ ent = create_proc_entry(name, access_mode, (struct proc_dir_entry *)root_dir);
+-
++#else
++ ent = proc_create_data(name, access_mode, (struct proc_dir_entry *)root_dir,
&firegl_fops, private_data);
++#endif
+ if (ent)
+ {
++#if LINUX_VERSION_CODE < KERNEL_VERSION(3,10,0)
+ ent->read_proc = (read_proc_t *)read_fn;
+ ent->write_proc = (write_proc_t *)write_fn;
+ ent->data = private_data;
++#endif
+ }
+ }
+
Index: sources
===================================================================
RCS file: /cvs/nonfree/rpms/catalyst-kmod/F-19/sources,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- sources 3 Aug 2013 11:54:19 -0000 1.8
+++ sources 4 Oct 2013 00:07:39 -0000 1.9
@@ -1 +1 @@
-c825603d6b0adeca862804fdd5093fb4 catalyst-kmod-data-13.8.tar.bz2
+113c704b666a380677c7161afad935b2 catalyst-kmod-data-13.9.tar.bz2