Commit 33bc227e authored by Linus Torvalds's avatar Linus Torvalds
parents 569cfaad 7655f493
...@@ -95,7 +95,7 @@ unsigned long drm_alloc_pages(int order, int area) ...@@ -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;
......
...@@ -221,7 +221,7 @@ unsigned long DRM(alloc_pages) (int order, int area) { ...@@ -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;
......
...@@ -161,7 +161,7 @@ static int mga_driver_device_is_agp(drm_device_t * dev) ...@@ -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;
......
...@@ -214,8 +214,6 @@ typedef struct drm_radeon_private { ...@@ -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 { ...@@ -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 {
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment