Failure to load firwmare is the primary reason to fail adreno_load_gpu().
Try to load it first before going into the hardware initialization code and
unwinding it. This is important for a6xx because the GMU gets loaded from
the runtime power code and it is more costly to fail in that path because
of missing firmware.

Signed-off-by: Jordan Crouse <jcro...@codeaurora.org>
---
 drivers/gpu/drm/msm/adreno/adreno_device.c | 23 +++++++++++++++++++++-
 1 file changed, 22 insertions(+), 1 deletion(-)

diff --git a/drivers/gpu/drm/msm/adreno/adreno_device.c 
b/drivers/gpu/drm/msm/adreno/adreno_device.c
index 0c0eaad68065..d70e7d145dae 100644
--- a/drivers/gpu/drm/msm/adreno/adreno_device.c
+++ b/drivers/gpu/drm/msm/adreno/adreno_device.c
@@ -155,6 +155,7 @@ struct msm_gpu *adreno_load_gpu(struct drm_device *dev)
        struct msm_drm_private *priv = dev->dev_private;
        struct platform_device *pdev = priv->gpu_pdev;
        struct msm_gpu *gpu = NULL;
+       struct adreno_gpu *adreno_gpu;
        int ret;
 
        if (pdev)
@@ -165,7 +166,27 @@ struct msm_gpu *adreno_load_gpu(struct drm_device *dev)
                return NULL;
        }
 
-       pm_runtime_get_sync(&pdev->dev);
+       adreno_gpu = to_adreno_gpu(gpu);
+
+       /*
+        * The number one reason for HW init to fail is if the firmware isn't
+        * loaded yet. Try that first and don't bother continuing on
+        * otherwise
+        */
+
+       ret = adreno_load_fw(adreno_gpu);
+       if (ret)
+               return NULL;
+
+       /* Make sure pm runtime is active and reset any previous errors */
+       pm_runtime_set_active(&pdev->dev);
+
+       ret = pm_runtime_get_sync(&pdev->dev);
+       if (ret < 0) {
+               dev_err(dev->dev, "Couldn't power up the GPU: %d\n", ret);
+               return NULL;
+       }
+
        mutex_lock(&dev->struct_mutex);
        ret = msm_gpu_hw_init(gpu);
        mutex_unlock(&dev->struct_mutex);
-- 
2.17.1

_______________________________________________
Freedreno mailing list
Freedreno@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/freedreno

Reply via email to