]> git.karo-electronics.de Git - karo-tx-linux.git/commit
drm/ttm: Pass GFP flags in order to avoid deadlock.
authorTetsuo Handa <penguin-kernel@I-love.SAKURA.ne.jp>
Sun, 3 Aug 2014 11:02:31 +0000 (20:02 +0900)
committerDave Airlie <airlied@redhat.com>
Tue, 5 Aug 2014 00:54:19 +0000 (10:54 +1000)
commita91576d7916f6cce76d30303e60e1ac47cf4a76d
tree2f710ba8939b09fe36559a9692f3e9bb39280f23
parent71336e011d1d2312bcbcaa8fcec7365024f3a95d
drm/ttm: Pass GFP flags in order to avoid deadlock.

Commit 7dc19d5a "drivers: convert shrinkers to new count/scan API" added
deadlock warnings that ttm_page_pool_free() and ttm_dma_page_pool_free()
are currently doing GFP_KERNEL allocation.

But these functions did not get updated to receive gfp_t argument.
This patch explicitly passes sc->gfp_mask or GFP_KERNEL to these functions,
and removes the deadlock warning.

Signed-off-by: Tetsuo Handa <penguin-kernel@I-love.SAKURA.ne.jp>
Cc: stable <stable@kernel.org> [2.6.35+]
Signed-off-by: Dave Airlie <airlied@redhat.com>
drivers/gpu/drm/ttm/ttm_page_alloc.c
drivers/gpu/drm/ttm/ttm_page_alloc_dma.c