diff options
| author |   Lucas Stach <l.stach@pengutronix.de> | 2018-07-23 14:27:23 +0200 |
|---|---|---|
| committer | Lucas Stach <l.stach@pengutronix.de> | 2018-08-06 15:24:33 +0200 |
| commit | 5b147465532365dc4e2fee8499d6ca1f52dd0d16 (patch) | |
| tree | bc81acaeaa17c14b39ef22f10704e62f5cb6ac27 /drivers/gpu/drm/etnaviv | |
| parent | drm/etnaviv: change return type to vm_fault_t (diff) | |
| download | linux-dev-5b147465532365dc4e2fee8499d6ca1f52dd0d16.tar.xz linux-dev-5b147465532365dc4e2fee8499d6ca1f52dd0d16.zip | |
drm/etnaviv: fix crash in GPU suspend when init failed due to buffer placement
When the suballocator was unable to provide a suitable buffer for the MMUv1
linear window, we roll back the GPU initialization. As the GPU is runtime
resumed at that point we need to clear the kernel cmdbuf suballoc entry to
properly skip any attempt to manipulate the cmdbuf when the GPU gets shut
down in the runtime suspend later on.
Signed-off-by: Lucas Stach <l.stach@pengutronix.de>
Diffstat (limited to 'drivers/gpu/drm/etnaviv')
| -rw-r--r-- | drivers/gpu/drm/etnaviv/etnaviv_gpu.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/gpu/drm/etnaviv/etnaviv_gpu.c b/drivers/gpu/drm/etnaviv/etnaviv_gpu.c index 18c2224ba0b8..ab8dfe7f69d6 100644 --- 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); + gpu->buffer.suballoc = NULL; destroy_iommu: etnaviv_iommu_destroy(gpu->mmu); gpu->mmu = NULL; |