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

Commit d31d2954 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: (22 commits)
  drm: add initial r500 drm support
  radeon: setup the ring buffer fetcher to be less agressive.
  drm: fixup some of the ioctl function exit paths
  drm: the drm really should call pci_set_master..
  i915: Add chipset id for Intel Integrated Graphics Device
  drm: cleanup DRM_DEBUG() parameters
  drm/i915: add support for E7221 chipset
  drm: don't cast a pointer to pointer of list_head
  mga_dma: return 'err' not just zero from mga_do_cleanup_dma()
  drm: add _DRM_DRIVER flag, and re-order unload.
  drm: enable udev node creation
  drm: Make DRM_IOCTL_GET_CLIENT return EINVAL when it can't find client #idx.
  drm: move drm_mem_init to proper place in startup sequence
  drm: call driver load function after initialising AGP
  drm: Fix ioc32 compat layer
  drm: fd.o bug #11895: Only add the AGP base to map offset if the caller didn't.
  i915: add suspend/resume support
  drm: update DRM sysfs support
  drm: Initialize the AGP structure's base address at init rather than enable.
  drm: move two function extern into the correct block
  ...
parents 7a8c6ad9 3d5e2c13

drivers/char/drm/Kconfig

+4 −5
Original line number Diff line number Diff line
@@ -105,4 +105,3 @@ config DRM_SAVAGE 
	help

	  Choose this option if you have a Savage3D/4/SuperSavage/Pro/Twister

	  chipset. If M is selected the module will be called savage.

drivers/char/drm/Makefile

+0 −2
Original line number Diff line number Diff line
@@ -38,5 +38,3 @@ obj-$(CONFIG_DRM_I915) += i915.o 
obj-$(CONFIG_DRM_SIS)   += sis.o

obj-$(CONFIG_DRM_SAVAGE)+= savage.o

obj-$(CONFIG_DRM_VIA)	+=via.o

drivers/char/drm/README.drm

+0 −1
Original line number Diff line number Diff line
@@ -41,4 +41,3 @@ For specific information about kernel-level support, see: 


    A Security Analysis of the Direct Rendering Infrastructure

    http://dri.sourceforge.net/doc/security_low_level.html

drivers/char/drm/ati_pcigart.c

+3 −3
Original line number Diff line number Diff line
@@ -41,7 +41,7 @@ static void *drm_ati_alloc_pcigart_table(int order) 
	struct page *page;

	int i;



	DRM_DEBUG("%s: alloc %d order\n", __FUNCTION__, order);

	DRM_DEBUG("%d order\n", order);



	address = __get_free_pages(GFP_KERNEL | __GFP_COMP,

				   order);
@@ -54,7 +54,7 @@ static void *drm_ati_alloc_pcigart_table(int order) 
	for (i = 0; i < order; i++, page++)

		SetPageReserved(page);



	DRM_DEBUG("%s: returning 0x%08lx\n", __FUNCTION__, address);

	DRM_DEBUG("returning 0x%08lx\n", address);

	return (void *)address;

}
@@ -63,7 +63,7 @@ static void drm_ati_free_pcigart_table(void *address, int order) 
	struct page *page;

	int i;

	int num_pages = 1 << order;

	DRM_DEBUG("%s\n", __FUNCTION__);

	DRM_DEBUG("\n");



	page = virt_to_page((unsigned long)address);

drivers/char/drm/drm.h

+2 −1
Original line number Diff line number Diff line
@@ -202,7 +202,8 @@ enum drm_map_flags { 
	_DRM_KERNEL = 0x08,	     /**< kernel requires access */

	_DRM_WRITE_COMBINING = 0x10, /**< use write-combining if available */

	_DRM_CONTAINS_LOCK = 0x20,   /**< SHM page that contains lock */

	_DRM_REMOVABLE = 0x40	     /**< Removable mapping */

	_DRM_REMOVABLE = 0x40,	     /**< Removable mapping */

	_DRM_DRIVER = 0x80	     /**< Managed by driver */

};



struct drm_ctx_priv_map {