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

Commit 33bc227e authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

parents 569cfaad 7655f493

drivers/char/drm/drm_memory.c

+1 −1
Original line number Diff line number Diff line
@@ -95,7 +95,7 @@ unsigned long drm_alloc_pages(int order, int area) 
	unsigned long addr;

	unsigned int sz;



	address = __get_free_pages(GFP_KERNEL, order);

	address = __get_free_pages(GFP_KERNEL|__GFP_COMP, order);

	if (!address)

		return 0;

drivers/char/drm/drm_memory_debug.h

+1 −1
Original line number Diff line number Diff line
@@ -221,7 +221,7 @@ unsigned long DRM(alloc_pages) (int order, int area) { 
	}

	spin_unlock(&DRM(mem_lock));



	address = __get_free_pages(GFP_KERNEL, order);

	address = __get_free_pages(GFP_KERNEL|__GFP_COMP, order);

	if (!address) {

		spin_lock(&DRM(mem_lock));

		++DRM(mem_stats)[area].fail_count;

drivers/char/drm/mga_drv.c

+1 −1
Original line number Diff line number Diff line
@@ -161,7 +161,7 @@ static int mga_driver_device_is_agp(drm_device_t * dev) 
	 * device.

	 */



	if ((pdev->device == 0x0525)

	if ((pdev->device == 0x0525) && pdev->bus->self

	    && (pdev->bus->self->vendor == 0x3388)

	    && (pdev->bus->self->device == 0x0021)) {

		return 0;

drivers/char/drm/radeon_drv.h

+1 −2
Original line number Diff line number Diff line
@@ -214,8 +214,6 @@ typedef struct drm_radeon_private { 


	int microcode_version;



	int is_pci;



	struct {

		u32 boxes;

		int freelist_timeouts;
@@ -275,6 +273,7 @@ typedef struct drm_radeon_private { 


	/* starting from here on, data is preserved accross an open */

	uint32_t flags;		/* see radeon_chip_flags */

	int is_pci;

} drm_radeon_private_t;



typedef struct drm_radeon_buf_priv {