From: Mikko Perttunen <mperttunen@nvidia.com>
To: thierry.reding@gmail.com, jonathanh@nvidia.com
Cc: digetx@gmail.com, dri-devel@lists.freedesktop.org,
linux-tegra@vger.kernel.org, linux-kernel@vger.kernel.org,
Mikko Perttunen <mperttunen@nvidia.com>
Subject: [PATCH 07/10] drm/tegra: Make syncpoints be per-context
Date: Sun, 5 Nov 2017 13:01:15 +0200 [thread overview]
Message-ID: <20171105110118.15142-8-mperttunen@nvidia.com> (raw)
In-Reply-To: <20171105110118.15142-1-mperttunen@nvidia.com>
As a preparation for each context potentially being able to have a
separate hardware channel, and thus requiring a separate syncpoint,
move syncpoints to be stored inside each context instead of global
client data.
Signed-off-by: Mikko Perttunen <mperttunen@nvidia.com>
---
drivers/gpu/drm/tegra/drm.c | 8 ++++----
drivers/gpu/drm/tegra/drm.h | 1 +
drivers/gpu/drm/tegra/gr2d.c | 2 ++
drivers/gpu/drm/tegra/gr3d.c | 2 ++
drivers/gpu/drm/tegra/vic.c | 2 ++
5 files changed, 11 insertions(+), 4 deletions(-)
diff --git a/drivers/gpu/drm/tegra/drm.c b/drivers/gpu/drm/tegra/drm.c
index 3e2a4a19412e..b964e18e3058 100644
--- a/drivers/gpu/drm/tegra/drm.c
+++ b/drivers/gpu/drm/tegra/drm.c
@@ -783,12 +783,12 @@ static int tegra_get_syncpt(struct drm_device *drm, void *data,
goto unlock;
}
- if (args->index >= context->client->base.num_syncpts) {
+ if (args->index >= 1) {
err = -EINVAL;
goto unlock;
}
- syncpt = context->client->base.syncpts[args->index];
+ syncpt = context->syncpt;
args->id = host1x_syncpt_id(syncpt);
unlock:
@@ -837,12 +837,12 @@ static int tegra_get_syncpt_base(struct drm_device *drm, void *data,
goto unlock;
}
- if (args->syncpt >= context->client->base.num_syncpts) {
+ if (args->syncpt >= 1) {
err = -EINVAL;
goto unlock;
}
- syncpt = context->client->base.syncpts[args->syncpt];
+ syncpt = context->syncpt;
base = host1x_syncpt_get_base(syncpt);
if (!base) {
diff --git a/drivers/gpu/drm/tegra/drm.h b/drivers/gpu/drm/tegra/drm.h
index 079aebb3fb38..11d690846fd0 100644
--- a/drivers/gpu/drm/tegra/drm.h
+++ b/drivers/gpu/drm/tegra/drm.h
@@ -79,6 +79,7 @@ struct tegra_drm_context {
struct tegra_drm_client *client;
struct host1x_channel *channel;
+ struct host1x_syncpt *syncpt;
unsigned int id;
};
diff --git a/drivers/gpu/drm/tegra/gr2d.c b/drivers/gpu/drm/tegra/gr2d.c
index 6ea070da7718..3db3bcac48b9 100644
--- a/drivers/gpu/drm/tegra/gr2d.c
+++ b/drivers/gpu/drm/tegra/gr2d.c
@@ -76,6 +76,8 @@ static int gr2d_open_channel(struct tegra_drm_client *client,
if (!context->channel)
return -ENOMEM;
+ context->syncpt = client->base.syncpts[0];
+
return 0;
}
diff --git a/drivers/gpu/drm/tegra/gr3d.c b/drivers/gpu/drm/tegra/gr3d.c
index cee2ab645cde..279438342c8c 100644
--- a/drivers/gpu/drm/tegra/gr3d.c
+++ b/drivers/gpu/drm/tegra/gr3d.c
@@ -86,6 +86,8 @@ static int gr3d_open_channel(struct tegra_drm_client *client,
if (!context->channel)
return -ENOMEM;
+ context->syncpt = client->base.syncpts[0];
+
return 0;
}
diff --git a/drivers/gpu/drm/tegra/vic.c b/drivers/gpu/drm/tegra/vic.c
index 6697a21a250d..efe5f3af933e 100644
--- a/drivers/gpu/drm/tegra/vic.c
+++ b/drivers/gpu/drm/tegra/vic.c
@@ -240,6 +240,8 @@ static int vic_open_channel(struct tegra_drm_client *client,
return -ENOMEM;
}
+ context->syncpt = client->base.syncpts[0];
+
return 0;
}
--
2.14.2
next prev parent reply other threads:[~2017-11-05 11:02 UTC|newest]
Thread overview: 32+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-11-05 11:01 [PATCH 00/10] Dynamic Host1x channel allocation Mikko Perttunen
2017-11-05 11:01 ` [PATCH 01/10] gpu: host1x: Parameterize channel aperture size Mikko Perttunen
2017-11-05 11:01 ` [PATCH 02/10] gpu: host1x: Print MLOCK state in debug dumps on T186 Mikko Perttunen
2017-11-05 11:01 ` [PATCH 03/10] gpu: host1x: Add lock around channel allocation Mikko Perttunen
2017-11-05 11:01 ` [PATCH 04/10] gpu: host1x: Lock classes during job submission Mikko Perttunen
2017-11-05 16:46 ` Dmitry Osipenko
2017-11-07 12:28 ` Mikko Perttunen
2017-11-07 21:23 ` Dmitry Osipenko
2017-12-05 13:21 ` Mikko Perttunen
2017-12-05 13:43 ` Dmitry Osipenko
2017-11-05 11:01 ` [PATCH 05/10] gpu: host1x: Add job done callback Mikko Perttunen
2017-11-05 11:01 ` [PATCH 06/10] drm/tegra: Deliver job completion callback to client Mikko Perttunen
2017-11-16 16:33 ` Dmitry Osipenko
2017-11-16 16:40 ` Dmitry Osipenko
2017-11-29 9:09 ` Mikko Perttunen
2017-11-05 11:01 ` Mikko Perttunen [this message]
2017-11-05 11:01 ` [PATCH 08/10] drm/tegra: Implement dynamic channel allocation model Mikko Perttunen
2017-11-05 17:43 ` Dmitry Osipenko
2017-11-07 12:29 ` Mikko Perttunen
2017-11-13 11:49 ` Dmitry Osipenko
2017-11-05 11:01 ` [PATCH 09/10] drm/tegra: Boot VIC in runtime resume Mikko Perttunen
2017-11-05 11:01 ` [PATCH 10/10] gpu: host1x: Optionally block when acquiring channel Mikko Perttunen
2017-11-05 17:14 ` Dmitry Osipenko
2017-11-07 13:11 ` Mikko Perttunen
2017-11-07 15:29 ` Dmitry Osipenko
2017-11-10 21:15 ` Dmitry Osipenko
2017-11-12 11:23 ` Dmitry Osipenko
2017-11-29 9:10 ` Mikko Perttunen
2017-11-29 12:18 ` Dmitry Osipenko
2017-11-29 12:25 ` Mikko Perttunen
2017-11-29 12:37 ` Dmitry Osipenko
2017-11-07 15:34 ` [PATCH 00/10] Dynamic Host1x channel allocation Dmitry Osipenko
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20171105110118.15142-8-mperttunen@nvidia.com \
--to=mperttunen@nvidia.com \
--cc=digetx@gmail.com \
--cc=dri-devel@lists.freedesktop.org \
--cc=jonathanh@nvidia.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-tegra@vger.kernel.org \
--cc=thierry.reding@gmail.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).