From: Arto Merilainen <amerilainen@nvidia.com>
To: <tbergstrom@nvidia.com>, <thierry.reding@gmail.com>
Cc: <dri-devel@lists.freedesktop.org>, <linux-tegra@vger.kernel.org>,
<linux-kernel@vger.kernel.org>, <amerilainen@nvidia.com>
Subject: [PATCH 2/3] drm/tegra: Deliver syncpoint base to user space
Date: Wed, 9 Oct 2013 14:54:09 +0300 [thread overview]
Message-ID: <1381319650-9799-3-git-send-email-amerilainen@nvidia.com> (raw)
In-Reply-To: <1381319650-9799-1-git-send-email-amerilainen@nvidia.com>
This patch makes the necessary additions to deliver syncpoint base
to the user space.
This patch splits the index field in the drm_tegra_get_syncpt structure
into three separate fields (index, support_base, base_id). This allows
to keep compatibility over kernel versions:
- The placing of index field stays constant and therefore the interface
should stay compatible with earlier userspace versions.
- The old index field was input-only and it was not supposed to be read
afterwards. Delivering data back in the same field should not introduce
regressions to any old user space applications.
- Old kernels left support_base and base_id fields intact (zero) and
hence the new user space applications get the correct response from
the kernel (=syncpoint does not have a base).
Signed-off-by: Arto Merilainen <amerilainen@nvidia.com>
---
drivers/gpu/host1x/drm/drm.c | 2 ++
include/uapi/drm/tegra_drm.h | 4 +++-
2 files changed, 5 insertions(+), 1 deletion(-)
diff --git a/drivers/gpu/host1x/drm/drm.c b/drivers/gpu/host1x/drm/drm.c
index 8c61cee..4251563 100644
--- a/drivers/gpu/host1x/drm/drm.c
+++ b/drivers/gpu/host1x/drm/drm.c
@@ -468,6 +468,8 @@ static int tegra_get_syncpt(struct drm_device *drm, void *data,
syncpt = context->client->syncpts[args->index];
args->id = host1x_syncpt_id(syncpt);
+ args->support_base = syncpt->base ? 1 : 0;
+ args->base_id = syncpt->base ? syncpt->base->id : 0;
return 0;
}
diff --git a/include/uapi/drm/tegra_drm.h b/include/uapi/drm/tegra_drm.h
index 73bde4e..7a79ca5 100644
--- a/include/uapi/drm/tegra_drm.h
+++ b/include/uapi/drm/tegra_drm.h
@@ -61,7 +61,9 @@ struct drm_tegra_close_channel {
struct drm_tegra_get_syncpt {
__u64 context;
- __u32 index;
+ __u16 index;
+ __u8 support_base;
+ __u8 base_id;
__u32 id;
};
--
1.8.1.5
next prev parent reply other threads:[~2013-10-09 11:58 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-10-09 11:54 [PATCH 0/3] gpu: host1x: Add syncpoint base support Arto Merilainen
2013-10-09 11:54 ` [PATCH 1/3] " Arto Merilainen
2013-10-11 9:39 ` Thierry Reding
2013-10-11 11:35 ` Arto Merilainen
2013-10-09 11:54 ` Arto Merilainen [this message]
2013-10-11 9:43 ` [PATCH 2/3] drm/tegra: Deliver syncpoint base to user space Thierry Reding
2013-10-11 10:23 ` Arto Merilainen
2013-10-09 11:54 ` [PATCH 3/3] drm/tegra: Reserve base for gr2d Arto Merilainen
2013-10-11 9:45 ` [PATCH 0/3] gpu: host1x: Add syncpoint base support Thierry Reding
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=1381319650-9799-3-git-send-email-amerilainen@nvidia.com \
--to=amerilainen@nvidia.com \
--cc=dri-devel@lists.freedesktop.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-tegra@vger.kernel.org \
--cc=tbergstrom@nvidia.com \
--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
Powered by JetHome