Commit 44e96138 authored by Mikko Perttunen's avatar Mikko Perttunen Committed by Thierry Reding
Browse files

drm/tegra: Implement syncpoint wait UAPI 



Implement new syncpoint wait UAPI. This is different from the
legacy one in taking an absolute timestamp in line with modern
DRM conventions.

Signed-off-by: default avatarMikko Perttunen <mperttunen@nvidia.com>
Signed-off-by: default avatarThierry Reding <treding@nvidia.com>
parent fc348336

drivers/gpu/drm/tegra/drm.c

+2 −0
Original line number Diff line number Diff line
@@ -732,6 +732,8 @@ static const struct drm_ioctl_desc tegra_drm_ioctls[] = { 
			  DRM_RENDER_ALLOW),

	DRM_IOCTL_DEF_DRV(TEGRA_SYNCPOINT_FREE, tegra_drm_ioctl_syncpoint_free,

			  DRM_RENDER_ALLOW),

	DRM_IOCTL_DEF_DRV(TEGRA_SYNCPOINT_WAIT, tegra_drm_ioctl_syncpoint_wait,

			  DRM_RENDER_ALLOW),



	DRM_IOCTL_DEF_DRV(TEGRA_GEM_CREATE, tegra_gem_create, DRM_RENDER_ALLOW),

	DRM_IOCTL_DEF_DRV(TEGRA_GEM_MMAP, tegra_gem_mmap, DRM_RENDER_ALLOW),

drivers/gpu/drm/tegra/uapi.c

+11 −28
Original line number Diff line number Diff line
@@ -7,6 +7,7 @@ 


#include <drm/drm_drv.h>

#include <drm/drm_file.h>

#include <drm/drm_utils.h>



#include "drm.h"

#include "uapi.h"
@@ -317,39 +318,21 @@ int tegra_drm_ioctl_syncpoint_free(struct drm_device *drm, void *data, struct dr 
	return 0;

}



int tegra_drm_ioctl_gem_create(struct drm_device *drm, void *data,

			       struct drm_file *file)

int tegra_drm_ioctl_syncpoint_wait(struct drm_device *drm, void *data, struct drm_file *file)

{

	struct drm_tegra_gem_create *args = data;

	struct tegra_bo *bo;

	struct host1x *host1x = tegra_drm_to_host1x(drm->dev_private);

	struct drm_tegra_syncpoint_wait *args = data;

	signed long timeout_jiffies;

	struct host1x_syncpt *sp;



	if (args->flags)

	if (args->padding != 0)

		return -EINVAL;



	bo = tegra_bo_create_with_handle(file, drm, args->size, args->flags,

					 &args->handle);

	if (IS_ERR(bo))

		return PTR_ERR(bo);



	return 0;

}



int tegra_drm_ioctl_gem_mmap(struct drm_device *drm, void *data,

			     struct drm_file *file)

{

	struct drm_tegra_gem_mmap *args = data;

	struct drm_gem_object *gem;

	struct tegra_bo *bo;



	gem = drm_gem_object_lookup(file, args->handle);

	if (!gem)

	sp = host1x_syncpt_get_by_id_noref(host1x, args->id);

	if (!sp)

		return -EINVAL;



	bo = to_tegra_bo(gem);

	timeout_jiffies = drm_timeout_abs_to_jiffies(args->timeout_ns);



	args->offset = drm_vma_node_offset_addr(&bo->gem.vma_node);



	drm_gem_object_put(gem);



	return 0;

	return host1x_syncpt_wait(sp, args->threshold, timeout_jiffies, &args->value);

}

drivers/gpu/drm/tegra/uapi.h

+2 −0
Original line number Diff line number Diff line
@@ -49,6 +49,8 @@ int tegra_drm_ioctl_syncpoint_allocate(struct drm_device *drm, void *data, 
				       struct drm_file *file);

int tegra_drm_ioctl_syncpoint_free(struct drm_device *drm, void *data,

				   struct drm_file *file);

int tegra_drm_ioctl_syncpoint_wait(struct drm_device *drm, void *data,

				   struct drm_file *file);



void tegra_drm_uapi_close_file(struct tegra_drm_file *file);

void tegra_drm_mapping_put(struct tegra_drm_mapping *mapping);