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

tegra: Make API more consistent 

Most functions in libdrm_tegra take as first parameter the object that
they operate on. Make the device and buffer object creation functions
follow the same scheme.

Reviewed-by: Mikko Perttunen <mperttunen@nvidia.com>
Signed-off-by: Thierry Reding <treding@nvidia.com>
main
Thierry Reding 2021-07-09 20:13:12 +02:00
parent abe27b1757
commit 69fa0dd940
3 changed files with 13 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
tegra/tegra.c
View File

@ -66,7 +66,7 @@ static int drm_tegra_wrap(struct drm_tegra **drmp, int fd, bool close)
return 0; return 0;
} }
drm_public int drm_tegra_new(struct drm_tegra **drmp, int fd) drm_public int drm_tegra_new(int fd, struct drm_tegra **drmp)
{ {
bool supported = false; bool supported = false;
drmVersionPtr version; drmVersionPtr version;
@ -118,8 +118,8 @@ static struct drm_tegra_bo *drm_tegra_bo_alloc(struct drm_tegra *drm,
} }
drm_public int drm_public int
drm_tegra_bo_new(struct drm_tegra_bo **bop, struct drm_tegra *drm, drm_tegra_bo_new(struct drm_tegra *drm, uint32_t flags, uint32_t size,
uint32_t flags, uint32_t size) struct drm_tegra_bo **bop)
{ {
struct drm_tegra_gem_create args; struct drm_tegra_gem_create args;
struct drm_tegra_bo *bo; struct drm_tegra_bo *bo;
@ -152,8 +152,8 @@ drm_tegra_bo_new(struct drm_tegra_bo **bop, struct drm_tegra *drm,
} }
drm_public int drm_public int
drm_tegra_bo_wrap(struct drm_tegra_bo **bop, struct drm_tegra *drm, drm_tegra_bo_wrap(struct drm_tegra *drm, uint32_t handle, uint32_t flags,
uint32_t handle, uint32_t flags, uint32_t size) uint32_t size, struct drm_tegra_bo **bop)
{ {
struct drm_tegra_bo *bo; struct drm_tegra_bo *bo;
@ -183,7 +183,8 @@ drm_public void drm_tegra_bo_unref(struct drm_tegra_bo *bo)
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;

10
tegra/tegra.h
View File

@ -31,13 +31,13 @@
struct drm_tegra_bo; struct drm_tegra_bo;
struct drm_tegra; struct drm_tegra;
int drm_tegra_new(struct drm_tegra **drmp, int fd); int drm_tegra_new(int fd, struct drm_tegra **drmp);
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 *drm, uint32_t flags, uint32_t size,
uint32_t flags, uint32_t size); struct drm_tegra_bo **bop);
int drm_tegra_bo_wrap(struct drm_tegra_bo **bop, struct drm_tegra *drm, int drm_tegra_bo_wrap(struct drm_tegra *drm, uint32_t handle, uint32_t flags,
uint32_t handle, uint32_t flags, uint32_t size); uint32_t size, struct drm_tegra_bo **bop);
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);

2
tests/tegra/openclose.c
View File

@ -56,7 +56,7 @@ int main(int argc, char *argv[])
drmFreeVersion(version); drmFreeVersion(version);
} }
err = drm_tegra_new(&tegra, fd); err = drm_tegra_new(fd, &tegra);
if (err < 0) if (err < 0)
return 1; return 1;