drm/ttm: Pass GFP flags in order to avoid deadlock.

Browse source

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>

...

This commit is contained in:

Tetsuo Handa 2014-08-03 20:02:31 +09:00 • committed by Dave Airlie

parent 71336e011d

commit a91576d791

2 changed files with 19 additions and 19 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download patch file Download diff file Expand all files Collapse all files

19

drivers/gpu/drm/ttm/ttm_page_alloc.c

View file

19

drivers/gpu/drm/ttm/ttm_page_alloc_dma.c

View file