From 74f063fc9d445f263242063e7acab1864ff75205 Mon Sep 17 00:00:00 2001 From: Jon Smirl Date: Fri, 24 Sep 2004 03:12:17 +0000 Subject: Create new linux-2.6 build. Move all gpl files into the 2.6 build. If you edit files for 2.6 be sure and break the link to the 2.4 directory and copy the cvs history. --- linux/Makefile | 2 +- linux/Makefile.kernel | 2 +- linux/drm_core.h | 1 - linux/drm_sysfs.h | 206 -------------------------------------------------- linux/radeon_gpl.h | 29 ------- linux/radeon_i2c.c | 157 -------------------------------------- 6 files changed, 2 insertions(+), 395 deletions(-) delete mode 100644 linux/drm_sysfs.h delete mode 100644 linux/radeon_gpl.h delete mode 100644 linux/radeon_i2c.c (limited to 'linux') diff --git a/linux/Makefile b/linux/Makefile index b338f7db..41339420 100644 --- a/linux/Makefile +++ b/linux/Makefile @@ -70,7 +70,7 @@ DRM_MODULES ?= $(MODULE_LIST) DRMTEMPLATES = drm_auth.h drm_bufs.h drm_context.h drm_dma.h drm_drawable.h \ drm_drv.h drm_fops.h drm_init.h drm_ioctl.h drm_irq.h \ drm_lock.h drm_memory.h drm_proc.h drm_stub.h drm_vm.h \ - drm_sysfs.h drm_core.h + drm_core.h DRMSHARED = drm.h drm_sarea.h DRMHEADERS = drmP.h $(DRMSHARED) diff --git a/linux/Makefile.kernel b/linux/Makefile.kernel index 5ff3d399..92e3f73e 100644 --- a/linux/Makefile.kernel +++ b/linux/Makefile.kernel @@ -13,7 +13,7 @@ mga-objs := mga_drv.o mga_dma.o mga_state.o mga_warp.o mga_irq.o i810-objs := i810_drv.o i810_dma.o i830-objs := i830_drv.o i830_dma.o i830_irq.o i915-objs := i915_drv.o i915_dma.o i915_irq.o i915_mem.o -radeon-objs := radeon_drv.o radeon_cp.o radeon_state.o radeon_mem.o radeon_irq.o radeon_i2c.o +radeon-objs := radeon_drv.o radeon_cp.o radeon_state.o radeon_mem.o radeon_irq.o sis-objs := sis_drv.o sis_ds.o sis_mm.o ffb-objs := ffb_drv.o ffb_context.o savage-objs := savage_drv.o savage_dma.o diff --git a/linux/drm_core.h b/linux/drm_core.h index 4e27d90a..adaf581b 100644 --- a/linux/drm_core.h +++ b/linux/drm_core.h @@ -39,6 +39,5 @@ #include "drm_pci.h" #include "drm_proc.h" #include "drm_vm.h" -#include "drm_sysfs.h" #include "drm_stub.h" #include "drm_scatter.h" diff --git a/linux/drm_sysfs.h b/linux/drm_sysfs.h deleted file mode 100644 index c6f6a7a9..00000000 --- a/linux/drm_sysfs.h +++ /dev/null @@ -1,206 +0,0 @@ -#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,0) -/* - * drm_sysfs.c - Modifications to drm_sysfs_class.c to support - * extra sysfs attribute from DRM. Normal drm_sysfs_class - * does not allow adding attributes. - * - * Copyright (c) 2004 Jon Smirl - * Copyright (c) 2003-2004 Greg Kroah-Hartman - * Copyright (c) 2003-2004 IBM Corp. - * - * This file is released under the GPLv2 - * - */ - -#include -#include -#include -#include - -struct drm_sysfs_class { - struct class_device_attribute attr; - struct class class; -}; -#define to_drm_sysfs_class(d) container_of(d, struct drm_sysfs_class, class) - -struct simple_dev { - struct list_head node; - dev_t dev; - struct class_device class_dev; -}; -#define to_simple_dev(d) container_of(d, struct simple_dev, class_dev) - -static LIST_HEAD(simple_dev_list); -static spinlock_t simple_dev_list_lock = SPIN_LOCK_UNLOCKED; - -static void release_simple_dev(struct class_device *class_dev) -{ - struct simple_dev *s_dev = to_simple_dev(class_dev); - kfree(s_dev); -} - -static ssize_t show_dev(struct class_device *class_dev, char *buf) -{ - struct simple_dev *s_dev = to_simple_dev(class_dev); - return print_dev_t(buf, s_dev->dev); -} - -static void drm_sysfs_class_release(struct class *class) -{ - struct drm_sysfs_class *cs = to_drm_sysfs_class(class); - kfree(cs); -} - -/* Display the version of drm_core. This doesn't work right in current design */ -static ssize_t version_show(struct class *dev, char *buf) -{ - return sprintf(buf, "fixme for drm_core %s %d.%d.%d %s\n", DRIVER_NAME, DRIVER_MAJOR, - DRIVER_MINOR, DRIVER_PATCHLEVEL, DRIVER_DATE); -} -static CLASS_ATTR(version, S_IRUGO, version_show, NULL); - -/** - * DRM(sysfs_create) - create a struct drm_sysfs_class structure - * @owner: pointer to the module that is to "own" this struct drm_sysfs_class - * @name: pointer to a string for the name of this class. - * - * This is used to create a struct drm_sysfs_class pointer that can then be used - * in calls to DRM(sysfs_device_add)(). - * - * Note, the pointer created here is to be destroyed when finished by making a - * call to DRM(sysfs_destroy)(). - */ -struct drm_sysfs_class *DRM(sysfs_create)(struct module *owner, char *name) -{ - struct drm_sysfs_class *cs; - int retval; - - cs = kmalloc(sizeof(*cs), GFP_KERNEL); - if (!cs) { - retval = -ENOMEM; - goto error; - } - memset(cs, 0x00, sizeof(*cs)); - - cs->class.name = name; - cs->class.class_release = drm_sysfs_class_release; - cs->class.release = release_simple_dev; - - cs->attr.attr.name = "dev"; - cs->attr.attr.mode = S_IRUGO; - cs->attr.attr.owner = owner; - cs->attr.show = show_dev; - cs->attr.store = NULL; - - retval = class_register(&cs->class); - if (retval) - goto error; - class_create_file(&cs->class, &class_attr_version); - - return cs; - -error: - kfree(cs); - return ERR_PTR(retval); -} - -/** - * DRM(sysfs_destroy) - destroys a struct drm_sysfs_class structure - * @cs: pointer to the struct drm_sysfs_class that is to be destroyed - * - * Note, the pointer to be destroyed must have been created with a call to - * DRM(sysfs_create)(). - */ -void DRM(sysfs_destroy)(struct drm_sysfs_class *cs) -{ - if ((cs == NULL) || (IS_ERR(cs))) - return; - - class_unregister(&cs->class); -} - -/** - * DRM(sysfs_device_add) - adds a class device to sysfs for a character driver - * @cs: pointer to the struct drm_sysfs_class that this device should be registered to. - * @dev: the dev_t for the device to be added. - * @device: a pointer to a struct device that is assiociated with this class device. - * @fmt: string for the class device's name - * - * A struct class_device will be created in sysfs, registered to the specified - * class. A "dev" file will be created, showing the dev_t for the device. The - * pointer to the struct class_device will be returned from the call. Any further - * sysfs files that might be required can be created using this pointer. - * Note: the struct drm_sysfs_class passed to this function must have previously been - * created with a call to DRM(sysfs_create)(). - */ -struct class_device *DRM(sysfs_device_add)(struct drm_sysfs_class *cs, dev_t dev, struct device *device, const char *fmt, ...) -{ - va_list args; - struct simple_dev *s_dev = NULL; - int retval; - - if ((cs == NULL) || (IS_ERR(cs))) { - retval = -ENODEV; - goto error; - } - - s_dev = kmalloc(sizeof(*s_dev), GFP_KERNEL); - if (!s_dev) { - retval = -ENOMEM; - goto error; - } - memset(s_dev, 0x00, sizeof(*s_dev)); - - s_dev->dev = dev; - s_dev->class_dev.dev = device; - s_dev->class_dev.class = &cs->class; - - va_start(args, fmt); - vsnprintf(s_dev->class_dev.class_id, BUS_ID_SIZE, fmt, args); - va_end(args); - retval = class_device_register(&s_dev->class_dev); - if (retval) - goto error; - - class_device_create_file(&s_dev->class_dev, &cs->attr); - - spin_lock(&simple_dev_list_lock); - list_add(&s_dev->node, &simple_dev_list); - spin_unlock(&simple_dev_list_lock); - - return &s_dev->class_dev; - -error: - kfree(s_dev); - return ERR_PTR(retval); -} - -/** - * DRM(sysfs_device_remove) - removes a class device that was created with DRM(sysfs_device_add)() - * @dev: the dev_t of the device that was previously registered. - * - * This call unregisters and cleans up a class device that was created with a - * call to DRM(sysfs_device_add)() - */ -void DRM(sysfs_device_remove)(dev_t dev) -{ - struct simple_dev *s_dev = NULL; - int found = 0; - - spin_lock(&simple_dev_list_lock); - list_for_each_entry(s_dev, &simple_dev_list, node) { - if (s_dev->dev == dev) { - found = 1; - break; - } - } - if (found) { - list_del(&s_dev->node); - spin_unlock(&simple_dev_list_lock); - class_device_unregister(&s_dev->class_dev); - } else { - spin_unlock(&simple_dev_list_lock); - } -} - -#endif diff --git a/linux/radeon_gpl.h b/linux/radeon_gpl.h deleted file mode 100644 index e8c479a1..00000000 --- a/linux/radeon_gpl.h +++ /dev/null @@ -1,29 +0,0 @@ -/* - * linux/radeon_gpl.h - * - * Original author probably Benjamin Herrenschmidt - * or Kronos - * Based on Xfree sources - * (C) Copyright 2004 Jon Smirl - * - * This is a GPL licensed file from the Linux kernel, don't add it to the BSD build - * - * Radeon I2C support routines - * - */ - -#include -#include -#include - -struct radeon_i2c_chan { - drm_device_t *dev; - u32 ddc_reg; - struct i2c_adapter adapter; - struct i2c_algo_bit_data algo; -}; - -extern int radeon_create_i2c_busses(drm_device_t *dev); -extern void radeon_delete_i2c_busses(drm_device_t *dev); - - diff --git a/linux/radeon_i2c.c b/linux/radeon_i2c.c deleted file mode 100644 index e2591723..00000000 --- a/linux/radeon_i2c.c +++ /dev/null @@ -1,157 +0,0 @@ -/* - * linux/radeon_i2c.c - * - * Original author probably Benjamin Herrenschmidt - * or Kronos - * Based on Xfree sources - * (C) Copyright 2004 Jon Smirl - * - * This is a GPL licensed file from the Linux kernel, don't add it to the BSD build - * - * Radeon I2C support routines - * - */ - -#include -#include -#include -#include -#include -#include -#include -#include - -#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,0) - -#include -#include