gpu: host1x: Stop CDMA before suspending

Before going into suspend, wait all CDMA to go idle and stop it.
This will ensure no channel is still active while we enter
suspend, and ensures the driver doesn't think that CDMA is still
active when coming back from suspend (as HW state has been reset).

Signed-off-by: Mikko Perttunen <mperttunen@nvidia.com>
Signed-off-by: Thierry Reding <treding@nvidia.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20230901111510.663401-2-cyndis@kapsi.fi

diff --git a/drivers/gpu/host1x/channel.c b/drivers/gpu/host1x/channel.c
index 79501c9575321cdf9bb12ee63a8bec553663bab2..08077afe4cde26796456b22e41bd044d962bbfe3 100644 (file)
--- a/drivers/gpu/host1x/channel.c
+++ b/drivers/gpu/host1x/channel.c
@@ -81,6 +81,25 @@ void host1x_channel_stop(struct host1x_channel *channel)
 }
 EXPORT_SYMBOL(host1x_channel_stop);
 
+/**
+ * host1x_channel_stop_all() - disable CDMA on allocated channels
+ * @host: host1x instance
+ *
+ * Stop CDMA on allocated channels
+ */
+void host1x_channel_stop_all(struct host1x *host)
+{
+       struct host1x_channel_list *chlist = &host->channel_list;
+       int bit;
+
+       mutex_lock(&chlist->lock);
+
+       for_each_set_bit(bit, chlist->allocated_channels, host->info->nb_channels)
+               host1x_channel_stop(&chlist->channels[bit]);
+
+       mutex_unlock(&chlist->lock);
+}
+
 static void release_channel(struct kref *kref)
 {
        struct host1x_channel *channel =

diff --git a/drivers/gpu/host1x/channel.h b/drivers/gpu/host1x/channel.h
index b23a8071fbd02e1eabd965af67afb01b6f60df9e..d7aede204d83d6105e48371dbd97de1b286404be 100644 (file)
--- a/drivers/gpu/host1x/channel.h
+++ b/drivers/gpu/host1x/channel.h
@@ -40,5 +40,6 @@ int host1x_channel_list_init(struct host1x_channel_list *chlist,
 void host1x_channel_list_free(struct host1x_channel_list *chlist);
 struct host1x_channel *host1x_channel_get_index(struct host1x *host,
                                                unsigned int index);
+void host1x_channel_stop_all(struct host1x *host);
 
 #endif

diff --git a/drivers/gpu/host1x/dev.c b/drivers/gpu/host1x/dev.c
index 7c6699aed7d2ae48401f6614203a95062d8ebbb7..6501bee9e8c1a3e4e2a61af4f3b7bbbe8693d998 100644 (file)
--- a/drivers/gpu/host1x/dev.c
+++ b/drivers/gpu/host1x/dev.c
@@ -655,6 +655,7 @@ static int __maybe_unused host1x_runtime_suspend(struct device *dev)
        struct host1x *host = dev_get_drvdata(dev);
        int err;
 
+       host1x_channel_stop_all(host);
        host1x_intr_stop(host);
        host1x_syncpt_save(host);