diff options
author | Lucas Stach <l.stach@pengutronix.de> | 2016-06-17 12:29:02 +0200 |
---|---|---|
committer | Lucas Stach <l.stach@pengutronix.de> | 2016-07-05 16:26:37 +0200 |
commit | 1409df043ab737e7fdf9d843eab359caf8685bdc (patch) | |
tree | cff0018a0889dbd08f77fd49a82cf29b6bc50852 /drivers/gpu/drm/etnaviv/etnaviv_gpu.c | |
parent | 7d0c6e711549cb623dc98a68bf89e66208263636 (diff) | |
download | op-kernel-dev-1409df043ab737e7fdf9d843eab359caf8685bdc.zip op-kernel-dev-1409df043ab737e7fdf9d843eab359caf8685bdc.tar.gz |
drm/etnaviv: improve error reporting in GPU init path
Print error messages that mention the exact cause of the failure on
all paths which may fail the GPU init.
Signed-off-by: Lucas Stach <l.stach@pengutronix.de>
Reviewed-by: Christian Gmeiner <christian.gmeiner@gmail.com>
Diffstat (limited to 'drivers/gpu/drm/etnaviv/etnaviv_gpu.c')
-rw-r--r-- | drivers/gpu/drm/etnaviv/etnaviv_gpu.c | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/drivers/gpu/drm/etnaviv/etnaviv_gpu.c b/drivers/gpu/drm/etnaviv/etnaviv_gpu.c index 9b72b6a..87ef341 100644 --- a/drivers/gpu/drm/etnaviv/etnaviv_gpu.c +++ b/drivers/gpu/drm/etnaviv/etnaviv_gpu.c @@ -597,8 +597,10 @@ int etnaviv_gpu_init(struct etnaviv_gpu *gpu) bool mmuv2; ret = pm_runtime_get_sync(gpu->dev); - if (ret < 0) + if (ret < 0) { + dev_err(gpu->dev, "Failed to enable GPU power domain\n"); return ret; + } etnaviv_hw_identify(gpu); @@ -635,8 +637,10 @@ int etnaviv_gpu_init(struct etnaviv_gpu *gpu) } ret = etnaviv_hw_reset(gpu); - if (ret) + if (ret) { + dev_err(gpu->dev, "GPU reset failed\n"); goto fail; + } /* Setup IOMMU.. eventually we will (I think) do this once per context * and have separate page tables per context. For now, to keep things @@ -654,12 +658,14 @@ int etnaviv_gpu_init(struct etnaviv_gpu *gpu) } if (!iommu) { + dev_err(gpu->dev, "Failed to allocate GPU IOMMU domain\n"); ret = -ENOMEM; goto fail; } gpu->mmu = etnaviv_iommu_new(gpu, iommu, version); if (!gpu->mmu) { + dev_err(gpu->dev, "Failed to instantiate GPU IOMMU\n"); iommu_domain_free(iommu); ret = -ENOMEM; goto fail; |