rpms/nvidia-304xx-kmod/F-18 nvidia_304.88_linux_3.10.patch, NONE, 1.1 nvidia-304xx-kmod.spec, 1.8, 1.9
by Nicolas Chauvet
Author: kwizart
Update of /cvs/nonfree/rpms/nvidia-304xx-kmod/F-18
In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv20556/F-18
Modified Files:
nvidia-304xx-kmod.spec
Added Files:
nvidia_304.88_linux_3.10.patch
Log Message:
Sync with F-19
nvidia_304.88_linux_3.10.patch:
nv-i2c.c | 14 --
nv-procfs.c | 411 ++++++++++++++++++++++++++++++------------------------------
2 files changed, 215 insertions(+), 210 deletions(-)
--- NEW FILE nvidia_304.88_linux_3.10.patch ---
diff -urN a/kernel/nv-i2c.c b/kernel/nv-i2c.c
--- a/kernel/nv-i2c.c 2013-03-27 17:26:51.000000000 -0400
+++ b/kernel/nv-i2c.c 2013-07-05 10:04:23.000000000 -0400
@@ -1,3 +1,4 @@
+
/* _NVRM_COPYRIGHT_BEGIN_
*
* Copyright 2005-2011 by NVIDIA Corporation. All rights reserved. All
@@ -311,8 +312,6 @@
BOOL NV_API_CALL nv_i2c_del_adapter(nv_state_t *nv, void *data)
{
struct i2c_adapter *pI2cAdapter = (struct i2c_adapter *)data;
- int osstatus = 0;
- BOOL wasReleased = FALSE;
#if defined(KERNEL_2_4)
if (!NV_WEAK_SYMBOL_PRESENT(i2c_add_adapter))
@@ -324,15 +323,10 @@
if (!pI2cAdapter) return FALSE;
// attempt release with the OS
- osstatus = i2c_del_adapter(pI2cAdapter);
-
- if (!osstatus)
- {
- os_free_mem(pI2cAdapter);
- wasReleased = TRUE;
- }
+ i2c_del_adapter(pI2cAdapter);
+ os_free_mem(pI2cAdapter);
- return wasReleased;
+ return TRUE;
}
#else // (defined(CONFIG_I2C) || defined(CONFIG_I2C_MODULE))
diff -urN a/kernel/nv-procfs.c b/kernel/nv-procfs.c
--- a/kernel/nv-procfs.c 2013-03-27 17:26:51.000000000 -0400
+++ b/kernel/nv-procfs.c 2013-07-05 10:12:52.000000000 -0400
@@ -60,60 +60,41 @@
__entry; \
})
-#define NV_CREATE_PROC_FILE(name,parent,__read_proc, \
- __write_proc,__fops,__data) \
- ({ \
- struct proc_dir_entry *__entry; \
- int __mode = (S_IFREG | S_IRUGO); \
- if ((NvUPtr)(__write_proc) != 0) \
- __mode |= S_IWUSR; \
- __entry = NV_CREATE_PROC_ENTRY(name, __mode, parent); \
- if (__entry != NULL) \
- { \
- if ((NvUPtr)(__read_proc) != 0) \
- __entry->read_proc = (__read_proc); \
- if ((NvUPtr)(__write_proc) != 0) \
- { \
- __entry->write_proc = (__write_proc); \
- __entry->proc_fops = (__fops); \
- } \
- __entry->data = (__data); \
- } \
- __entry; \
- })
+#define NV_PROC_RW (S_IFREG|S_IRUGO|S_IWUSR)
+#define NV_PROC_RO (S_IFREG|S_IRUGO)
#define NV_CREATE_PROC_DIR(name,parent) \
({ \
struct proc_dir_entry *__entry; \
int __mode = (S_IFDIR | S_IRUGO | S_IXUGO); \
- __entry = NV_CREATE_PROC_ENTRY(name, __mode, parent); \
+ __entry = proc_mkdir_mode(name, __mode, parent); \
__entry; \
})
+#if LINUX_VERSION_CODE <= KERNEL_VERSION(3,9,255)
+static inline void *PDE_DATA(const struct inode *inode) {
+ return PDE(inode)->data;
+}
+#endif
+
#define NV_PROC_WRITE_BUFFER_SIZE (64 * RM_PAGE_SIZE)
static int
-nv_procfs_read_gpu_info(
- char *page,
- char **start,
- off_t off,
- int count,
- int *eof,
- void *data
+nv_procfs_show_gpu_info(
+ struct seq_file *m,
+ void *v
)
{
- nv_state_t *nv = data;
+ nv_state_t *nv = m->private;
nv_linux_state_t *nvl = NV_GET_NVL_FROM_NV_STATE(nv);
struct pci_dev *dev = nvl->dev;
char *type, *fmt, tmpstr[NV_DEVICE_NAME_LENGTH];
- int len = 0, status;
+ int status;
NvU8 *uuid;
NvU32 vbios_rev1, vbios_rev2, vbios_rev3, vbios_rev4, vbios_rev5;
NvU32 fpga_rev1, fpga_rev2, fpga_rev3;
nv_stack_t *sp = NULL;
- *eof = 1;
-
NV_KMEM_CACHE_ALLOC_STACK(sp);
if (sp == NULL)
{
@@ -134,31 +115,31 @@
if (rm_get_device_name(sp, nv, dev->device, dev->subsystem_vendor,
dev->subsystem_device, NV_DEVICE_NAME_LENGTH,
tmpstr) != RM_OK)
- {
+ {
strcpy (tmpstr, "Unknown");
}
}
- len += sprintf(page+len, "Model: \t\t %s\n", tmpstr);
- len += sprintf(page+len, "IRQ: \t\t %d\n", nv->interrupt_line);
+ seq_printf(m, "Model: \t\t %s\n", tmpstr);
+ seq_printf(m, "IRQ: \t\t %d\n", nv->interrupt_line);
if (NV_IS_GVI_DEVICE(nv))
{
status = rm_gvi_get_firmware_version(sp, nv, &fpga_rev1, &fpga_rev2,
&fpga_rev3);
if (status != RM_OK)
- len += sprintf(page+len, "Firmware: \t ????.??.??\n");
+ seq_printf(m, "Firmware: \t ????.??.??\n");
else
{
fmt = "Firmware: \t %x.%x.%x\n";
- len += sprintf(page+len, fmt, fpga_rev1, fpga_rev2, fpga_rev3);
+ seq_printf(m, fmt, fpga_rev1, fpga_rev2, fpga_rev3);
}
}
else
{
if (rm_get_gpu_uuid(sp, nv, &uuid, NULL) == RM_OK)
{
- len += sprintf(page+len, "GPU UUID: \t %s\n", (char *)uuid);
+ seq_printf(m, "GPU UUID: \t %s\n", (char *)uuid);
os_free_mem(uuid);
}
@@ -166,12 +147,12 @@
&vbios_rev3, &vbios_rev4,
&vbios_rev5) != RM_OK)
{
- len += sprintf(page+len, "Video BIOS: \t ??.??.??.??.??\n");
+ seq_printf(m, "Video BIOS: \t ??.??.??.??.??\n");
}
else
{
fmt = "Video BIOS: \t %02x.%02x.%02x.%02x.%02x\n";
- len += sprintf(page+len, fmt, vbios_rev1, vbios_rev2, vbios_rev3,
+ seq_printf(m, fmt, vbios_rev1, vbios_rev2, vbios_rev3,
vbios_rev4, vbios_rev5);
}
}
@@ -182,12 +163,12 @@
type = "PCI-E";
else
type = "PCI";
- len += sprintf(page+len, "Bus Type: \t %s\n", type);
+ seq_printf(m, "Bus Type: \t %s\n", type);
- len += sprintf(page+len, "DMA Size: \t %d bits\n",
+ seq_printf(m, "DMA Size: \t %d bits\n",
nv_count_bits(dev->dma_mask));
- len += sprintf(page+len, "DMA Mask: \t 0x%llx\n", dev->dma_mask);
- len += sprintf(page+len, "Bus Location: \t %04x:%02x.%02x.%x\n",
+ seq_printf(m, "DMA Mask: \t 0x%llx\n", dev->dma_mask);
+ seq_printf(m, "Bus Location: \t %04x:%02x.%02x.%x\n",
nv->domain, nv->bus, nv->slot, PCI_FUNC(dev->devfn));
#if defined(DEBUG)
do
@@ -195,7 +176,7 @@
int j;
for (j = 0; j < NV_GPU_NUM_BARS; j++)
{
- len += sprintf(page+len, "BAR%u: \t\t 0x%llx (%lluMB)\n",
+ seq_printf(m, "BAR%u: \t\t 0x%llx (%lluMB)\n",
j, nv->bars[j].address, (nv->bars[j].size >> 20));
}
} while (0);
@@ -203,26 +184,120 @@
NV_KMEM_CACHE_FREE_STACK(sp);
- return len;
+ return 0;
}
static int
-nv_procfs_read_version(
- char *page,
- char **start,
- off_t off,
- int count,
- int *eof,
- void *data
+nv_procfs_open_gpu_info(
+ struct inode *inode,
+ struct file *file
)
{
- int len = 0;
- *eof = 1;
+ return single_open(file, nv_procfs_show_gpu_info, PDE_DATA(inode));
+}
- len += sprintf(page+len, "NVRM version: %s\n", pNVRM_ID);
- len += sprintf(page+len, "GCC version: %s\n", NV_COMPILER);
+static const struct file_operations nv_procfs_gpu_info_fops = {
+ .owner = THIS_MODULE,
+ .open = nv_procfs_open_gpu_info,
+ .read = seq_read,
+ .llseek = seq_lseek,
+ .release = single_release,
+};
- return len;
+static int
+nv_procfs_show_version(
+ struct seq_file *m,
+ void *v
+)
+{
+ seq_printf(m, "NVRM version: %s\n", pNVRM_ID);
+ seq_printf(m, "GCC version: %s\n", NV_COMPILER);
+
+ return 0;
+}
+
+static int
+nv_procfs_open_version(
+ struct inode *inode,
+ struct file *file
+)
+{
+ return single_open(file, nv_procfs_show_version, NULL);
+}
+
+static const struct file_operations nv_procfs_version_fops = {
+ .owner = THIS_MODULE,
+ .open = nv_procfs_open_version,
+ .read = seq_read,
+ .llseek = seq_lseek,
+ .release = single_release,
+};
+
+static int
+nv_procfs_show_registry(
+ struct seq_file *m,
+ void *v
+)
+{
+ nv_state_t *nv = m->private;
+ nv_linux_state_t *nvl = NULL;
+ char *registry_keys;
+
+ if (nv != NULL)
+ nvl = NV_GET_NVL_FROM_NV_STATE(nv);
+ registry_keys = ((nvl != NULL) ?
+ nvl->registry_keys : nv_registry_keys);
+
+ seq_printf(m, "Binary: \"%s\"\n", registry_keys);
+
+ return 0;
+}
+
+static ssize_t
+nv_procfs_write_registry(
+ struct file *file,
+ const char __user *buffer,
+ size_t count,
+ loff_t *pos
+)
+{
+ int status = 0;
+ nv_file_private_t *nvfp = NV_GET_FILE_PRIVATE(file);
+ char *proc_buffer;
+ unsigned long bytes_left;
+
+ down(&nvfp->fops_sp_lock[NV_FOPS_STACK_INDEX_PROCFS]);
+
+ bytes_left = (NV_PROC_WRITE_BUFFER_SIZE - nvfp->off - 1);
+
+ if (count == 0)
+ {
+ status = -EINVAL;
+ goto done;
+ }
+ else if ((bytes_left == 0) || (count > bytes_left))
+ {
+ status = -ENOSPC;
+ goto done;
+ }
+
+ proc_buffer = &((char *)nvfp->data)[nvfp->off];
+
+ if (copy_from_user(proc_buffer, buffer, count))
+ {
+ nv_printf(NV_DBG_ERRORS, "NVRM: failed to copy in proc data!\n");
+ status = -EFAULT;
+ }
+ else
+ {
+ nvfp->proc_data = PDE_DATA(file->f_inode);
+ nvfp->off += count;
+ }
+
+done:
+ up(&nvfp->fops_sp_lock[NV_FOPS_STACK_INDEX_PROCFS]);
+
+ return ((status < 0) ? status : count);
}
static struct pci_dev *nv_get_agp_device_by_class(unsigned int class)
@@ -432,7 +507,7 @@
nv_stack_t *sp = NULL;
if (0 == (file->f_mode & FMODE_WRITE))
- return 0;
+ return single_open(file, nv_procfs_show_registry, PDE_DATA(inode));
nvfp = nv_alloc_file_private();
if (nvfp == NULL)
@@ -481,6 +556,9 @@
RM_STATUS rm_status;
int rc = 0;
+ if (0 == (file->f_mode & FMODE_WRITE))
+ return single_release(inode, file);
+
nvfp = NV_GET_FILE_PRIVATE(file);
if (nvfp == NULL)
return 0;
@@ -545,122 +623,84 @@
return rc;
}
-static struct file_operations nv_procfs_registry_fops = {
+static const struct file_operations nv_procfs_registry_fops = {
.open = nv_procfs_open_registry,
+ .read = seq_read,
+ .llseek = seq_lseek,
+ .write = nv_procfs_write_registry,
.release = nv_procfs_close_registry,
};
static int
-nv_procfs_read_params(
- char *page,
- char **start,
- off_t off,
- int count,
- int *eof,
- void *data
+nv_procfs_show_params(
+ struct seq_file *m,
+ void *v
)
{
unsigned int i;
- int len = 0;
nv_parm_t *entry;
- *eof = 1;
for (i = 0; (entry = &nv_parms[i])->name != NULL; i++)
- len += sprintf(page+len, "%s: %u\n", entry->name, *entry->data);
+ seq_printf(m, "%s: %u\n", entry->name, *entry->data);
- len += sprintf(page+len, "RegistryDwords: \"%s\"\n",
+ seq_printf(m, "RegistryDwords: \"%s\"\n",
(NVreg_RegistryDwords != NULL) ? NVreg_RegistryDwords : "");
- len += sprintf(page+len, "RmMsg: \"%s\"\n",
+seq_printf(m, "RmMsg: \"%s\"\n",
(NVreg_RmMsg != NULL) ? NVreg_RmMsg : "");
- return len;
+ return 0;
}
static int
-nv_procfs_read_registry(
- char *page,
- char **start,
- off_t off,
- int count,
- int *eof,
- void *data
-)
+nv_procfs_open_params(
+ struct inode *inode,
+ struct file *file
+)
{
- nv_state_t *nv = data;
- nv_linux_state_t *nvl = NULL;
- char *registry_keys;
-
- if (nv != NULL)
- nvl = NV_GET_NVL_FROM_NV_STATE(nv);
- registry_keys = ((nvl != NULL) ?
- nvl->registry_keys : nv_registry_keys);
- *eof = 1;
- return sprintf(page, "Binary: \"%s\"\n", registry_keys);
+return single_open(file, nv_procfs_show_params, NULL);
}
+
+
+static const struct file_operations nv_procfs_params_fops = {
+ .owner = THIS_MODULE,
+ .open = nv_procfs_open_params,
+ .read = seq_read,
+ .llseek = seq_lseek,
+ .release = single_release,
+};
+
static int
-nv_procfs_write_registry(
- struct file *file,
- const char *buffer,
- unsigned long count,
- void *data
+nv_procfs_show_text_file(
+ struct seq_file *m,
+ void *v
)
{
- int status = 0;
- nv_file_private_t *nvfp = NV_GET_FILE_PRIVATE(file);
- char *proc_buffer;
- unsigned long bytes_left;
+ seq_printf(m, "%s", (char *)m->private);
- down(&nvfp->fops_sp_lock[NV_FOPS_STACK_INDEX_PROCFS]);
-
- bytes_left = (NV_PROC_WRITE_BUFFER_SIZE - nvfp->off - 1);
-
- if (count == 0)
- {
- status = -EINVAL;
- goto done;
- }
- else if ((bytes_left == 0) || (count > bytes_left))
- {
- status = -ENOSPC;
- goto done;
- }
-
- proc_buffer = &((char *)nvfp->data)[nvfp->off];
-
- if (copy_from_user(proc_buffer, buffer, count))
- {
- nv_printf(NV_DBG_ERRORS, "NVRM: failed to copy in proc data!\n");
- status = -EFAULT;
- }
- else
- {
- nvfp->proc_data = data;
- nvfp->off += count;
- }
-
-done:
- up(&nvfp->fops_sp_lock[NV_FOPS_STACK_INDEX_PROCFS]);
-
- return ((status < 0) ? status : (int)count);
+ return 0;
}
static int
-nv_procfs_read_text_file(
- char *page,
- char **start,
- off_t off,
- int count,
- int *eof,
- void *data
+nv_procfs_open_text_file(
+ struct inode *inode,
+ struct file *file
)
{
- *eof = 1;
- return sprintf(page, "%s", (char *)data);
+ return single_open(file, nv_procfs_show_text_file, PDE_DATA(inode));
}
+
+static const struct file_operations nv_procfs_text_fops = {
+ .owner = THIS_MODULE,
+ .open = nv_procfs_open_text_file,
+ .read = seq_read,
+ .llseek = seq_lseek,
+ .release = single_release,
+};
+
static void
nv_procfs_add_text_file(
struct proc_dir_entry *parent,
@@ -668,22 +708,7 @@
const char *text
)
{
- NV_CREATE_PROC_FILE(filename, parent,
- nv_procfs_read_text_file, NULL, NULL, (void *)text);
-}
-
-static void nv_procfs_unregister_all(struct proc_dir_entry *entry)
-{
- while (entry)
- {
- struct proc_dir_entry *next = entry->next;
- if (entry->subdir)
- nv_procfs_unregister_all(entry->subdir);
- remove_proc_entry(entry->name, entry->parent);
- if (entry == proc_nvidia)
- break;
- entry = next;
- }
+ proc_create_data(filename, NV_PROC_RO, parent, &nv_procfs_text_fops, (void *)text);
}
#endif
@@ -713,26 +738,11 @@
if (!proc_nvidia)
goto failed;
- entry = NV_CREATE_PROC_FILE("params", proc_nvidia,
- nv_procfs_read_params, NULL, NULL, NULL);
+ entry = proc_create("params", NV_PROC_RO, proc_nvidia, &nv_procfs_params_fops);
if (!entry)
goto failed;
- /*
- * entry->proc_fops originally points to a constant
- * structure, so to add more methods for the
- * binary registry write path, we need to replace the
- * said entry->proc_fops with a new fops structure.
- * However, in preparation for this, we need to preserve
- * the procfs read() and write() operations.
- */
- nv_procfs_registry_fops.read = entry->proc_fops->read;
- nv_procfs_registry_fops.write = entry->proc_fops->write;
-
- entry = NV_CREATE_PROC_FILE("registry", proc_nvidia,
- nv_procfs_read_registry,
- nv_procfs_write_registry,
- &nv_procfs_registry_fops, NULL);
+ entry = proc_create("registry", NV_PROC_RW, proc_nvidia, &nv_procfs_registry_fops);
if (!entry)
goto failed;
@@ -753,8 +763,7 @@
nv_procfs_add_text_file(proc_nvidia_patches, "README", __README_patches);
- entry = NV_CREATE_PROC_FILE("version", proc_nvidia,
- nv_procfs_read_version, NULL, NULL, NULL);
+ entry = proc_create("version", NV_PROC_RO, proc_nvidia, &nv_procfs_version_fops);
if (!entry)
goto failed;
@@ -771,15 +780,11 @@
if (!proc_nvidia_gpu)
goto failed;
- entry = NV_CREATE_PROC_FILE("information", proc_nvidia_gpu,
- nv_procfs_read_gpu_info, NULL, NULL, nv);
+ entry = proc_create_data("information", NV_PROC_RO, proc_nvidia_gpu, &nv_procfs_gpu_info_fops, nv);
if (!entry)
goto failed;
- entry = NV_CREATE_PROC_FILE("registry", proc_nvidia_gpu,
- nv_procfs_read_registry,
- nv_procfs_write_registry,
- &nv_procfs_registry_fops, nv);
+ entry = proc_create_data("registry", NV_PROC_RW, proc_nvidia_gpu, &nv_procfs_registry_fops, nv);
if (!entry)
goto failed;
@@ -788,28 +793,34 @@
proc_nvidia_agp = NV_CREATE_PROC_DIR("agp", proc_nvidia);
if (!proc_nvidia_agp)
goto failed;
-
- entry = NV_CREATE_PROC_FILE("status", proc_nvidia_agp,
- nv_procfs_read_agp_status, NULL, NULL, nv);
- if (!entry)
- goto failed;
-
- entry = NV_CREATE_PROC_FILE("host-bridge", proc_nvidia_agp,
- nv_procfs_read_agp_info, NULL, NULL, NULL);
- if (!entry)
- goto failed;
-
- entry = NV_CREATE_PROC_FILE("gpu", proc_nvidia_agp,
- nv_procfs_read_agp_info, NULL, NULL, nv);
- if (!entry)
- goto failed;
+//
+// - entry = NV_CREATE_PROC_FILE("params", proc_nvidia,
+//- nv_procfs_read_params, NULL, NULL, NULL);
+//+ entry = proc_create("params", NV_PROC_RO, proc_nvidia, &nv_procfs_params_fops);
+
+ // entry = NV_CREATE_PROC_FILE("status", proc_nvidia_agp,
+ // nv_procfs_read_agp_status, NULL, NULL, nv);
+// entry = proc_create("status", NV_PROC_RO, proc_nvidia, &nv_procfs_params_fops);
+
+ // if (!entry)
+ // goto failed;
+
+ // entry = NV_CREATE_PROC_FILE("host-bridge", proc_nvidia_agp,
+ // nv_procfs_read_agp_info, NULL, NULL, NULL);
+ // if (!entry)
+ // goto failed;
+
+ //entry = NV_CREATE_PROC_FILE("gpu", proc_nvidia_agp,
+ // nv_procfs_read_agp_info, NULL, NULL, nv);
+ //if (!entry)
+ // goto failed;
}
}
#endif
return 0;
#if defined(CONFIG_PROC_FS)
failed:
- nv_procfs_unregister_all(proc_nvidia);
+ remove_proc_subtree("nvidia", proc_nvidia);
return -1;
#endif
}
@@ -817,6 +828,6 @@
void nv_unregister_procfs(void)
{
#if defined(CONFIG_PROC_FS)
- nv_procfs_unregister_all(proc_nvidia);
+ remove_proc_subtree("nvidia", proc_nvidia);
#endif
}
Index: nvidia-304xx-kmod.spec
===================================================================
RCS file: /cvs/nonfree/rpms/nvidia-304xx-kmod/F-18/nvidia-304xx-kmod.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- nvidia-304xx-kmod.spec 2 Aug 2013 23:20:25 -0000 1.8
+++ nvidia-304xx-kmod.spec 3 Aug 2013 16:00:15 -0000 1.9
@@ -3,12 +3,12 @@
# "buildforkernels newest" macro for just that build; immediately after
# queuing that build enable the macro again for subsequent builds; that way
# a new akmod package will only get build when a new one is actually needed
-%global buildforkernels newest
+#global buildforkernels newest
Name: nvidia-304xx-kmod
Version: 304.88
# Taken over by kmodtool
-Release: 1%{?dist}.7
+Release: 2%{?dist}
Summary: NVIDIA display driver kernel module
Group: System Environment/Kernel
License: Redistributable, no modification permitted
@@ -19,7 +19,7 @@
Source0: nvidia-kmod-data-%{version}.tar.xz
Source11: nvidia-304xx-kmodtool-excludekernel-filterfile
-
+Patch0: nvidia_304.88_linux_3.10.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -46,7 +46,7 @@
for arch in x86 x64
do
pushd nvidiapkg-${arch}
- echo "NoPatch"
+%patch0 -p1
popd
done
@@ -80,8 +80,8 @@
%changelog
-* Sat Aug 03 2013 Nicolas Chauvet <kwizart(a)gmail.com> - 304.88-1.7
-- Rebuilt for kernel
+* Fri Jul 26 2013 Leigh Scott <leigh123linux(a)googlemail.com> - 304.88-2
+- patch for 3.10 kernel
* Tue Jul 23 2013 Nicolas Chauvet <kwizart(a)gmail.com> - 304.88-1.6
- Rebuilt for kernel
11 years, 3 months
rpms/nvidia-kmod/F-18 nvidia-kmod.spec,1.157,1.158
by Nicolas Chauvet
Author: kwizart
Update of /cvs/nonfree/rpms/nvidia-kmod/F-18
In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv20155
Modified Files:
nvidia-kmod.spec
Log Message:
Avoid previous changelog
Index: nvidia-kmod.spec
===================================================================
RCS file: /cvs/nonfree/rpms/nvidia-kmod/F-18/nvidia-kmod.spec,v
retrieving revision 1.157
retrieving revision 1.158
diff -u -r1.157 -r1.158
--- nvidia-kmod.spec 3 Aug 2013 15:52:20 -0000 1.157
+++ nvidia-kmod.spec 3 Aug 2013 15:53:12 -0000 1.158
@@ -81,9 +81,6 @@
* Fri Jul 26 2013 Leigh Scott <leigh123linux(a)googlemail.com> - 1:319.32-2
- patch for 3.10 kernel
-* Sat Aug 03 2013 Nicolas Chauvet <kwizart(a)gmail.com> - 1:319.32-1.1
-- Rebuilt for kernel
-
* Sat Jul 13 2013 Nicolas Chauvet <kwizart(a)gmail.com> - 1:319.32-1
- Update to 319.32
- Add support for armv7hl
11 years, 3 months
rpms/nvidia-kmod/F-18 3.10_kernel.patch, NONE, 1.1 nvidia-kmod.spec, 1.156, 1.157
by Nicolas Chauvet
Author: kwizart
Update of /cvs/nonfree/rpms/nvidia-kmod/F-18
In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv20056/F-18
Modified Files:
nvidia-kmod.spec
Added Files:
3.10_kernel.patch
Log Message:
3.10
3.10_kernel.patch:
nv-i2c.c | 13 --
nv-procfs.c | 372 ++++++++++++++++++++++++++++++------------------------------
2 files changed, 190 insertions(+), 195 deletions(-)
--- NEW FILE 3.10_kernel.patch ---
diff -ur a/kernel/nv-i2c.c b/kernel/nv-i2c.c
--- a/kernel/nv-i2c.c 2013-07-19 15:37:04.977306079 +0200
+++ b/kernel/nv-i2c.c 2013-07-19 14:16:08.755700586 +0200
@@ -311,8 +311,6 @@
BOOL NV_API_CALL nv_i2c_del_adapter(nv_state_t *nv, void *data)
{
struct i2c_adapter *pI2cAdapter = (struct i2c_adapter *)data;
- int osstatus = 0;
- BOOL wasReleased = FALSE;
#if defined(KERNEL_2_4)
if (!NV_WEAK_SYMBOL_PRESENT(i2c_add_adapter))
@@ -324,15 +322,10 @@
if (!pI2cAdapter) return FALSE;
// attempt release with the OS
- osstatus = i2c_del_adapter(pI2cAdapter);
+ i2c_del_adapter(pI2cAdapter);
+ os_free_mem(pI2cAdapter);
- if (!osstatus)
- {
- os_free_mem(pI2cAdapter);
- wasReleased = TRUE;
- }
-
- return wasReleased;
+ return TRUE;
}
#else // (defined(CONFIG_I2C) || defined(CONFIG_I2C_MODULE))
diff -ur a/kernel/nv-procfs.c b/kernel/nv-procfs.c
--- a/kernel/nv-procfs.c 2013-07-19 15:37:04.977306079 +0200
+++ b/kernel/nv-procfs.c 2013-07-19 15:23:15.013490851 +0200
@@ -60,60 +60,41 @@
__entry; \
})
-#define NV_CREATE_PROC_FILE(name,parent,__read_proc, \
- __write_proc,__fops,__data) \
- ({ \
- struct proc_dir_entry *__entry; \
- int __mode = (S_IFREG | S_IRUGO); \
- if ((NvUPtr)(__write_proc) != 0) \
- __mode |= S_IWUSR; \
- __entry = NV_CREATE_PROC_ENTRY(name, __mode, parent); \
- if (__entry != NULL) \
- { \
- if ((NvUPtr)(__read_proc) != 0) \
- __entry->read_proc = (__read_proc); \
- if ((NvUPtr)(__write_proc) != 0) \
- { \
- __entry->write_proc = (__write_proc); \
- __entry->proc_fops = (__fops); \
- } \
- __entry->data = (__data); \
- } \
- __entry; \
- })
+#define NV_PROC_RW (S_IFREG|S_IRUGO|S_IWUSR)
+#define NV_PROC_RO (S_IFREG|S_IRUGO)
#define NV_CREATE_PROC_DIR(name,parent) \
({ \
struct proc_dir_entry *__entry; \
int __mode = (S_IFDIR | S_IRUGO | S_IXUGO); \
- __entry = NV_CREATE_PROC_ENTRY(name, __mode, parent); \
+ __entry = proc_mkdir_mode(name, __mode, parent); \
__entry; \
})
+#if LINUX_VERSION_CODE <= KERNEL_VERSION(3,9,255)
+static inline void *PDE_DATA(const struct inode *inode) {
+ return PDE(inode)->data;
+}
+#endif
+
#define NV_PROC_WRITE_BUFFER_SIZE (64 * RM_PAGE_SIZE)
static int
-nv_procfs_read_gpu_info(
- char *page,
- char **start,
- off_t off,
- int count,
- int *eof,
- void *data
+nv_procfs_show_gpu_info(
+ struct seq_file *m,
+ void *v
)
{
- nv_state_t *nv = data;
+ nv_state_t *nv = m->private;
nv_linux_state_t *nvl = NV_GET_NVL_FROM_NV_STATE(nv);
struct pci_dev *dev = nvl->dev;
char *type, *fmt, tmpstr[NV_DEVICE_NAME_LENGTH];
- int len = 0, status;
+ int status;
NvU8 *uuid;
NvU32 vbios_rev1, vbios_rev2, vbios_rev3, vbios_rev4, vbios_rev5;
NvU32 fpga_rev1, fpga_rev2, fpga_rev3;
nv_stack_t *sp = NULL;
- *eof = 1;
-
NV_KMEM_CACHE_ALLOC_STACK(sp);
if (sp == NULL)
{
@@ -134,31 +115,31 @@
if (rm_get_device_name(sp, nv, dev->device, dev->subsystem_vendor,
dev->subsystem_device, NV_DEVICE_NAME_LENGTH,
tmpstr) != RM_OK)
- {
+ {
strcpy (tmpstr, "Unknown");
}
}
- len += sprintf(page+len, "Model: \t\t %s\n", tmpstr);
- len += sprintf(page+len, "IRQ: \t\t %d\n", nv->interrupt_line);
+ seq_printf(m, "Model: \t\t %s\n", tmpstr);
+ seq_printf(m, "IRQ: \t\t %d\n", nv->interrupt_line);
if (NV_IS_GVI_DEVICE(nv))
{
status = rm_gvi_get_firmware_version(sp, nv, &fpga_rev1, &fpga_rev2,
&fpga_rev3);
if (status != RM_OK)
- len += sprintf(page+len, "Firmware: \t ????.??.??\n");
+ seq_printf(m, "Firmware: \t ????.??.??\n");
else
{
fmt = "Firmware: \t %x.%x.%x\n";
- len += sprintf(page+len, fmt, fpga_rev1, fpga_rev2, fpga_rev3);
+ seq_printf(m, fmt, fpga_rev1, fpga_rev2, fpga_rev3);
}
}
else
{
if (rm_get_gpu_uuid(sp, nv, &uuid, NULL) == RM_OK)
{
- len += sprintf(page+len, "GPU UUID: \t %s\n", (char *)uuid);
+ seq_printf(m, "GPU UUID: \t %s\n", (char *)uuid);
os_free_mem(uuid);
}
@@ -166,12 +147,12 @@
&vbios_rev3, &vbios_rev4,
&vbios_rev5) != RM_OK)
{
- len += sprintf(page+len, "Video BIOS: \t ??.??.??.??.??\n");
+ seq_printf(m, "Video BIOS: \t ??.??.??.??.??\n");
}
else
{
fmt = "Video BIOS: \t %02x.%02x.%02x.%02x.%02x\n";
- len += sprintf(page+len, fmt, vbios_rev1, vbios_rev2, vbios_rev3,
+ seq_printf(m, fmt, vbios_rev1, vbios_rev2, vbios_rev3,
vbios_rev4, vbios_rev5);
}
}
@@ -180,12 +161,12 @@
type = "PCIe";
else
type = "PCI";
- len += sprintf(page+len, "Bus Type: \t %s\n", type);
+ seq_printf(m, "Bus Type: \t %s\n", type);
- len += sprintf(page+len, "DMA Size: \t %d bits\n",
+ seq_printf(m, "DMA Size: \t %d bits\n",
nv_count_bits(dev->dma_mask));
- len += sprintf(page+len, "DMA Mask: \t 0x%llx\n", dev->dma_mask);
- len += sprintf(page+len, "Bus Location: \t %04x:%02x.%02x.%x\n",
+ seq_printf(m, "DMA Mask: \t 0x%llx\n", dev->dma_mask);
+ seq_printf(m, "Bus Location: \t %04x:%02x.%02x.%x\n",
nv->domain, nv->bus, nv->slot, PCI_FUNC(dev->devfn));
#if defined(DEBUG)
do
@@ -193,7 +174,7 @@
int j;
for (j = 0; j < NV_GPU_NUM_BARS; j++)
{
- len += sprintf(page+len, "BAR%u: \t\t 0x%llx (%lluMB)\n",
+ seq_printf(m, "BAR%u: \t\t 0x%llx (%lluMB)\n",
j, nv->bars[j].address, (nv->bars[j].size >> 20));
}
} while (0);
@@ -201,26 +182,120 @@
NV_KMEM_CACHE_FREE_STACK(sp);
- return len;
+ return 0;
}
static int
-nv_procfs_read_version(
- char *page,
- char **start,
- off_t off,
- int count,
- int *eof,
- void *data
+nv_procfs_open_gpu_info(
+ struct inode *inode,
+ struct file *file
+)
+{
+ return single_open(file, nv_procfs_show_gpu_info, PDE_DATA(inode));
+}
+
+static const struct file_operations nv_procfs_gpu_info_fops = {
+ .owner = THIS_MODULE,
+ .open = nv_procfs_open_gpu_info,
+ .read = seq_read,
+ .llseek = seq_lseek,
+ .release = single_release,
+};
+
+static int
+nv_procfs_show_version(
+ struct seq_file *m,
+ void *v
+)
+{
+ seq_printf(m, "NVRM version: %s\n", pNVRM_ID);
+ seq_printf(m, "GCC version: %s\n", NV_COMPILER);
+
+ return 0;
+}
+
+static int
+nv_procfs_open_version(
+ struct inode *inode,
+ struct file *file
+)
+{
+ return single_open(file, nv_procfs_show_version, NULL);
+}
+
+static const struct file_operations nv_procfs_version_fops = {
+ .owner = THIS_MODULE,
+ .open = nv_procfs_open_version,
+ .read = seq_read,
+ .llseek = seq_lseek,
+ .release = single_release,
+};
+
+static int
+nv_procfs_show_registry(
+ struct seq_file *m,
+ void *v
+)
+{
+ nv_state_t *nv = m->private;
+ nv_linux_state_t *nvl = NULL;
+ char *registry_keys;
+
+ if (nv != NULL)
+ nvl = NV_GET_NVL_FROM_NV_STATE(nv);
+ registry_keys = ((nvl != NULL) ?
+ nvl->registry_keys : nv_registry_keys);
+
+ seq_printf(m, "Binary: \"%s\"\n", registry_keys);
+
+ return 0;
+}
+
+static ssize_t
+nv_procfs_write_registry(
+ struct file *file,
+ const char __user *buffer,
+ size_t count,
+ loff_t *pos
)
{
- int len = 0;
- *eof = 1;
+ int status = 0;
+ nv_file_private_t *nvfp = NV_GET_FILE_PRIVATE(file);
+ char *proc_buffer;
+ unsigned long bytes_left;
+
+ down(&nvfp->fops_sp_lock[NV_FOPS_STACK_INDEX_PROCFS]);
+
+ bytes_left = (NV_PROC_WRITE_BUFFER_SIZE - nvfp->off - 1);
+
+ if (count == 0)
+ {
+ status = -EINVAL;
+ goto done;
+ }
+ else if ((bytes_left == 0) || (count > bytes_left))
+ {
+ status = -ENOSPC;
+ goto done;
+ }
+
+ proc_buffer = &((char *)nvfp->data)[nvfp->off];
+
+ if (copy_from_user(proc_buffer, buffer, count))
+ {
+ nv_printf(NV_DBG_ERRORS, "NVRM: failed to copy in proc data!\n");
+ status = -EFAULT;
+ }
+ else
+ {
+ nvfp->proc_data = PDE_DATA(file->f_inode);
+ nvfp->off += count;
+ }
- len += sprintf(page+len, "NVRM version: %s\n", pNVRM_ID);
- len += sprintf(page+len, "GCC version: %s\n", NV_COMPILER);
+done:
+ up(&nvfp->fops_sp_lock[NV_FOPS_STACK_INDEX_PROCFS]);
- return len;
+ return ((status < 0) ? status : count);
}
static int
@@ -233,7 +308,7 @@
nv_stack_t *sp = NULL;
if (0 == (file->f_mode & FMODE_WRITE))
- return 0;
+ return single_open(file, nv_procfs_show_registry, PDE_DATA(inode));
nvfp = nv_alloc_file_private();
if (nvfp == NULL)
@@ -282,6 +357,9 @@
RM_STATUS rm_status;
int rc = 0;
+ if (0 == (file->f_mode & FMODE_WRITE))
+ return single_release(inode, file);
+
nvfp = NV_GET_FILE_PRIVATE(file);
if (nvfp == NULL)
return 0;
@@ -346,122 +424,81 @@
return rc;
}
-static struct file_operations nv_procfs_registry_fops = {
+static const struct file_operations nv_procfs_registry_fops = {
.open = nv_procfs_open_registry,
+ .read = seq_read,
+ .llseek = seq_lseek,
+ .write = nv_procfs_write_registry,
.release = nv_procfs_close_registry,
};
static int
-nv_procfs_read_params(
- char *page,
- char **start,
- off_t off,
- int count,
- int *eof,
- void *data
+nv_procfs_show_params(
+ struct seq_file *m,
+ void *v
)
{
unsigned int i;
- int len = 0;
nv_parm_t *entry;
- *eof = 1;
for (i = 0; (entry = &nv_parms[i])->name != NULL; i++)
- len += sprintf(page+len, "%s: %u\n", entry->name, *entry->data);
+ seq_printf(m, "%s: %u\n", entry->name, *entry->data);
- len += sprintf(page+len, "RegistryDwords: \"%s\"\n",
+ seq_printf(m, "RegistryDwords: \"%s\"\n",
(NVreg_RegistryDwords != NULL) ? NVreg_RegistryDwords : "");
- len += sprintf(page+len, "RmMsg: \"%s\"\n",
+ seq_printf(m, "RmMsg: \"%s\"\n",
(NVreg_RmMsg != NULL) ? NVreg_RmMsg : "");
- return len;
+ return 0;
}
static int
-nv_procfs_read_registry(
- char *page,
- char **start,
- off_t off,
- int count,
- int *eof,
- void *data
-)
+nv_procfs_open_params(
+ struct inode *inode,
+ struct file *file
+)
{
- nv_state_t *nv = data;
- nv_linux_state_t *nvl = NULL;
- char *registry_keys;
+ return single_open(file, nv_procfs_show_params, NULL);
+}
- if (nv != NULL)
- nvl = NV_GET_NVL_FROM_NV_STATE(nv);
- registry_keys = ((nvl != NULL) ?
- nvl->registry_keys : nv_registry_keys);
+static const struct file_operations nv_procfs_params_fops = {
+ .owner = THIS_MODULE,
+ .open = nv_procfs_open_params,
+ .read = seq_read,
+ .llseek = seq_lseek,
+ .release = single_release,
+};
- *eof = 1;
- return sprintf(page, "Binary: \"%s\"\n", registry_keys);
-}
static int
-nv_procfs_write_registry(
- struct file *file,
- const char *buffer,
- unsigned long count,
- void *data
+nv_procfs_show_text_file(
+ struct seq_file *m,
+ void *v
)
{
- int status = 0;
- nv_file_private_t *nvfp = NV_GET_FILE_PRIVATE(file);
- char *proc_buffer;
- unsigned long bytes_left;
-
- down(&nvfp->fops_sp_lock[NV_FOPS_STACK_INDEX_PROCFS]);
-
- bytes_left = (NV_PROC_WRITE_BUFFER_SIZE - nvfp->off - 1);
+ seq_printf(m, "%s", (char *)m->private);
- if (count == 0)
- {
- status = -EINVAL;
- goto done;
- }
- else if ((bytes_left == 0) || (count > bytes_left))
- {
- status = -ENOSPC;
- goto done;
- }
-
- proc_buffer = &((char *)nvfp->data)[nvfp->off];
-
- if (copy_from_user(proc_buffer, buffer, count))
- {
- nv_printf(NV_DBG_ERRORS, "NVRM: failed to copy in proc data!\n");
- status = -EFAULT;
- }
- else
- {
- nvfp->proc_data = data;
- nvfp->off += count;
- }
-
-done:
- up(&nvfp->fops_sp_lock[NV_FOPS_STACK_INDEX_PROCFS]);
-
- return ((status < 0) ? status : (int)count);
+ return 0;
}
static int
-nv_procfs_read_text_file(
- char *page,
- char **start,
- off_t off,
- int count,
- int *eof,
- void *data
+nv_procfs_open_text_file(
+ struct inode *inode,
+ struct file *file
)
{
- *eof = 1;
- return sprintf(page, "%s", (char *)data);
+ return single_open(file, nv_procfs_show_text_file, PDE_DATA(inode));
}
+static const struct file_operations nv_procfs_text_fops = {
+ .owner = THIS_MODULE,
+ .open = nv_procfs_open_text_file,
+ .read = seq_read,
+ .llseek = seq_lseek,
+ .release = single_release,
+};
+
static void
nv_procfs_add_text_file(
struct proc_dir_entry *parent,
@@ -469,22 +506,7 @@
const char *text
)
{
- NV_CREATE_PROC_FILE(filename, parent,
- nv_procfs_read_text_file, NULL, NULL, (void *)text);
-}
-
-static void nv_procfs_unregister_all(struct proc_dir_entry *entry)
-{
- while (entry)
- {
- struct proc_dir_entry *next = entry->next;
- if (entry->subdir)
- nv_procfs_unregister_all(entry->subdir);
- remove_proc_entry(entry->name, entry->parent);
- if (entry == proc_nvidia)
- break;
- entry = next;
- }
+ proc_create_data(filename, NV_PROC_RO, parent, &nv_procfs_text_fops, (void *)text);
}
#endif
@@ -513,26 +535,11 @@
if (!proc_nvidia)
goto failed;
- entry = NV_CREATE_PROC_FILE("params", proc_nvidia,
- nv_procfs_read_params, NULL, NULL, NULL);
+ entry = proc_create("params", NV_PROC_RO, proc_nvidia, &nv_procfs_params_fops);
if (!entry)
goto failed;
- /*
- * entry->proc_fops originally points to a constant
- * structure, so to add more methods for the
- * binary registry write path, we need to replace the
- * said entry->proc_fops with a new fops structure.
- * However, in preparation for this, we need to preserve
- * the procfs read() and write() operations.
- */
- nv_procfs_registry_fops.read = entry->proc_fops->read;
- nv_procfs_registry_fops.write = entry->proc_fops->write;
-
- entry = NV_CREATE_PROC_FILE("registry", proc_nvidia,
- nv_procfs_read_registry,
- nv_procfs_write_registry,
- &nv_procfs_registry_fops, NULL);
+ entry = proc_create("registry", NV_PROC_RW, proc_nvidia, &nv_procfs_registry_fops);
if (!entry)
goto failed;
@@ -553,8 +560,7 @@
nv_procfs_add_text_file(proc_nvidia_patches, "README", __README_patches);
- entry = NV_CREATE_PROC_FILE("version", proc_nvidia,
- nv_procfs_read_version, NULL, NULL, NULL);
+ entry = proc_create("version", NV_PROC_RO, proc_nvidia, &nv_procfs_version_fops);
if (!entry)
goto failed;
@@ -571,15 +577,11 @@
if (!proc_nvidia_gpu)
goto failed;
- entry = NV_CREATE_PROC_FILE("information", proc_nvidia_gpu,
- nv_procfs_read_gpu_info, NULL, NULL, nv);
+ entry = proc_create_data("information", NV_PROC_RO, proc_nvidia_gpu, &nv_procfs_gpu_info_fops, nv);
if (!entry)
goto failed;
- entry = NV_CREATE_PROC_FILE("registry", proc_nvidia_gpu,
- nv_procfs_read_registry,
- nv_procfs_write_registry,
- &nv_procfs_registry_fops, nv);
+ entry = proc_create_data("registry", NV_PROC_RW, proc_nvidia_gpu, &nv_procfs_registry_fops, nv);
if (!entry)
goto failed;
}
@@ -587,7 +589,7 @@
return 0;
#if defined(CONFIG_PROC_FS)
failed:
- nv_procfs_unregister_all(proc_nvidia);
+ remove_proc_subtree("driver/nvidia", NULL);
return -1;
#endif
}
@@ -595,6 +597,6 @@
void nv_unregister_procfs(void)
{
#if defined(CONFIG_PROC_FS)
- nv_procfs_unregister_all(proc_nvidia);
+ remove_proc_subtree("driver/nvidia", NULL);
#endif
}
Index: nvidia-kmod.spec
===================================================================
RCS file: /cvs/nonfree/rpms/nvidia-kmod/F-18/nvidia-kmod.spec,v
retrieving revision 1.156
retrieving revision 1.157
diff -u -r1.156 -r1.157
--- nvidia-kmod.spec 2 Aug 2013 23:20:37 -0000 1.156
+++ nvidia-kmod.spec 3 Aug 2013 15:52:20 -0000 1.157
@@ -3,13 +3,13 @@
# "buildforkernels newest" macro for just that build; immediately after
# queuing that build enable the macro again for subsequent builds; that way
# a new akmod package will only get build when a new one is actually needed
-%global buildforkernels newest
+#global buildforkernels newest
Name: nvidia-kmod
Epoch: 1
Version: 319.32
# Taken over by kmodtool
-Release: 1%{?dist}.1
+Release: 2%{?dist}
Summary: NVIDIA display driver kernel module
Group: System Environment/Kernel
License: Redistributable, no modification permitted
@@ -21,6 +21,7 @@
Source0: nvidia-kmod-data-%{version}.tar.xz
Source11: nvidia-kmodtool-excludekernel-filterfile
+Patch0: 3.10_kernel.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -47,7 +48,7 @@
for arch in x86_64 i686 armv7hl
do
pushd nvidiapkg-${arch}
-echo "Nothing to patch"
+%patch0 -p1
popd
done
@@ -77,6 +78,9 @@
%changelog
+* Fri Jul 26 2013 Leigh Scott <leigh123linux(a)googlemail.com> - 1:319.32-2
+- patch for 3.10 kernel
+
* Sat Aug 03 2013 Nicolas Chauvet <kwizart(a)gmail.com> - 1:319.32-1.1
- Rebuilt for kernel
11 years, 3 months
rpms/catalyst-kmod/F-18 catalyst-kmod.spec, 1.62, 1.63 sources, 1.11, 1.12
by Leigh Scott
Author: leigh123linux
Update of /cvs/nonfree/rpms/catalyst-kmod/F-18
In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv10390
Modified Files:
catalyst-kmod.spec sources
Log Message:
* Sat Aug 03 2013 Leigh Scott <leigh123linux(a)googlemail.com> - 13.8-0.1.beta1
- Update to Catalyst 13.8beta1 (internal version 13.20.5)
Index: catalyst-kmod.spec
===================================================================
RCS file: /cvs/nonfree/rpms/catalyst-kmod/F-18/catalyst-kmod.spec,v
retrieving revision 1.62
retrieving revision 1.63
diff -u -r1.62 -r1.63
--- catalyst-kmod.spec 2 Aug 2013 23:19:42 -0000 1.62
+++ catalyst-kmod.spec 3 Aug 2013 12:31:01 -0000 1.63
@@ -3,7 +3,7 @@
# "buildforkernels newest" macro for just that build; immediately after
# queuing that build enable the macro again for subsequent builds; that way
# a new akmod package will only get build when a new one is actually needed
-%global buildforkernels newest
+%global buildforkernels current
# Tweak to have debuginfo - part 1/2
%if 0%{?fedora} > 7
@@ -12,8 +12,8 @@
%endif
Name: catalyst-kmod
-Version: 13.4
-Release: 2%{?dist}.9
+Version: 13.8
+Release: 0.1.beta1%{?dist}
# Taken over by kmodtool
Summary: AMD display driver kernel module
Group: System Environment/Kernel
@@ -97,6 +97,9 @@
%changelog
+* Sat Aug 03 2013 Leigh Scott <leigh123linux(a)googlemail.com> - 13.8-0.1.beta1
+- Update to Catalyst 13.8beta1 (internal version 13.20.5)
+
* Sat Aug 03 2013 Nicolas Chauvet <kwizart(a)gmail.com> - 13.4-2.9
- Rebuilt for kernel
Index: sources
===================================================================
RCS file: /cvs/nonfree/rpms/catalyst-kmod/F-18/sources,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- sources 11 May 2013 10:22:28 -0000 1.11
+++ sources 3 Aug 2013 12:31:02 -0000 1.12
@@ -1 +1 @@
-e806cfacc7d2f562518d5cbe8b7fa50f catalyst-kmod-data-13.4.tar.bz2
+c825603d6b0adeca862804fdd5093fb4 catalyst-kmod-data-13.8.tar.bz2
11 years, 3 months
rpms/xorg-x11-drv-catalyst/F-18 sources, 1.11, 1.12 xorg-x11-drv-catalyst.spec, 1.13, 1.14
by Leigh Scott
Author: leigh123linux
Update of /cvs/nonfree/rpms/xorg-x11-drv-catalyst/F-18
In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv10194
Modified Files:
sources xorg-x11-drv-catalyst.spec
Log Message:
* Sat Aug 03 2013 Leigh Scott <leigh123linux(a)googlemail.com> - 13.8-0.1.beta1
- Update to Catalyst 13.8beta1 (internal version 13.20.5)
Index: sources
===================================================================
RCS file: /cvs/nonfree/rpms/xorg-x11-drv-catalyst/F-18/sources,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- sources 11 May 2013 10:23:35 -0000 1.11
+++ sources 3 Aug 2013 12:29:34 -0000 1.12
@@ -1,2 +1,2 @@
b8f56bc55aa70cb19dd12857fdc184cc xvba-sdk-0.74-404001.tar.gz
-558bd1b31173b06b25da647a7112e734 amd-catalyst-13.4-linux-x86.x86_64.zip
+87fc4a1d842856f4eb28cdff6b602466 amd-catalyst-13.8-beta1-linux-x86.x86_64.zip
Index: xorg-x11-drv-catalyst.spec
===================================================================
RCS file: /cvs/nonfree/rpms/xorg-x11-drv-catalyst/F-18/xorg-x11-drv-catalyst.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- xorg-x11-drv-catalyst.spec 11 May 2013 10:23:35 -0000 1.13
+++ xorg-x11-drv-catalyst.spec 3 Aug 2013 12:29:34 -0000 1.14
@@ -1,16 +1,16 @@
%global atilibdir %{_libdir}/catalyst
-%global amdrun amd-catalyst-13.4-linux-x86.x86_64.run
+%global amdrun amd-catalyst-13.8-beta1-linux-x86.x86_64.run
%global debug_package %{nil}
%global __strip /bin/true
Name: xorg-x11-drv-catalyst
-Version: 13.4
-Release: 1%{?dist}
+Version: 13.8
+Release: 0.1.beta1%{?dist}
Summary: AMD's proprietary driver for ATI graphic cards
Group: User Interface/X Hardware Support
License: Redistributable, no modification permitted
URL: http://www.ati.com/support/drivers/linux/radeon-linux.html
-Source0: http://www2.ati.com/drivers/linux/amd-catalyst-13.4-linux-x86.x86_64.zip
+Source0: http://www2.ati.com/drivers/beta/amd-catalyst-13.8-beta1-linux-x86.x86_64...
Source1: http://developer.amd.com/downloads/xvba-sdk-0.74-404001.tar.gz
Source2: catalyst-README.Fedora
Source3: amdcccle.desktop
@@ -352,6 +352,8 @@
%config %{_sysconfdir}/X11/xorg.conf.d/*catalyst*.conf
%{_sysconfdir}/ati/atiogl.xml
%{_sysconfdir}/ati/atiapfxx.blb
+%{_sysconfdir}/ati/atiapfxx
+%{_sysconfdir}/ati/atiapfxx.log
%{_sysconfdir}/ati/logo.xbm.example
%{_sysconfdir}/ati/logo_mask.xbm.example
%{_sysconfdir}/ati/amdpcsdb.default
@@ -403,6 +405,9 @@
%changelog
+* Sat Aug 03 2013 Leigh Scott <leigh123linux(a)googlemail.com> - 13.8-0.1.beta1
+- Update to Catalyst 13.8beta1 (internal version 13.20.5)
+
* Sat May 11 2013 Leigh Scott <leigh123linux(a)googlemail.com> - 13.4-1
- Update to Catalyst 13.4 (internal version 12.104)
11 years, 3 months
rpms/xorg-x11-drv-catalyst/F-19 .cvsignore, 1.6, 1.7 sources, 1.6, 1.7 xorg-x11-drv-catalyst.spec, 1.8, 1.9
by Leigh Scott
Author: leigh123linux
Update of /cvs/nonfree/rpms/xorg-x11-drv-catalyst/F-19
In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv9656
Modified Files:
.cvsignore sources xorg-x11-drv-catalyst.spec
Log Message:
* Sat Aug 03 2013 Leigh Scott <leigh123linux(a)googlemail.com> - 13.8-0.1.beta1
- Update to Catalyst 13.8beta1 (internal version 13.20.5)
Index: .cvsignore
===================================================================
RCS file: /cvs/nonfree/rpms/xorg-x11-drv-catalyst/F-19/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- .cvsignore 29 May 2013 14:11:21 -0000 1.6
+++ .cvsignore 3 Aug 2013 12:17:19 -0000 1.7
@@ -1,3 +1,4 @@
xvba-sdk-0.74-404001.tar.gz
ati-driver-installer-11-11-x86.x86_64.run
amd-driver-installer-catalyst-13-6-beta-x86.x86_64.zip
+amd-catalyst-13.8-beta1-linux-x86.x86_64.zip
Index: sources
===================================================================
RCS file: /cvs/nonfree/rpms/xorg-x11-drv-catalyst/F-19/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- sources 29 May 2013 14:11:21 -0000 1.6
+++ sources 3 Aug 2013 12:17:19 -0000 1.7
@@ -1,2 +1,2 @@
b8f56bc55aa70cb19dd12857fdc184cc xvba-sdk-0.74-404001.tar.gz
-5ee72801e7e219fff0ef21ffc39301b4 amd-driver-installer-catalyst-13-6-beta-x86.x86_64.zip
+87fc4a1d842856f4eb28cdff6b602466 amd-catalyst-13.8-beta1-linux-x86.x86_64.zip
Index: xorg-x11-drv-catalyst.spec
===================================================================
RCS file: /cvs/nonfree/rpms/xorg-x11-drv-catalyst/F-19/xorg-x11-drv-catalyst.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- xorg-x11-drv-catalyst.spec 29 May 2013 14:20:12 -0000 1.8
+++ xorg-x11-drv-catalyst.spec 3 Aug 2013 12:17:19 -0000 1.9
@@ -1,16 +1,16 @@
%global atilibdir %{_libdir}/catalyst
-%global amdrun amd-driver-installer-catalyst-13-6-beta-x86.x86_64.run
+%global amdrun amd-catalyst-13.8-beta1-linux-x86.x86_64.run
%global debug_package %{nil}
%global __strip /bin/true
Name: xorg-x11-drv-catalyst
-Version: 13.6
-Release: 0.1.beta%{?dist}
+Version: 13.8
+Release: 0.1.beta1%{?dist}
Summary: AMD's proprietary driver for ATI graphic cards
Group: User Interface/X Hardware Support
License: Redistributable, no modification permitted
URL: http://www.ati.com/support/drivers/linux/radeon-linux.html
-Source0: http://www2.ati.com/drivers/beta/amd-driver-installer-catalyst-13-6-beta-...
+Source0: http://www2.ati.com/drivers/beta/amd-catalyst-13.8-beta1-linux-x86.x86_64...
Source1: http://developer.amd.com/downloads/xvba-sdk-0.74-404001.tar.gz
Source2: catalyst-README.Fedora
Source3: amdcccle.desktop
@@ -405,6 +405,9 @@
%changelog
+* Sat Aug 03 2013 Leigh Scott <leigh123linux(a)googlemail.com> - 13.8-0.1.beta1
+- Update to Catalyst 13.8beta1 (internal version 13.20.5)
+
* Wed May 29 2013 Leigh Scott <leigh123linux(a)googlemail.com> - 13.6-0.1.beta
- Update to Catalyst 13.6beta (internal version 13.101)
11 years, 3 months
rpms/catalyst-kmod/F-19 .cvsignore, 1.7, 1.8 catalyst-kmod.spec, 1.30, 1.31 sources, 1.7, 1.8
by Leigh Scott
Author: leigh123linux
Update of /cvs/nonfree/rpms/catalyst-kmod/F-19
In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv8313
Modified Files:
.cvsignore catalyst-kmod.spec sources
Log Message:
* Sat Aug 03 2013 Leigh Scott <leigh123linux(a)googlemail.com> - 13.8-0.1.beta1
- Update to Catalyst 13.8beta1 (internal version 13.20.5)
* Wed May 29 2013 Leigh Scott <leigh123linux(a)googlemail.com> - 13.6-0.1.beta
- Update to Catalyst 13.6beta (internal version 13.101)
Index: .cvsignore
===================================================================
RCS file: /cvs/nonfree/rpms/catalyst-kmod/F-19/.cvsignore,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- .cvsignore 29 May 2013 14:30:45 -0000 1.7
+++ .cvsignore 3 Aug 2013 11:54:19 -0000 1.8
@@ -1 +1 @@
-catalyst-kmod-data-13.6.tar.bz2
+catalyst-kmod-data-13.8.tar.bz2
Index: catalyst-kmod.spec
===================================================================
RCS file: /cvs/nonfree/rpms/catalyst-kmod/F-19/catalyst-kmod.spec,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -r1.30 -r1.31
--- catalyst-kmod.spec 30 Jul 2013 15:57:59 -0000 1.30
+++ catalyst-kmod.spec 3 Aug 2013 11:54:19 -0000 1.31
@@ -3,7 +3,7 @@
# "buildforkernels newest" macro for just that build; immediately after
# queuing that build enable the macro again for subsequent builds; that way
# a new akmod package will only get build when a new one is actually needed
-%global buildforkernels newest
+%global buildforkernels current
# Tweak to have debuginfo - part 1/2
%if 0%{?fedora} > 7
@@ -12,8 +12,8 @@
%endif
Name: catalyst-kmod
-Version: 13.6
-Release: 0.1.beta%{?dist}.9
+Version: 13.8
+Release: 0.1.beta1%{?dist}
# Taken over by kmodtool
Summary: AMD display driver kernel module
Group: System Environment/Kernel
@@ -97,6 +97,9 @@
%changelog
+* Sat Aug 03 2013 Leigh Scott <leigh123linux(a)googlemail.com> - 13.8-0.1.beta1
+- Update to Catalyst 13.8beta1 (internal version 13.20.5)
+
* Tue Jul 30 2013 Nicolas Chauvet <kwizart(a)gmail.com> - 13.6-0.1.beta.9
- Rebuilt for kernel
Index: sources
===================================================================
RCS file: /cvs/nonfree/rpms/catalyst-kmod/F-19/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- sources 29 May 2013 14:30:45 -0000 1.7
+++ sources 3 Aug 2013 11:54:19 -0000 1.8
@@ -1 +1 @@
-060649ce0b71257042be3f96187a6e5d catalyst-kmod-data-13.6.tar.bz2
+c825603d6b0adeca862804fdd5093fb4 catalyst-kmod-data-13.8.tar.bz2
11 years, 3 months
rpms/wl-kmod/F-18 wl-kmod.spec,1.109,1.110
by Nicolas Chauvet
Author: kwizart
Update of /cvs/nonfree/rpms/wl-kmod/F-18
In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv19579
Modified Files:
wl-kmod.spec
Log Message:
* Sat Aug 03 2013 Nicolas Chauvet <kwizart(a)gmail.com> - 5.100.82.112-10.9
- Rebuilt for kernel
Index: wl-kmod.spec
===================================================================
RCS file: /cvs/nonfree/rpms/wl-kmod/F-18/wl-kmod.spec,v
retrieving revision 1.109
retrieving revision 1.110
diff -u -r1.109 -r1.110
--- wl-kmod.spec 23 Jul 2013 08:18:31 -0000 1.109
+++ wl-kmod.spec 2 Aug 2013 23:20:50 -0000 1.110
@@ -7,7 +7,7 @@
Name: wl-kmod
Version: 5.100.82.112
-Release: 10%{?dist}.8
+Release: 10%{?dist}.9
Summary: Kernel module for Broadcom wireless devices
Group: System Environment/Kernel
License: Redistributable, no modification permitted
@@ -101,6 +101,9 @@
rm -rf $RPM_BUILD_ROOT
%changelog
+* Sat Aug 03 2013 Nicolas Chauvet <kwizart(a)gmail.com> - 5.100.82.112-10.9
+- Rebuilt for kernel
+
* Tue Jul 23 2013 Nicolas Chauvet <kwizart(a)gmail.com> - 5.100.82.112-10.8
- Rebuilt for kernel
11 years, 3 months
rpms/nvidia-kmod/F-18 nvidia-kmod.spec,1.155,1.156
by Nicolas Chauvet
Author: kwizart
Update of /cvs/nonfree/rpms/nvidia-kmod/F-18
In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv19436
Modified Files:
nvidia-kmod.spec
Log Message:
* Sat Aug 03 2013 Nicolas Chauvet <kwizart(a)gmail.com> - 1:319.32-1.1
- Rebuilt for kernel
Index: nvidia-kmod.spec
===================================================================
RCS file: /cvs/nonfree/rpms/nvidia-kmod/F-18/nvidia-kmod.spec,v
retrieving revision 1.155
retrieving revision 1.156
diff -u -r1.155 -r1.156
--- nvidia-kmod.spec 24 Jul 2013 10:34:49 -0000 1.155
+++ nvidia-kmod.spec 2 Aug 2013 23:20:37 -0000 1.156
@@ -3,13 +3,13 @@
# "buildforkernels newest" macro for just that build; immediately after
# queuing that build enable the macro again for subsequent builds; that way
# a new akmod package will only get build when a new one is actually needed
-#global buildforkernels newest
+%global buildforkernels newest
Name: nvidia-kmod
Epoch: 1
Version: 319.32
# Taken over by kmodtool
-Release: 1%{?dist}
+Release: 1%{?dist}.1
Summary: NVIDIA display driver kernel module
Group: System Environment/Kernel
License: Redistributable, no modification permitted
@@ -77,6 +77,9 @@
%changelog
+* Sat Aug 03 2013 Nicolas Chauvet <kwizart(a)gmail.com> - 1:319.32-1.1
+- Rebuilt for kernel
+
* Sat Jul 13 2013 Nicolas Chauvet <kwizart(a)gmail.com> - 1:319.32-1
- Update to 319.32
- Add support for armv7hl
11 years, 3 months
rpms/nvidia-304xx-kmod/F-18 nvidia-304xx-kmod.spec,1.7,1.8
by Nicolas Chauvet
Author: kwizart
Update of /cvs/nonfree/rpms/nvidia-304xx-kmod/F-18
In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv19277
Modified Files:
nvidia-304xx-kmod.spec
Log Message:
* Sat Aug 03 2013 Nicolas Chauvet <kwizart(a)gmail.com> - 304.88-1.7
- Rebuilt for kernel
Index: nvidia-304xx-kmod.spec
===================================================================
RCS file: /cvs/nonfree/rpms/nvidia-304xx-kmod/F-18/nvidia-304xx-kmod.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- nvidia-304xx-kmod.spec 23 Jul 2013 08:18:04 -0000 1.7
+++ nvidia-304xx-kmod.spec 2 Aug 2013 23:20:25 -0000 1.8
@@ -8,7 +8,7 @@
Name: nvidia-304xx-kmod
Version: 304.88
# Taken over by kmodtool
-Release: 1%{?dist}.6
+Release: 1%{?dist}.7
Summary: NVIDIA display driver kernel module
Group: System Environment/Kernel
License: Redistributable, no modification permitted
@@ -80,6 +80,9 @@
%changelog
+* Sat Aug 03 2013 Nicolas Chauvet <kwizart(a)gmail.com> - 304.88-1.7
+- Rebuilt for kernel
+
* Tue Jul 23 2013 Nicolas Chauvet <kwizart(a)gmail.com> - 304.88-1.6
- Rebuilt for kernel
11 years, 3 months