git.samba.org
/
sfrench
/
cifs-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
drm/etnaviv: fix crash in GPU suspend when init failed due to buffer placement
[sfrench/cifs-2.6.git]
/
drivers
/
gpu
/
drm
/
etnaviv
/
etnaviv_gpu.c
diff --git
a/drivers/gpu/drm/etnaviv/etnaviv_gpu.c
b/drivers/gpu/drm/etnaviv/etnaviv_gpu.c
index 686f6552db48d927f4b00f82576dc6c0e037837e..ab8dfe7f69d6cac30c19f1c9bdf949719adbbc50 100644
(file)
--- a/
drivers/gpu/drm/etnaviv/etnaviv_gpu.c
+++ b/
drivers/gpu/drm/etnaviv/etnaviv_gpu.c
@@
-799,6
+799,7
@@
int etnaviv_gpu_init(struct etnaviv_gpu *gpu)
free_buffer:
etnaviv_cmdbuf_free(&gpu->buffer);
free_buffer:
etnaviv_cmdbuf_free(&gpu->buffer);
+ gpu->buffer.suballoc = NULL;
destroy_iommu:
etnaviv_iommu_destroy(gpu->mmu);
gpu->mmu = NULL;
destroy_iommu:
etnaviv_iommu_destroy(gpu->mmu);
gpu->mmu = NULL;
@@
-1733,7
+1734,7
@@
static int etnaviv_gpu_platform_probe(struct platform_device *pdev)
gpu->dev = &pdev->dev;
mutex_init(&gpu->lock);
gpu->dev = &pdev->dev;
mutex_init(&gpu->lock);
- mutex_init(&gpu->fence_
idr_
lock);
+ mutex_init(&gpu->fence_lock);
/* Map registers: */
res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
/* Map registers: */
res = platform_get_resource(pdev, IORESOURCE_MEM, 0);