openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

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

This commit is contained in:
Linus Torvalds 2005-11-23 23:10:47 -08:00
parent 569cfaadb0 7655f493b7
commit 33bc227e4e
4 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
drivers/char/drm/drm_memory.c
View File

@ -95,7 +95,7 @@ unsigned long drm_alloc_pages(int order, int area)
unsigned long addr; unsigned long addr;
unsigned int sz; unsigned int sz;
address = __get_free_pages(GFP_KERNEL, order); address = __get_free_pages(GFP_KERNEL|__GFP_COMP, order);
if (!address) if (!address)
return 0; return 0;

2
drivers/char/drm/drm_memory_debug.h
View File

@ -221,7 +221,7 @@ unsigned long DRM(alloc_pages) (int order, int area) {
} }
spin_unlock(&DRM(mem_lock)); spin_unlock(&DRM(mem_lock));
address = __get_free_pages(GFP_KERNEL, order); address = __get_free_pages(GFP_KERNEL|__GFP_COMP, order);
if (!address) { if (!address) {
spin_lock(&DRM(mem_lock)); spin_lock(&DRM(mem_lock));
++DRM(mem_stats)[area].fail_count; ++DRM(mem_stats)[area].fail_count;

2
drivers/char/drm/mga_drv.c
View File

@ -161,7 +161,7 @@ static int mga_driver_device_is_agp(drm_device_t * dev)
* device. * device.
*/ */
if ((pdev->device == 0x0525) if ((pdev->device == 0x0525) && pdev->bus->self
&& (pdev->bus->self->vendor == 0x3388) && (pdev->bus->self->vendor == 0x3388)
&& (pdev->bus->self->device == 0x0021)) { && (pdev->bus->self->device == 0x0021)) {
return 0; return 0;

3
drivers/char/drm/radeon_drv.h
View File

@ -214,8 +214,6 @@ typedef struct drm_radeon_private {
int microcode_version; int microcode_version;
int is_pci;
struct { struct {
u32 boxes; u32 boxes;
int freelist_timeouts; int freelist_timeouts;
@ -275,6 +273,7 @@ typedef struct drm_radeon_private {
/* starting from here on, data is preserved accross an open */ /* starting from here on, data is preserved accross an open */
uint32_t flags; /* see radeon_chip_flags */ uint32_t flags; /* see radeon_chip_flags */
int is_pci;
} drm_radeon_private_t; } drm_radeon_private_t;
typedef struct drm_radeon_buf_priv { typedef struct drm_radeon_buf_priv {