]> git.ipfire.org Git - thirdparty/kernel/stable.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)
committerJiri Slaby <jslaby@suse.cz>
Thu, 18 Sep 2014 14:40:00 +0000 (16:40 +0200)
commitfe4bbb9bc4d42e980d01895cb7492babdcdf55cf
treeb55bbb3fa7ad36025df36e25b90df97a375aad8b
parent726e09542d0526359c9066f27fcc99437558bf7e
drm/ttm: Pass GFP flags in order to avoid deadlock.

commit a91576d7916f6cce76d30303e60e1ac47cf4a76d upstream.

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>
Signed-off-by: Dave Airlie <airlied@redhat.com>
Signed-off-by: Jiri Slaby <jslaby@suse.cz>
drivers/gpu/drm/ttm/ttm_page_alloc.c
drivers/gpu/drm/ttm/ttm_page_alloc_dma.c