From: Alex Deucher <alexander.deucher@amd.com>
Date: Fri, 22 Jun 2018 20:00:26 +0000 (-0500)
Subject: Revert "drm/amdgpu: avoid sleep while executing atombios table (V2)"
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=a25ca1625dd4ecc89c20bb9082b325490f3f78f2;p=openwrt%2Fstaging%2Fblogic.git

Revert "drm/amdgpu: avoid sleep while executing atombios table (V2)"

This reverts commit 8f4805a265fd710a2827b2c0e10c08ef2b526870.

This change was mistakenly committed and should have been dropped
with the rest of the series.

Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
---

diff --git a/drivers/gpu/drm/amd/amdgpu/atom.c b/drivers/gpu/drm/amd/amdgpu/atom.c
index b18c31a701e2..e9934de1b9cf 100644
--- 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_ATOMIC);
+		ectx.ws = kcalloc(4, ws, GFP_KERNEL);
 	else
 		ectx.ws = NULL;