diff options
| author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2016-02-01 20:50:26 (GMT) |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2016-02-01 20:50:26 (GMT) |
| commit | 4cff7adbebf4d25f662b13c6582b945d9d549e25 (patch) | |
| tree | cfb6bc0aaab6ad7fa7ca2bb07453ed2fd139138c /drivers/gpu/drm/etnaviv/etnaviv_dump.c | |
| parent | 7e3933df9874b70745548ce9177295d11c58fc21 (diff) | |
| parent | 36f90b0a2ddd60823fe193a85e60ff1906c2a9b3 (diff) | |
| download | linux-4cff7adbebf4d25f662b13c6582b945d9d549e25.tar.xz | |
Merge 4.5-rc2 into staging-next
This fixes a merge issue with the panel driver, and picks up fixes in
iio and other drivers that we want here.
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/gpu/drm/etnaviv/etnaviv_dump.c')
| -rw-r--r-- | drivers/gpu/drm/etnaviv/etnaviv_dump.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/drivers/gpu/drm/etnaviv/etnaviv_dump.c b/drivers/gpu/drm/etnaviv/etnaviv_dump.c index bf8fa85..4a29eea 100644 --- a/drivers/gpu/drm/etnaviv/etnaviv_dump.c +++ b/drivers/gpu/drm/etnaviv/etnaviv_dump.c @@ -201,7 +201,9 @@ void etnaviv_core_dump(struct etnaviv_gpu *gpu) obj = vram->object; + mutex_lock(&obj->lock); pages = etnaviv_gem_get_pages(obj); + mutex_unlock(&obj->lock); if (pages) { int j; @@ -213,8 +215,8 @@ void etnaviv_core_dump(struct etnaviv_gpu *gpu) iter.hdr->iova = cpu_to_le64(vram->iova); - vaddr = etnaviv_gem_vaddr(&obj->base); - if (vaddr && !IS_ERR(vaddr)) + vaddr = etnaviv_gem_vmap(&obj->base); + if (vaddr) memcpy(iter.data, vaddr, obj->base.size); etnaviv_core_dump_header(&iter, ETDUMP_BUF_BO, iter.data + |