|
@@ -27,6 +27,7 @@
|
|
|
#include "i915_drv.h"
|
|
#include "i915_drv.h"
|
|
|
|
|
|
|
|
#define QUIET (__GFP_NORETRY | __GFP_NOWARN)
|
|
#define QUIET (__GFP_NORETRY | __GFP_NOWARN)
|
|
|
|
|
+#define MAYFAIL (__GFP_RETRY_MAYFAIL | __GFP_NOWARN)
|
|
|
|
|
|
|
|
/* convert swiotlb segment size into sensible units (pages)! */
|
|
/* convert swiotlb segment size into sensible units (pages)! */
|
|
|
#define IO_TLB_SEGPAGES (IO_TLB_SEGSIZE << IO_TLB_SHIFT >> PAGE_SHIFT)
|
|
#define IO_TLB_SEGPAGES (IO_TLB_SEGSIZE << IO_TLB_SHIFT >> PAGE_SHIFT)
|
|
@@ -95,7 +96,8 @@ create_st:
|
|
|
struct page *page;
|
|
struct page *page;
|
|
|
|
|
|
|
|
do {
|
|
do {
|
|
|
- page = alloc_pages(gfp | (order ? QUIET : 0), order);
|
|
|
|
|
|
|
+ page = alloc_pages(gfp | (order ? QUIET : MAYFAIL),
|
|
|
|
|
+ order);
|
|
|
if (page)
|
|
if (page)
|
|
|
break;
|
|
break;
|
|
|
if (!order--)
|
|
if (!order--)
|