diff options
| author | Dave Airlie <airlied@redhat.com> | 2018-06-22 13:18:32 +1000 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2018-06-22 13:19:05 +1000 |
| commit | 565c17b5f02dacd8430da8d95bbba60587f339af (patch) | |
| tree | 63dc8a786f522f11e44058ec9707af12fb3d83c4 /drivers/gpu/drm/amd/amdgpu/atom.c | |
| parent | f4366e44efeb895c358fddd11f9ecee81bdad06b (diff) | |
| parent | a21daa88d4f08c959a36ad9760df045407a080e5 (diff) | |
| download | op-kernel-dev-565c17b5f02dacd8430da8d95bbba60587f339af.zip op-kernel-dev-565c17b5f02dacd8430da8d95bbba60587f339af.tar.gz | |
Merge branch 'drm-next-4.19' of git://people.freedesktop.org/~agd5f/linux into drm-next
First feature request for 4.19. Highlights:
- Add initial amdgpu documentation
- Add initial GPU scheduler documention
- GPU scheduler fixes for dying processes
- Add support for the JPEG engine on VCN
- Switch CI to use powerplay by default
- EDC support for CZ
- More powerplay cleanups
- Misc DC fixes
Signed-off-by: Dave Airlie <airlied@redhat.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20180621161138.3008-1-alexander.deucher@amd.com
Diffstat (limited to 'drivers/gpu/drm/amd/amdgpu/atom.c')
| -rw-r--r-- | drivers/gpu/drm/amd/amdgpu/atom.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/gpu/drm/amd/amdgpu/atom.c b/drivers/gpu/drm/amd/amdgpu/atom.c index e9934de..b18c31a 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_KERNEL); + ectx.ws = kcalloc(4, ws, GFP_ATOMIC); else ectx.ws = NULL; |
