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

Commit c41f4712 authored by Dave Airlie's avatar Dave Airlie Committed by Dave Airlie
Browse files

drm: add __GFP_COMP to the drm_alloc_pages 



The DRM only uses drm_alloc_pages for non-SG PCI cards using DRM.

Signed-off-by: default avatarHugh Dickins <hugh@veritas.com>
Signed-off-by: default avatarDave Airlie <airlied@linux.ie>
parent bd07ed2b

drivers/char/drm/drm_memory.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -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;

drivers/char/drm/drm_memory_debug.h

+1 −1
Original line number Original line Diff line number Diff line
@@ -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;