Merge tag 'tilcdc-4.19' of https://github.com/jsarha/linux into drm-next

[linux.git] / drivers / gpu / drm / amd / amdgpu / atom.c

diff --git a/drivers/gpu/drm/amd/amdgpu/atom.c b/drivers/gpu/drm/amd/amdgpu/atom.c
index e9934de1b9cf8127eb2b770e4301d6ee90c98223..b18c31a701e2277dce2b87cb23446dd6d78e6225 100644 (file)
--- a/drivers/gpu/drm/amd/amdgpu/atom.c
+++ b/drivers/gpu/drm/amd/amdgpu/atom.c
@@ -1221,7 +1221,7 @@ static int amdgpu_atom_execute_table_locked(struct atom_context *ctx, int index,
        ectx.abort = false;
        ectx.last_jump = 0;
        if (ws)
-               ectx.ws = kcalloc(4, ws, GFP_KERNEL);
+               ectx.ws = kcalloc(4, ws, GFP_ATOMIC);
        else
                ectx.ws = NULL;