Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit c2dc1ad5 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'drm-patches' of ssh://master.kernel.org/pub/scm/linux/kernel/git/airlied/drm-2.6 

* 'drm-patches' of ssh://master.kernel.org/pub/scm/linux/kernel/git/airlied/drm-2.6:
  drm: remove core typedefs from the ioc32 wrappers
  drm: remove sarea typedefs
  drm: detypedef the hashtab and more of sman
  drm: de-typedef sman
  drm: detypedeffing continues...
  drm: detypef waitlist/freelist/buf_entry/device_dma/drm_queue structs
  drm: drop drm_vma_entry_t, drm_magic_entry_t
  drm: drop drm_buf_t typedef
  drm: fixup other drivers for typedef removals
  drm: remove drm_file_t, drm_device_t and drm_head_t typedefs
  drm: remove a bunch of typedefs on the userspace interface
  r300: updates register header
  radeon: add support for vblank on crtc2
  drm: cleanup list initialisation
  drm: fix typo on code drm getsarea
  drm: remove DRM_GETSAREA and replace with drm_getsarea function
  drm: cleanup use of Linux list handling macros
parents 5b37696f ff4135ae

drivers/char/drm/ati_pcigart.c

+4 −4
Original line number Diff line number Diff line
@@ -73,9 +73,9 @@ static void drm_ati_free_pcigart_table(void *address, int order) 
	free_pages((unsigned long)address, order);

}



int drm_ati_pcigart_cleanup(drm_device_t *dev, drm_ati_pcigart_info *gart_info)

int drm_ati_pcigart_cleanup(struct drm_device *dev, struct drm_ati_pcigart_info *gart_info)

{

	drm_sg_mem_t *entry = dev->sg;

	struct drm_sg_mem *entry = dev->sg;

	unsigned long pages;

	int i;

	int order;
@@ -122,9 +122,9 @@ int drm_ati_pcigart_cleanup(drm_device_t *dev, drm_ati_pcigart_info *gart_info) 
}

EXPORT_SYMBOL(drm_ati_pcigart_cleanup);



int drm_ati_pcigart_init(drm_device_t *dev, drm_ati_pcigart_info *gart_info)

int drm_ati_pcigart_init(struct drm_device *dev, struct drm_ati_pcigart_info *gart_info)

{

	drm_sg_mem_t *entry = dev->sg;

	struct drm_sg_mem *entry = dev->sg;

	void *address = NULL;

	unsigned long pages;

	u32 *pci_gart, page_base, bus_address = 0;

drivers/char/drm/drm.h

+187 −142

File changed.

Preview size limit exceeded, changes collapsed.

drivers/char/drm/drmP.h

+170 −179

File changed.

Preview size limit exceeded, changes collapsed.

drivers/char/drm/drm_agpsupport.c

+54 −62

File changed.

Preview size limit exceeded, changes collapsed.

drivers/char/drm/drm_auth.c

+20 −20
Original line number Diff line number Diff line
@@ -45,15 +45,15 @@ 
 * the one with matching magic number, while holding the drm_device::struct_mutex

 * lock.

 */

static drm_file_t *drm_find_file(drm_device_t * dev, drm_magic_t magic)

static struct drm_file *drm_find_file(struct drm_device * dev, drm_magic_t magic)

{

	drm_file_t *retval = NULL;

	drm_magic_entry_t *pt;

	drm_hash_item_t *hash;

	struct drm_file *retval = NULL;

	struct drm_magic_entry *pt;

	struct drm_hash_item *hash;



	mutex_lock(&dev->struct_mutex);

	if (!drm_ht_find_item(&dev->magiclist, (unsigned long)magic, &hash)) {

		pt = drm_hash_entry(hash, drm_magic_entry_t, hash_item);

		pt = drm_hash_entry(hash, struct drm_magic_entry, hash_item);

		retval = pt->priv;

	}

	mutex_unlock(&dev->struct_mutex);
@@ -71,10 +71,10 @@ static drm_file_t *drm_find_file(drm_device_t * dev, drm_magic_t magic) 
 * associated the magic number hash key in drm_device::magiclist, while holding

 * the drm_device::struct_mutex lock.

 */

static int drm_add_magic(drm_device_t * dev, drm_file_t * priv,

static int drm_add_magic(struct drm_device * dev, struct drm_file * priv,

			 drm_magic_t magic)

{

	drm_magic_entry_t *entry;

	struct drm_magic_entry *entry;



	DRM_DEBUG("%d\n", magic);
@@ -102,10 +102,10 @@ static int drm_add_magic(drm_device_t * dev, drm_file_t * priv, 
 * Searches and unlinks the entry in drm_device::magiclist with the magic

 * number hash key, while holding the drm_device::struct_mutex lock.

 */

static int drm_remove_magic(drm_device_t * dev, drm_magic_t magic)

static int drm_remove_magic(struct drm_device * dev, drm_magic_t magic)

{

	drm_magic_entry_t *pt;

	drm_hash_item_t *hash;

	struct drm_magic_entry *pt;

	struct drm_hash_item *hash;



	DRM_DEBUG("%d\n", magic);
@@ -114,7 +114,7 @@ static int drm_remove_magic(drm_device_t * dev, drm_magic_t magic) 
		mutex_unlock(&dev->struct_mutex);

		return -EINVAL;

	}

	pt = drm_hash_entry(hash, drm_magic_entry_t, hash_item);

	pt = drm_hash_entry(hash, struct drm_magic_entry, hash_item);

	drm_ht_remove_item(&dev->magiclist, hash);

	list_del(&pt->head);

	mutex_unlock(&dev->struct_mutex);
@@ -142,9 +142,9 @@ int drm_getmagic(struct inode *inode, struct file *filp, 
{

	static drm_magic_t sequence = 0;

	static DEFINE_SPINLOCK(lock);

	drm_file_t *priv = filp->private_data;

	drm_device_t *dev = priv->head->dev;

	drm_auth_t auth;

	struct drm_file *priv = filp->private_data;

	struct drm_device *dev = priv->head->dev;

	struct drm_auth auth;



	/* Find unique magic */

	if (priv->magic) {
@@ -162,7 +162,7 @@ int drm_getmagic(struct inode *inode, struct file *filp, 
	}



	DRM_DEBUG("%u\n", auth.magic);

	if (copy_to_user((drm_auth_t __user *) arg, &auth, sizeof(auth)))

	if (copy_to_user((struct drm_auth __user *) arg, &auth, sizeof(auth)))

		return -EFAULT;

	return 0;

}
@@ -181,12 +181,12 @@ int drm_getmagic(struct inode *inode, struct file *filp, 
int drm_authmagic(struct inode *inode, struct file *filp,

		  unsigned int cmd, unsigned long arg)

{

	drm_file_t *priv = filp->private_data;

	drm_device_t *dev = priv->head->dev;

	drm_auth_t auth;

	drm_file_t *file;

	struct drm_file *priv = filp->private_data;

	struct drm_device *dev = priv->head->dev;

	struct drm_auth auth;

	struct drm_file *file;



	if (copy_from_user(&auth, (drm_auth_t __user *) arg, sizeof(auth)))

	if (copy_from_user(&auth, (struct drm_auth __user *) arg, sizeof(auth)))

		return -EFAULT;

	DRM_DEBUG("%u\n", auth.magic);

	if ((file = drm_find_file(dev, auth.magic))) {