gpu: host1x: Request channels for clients, not devices

A struct device doesn't carry much information that a channel might be
interested in, but the client very much does. Request channels for the
clients rather than their parent devices and store a pointer to them
in order to have that information available when needed.

Signed-off-by: Thierry Reding <treding@nvidia.com>

diff --git a/drivers/gpu/drm/tegra/gr2d.c b/drivers/gpu/drm/tegra/gr2d.c
index 641299c..3cbb4a0 100644 (file)
--- a/drivers/gpu/drm/tegra/gr2d.c
+++ b/drivers/gpu/drm/tegra/gr2d.c
@@ -40,7 +40,7 @@ static int gr2d_init(struct host1x_client *client)
        struct gr2d *gr2d = to_gr2d(drm);
        int err;
 
-       gr2d->channel = host1x_channel_request(client->dev);
+       gr2d->channel = host1x_channel_request(client);
        if (!gr2d->channel)
                return -ENOMEM;
 

diff --git a/drivers/gpu/drm/tegra/gr3d.c b/drivers/gpu/drm/tegra/gr3d.c
index 8b9a35b..87a3861 100644 (file)
--- a/drivers/gpu/drm/tegra/gr3d.c
+++ b/drivers/gpu/drm/tegra/gr3d.c
@@ -49,7 +49,7 @@ static int gr3d_init(struct host1x_client *client)
        struct gr3d *gr3d = to_gr3d(drm);
        int err;
 
-       gr3d->channel = host1x_channel_request(client->dev);
+       gr3d->channel = host1x_channel_request(client);
        if (!gr3d->channel)
                return -ENOMEM;
 

diff --git a/drivers/gpu/drm/tegra/vic.c b/drivers/gpu/drm/tegra/vic.c
index cd0399f..c97a61c 100644 (file)
--- a/drivers/gpu/drm/tegra/vic.c
+++ b/drivers/gpu/drm/tegra/vic.c
@@ -198,7 +198,7 @@ static int vic_init(struct host1x_client *client)
                vic->domain = tegra->domain;
        }
 
-       vic->channel = host1x_channel_request(client->dev);
+       vic->channel = host1x_channel_request(client);
        if (!vic->channel) {
                err = -ENOMEM;
                goto detach;

diff --git a/drivers/gpu/host1x/channel.c b/drivers/gpu/host1x/channel.c
index 1436295..4cd212b 100644 (file)
--- a/drivers/gpu/host1x/channel.c
+++ b/drivers/gpu/host1x/channel.c
@@ -115,14 +115,14 @@ static struct host1x_channel *acquire_unused_channel(struct host1x *host)
 
 /**
  * host1x_channel_request() - Allocate a channel
- * @device: Host1x unit this channel will be used to send commands to
+ * @client: Host1x client this channel will be used to send commands to
  *
- * Allocates a new host1x channel for @device. May return NULL if CDMA
+ * Allocates a new host1x channel for @client. May return NULL if CDMA
  * initialization fails.
  */
-struct host1x_channel *host1x_channel_request(struct device *dev)
+struct host1x_channel *host1x_channel_request(struct host1x_client *client)
 {
-       struct host1x *host = dev_get_drvdata(dev->parent);
+       struct host1x *host = dev_get_drvdata(client->dev->parent);
        struct host1x_channel_list *chlist = &host->channel_list;
        struct host1x_channel *channel;
        int err;
@@ -133,7 +133,8 @@ struct host1x_channel *host1x_channel_request(struct device *dev)
 
        kref_init(&channel->refcount);
        mutex_init(&channel->submitlock);
-       channel->dev = dev;
+       channel->client = client;
+       channel->dev = client->dev;
 
        err = host1x_hw_channel_init(host, channel, channel->id);
        if (err < 0)
@@ -148,7 +149,7 @@ struct host1x_channel *host1x_channel_request(struct device *dev)
 fail:
        clear_bit(channel->id, chlist->allocated_channels);
 
-       dev_err(dev, "failed to initialize channel\n");
+       dev_err(client->dev, "failed to initialize channel\n");
 
        return NULL;
 }

diff --git a/drivers/gpu/host1x/channel.h b/drivers/gpu/host1x/channel.h
index 4fd6948..39044ff 100644 (file)
--- a/drivers/gpu/host1x/channel.h
+++ b/drivers/gpu/host1x/channel.h
@@ -26,6 +26,7 @@ struct host1x_channel {
        unsigned int id;
        struct mutex submitlock;
        void __iomem *regs;
+       struct host1x_client *client;
        struct device *dev;
        struct host1x_cdma cdma;
 };

diff --git a/include/linux/host1x.h b/include/linux/host1x.h
index e6eea45..4396cd5 100644 (file)
--- a/include/linux/host1x.h
+++ b/include/linux/host1x.h
@@ -158,7 +158,7 @@ u32 host1x_syncpt_base_id(struct host1x_syncpt_base *base);
 struct host1x_channel;
 struct host1x_job;
 
-struct host1x_channel *host1x_channel_request(struct device *dev);
+struct host1x_channel *host1x_channel_request(struct host1x_client *client);
 struct host1x_channel *host1x_channel_get(struct host1x_channel *channel);
 void host1x_channel_put(struct host1x_channel *channel);
 int host1x_job_submit(struct host1x_job *job);