geemili
/
drm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

tegra: Indent according to .editorconfig 

Reindent the sources according to the settings found in the newly added
.editorconfig.

Reviewed-by: Mikko Perttunen <mperttunen@nvidia.com>
Signed-off-by: Thierry Reding <treding@nvidia.com>
main
Thierry Reding 2018-03-20 12:55:04 +01:00
parent d13ab997f5
commit bca42ae004
4 changed files with 217 additions and 213 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
tegra/private.h
View File

@ -34,18 +34,18 @@
#include "tegra.h" #include "tegra.h"
struct drm_tegra { struct drm_tegra {
bool close; bool close;
int fd; int fd;
}; };
struct drm_tegra_bo { struct drm_tegra_bo {
struct drm_tegra *drm; struct drm_tegra *drm;
uint32_t handle; uint32_t handle;
uint32_t offset; uint32_t offset;
uint32_t flags; uint32_t flags;
uint32_t size; uint32_t size;
atomic_t ref; atomic_t ref;
void *map; void *map;
}; };
#endif /* __DRM_TEGRA_PRIVATE_H__ */ #endif /* __DRM_TEGRA_PRIVATE_H__ */

348
tegra/tegra.c
View File

@ -37,288 +37,292 @@
static void drm_tegra_bo_free(struct drm_tegra_bo *bo) static void drm_tegra_bo_free(struct drm_tegra_bo *bo)
{ {
struct drm_tegra *drm = bo->drm; struct drm_tegra *drm = bo->drm;
if (bo->map) if (bo->map)
munmap(bo->map, bo->size); munmap(bo->map, bo->size);
drmCloseBufferHandle(drm->fd, bo->handle); drmCloseBufferHandle(drm->fd, bo->handle);
free(bo); free(bo);
} }
static int drm_tegra_wrap(struct drm_tegra **drmp, int fd, bool close) static int drm_tegra_wrap(struct drm_tegra **drmp, int fd, bool close)
{ {
struct drm_tegra *drm; struct drm_tegra *drm;
if (fd < 0 || !drmp) if (fd < 0 || !drmp)
return -EINVAL; return -EINVAL;
drm = calloc(1, sizeof(*drm)); drm = calloc(1, sizeof(*drm));
if (!drm) if (!drm)
return -ENOMEM; return -ENOMEM;
drm->close = close; drm->close = close;
drm->fd = fd; drm->fd = fd;
*drmp = drm; *drmp = drm;
return 0; return 0;
} }
drm_public int drm_tegra_new(struct drm_tegra **drmp, int fd) drm_public int drm_tegra_new(struct drm_tegra **drmp, int fd)
{ {
bool supported = false; bool supported = false;
drmVersionPtr version; drmVersionPtr version;
version = drmGetVersion(fd); version = drmGetVersion(fd);
if (!version) if (!version)
return -ENOMEM; return -ENOMEM;
if (!strncmp(version->name, "tegra", version->name_len)) if (!strncmp(version->name, "tegra", version->name_len))
supported = true; supported = true;
drmFreeVersion(version); drmFreeVersion(version);
if (!supported) if (!supported)
return -ENOTSUP; return -ENOTSUP;
return drm_tegra_wrap(drmp, fd, false); return drm_tegra_wrap(drmp, fd, false);
} }
drm_public void drm_tegra_close(struct drm_tegra *drm) drm_public void drm_tegra_close(struct drm_tegra *drm)
{ {
if (!drm) if (!drm)
return; return;
if (drm->close) if (drm->close)
close(drm->fd); close(drm->fd);
free(drm); free(drm);
} }
drm_public int drm_tegra_bo_new(struct drm_tegra_bo **bop, struct drm_tegra *drm, drm_public int
uint32_t flags, uint32_t size) drm_tegra_bo_new(struct drm_tegra_bo **bop, struct drm_tegra *drm,
uint32_t flags, uint32_t size)
{ {
struct drm_tegra_gem_create args; struct drm_tegra_gem_create args;
struct drm_tegra_bo *bo; struct drm_tegra_bo *bo;
int err; int err;
if (!drm || size == 0 || !bop) if (!drm || size == 0 || !bop)
return -EINVAL; return -EINVAL;
bo = calloc(1, sizeof(*bo)); bo = calloc(1, sizeof(*bo));
if (!bo) if (!bo)
return -ENOMEM; return -ENOMEM;
atomic_set(&bo->ref, 1); atomic_set(&bo->ref, 1);
bo->flags = flags; bo->flags = flags;
bo->size = size; bo->size = size;
bo->drm = drm; bo->drm = drm;
memset(&args, 0, sizeof(args)); memset(&args, 0, sizeof(args));
args.flags = flags; args.flags = flags;
args.size = size; args.size = size;
err = drmCommandWriteRead(drm->fd, DRM_TEGRA_GEM_CREATE, &args, err = drmCommandWriteRead(drm->fd, DRM_TEGRA_GEM_CREATE, &args,
sizeof(args)); sizeof(args));
if (err < 0) { if (err < 0) {
err = -errno; err = -errno;
free(bo); free(bo);
return err; return err;
} }
bo->handle = args.handle; bo->handle = args.handle;
*bop = bo; *bop = bo;
return 0; return 0;
} }
drm_public int drm_tegra_bo_wrap(struct drm_tegra_bo **bop, struct drm_tegra *drm, drm_public int
uint32_t handle, uint32_t flags, uint32_t size) drm_tegra_bo_wrap(struct drm_tegra_bo **bop, struct drm_tegra *drm,
uint32_t handle, uint32_t flags, uint32_t size)
{ {
struct drm_tegra_bo *bo; struct drm_tegra_bo *bo;
if (!drm || !bop) if (!drm || !bop)
return -EINVAL; return -EINVAL;
bo = calloc(1, sizeof(*bo)); bo = calloc(1, sizeof(*bo));
if (!bo) if (!bo)
return -ENOMEM; return -ENOMEM;
atomic_set(&bo->ref, 1); atomic_set(&bo->ref, 1);
bo->handle = handle; bo->handle = handle;
bo->flags = flags; bo->flags = flags;
bo->size = size; bo->size = size;
bo->drm = drm; bo->drm = drm;
*bop = bo; *bop = bo;
return 0; return 0;
} }
drm_public struct drm_tegra_bo *drm_tegra_bo_ref(struct drm_tegra_bo *bo) drm_public struct drm_tegra_bo *drm_tegra_bo_ref(struct drm_tegra_bo *bo)
{ {
if (bo) if (bo)
atomic_inc(&bo->ref); atomic_inc(&bo->ref);
return bo; return bo;
} }
drm_public void drm_tegra_bo_unref(struct drm_tegra_bo *bo) drm_public void drm_tegra_bo_unref(struct drm_tegra_bo *bo)
{ {
if (bo && atomic_dec_and_test(&bo->ref)) if (bo && atomic_dec_and_test(&bo->ref))
drm_tegra_bo_free(bo); drm_tegra_bo_free(bo);
} }
drm_public int drm_tegra_bo_get_handle(struct drm_tegra_bo *bo, uint32_t *handle) drm_public int drm_tegra_bo_get_handle(struct drm_tegra_bo *bo, uint32_t *handle)
{ {
if (!bo || !handle) if (!bo || !handle)
return -EINVAL; return -EINVAL;
*handle = bo->handle; *handle = bo->handle;
return 0; return 0;
} }
drm_public int drm_tegra_bo_map(struct drm_tegra_bo *bo, void **ptr) drm_public int drm_tegra_bo_map(struct drm_tegra_bo *bo, void **ptr)
{ {
struct drm_tegra *drm = bo->drm; struct drm_tegra *drm = bo->drm;
if (!bo->map) { if (!bo->map) {
struct drm_tegra_gem_mmap args; struct drm_tegra_gem_mmap args;
int err; int err;
memset(&args, 0, sizeof(args)); memset(&args, 0, sizeof(args));
args.handle = bo->handle; args.handle = bo->handle;
err = drmCommandWriteRead(drm->fd, DRM_TEGRA_GEM_MMAP, &args, err = drmCommandWriteRead(drm->fd, DRM_TEGRA_GEM_MMAP, &args,
sizeof(args)); sizeof(args));
if (err < 0) if (err < 0)
return -errno; return -errno;
bo->offset = args.offset; bo->offset = args.offset;
bo->map = mmap(0, bo->size, PROT_READ | PROT_WRITE, MAP_SHARED, bo->map = mmap(0, bo->size, PROT_READ | PROT_WRITE, MAP_SHARED,
drm->fd, bo->offset); drm->fd, bo->offset);
if (bo->map == MAP_FAILED) { if (bo->map == MAP_FAILED) {
bo->map = NULL; bo->map = NULL;
return -errno; return -errno;
} }
} }
if (ptr) if (ptr)
*ptr = bo->map; *ptr = bo->map;
return 0; return 0;
} }
drm_public int drm_tegra_bo_unmap(struct drm_tegra_bo *bo) drm_public int drm_tegra_bo_unmap(struct drm_tegra_bo *bo)
{ {
if (!bo) if (!bo)
return -EINVAL; return -EINVAL;
if (!bo->map) if (!bo->map)
return 0; return 0;
if (munmap(bo->map, bo->size)) if (munmap(bo->map, bo->size))
return -errno; return -errno;
bo->map = NULL; bo->map = NULL;
return 0; return 0;
} }
drm_public int drm_tegra_bo_get_flags(struct drm_tegra_bo *bo, uint32_t *flags) drm_public int drm_tegra_bo_get_flags(struct drm_tegra_bo *bo, uint32_t *flags)
{ {
struct drm_tegra_gem_get_flags args; struct drm_tegra_gem_get_flags args;
struct drm_tegra *drm = bo->drm; struct drm_tegra *drm = bo->drm;
int err; int err;
if (!bo) if (!bo)
return -EINVAL; return -EINVAL;
memset(&args, 0, sizeof(args)); memset(&args, 0, sizeof(args));
args.handle = bo->handle; args.handle = bo->handle;
err = drmCommandWriteRead(drm->fd, DRM_TEGRA_GEM_GET_FLAGS, &args, err = drmCommandWriteRead(drm->fd, DRM_TEGRA_GEM_GET_FLAGS, &args,
sizeof(args)); sizeof(args));
if (err < 0) if (err < 0)
return -errno; return -errno;
if (flags) if (flags)
*flags = args.flags; *flags = args.flags;
return 0; return 0;
} }
drm_public int drm_tegra_bo_set_flags(struct drm_tegra_bo *bo, uint32_t flags) drm_public int drm_tegra_bo_set_flags(struct drm_tegra_bo *bo, uint32_t flags)
{ {
struct drm_tegra_gem_get_flags args; struct drm_tegra_gem_get_flags args;
struct drm_tegra *drm = bo->drm; struct drm_tegra *drm = bo->drm;
int err; int err;
if (!bo) if (!bo)
return -EINVAL; return -EINVAL;
memset(&args, 0, sizeof(args)); memset(&args, 0, sizeof(args));
args.handle = bo->handle; args.handle = bo->handle;
args.flags = flags; args.flags = flags;
err = drmCommandWriteRead(drm->fd, DRM_TEGRA_GEM_SET_FLAGS, &args, err = drmCommandWriteRead(drm->fd, DRM_TEGRA_GEM_SET_FLAGS, &args,
sizeof(args)); sizeof(args));
if (err < 0) if (err < 0)
return -errno; return -errno;
return 0; return 0;
} }
drm_public int drm_tegra_bo_get_tiling(struct drm_tegra_bo *bo, drm_public int
struct drm_tegra_bo_tiling *tiling) drm_tegra_bo_get_tiling(struct drm_tegra_bo *bo,
struct drm_tegra_bo_tiling *tiling)
{ {
struct drm_tegra_gem_get_tiling args; struct drm_tegra_gem_get_tiling args;
struct drm_tegra *drm = bo->drm; struct drm_tegra *drm = bo->drm;
int err; int err;
if (!bo) if (!bo)
return -EINVAL; return -EINVAL;
memset(&args, 0, sizeof(args)); memset(&args, 0, sizeof(args));
args.handle = bo->handle; args.handle = bo->handle;
err = drmCommandWriteRead(drm->fd, DRM_TEGRA_GEM_GET_TILING, &args, err = drmCommandWriteRead(drm->fd, DRM_TEGRA_GEM_GET_TILING, &args,
sizeof(args)); sizeof(args));
if (err < 0) if (err < 0)
return -errno; return -errno;
if (tiling) { if (tiling) {
tiling->mode = args.mode; tiling->mode = args.mode;
tiling->value = args.value; tiling->value = args.value;
} }
return 0; return 0;
} }
drm_public int drm_tegra_bo_set_tiling(struct drm_tegra_bo *bo, drm_public int
const struct drm_tegra_bo_tiling *tiling) drm_tegra_bo_set_tiling(struct drm_tegra_bo *bo,
const struct drm_tegra_bo_tiling *tiling)
{ {
struct drm_tegra_gem_set_tiling args; struct drm_tegra_gem_set_tiling args;
struct drm_tegra *drm = bo->drm; struct drm_tegra *drm = bo->drm;
int err; int err;
if (!bo) if (!bo)
return -EINVAL; return -EINVAL;
memset(&args, 0, sizeof(args)); memset(&args, 0, sizeof(args));
args.handle = bo->handle; args.handle = bo->handle;
args.mode = tiling->mode; args.mode = tiling->mode;
args.value = tiling->value; args.value = tiling->value;
err = drmCommandWriteRead(drm->fd, DRM_TEGRA_GEM_SET_TILING, &args, err = drmCommandWriteRead(drm->fd, DRM_TEGRA_GEM_SET_TILING, &args,
sizeof(args)); sizeof(args));
if (err < 0) if (err < 0)
return -errno; return -errno;
return 0; return 0;
} }

12
tegra/tegra.h
View File

@ -35,9 +35,9 @@ int drm_tegra_new(struct drm_tegra **drmp, int fd);
void drm_tegra_close(struct drm_tegra *drm); void drm_tegra_close(struct drm_tegra *drm);
int drm_tegra_bo_new(struct drm_tegra_bo **bop, struct drm_tegra *drm, int drm_tegra_bo_new(struct drm_tegra_bo **bop, struct drm_tegra *drm,
uint32_t flags, uint32_t size); uint32_t flags, uint32_t size);
int drm_tegra_bo_wrap(struct drm_tegra_bo **bop, struct drm_tegra *drm, int drm_tegra_bo_wrap(struct drm_tegra_bo **bop, struct drm_tegra *drm,
uint32_t handle, uint32_t flags, uint32_t size); uint32_t handle, uint32_t flags, uint32_t size);
struct drm_tegra_bo *drm_tegra_bo_ref(struct drm_tegra_bo *bo); struct drm_tegra_bo *drm_tegra_bo_ref(struct drm_tegra_bo *bo);
void drm_tegra_bo_unref(struct drm_tegra_bo *bo); void drm_tegra_bo_unref(struct drm_tegra_bo *bo);
int drm_tegra_bo_get_handle(struct drm_tegra_bo *bo, uint32_t *handle); int drm_tegra_bo_get_handle(struct drm_tegra_bo *bo, uint32_t *handle);
@ -48,13 +48,13 @@ int drm_tegra_bo_get_flags(struct drm_tegra_bo *bo, uint32_t *flags);
int drm_tegra_bo_set_flags(struct drm_tegra_bo *bo, uint32_t flags); int drm_tegra_bo_set_flags(struct drm_tegra_bo *bo, uint32_t flags);
struct drm_tegra_bo_tiling { struct drm_tegra_bo_tiling {
uint32_t mode; uint32_t mode;
uint32_t value; uint32_t value;
}; };
int drm_tegra_bo_get_tiling(struct drm_tegra_bo *bo, int drm_tegra_bo_get_tiling(struct drm_tegra_bo *bo,
struct drm_tegra_bo_tiling *tiling); struct drm_tegra_bo_tiling *tiling);
int drm_tegra_bo_set_tiling(struct drm_tegra_bo *bo, int drm_tegra_bo_set_tiling(struct drm_tegra_bo *bo,
const struct drm_tegra_bo_tiling *tiling); const struct drm_tegra_bo_tiling *tiling);
#endif /* __DRM_TEGRA_H__ */ #endif /* __DRM_TEGRA_H__ */

52
tests/tegra/openclose.c
View File

@ -31,37 +31,37 @@ static const char default_device[] = "/dev/dri/card0";
int main(int argc, char *argv[]) int main(int argc, char *argv[])
{ {
struct drm_tegra *tegra; struct drm_tegra *tegra;
drmVersionPtr version; drmVersionPtr version;
const char *device; const char *device;
int err, fd; int err, fd;
if (argc < 2) if (argc < 2)
device = default_device; device = default_device;
else else
device = argv[1]; device = argv[1];
fd = open(device, O_RDWR); fd = open(device, O_RDWR);
if (fd < 0) if (fd < 0)
return 1; return 1;
version = drmGetVersion(fd); version = drmGetVersion(fd);
if (version) { if (version) {
printf("Version: %d.%d.%d\n", version->version_major, printf("Version: %d.%d.%d\n", version->version_major,
version->version_minor, version->version_patchlevel); version->version_minor, version->version_patchlevel);
printf(" Name: %s\n", version->name); printf(" Name: %s\n", version->name);
printf(" Date: %s\n", version->date); printf(" Date: %s\n", version->date);
printf(" Description: %s\n", version->desc); printf(" Description: %s\n", version->desc);
drmFreeVersion(version); drmFreeVersion(version);
} }
err = drm_tegra_new(&tegra, fd); err = drm_tegra_new(&tegra, fd);
if (err < 0) if (err < 0)
return 1; return 1;
drm_tegra_close(tegra); drm_tegra_close(tegra);
close(fd); close(fd);
return 0; return 0;
} }