diff options
| author | Dave Airlie <airlied@redhat.com> | 2018-12-13 02:24:18 +0300 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2018-12-13 02:24:37 +0300 |
| commit | 26eacb788b7e37f9b08e6e6fc9686bf0817c0163 (patch) | |
| tree | 9e003ab5e672b2d79808c0ce76bc926511e0daf0 /drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c | |
| parent | e59166b59aad95d313cfc4cfe32240f1608b33d4 (diff) | |
| parent | 676fff1a5512e7971aa9a235052d253df8f5284a (diff) | |
| download | linux-26eacb788b7e37f9b08e6e6fc9686bf0817c0163.tar.xz | |
Merge branch 'drm-fixes-4.20' of git://people.freedesktop.org/~agd5f/linux into drm-fixes
Fixes for 4.20:
- Stability fixes for new polaris variants (e.g., RX590)
- New vega pci ids
- Vega20 smu fix
- Ctx locking fix
Signed-off-by: Dave Airlie <airlied@redhat.com>
From: Alex Deucher <alexdeucher@gmail.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20181212203022.3054-1-alexander.deucher@amd.com
Diffstat (limited to 'drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c')
| -rw-r--r-- | drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c index 663043c8f0f5..0acc8dee2cb8 100644 --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c @@ -124,14 +124,14 @@ static int amdgpu_cs_parser_init(struct amdgpu_cs_parser *p, union drm_amdgpu_cs goto free_chunk; } + mutex_lock(&p->ctx->lock); + /* skip guilty context job */ if (atomic_read(&p->ctx->guilty) == 1) { ret = -ECANCELED; goto free_chunk; } - mutex_lock(&p->ctx->lock); - /* get chunks */ chunk_array_user = u64_to_user_ptr(cs->in.chunks); if (copy_from_user(chunk_array, chunk_array_user, |