Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit c54a169b authored by Arto Merilainen's avatar Arto Merilainen Committed by Thierry Reding
Browse files

drm/tegra: Deliver syncpoint base to user space 



This patch adds a separate ioctl for delivering syncpoint base number
to user space. If the syncpoint does not have an associated base, the
function returns -ENXIO.

Signed-off-by: default avatarArto Merilainen <amerilainen@nvidia.com>
Reviewed-by: default avatarTerje Bergstrom <tbergstrom@nvidia.com>
Signed-off-by: default avatarThierry Reding <treding@nvidia.com>
parent f5a954fe

drivers/gpu/drm/tegra/drm.c

+29 −0
Original line number Diff line number Diff line
@@ -418,6 +418,34 @@ static int tegra_submit(struct drm_device *drm, void *data, 


	return context->client->ops->submit(context, args, drm, file);

}



static int tegra_get_syncpt_base(struct drm_device *drm, void *data,

				 struct drm_file *file)

{

	struct tegra_drm_file *fpriv = file->driver_priv;

	struct drm_tegra_get_syncpt_base *args = data;

	struct tegra_drm_context *context;

	struct host1x_syncpt_base *base;

	struct host1x_syncpt *syncpt;



	context = tegra_drm_get_context(args->context);



	if (!tegra_drm_file_owns_context(fpriv, context))

		return -ENODEV;



	if (args->syncpt >= context->client->base.num_syncpts)

		return -EINVAL;



	syncpt = context->client->base.syncpts[args->syncpt];



	base = host1x_syncpt_get_base(syncpt);

	if (!base)

		return -ENXIO;



	args->id = host1x_syncpt_base_id(base);



	return 0;

}

#endif



static const struct drm_ioctl_desc tegra_drm_ioctls[] = {
@@ -431,6 +459,7 @@ static const struct drm_ioctl_desc tegra_drm_ioctls[] = { 
	DRM_IOCTL_DEF_DRV(TEGRA_CLOSE_CHANNEL, tegra_close_channel, DRM_UNLOCKED),

	DRM_IOCTL_DEF_DRV(TEGRA_GET_SYNCPT, tegra_get_syncpt, DRM_UNLOCKED),

	DRM_IOCTL_DEF_DRV(TEGRA_SUBMIT, tegra_submit, DRM_UNLOCKED),

	DRM_IOCTL_DEF_DRV(TEGRA_GET_SYNCPT_BASE, tegra_get_syncpt_base, DRM_UNLOCKED),

#endif

};

include/uapi/drm/tegra_drm.h

+17 −9
Original line number Diff line number Diff line
@@ -68,6 +68,12 @@ struct drm_tegra_get_syncpt { 
	__u32 id;

};



struct drm_tegra_get_syncpt_base {

	__u64 context;

	__u32 syncpt;

	__u32 id;

};



struct drm_tegra_syncpt {

	__u32 id;

	__u32 incrs;
@@ -127,6 +133,7 @@ struct drm_tegra_submit { 
#define DRM_TEGRA_CLOSE_CHANNEL		0x06

#define DRM_TEGRA_GET_SYNCPT		0x07

#define DRM_TEGRA_SUBMIT		0x08

#define DRM_TEGRA_GET_SYNCPT_BASE	0x09



#define DRM_IOCTL_TEGRA_GEM_CREATE DRM_IOWR(DRM_COMMAND_BASE + DRM_TEGRA_GEM_CREATE, struct drm_tegra_gem_create)

#define DRM_IOCTL_TEGRA_GEM_MMAP DRM_IOWR(DRM_COMMAND_BASE + DRM_TEGRA_GEM_MMAP, struct drm_tegra_gem_mmap)
@@ -137,5 +144,6 @@ struct drm_tegra_submit { 
#define DRM_IOCTL_TEGRA_CLOSE_CHANNEL DRM_IOWR(DRM_COMMAND_BASE + DRM_TEGRA_CLOSE_CHANNEL, struct drm_tegra_open_channel)

#define DRM_IOCTL_TEGRA_GET_SYNCPT DRM_IOWR(DRM_COMMAND_BASE + DRM_TEGRA_GET_SYNCPT, struct drm_tegra_get_syncpt)

#define DRM_IOCTL_TEGRA_SUBMIT DRM_IOWR(DRM_COMMAND_BASE + DRM_TEGRA_SUBMIT, struct drm_tegra_submit)

#define DRM_IOCTL_TEGRA_GET_SYNCPT_BASE DRM_IOWR(DRM_COMMAND_BASE + DRM_TEGRA_GET_SYNCPT_BASE, struct drm_tegra_get_syncpt_base)



#endif