tegra: Add job and push buffer APIs
These new functions can be used to create a job on a given channel, add commands to the job using its push buffer and submit the job. Reviewed-by: Mikko Perttunen <mperttunen@nvidia.com> Signed-off-by: Thierry Reding <treding@nvidia.com>main
Thierry Reding
parent
b77af8ece6
commit
4c18828e16
|
|
@ -0,0 +1,164 @@
|
|||
/*
|
||||
* Copyright © 2012, 2013 Thierry Reding
|
||||
* Copyright © 2013 Erik Faye-Lund
|
||||
* Copyright © 2014 NVIDIA Corporation
|
||||
*
|
||||
* Permission is hereby granted, free of charge, to any person obtaining a
|
||||
* copy of this software and associated documentation files (the "Software"),
|
||||
* to deal in the Software without restriction, including without limitation
|
||||
* the rights to use, copy, modify, merge, publish, distribute, sublicense,
|
||||
* and/or sell copies of the Software, and to permit persons to whom the
|
||||
* Software is furnished to do so, subject to the following conditions:
|
||||
*
|
||||
* The above copyright notice and this permission notice shall be included in
|
||||
* all copies or substantial portions of the Software.
|
||||
*
|
||||
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
|
||||
* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
|
||||
* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
|
||||
* THE COPYRIGHT HOLDER(S) OR AUTHOR(S) BE LIABLE FOR ANY CLAIM, DAMAGES OR
|
||||
* OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
|
||||
* ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
|
||||
* OTHER DEALINGS IN THE SOFTWARE.
|
||||
*/
|
||||
|
||||
#ifdef HAVE_CONFIG_H
|
||||
# include "config.h"
|
||||
#endif
|
||||
|
||||
#include <errno.h>
|
||||
#include <stdlib.h>
|
||||
#include <string.h>
|
||||
#include <time.h>
|
||||
#include <unistd.h>
|
||||
|
||||
#include <sys/ioctl.h>
|
||||
#include <sys/poll.h>
|
||||
|
||||
#include "private.h"
|
||||
|
||||
struct drm_tegra_submit_cmd *
|
||||
drm_tegra_job_add_command(struct drm_tegra_job *job, uint32_t type,
|
||||
uint32_t flags)
|
||||
{
|
||||
struct drm_tegra_submit_cmd *commands, *command;
|
||||
size_t size;
|
||||
|
||||
size = (job->num_commands + 1) * sizeof(*commands);
|
||||
|
||||
commands = realloc(job->commands, size);
|
||||
if (!commands)
|
||||
return NULL;
|
||||
|
||||
command = &commands[job->num_commands];
|
||||
memset(command, 0, sizeof(*command));
|
||||
command->type = type;
|
||||
command->flags = flags;
|
||||
|
||||
job->commands = commands;
|
||||
job->num_commands++;
|
||||
|
||||
return command;
|
||||
}
|
||||
|
||||
drm_public int
|
||||
drm_tegra_job_new(struct drm_tegra_channel *channel,
|
||||
struct drm_tegra_job **jobp)
|
||||
{
|
||||
struct drm_tegra_job *job;
|
||||
|
||||
job = calloc(1, sizeof(*job));
|
||||
if (!job)
|
||||
return -ENOMEM;
|
||||
|
||||
job->page_size = sysconf(_SC_PAGESIZE);
|
||||
job->channel = channel;
|
||||
|
||||
*jobp = job;
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
||||
drm_public int drm_tegra_job_free(struct drm_tegra_job *job)
|
||||
{
|
||||
if (!job)
|
||||
return -EINVAL;
|
||||
|
||||
if (job->pushbuf)
|
||||
drm_tegra_pushbuf_free(job->pushbuf);
|
||||
|
||||
if (job->commands)
|
||||
free(job->commands);
|
||||
|
||||
if (job->buffers)
|
||||
free(job->buffers);
|
||||
|
||||
free(job);
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
||||
drm_public int
|
||||
drm_tegra_job_get_pushbuf(struct drm_tegra_job *job,
|
||||
struct drm_tegra_pushbuf **pushbufp)
|
||||
{
|
||||
struct drm_tegra_pushbuf *pushbuf;
|
||||
|
||||
if (!job->pushbuf) {
|
||||
pushbuf = calloc(1, sizeof(*pushbuf));
|
||||
if (!pushbuf)
|
||||
return -ENOMEM;
|
||||
|
||||
pushbuf->job = job;
|
||||
|
||||
pushbuf->start = calloc(1, job->page_size);
|
||||
if (!pushbuf->start) {
|
||||
free(pushbuf);
|
||||
return -ENOMEM;
|
||||
}
|
||||
|
||||
pushbuf->end = pushbuf->start + job->page_size / 4;
|
||||
pushbuf->ptr = pushbuf->start;
|
||||
|
||||
job->pushbuf = pushbuf;
|
||||
}
|
||||
|
||||
*pushbufp = job->pushbuf;
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
||||
drm_public int
|
||||
drm_tegra_job_submit(struct drm_tegra_job *job, struct drm_tegra_fence *fence)
|
||||
{
|
||||
struct drm_tegra_channel *channel = job->channel;
|
||||
struct drm_tegra *drm = channel->drm;
|
||||
struct drm_tegra_channel_submit args;
|
||||
int err;
|
||||
|
||||
memset(&args, 0, sizeof(args));
|
||||
args.context = channel->context;
|
||||
args.num_bufs = job->num_buffers;
|
||||
args.num_cmds = job->num_commands;
|
||||
args.gather_data_words = job->pushbuf->ptr - job->pushbuf->start;
|
||||
args.syncpt.id = job->syncpt.id;
|
||||
args.syncpt.increments = job->syncpt.increments;
|
||||
|
||||
args.bufs_ptr = (uintptr_t)job->buffers;
|
||||
args.cmds_ptr = (uintptr_t)job->commands;
|
||||
args.gather_data_ptr = (uintptr_t)job->pushbuf->start;
|
||||
|
||||
err = ioctl(drm->fd, DRM_IOCTL_TEGRA_CHANNEL_SUBMIT, &args);
|
||||
if (err < 0)
|
||||
return -errno;
|
||||
|
||||
job->syncpt.fence = args.syncpt.value;
|
||||
|
||||
if (fence) {
|
||||
fence->drm = drm;
|
||||
fence->syncpt = job->syncpt.id;
|
||||
fence->value = job->syncpt.fence;
|
||||
}
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
|
@ -22,7 +22,7 @@ libdrm_tegra = library(
|
|||
'drm_tegra',
|
||||
[
|
||||
files(
|
||||
'channel.c', 'private.h', 'tegra.c'
|
||||
'channel.c', 'job.c', 'private.h', 'pushbuf.c', 'tegra.c'
|
||||
),
|
||||
config_file
|
||||
],
|
||||
|
|
|
|||
|
|
@ -72,4 +72,36 @@ struct drm_tegra_mapping {
|
|||
uint32_t id;
|
||||
};
|
||||
|
||||
struct drm_tegra_pushbuf {
|
||||
struct drm_tegra_job *job;
|
||||
|
||||
uint32_t *start;
|
||||
uint32_t *end;
|
||||
uint32_t *ptr;
|
||||
};
|
||||
|
||||
void drm_tegra_pushbuf_free(struct drm_tegra_pushbuf *pushbuf);
|
||||
|
||||
struct drm_tegra_job {
|
||||
struct drm_tegra_channel *channel;
|
||||
struct drm_tegra_pushbuf *pushbuf;
|
||||
size_t page_size;
|
||||
|
||||
struct drm_tegra_submit_cmd *commands;
|
||||
unsigned int num_commands;
|
||||
|
||||
struct drm_tegra_submit_buf *buffers;
|
||||
unsigned int num_buffers;
|
||||
|
||||
struct {
|
||||
uint32_t id;
|
||||
uint32_t increments;
|
||||
uint32_t fence;
|
||||
} syncpt;
|
||||
};
|
||||
|
||||
struct drm_tegra_submit_cmd *
|
||||
drm_tegra_job_add_command(struct drm_tegra_job *job, uint32_t type,
|
||||
uint32_t flags);
|
||||
|
||||
#endif /* __DRM_TEGRA_PRIVATE_H__ */
|
||||
|
|
|
|||
|
|
@ -0,0 +1,136 @@
|
|||
/*
|
||||
* Copyright © 2012, 2013 Thierry Reding
|
||||
* Copyright © 2013 Erik Faye-Lund
|
||||
* Copyright © 2014 NVIDIA Corporation
|
||||
*
|
||||
* Permission is hereby granted, free of charge, to any person obtaining a
|
||||
* copy of this software and associated documentation files (the "Software"),
|
||||
* to deal in the Software without restriction, including without limitation
|
||||
* the rights to use, copy, modify, merge, publish, distribute, sublicense,
|
||||
* and/or sell copies of the Software, and to permit persons to whom the
|
||||
* Software is furnished to do so, subject to the following conditions:
|
||||
*
|
||||
* The above copyright notice and this permission notice shall be included in
|
||||
* all copies or substantial portions of the Software.
|
||||
*
|
||||
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
|
||||
* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
|
||||
* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
|
||||
* THE COPYRIGHT HOLDER(S) OR AUTHOR(S) BE LIABLE FOR ANY CLAIM, DAMAGES OR
|
||||
* OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
|
||||
* ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
|
||||
* OTHER DEALINGS IN THE SOFTWARE.
|
||||
*/
|
||||
|
||||
#ifdef HAVE_CONFIG_H
|
||||
# include "config.h"
|
||||
#endif
|
||||
|
||||
#include <errno.h>
|
||||
#include <stdlib.h>
|
||||
#include <string.h>
|
||||
|
||||
#include "util_math.h"
|
||||
#include "private.h"
|
||||
|
||||
#define HOST1X_OPCODE_NONINCR(offset, count) \
|
||||
((0x2 << 28) | (((offset) & 0xfff) << 16) | ((count) & 0xffff))
|
||||
|
||||
static inline unsigned int
|
||||
drm_tegra_pushbuf_get_offset(struct drm_tegra_pushbuf *pushbuf, uint32_t *ptr)
|
||||
{
|
||||
return ptr - pushbuf->start;
|
||||
}
|
||||
|
||||
void drm_tegra_pushbuf_free(struct drm_tegra_pushbuf *pushbuf)
|
||||
{
|
||||
if (pushbuf->start)
|
||||
free(pushbuf->start);
|
||||
|
||||
free(pushbuf);
|
||||
}
|
||||
|
||||
/**
|
||||
* drm_tegra_pushbuf_begin() - prepare push buffer for a series of pushes
|
||||
* @pushbuf: push buffer
|
||||
* @words: maximum number of words in series of pushes to follow
|
||||
*/
|
||||
drm_public int
|
||||
drm_tegra_pushbuf_begin(struct drm_tegra_pushbuf *pushbuf,
|
||||
unsigned int words, uint32_t **ptrp)
|
||||
{
|
||||
struct drm_tegra_job *job = pushbuf->job;
|
||||
unsigned long offset;
|
||||
size_t size;
|
||||
void *ptr;
|
||||
|
||||
if (pushbuf->ptr + words >= pushbuf->end) {
|
||||
words = pushbuf->end - pushbuf->start + words;
|
||||
size = ALIGN(words * 4, job->page_size);
|
||||
offset = pushbuf->ptr - pushbuf->start;
|
||||
|
||||
ptr = realloc(pushbuf->start, size);
|
||||
if (!ptr)
|
||||
return -ENOMEM;
|
||||
|
||||
pushbuf->start = ptr;
|
||||
pushbuf->end = pushbuf->start + size / 4;
|
||||
pushbuf->ptr = pushbuf->start + offset;
|
||||
}
|
||||
|
||||
if (ptrp)
|
||||
*ptrp = pushbuf->ptr;
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
||||
drm_public int
|
||||
drm_tegra_pushbuf_end(struct drm_tegra_pushbuf *pushbuf, uint32_t *ptr)
|
||||
{
|
||||
struct drm_tegra_submit_cmd *command;
|
||||
|
||||
command = drm_tegra_job_add_command(pushbuf->job,
|
||||
DRM_TEGRA_SUBMIT_CMD_GATHER_UPTR,
|
||||
0);
|
||||
if (!command)
|
||||
return -ENOMEM;
|
||||
|
||||
command->gather_uptr.words = ptr - pushbuf->start;
|
||||
pushbuf->ptr = ptr;
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
||||
drm_public int
|
||||
drm_tegra_pushbuf_relocate(struct drm_tegra_pushbuf *pushbuf, uint32_t **ptrp,
|
||||
struct drm_tegra_mapping *target,
|
||||
unsigned long offset, unsigned int shift,
|
||||
uint32_t flags)
|
||||
{
|
||||
struct drm_tegra_submit_buf *buffers, *buffer;
|
||||
struct drm_tegra_job *job = pushbuf->job;
|
||||
size_t size;
|
||||
|
||||
size = (job->num_buffers + 1) * sizeof(*buffer);
|
||||
|
||||
buffers = realloc(job->buffers, size);
|
||||
if (!buffers)
|
||||
return -ENOMEM;
|
||||
|
||||
buffer = &buffers[job->num_buffers];
|
||||
|
||||
memset(buffer, 0, sizeof(*buffer));
|
||||
buffer->mapping = target->id;
|
||||
buffer->flags = flags;
|
||||
buffer->reloc.target_offset = offset;
|
||||
buffer->reloc.gather_offset_words = drm_tegra_pushbuf_get_offset(pushbuf,
|
||||
*ptrp);
|
||||
buffer->reloc.shift = shift;
|
||||
|
||||
*(*ptrp)++ = 0xdeadbeef;
|
||||
|
||||
job->buffers = buffers;
|
||||
job->num_buffers++;
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
|
@ -15,4 +15,11 @@ drm_tegra_channel_map
|
|||
drm_tegra_channel_open
|
||||
drm_tegra_channel_unmap
|
||||
drm_tegra_close
|
||||
drm_tegra_job_free
|
||||
drm_tegra_job_get_pushbuf
|
||||
drm_tegra_job_new
|
||||
drm_tegra_job_submit
|
||||
drm_tegra_new
|
||||
drm_tegra_pushbuf_begin
|
||||
drm_tegra_pushbuf_end
|
||||
drm_tegra_pushbuf_relocate
|
||||
|
|
|
|||
|
|
@ -63,6 +63,22 @@ int drm_tegra_bo_import(struct drm_tegra *drm, int fd,
|
|||
|
||||
struct drm_tegra_channel;
|
||||
struct drm_tegra_mapping;
|
||||
struct drm_tegra_pushbuf;
|
||||
struct drm_tegra_job;
|
||||
|
||||
enum drm_tegra_sync_cond {
|
||||
DRM_TEGRA_SYNC_COND_IMMEDIATE,
|
||||
DRM_TEGRA_SYNC_COND_OP_DONE,
|
||||
DRM_TEGRA_SYNC_COND_RD_DONE,
|
||||
DRM_TEGRA_SYNC_COND_WR_SAFE,
|
||||
DRM_TEGRA_SYNC_COND_MAX,
|
||||
};
|
||||
|
||||
struct drm_tegra_fence {
|
||||
struct drm_tegra *drm;
|
||||
uint32_t syncpt;
|
||||
uint32_t value;
|
||||
};
|
||||
|
||||
int drm_tegra_channel_open(struct drm_tegra *drm,
|
||||
enum drm_tegra_class client,
|
||||
|
|
@ -74,4 +90,22 @@ int drm_tegra_channel_map(struct drm_tegra_channel *channel,
|
|||
struct drm_tegra_mapping **mapp);
|
||||
int drm_tegra_channel_unmap(struct drm_tegra_mapping *map);
|
||||
|
||||
int drm_tegra_job_new(struct drm_tegra_channel *channel,
|
||||
struct drm_tegra_job **jobp);
|
||||
int drm_tegra_job_free(struct drm_tegra_job *job);
|
||||
int drm_tegra_job_get_pushbuf(struct drm_tegra_job *job,
|
||||
struct drm_tegra_pushbuf **pushbufp);
|
||||
int drm_tegra_job_submit(struct drm_tegra_job *job,
|
||||
struct drm_tegra_fence *fence);
|
||||
int drm_tegra_job_wait(struct drm_tegra_job *job, unsigned long timeout);
|
||||
|
||||
int drm_tegra_pushbuf_begin(struct drm_tegra_pushbuf *pushbuf,
|
||||
unsigned int words, uint32_t **ptrp);
|
||||
int drm_tegra_pushbuf_end(struct drm_tegra_pushbuf *pushbuf, uint32_t *ptr);
|
||||
int drm_tegra_pushbuf_relocate(struct drm_tegra_pushbuf *pushbuf,
|
||||
uint32_t **ptrp,
|
||||
struct drm_tegra_mapping *target,
|
||||
unsigned long offset, unsigned int shift,
|
||||
uint32_t flags);
|
||||
|
||||
#endif /* __DRM_TEGRA_H__ */
|
||||
|
|
|
|||
Loading…
Reference in New Issue