drm/etnaviv: drop GPU initialized property

Now that it is only used to track the driver internal state of
the MMU global and cmdbuf objects, we can get rid of this property
by making the free/finit functions of those objects safe to call
on an uninitialized object.

Signed-off-by: Lucas Stach <[email protected]>
Reviewed-by: Christian Gmeiner <[email protected]>

diff --git a/drivers/gpu/drm/etnaviv/etnaviv_cmdbuf.c b/drivers/gpu/drm/etnaviv/etnaviv_cmdbuf.c
index 9dc20d892c15cce50ffe480cdb72723743c0217b..721d633aece9d4c81f0019e4c55884f26ee61c60 100644 (file)
--- a/drivers/gpu/drm/etnaviv/etnaviv_cmdbuf.c
+++ b/drivers/gpu/drm/etnaviv/etnaviv_cmdbuf.c
@@ -121,6 +121,9 @@ void etnaviv_cmdbuf_free(struct etnaviv_cmdbuf *cmdbuf)
        int order = order_base_2(ALIGN(cmdbuf->size, SUBALLOC_GRANULE) /
                                 SUBALLOC_GRANULE);
 
+       if (!suballoc)
+               return;
+
        mutex_lock(&suballoc->lock);
        bitmap_release_region(suballoc->granule_map,
                              cmdbuf->suballoc_offset / SUBALLOC_GRANULE,

diff --git a/drivers/gpu/drm/etnaviv/etnaviv_gpu.c b/drivers/gpu/drm/etnaviv/etnaviv_gpu.c
index a024f5422df2207a9bfed31c489a313f725d4815..53050cf68e1bac775d84d1038e0adc3c713129dd 100644 (file)
--- a/drivers/gpu/drm/etnaviv/etnaviv_gpu.c
+++ b/drivers/gpu/drm/etnaviv/etnaviv_gpu.c
@@ -876,8 +876,6 @@ int etnaviv_gpu_init(struct etnaviv_gpu *gpu)
        pm_runtime_mark_last_busy(gpu->dev);
        pm_runtime_put_autosuspend(gpu->dev);
 
-       gpu->initialized = true;
-
        return 0;
 
 fail:
@@ -1805,11 +1803,8 @@ static void etnaviv_gpu_unbind(struct device *dev, struct device *master,
        if (gpu->mmu_context)
                etnaviv_iommu_context_put(gpu->mmu_context);
 
-       if (gpu->initialized) {
-               etnaviv_cmdbuf_free(&gpu->buffer);
-               etnaviv_iommu_global_fini(gpu);
-               gpu->initialized = false;
-       }
+       etnaviv_cmdbuf_free(&gpu->buffer);
+       etnaviv_iommu_global_fini(gpu);
 
        gpu->drm = NULL;
        xa_destroy(&gpu->user_fences);

diff --git a/drivers/gpu/drm/etnaviv/etnaviv_gpu.h b/drivers/gpu/drm/etnaviv/etnaviv_gpu.h
index b4e545dce9477e8cc107a42e7d5dbf1dc87e2f8b..85c669dba88e56403df15f22de48e06ad27848f3 100644 (file)
--- a/drivers/gpu/drm/etnaviv/etnaviv_gpu.h
+++ b/drivers/gpu/drm/etnaviv/etnaviv_gpu.h
@@ -114,7 +114,6 @@ struct etnaviv_gpu {
        struct mutex sched_lock;
        struct drm_gpu_scheduler sched;
        enum etnaviv_gpu_state state;
-       bool initialized;
 
        /* 'ring'-buffer: */
        struct etnaviv_cmdbuf buffer;

diff --git a/drivers/gpu/drm/etnaviv/etnaviv_mmu.c b/drivers/gpu/drm/etnaviv/etnaviv_mmu.c
index 67bdce5326c6e3a3b6efb3da787e3c58ed22f4b8..4fa72567183a8e138683f8c072c219974e1befa8 100644 (file)
--- a/drivers/gpu/drm/etnaviv/etnaviv_mmu.c
+++ b/drivers/gpu/drm/etnaviv/etnaviv_mmu.c
@@ -553,6 +553,9 @@ void etnaviv_iommu_global_fini(struct etnaviv_gpu *gpu)
        struct etnaviv_drm_private *priv = gpu->drm->dev_private;
        struct etnaviv_iommu_global *global = priv->mmu_global;
 
+       if (!global)
+               return;
+
        if (--global->use > 0)
                return;