diff options
| author | Dave Airlie <airlied@redhat.com> | 2019-05-30 10:48:09 +1000 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2019-05-30 10:50:41 +1000 |
| commit | b077dc23b548cbcac64040cae1e2d2658d4a5bfd (patch) | |
| tree | fa1a9daef790b48fce08946ef3ba03664203f7e2 /drivers/gpu/drm/etnaviv | |
| parent | cd6c84d8f0cdc911df435bb075ba22ce3c605b07 (diff) | |
| parent | 1396500d673bd027683a0609ff84dca7eb6ea2e7 (diff) | |
| download | linux-b077dc23b548cbcac64040cae1e2d2658d4a5bfd.tar.gz linux-b077dc23b548cbcac64040cae1e2d2658d4a5bfd.tar.bz2 linux-b077dc23b548cbcac64040cae1e2d2658d4a5bfd.zip | |
Merge branch 'etnaviv/fixes' of https://git.pengutronix.de/git/lst/linux into drm-fixes
etnaviv core dump locking fix
Signed-off-by: Dave Airlie <airlied@redhat.com>
From: Lucas Stach <l.stach@pengutronix.de>
Link: https://patchwork.freedesktop.org/patch/msgid/1558966666.4039.4.camel@pengutronix.de
Diffstat (limited to 'drivers/gpu/drm/etnaviv')
| -rw-r--r-- | drivers/gpu/drm/etnaviv/etnaviv_dump.c | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/drivers/gpu/drm/etnaviv/etnaviv_dump.c b/drivers/gpu/drm/etnaviv/etnaviv_dump.c index 33854c94cb85..515515ef24f9 100644 --- a/drivers/gpu/drm/etnaviv/etnaviv_dump.c +++ b/drivers/gpu/drm/etnaviv/etnaviv_dump.c @@ -125,6 +125,8 @@ void etnaviv_core_dump(struct etnaviv_gpu *gpu) return; etnaviv_dump_core = false; + mutex_lock(&gpu->mmu->lock); + mmu_size = etnaviv_iommu_dump_size(gpu->mmu); /* We always dump registers, mmu, ring and end marker */ @@ -167,6 +169,7 @@ void etnaviv_core_dump(struct etnaviv_gpu *gpu) iter.start = __vmalloc(file_size, GFP_KERNEL | __GFP_NOWARN | __GFP_NORETRY, PAGE_KERNEL); if (!iter.start) { + mutex_unlock(&gpu->mmu->lock); dev_warn(gpu->dev, "failed to allocate devcoredump file\n"); return; } @@ -234,6 +237,8 @@ void etnaviv_core_dump(struct etnaviv_gpu *gpu) obj->base.size); } + mutex_unlock(&gpu->mmu->lock); + etnaviv_core_dump_header(&iter, ETDUMP_BUF_END, iter.data); dev_coredumpv(gpu->dev, iter.start, iter.data - iter.start, GFP_KERNEL); |