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

Commit 950709a8 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

* 'drm-patches' of git://git.kernel.org/pub/scm/linux/kernel/git/airlied/drm-2.6:
  drm: possible cleanups
  drm: fixup r300 scratch on BE machines
parents 41bc3982 5d23fafb

drivers/char/drm/drmP.h

+0 −1
Original line number Original line Diff line number Diff line
@@ -889,7 +889,6 @@ extern int drm_lock_free(drm_device_t * dev, 
				/* Buffer management support (drm_bufs.h) */

				/* Buffer management support (drm_bufs.h) */

extern int drm_addbufs_agp(drm_device_t * dev, drm_buf_desc_t * request);

extern int drm_addbufs_agp(drm_device_t * dev, drm_buf_desc_t * request);

extern int drm_addbufs_pci(drm_device_t * dev, drm_buf_desc_t * request);

extern int drm_addbufs_pci(drm_device_t * dev, drm_buf_desc_t * request);

extern int drm_addbufs_fb(drm_device_t *dev, drm_buf_desc_t *request);

extern int drm_addmap(drm_device_t * dev, unsigned int offset,

extern int drm_addmap(drm_device_t * dev, unsigned int offset,

		      unsigned int size, drm_map_type_t type,

		      unsigned int size, drm_map_type_t type,

		      drm_map_flags_t flags, drm_local_map_t ** map_ptr);

		      drm_map_flags_t flags, drm_local_map_t ** map_ptr);

drivers/char/drm/drm_agpsupport.c

+0 −2
Original line number Original line Diff line number Diff line
@@ -503,8 +503,6 @@ int drm_agp_bind_memory(DRM_AGP_MEM * handle, off_t start) 
	return agp_bind_memory(handle, start);

	return agp_bind_memory(handle, start);

}

}





EXPORT_SYMBOL(drm_agp_bind_memory);



/** Calls agp_unbind_memory() */

/** Calls agp_unbind_memory() */

int drm_agp_unbind_memory(DRM_AGP_MEM * handle)

int drm_agp_unbind_memory(DRM_AGP_MEM * handle)

{

{

drivers/char/drm/drm_bufs.c

+1 −4
Original line number Original line Diff line number Diff line
@@ -386,7 +386,6 @@ int drm_rmmap_locked(drm_device_t *dev, drm_local_map_t *map) 




	return 0;

	return 0;

}

}

EXPORT_SYMBOL(drm_rmmap_locked);





int drm_rmmap(drm_device_t *dev, drm_local_map_t *map)

int drm_rmmap(drm_device_t *dev, drm_local_map_t *map)

{

{
@@ -398,7 +397,6 @@ int drm_rmmap(drm_device_t *dev, drm_local_map_t *map) 




	return ret;

	return ret;

}

}

EXPORT_SYMBOL(drm_rmmap);





/* The rmmap ioctl appears to be unnecessary.  All mappings are torn down on

/* The rmmap ioctl appears to be unnecessary.  All mappings are torn down on

 * the last close of the device, and this is necessary for cleanup when things

 * the last close of the device, and this is necessary for cleanup when things
@@ -1053,7 +1051,7 @@ static int drm_addbufs_sg(drm_device_t * dev, drm_buf_desc_t * request) 
	return 0;

	return 0;

}

}





int drm_addbufs_fb(drm_device_t * dev, drm_buf_desc_t * request)

static int drm_addbufs_fb(drm_device_t * dev, drm_buf_desc_t * request)

{

{

	drm_device_dma_t *dma = dev->dma;

	drm_device_dma_t *dma = dev->dma;

	drm_buf_entry_t *entry;

	drm_buf_entry_t *entry;
@@ -1212,7 +1210,6 @@ int drm_addbufs_fb(drm_device_t * dev, drm_buf_desc_t * request) 
	atomic_dec(&dev->buf_alloc);

	atomic_dec(&dev->buf_alloc);

	return 0;

	return 0;

}

}

EXPORT_SYMBOL(drm_addbufs_fb);









/**

/**

drivers/char/drm/drm_stub.c

+0 −2
Original line number Original line Diff line number Diff line
@@ -229,8 +229,6 @@ int drm_get_dev(struct pci_dev *pdev, const struct pci_device_id *ent, 
	return ret;

	return ret;

}

}





EXPORT_SYMBOL(drm_get_dev);



/**

/**

 * Put a device minor number.

 * Put a device minor number.

 *

 *

drivers/char/drm/r300_cmdbuf.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -723,7 +723,7 @@ static int r300_scratch(drm_radeon_private_t *dev_priv, 
	

	

	dev_priv->scratch_ages[header.scratch.reg]++;

	dev_priv->scratch_ages[header.scratch.reg]++;

	

	

	ref_age_base = *(u32 **)cmdbuf->buf;

	ref_age_base =  (u32 *)(unsigned long)*((uint64_t *)cmdbuf->buf);

	

	

	cmdbuf->buf += sizeof(u64);

	cmdbuf->buf += sizeof(u64);

	cmdbuf->bufsz -= sizeof(u64);

	cmdbuf->bufsz -= sizeof(u64);