drm/msm/gpu: Attach to the GPU GX power domain

99.999% of the time during normal operation the GMU is responsible
for power and clock control on the GX domain and the CPU remains
blissfully unaware. However, there is one situation where the CPU
needs to get involved:

The power sequencing rules dictate that the GX needs to be turned
off before the CX so that the CX can be turned on before the GX
during power up. During normal operation when the CPU is taking
down the CX domain a stop command is sent to the GMU which turns
off the GX domain and then the CPU handles the CX domain.

But if the GMU happened to be unresponsive while the GX domain was
left then the CPU will need to step in and turn off the GX domain
before resetting the CX and rebooting the GMU. This unfortunately
means that the CPU needs to be marginally aware of the GX domain
even though it is expected to usually keep its hands off.

To support this we create a semi-disabled GX power domain that
does nothing to the hardware on power up but tries to shut it
down normally on power down. In this method the reference counting
is correct and we can step in with the pm_runtime_put() at the right
time during the failure path.

This patch sets up the connection to the GX power domain and does
the magic to "enable" and disable it at the right points.

Signed-off-by: Jordan Crouse <jcrouse@codeaurora.org>
Signed-off-by: Rob Clark <robdclark@chromium.org>

diff --git a/drivers/gpu/drm/msm/adreno/a6xx_gmu.c b/drivers/gpu/drm/msm/adreno/a6xx_gmu.c
index 4618438..f804cfe 100644 (file)
--- a/drivers/gpu/drm/msm/adreno/a6xx_gmu.c
+++ b/drivers/gpu/drm/msm/adreno/a6xx_gmu.c
@@ -3,6 +3,7 @@
 
 #include <linux/clk.h>
 #include <linux/interconnect.h>
+#include <linux/pm_domain.h>
 #include <linux/pm_opp.h>
 #include <soc/qcom/cmd-db.h>
 
@@ -681,6 +682,16 @@ int a6xx_gmu_reset(struct a6xx_gpu *a6xx_gpu)
        gmu_poll_timeout(gmu, REG_A6XX_RSCC_TCS3_DRV0_STATUS, val,
                (val & 1), 100, 1000);
 
+       /*
+        * Depending on the state of the GMU at this point the GX domain might
+        * have been left on. Hardware sequencing rules state that the GX has to
+        * be turned off before the CX domain so this is that one time that
+        * that calling pm_runtime_put_sync() is expected to do something useful
+        * (turn off the headswitch)
+        */
+       if (!IS_ERR(gmu->gxpd))
+               pm_runtime_put_sync(gmu->gxpd);
+
        /* Disable the resources */
        clk_bulk_disable_unprepare(gmu->nr_clocks, gmu->clocks);
        pm_runtime_put_sync(gmu->dev);
@@ -747,6 +758,14 @@ int a6xx_gmu_resume(struct a6xx_gpu *a6xx_gpu)
        /* Set the GPU to the highest power frequency */
        __a6xx_gmu_set_freq(gmu, gmu->nr_gpu_freqs - 1);
 
+       /*
+        * "enable" the GX power domain which won't actually do anything but it
+        * will make sure that the refcounting is correct in case we need to
+        * bring down the GX after a GMU failure
+        */
+       if (!IS_ERR(gmu->gxpd))
+               pm_runtime_get(gmu->gxpd);
+
 out:
        /* Make sure to turn off the boot OOB request on error */
        if (ret)
@@ -823,6 +842,14 @@ int a6xx_gmu_stop(struct a6xx_gpu *a6xx_gpu)
        /* Remove the bus vote */
        icc_set_bw(gpu->icc_path, 0, 0);
 
+       /*
+        * Mark the GPU power domain as off. During the shutdown process the GMU
+        * should actually turn off the power so this is really just a
+        * houskeeping step
+        */
+       if (!IS_ERR(gmu->gxpd))
+               pm_runtime_put_sync(gmu->gxpd);
+
        clk_bulk_disable_unprepare(gmu->nr_clocks, gmu->clocks);
 
        pm_runtime_put_sync(gmu->dev);
@@ -1187,9 +1214,15 @@ void a6xx_gmu_remove(struct a6xx_gpu *a6xx_gpu)
        if (IS_ERR_OR_NULL(gmu->mmio))
                return;
 
-       pm_runtime_disable(gmu->dev);
        a6xx_gmu_stop(a6xx_gpu);
 
+       pm_runtime_disable(gmu->dev);
+
+       if (!IS_ERR(gmu->gxpd)) {
+               pm_runtime_disable(gmu->gxpd);
+               dev_pm_domain_detach(gmu->gxpd, false);
+       }
+
        a6xx_gmu_irq_disable(gmu);
        a6xx_gmu_memory_free(gmu, gmu->hfi);
 
@@ -1248,6 +1281,12 @@ int a6xx_gmu_probe(struct a6xx_gpu *a6xx_gpu, struct device_node *node)
        if (gmu->hfi_irq < 0 || gmu->gmu_irq < 0)
                goto err;
 
+       /*
+        * Get a link to the GX power domain to reset the GPU in case of GMU
+        * crash
+        */
+       gmu->gxpd = dev_pm_domain_attach_by_name(gmu->dev, "gx");
+
        /* Get the power levels for the GMU and GPU */
        a6xx_gmu_pwrlevels_probe(gmu);
 

diff --git a/drivers/gpu/drm/msm/adreno/a6xx_gmu.h b/drivers/gpu/drm/msm/adreno/a6xx_gmu.h
index 8081083..078d418 100644 (file)
--- a/drivers/gpu/drm/msm/adreno/a6xx_gmu.h
+++ b/drivers/gpu/drm/msm/adreno/a6xx_gmu.h
@@ -55,6 +55,8 @@ struct a6xx_gmu {
        struct iommu_domain *domain;
        u64 uncached_iova_base;
 
+       struct device *gxpd;
+
        int idle_level;
 
        struct a6xx_gmu_bo *hfi;