mainnika/weston
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

simple-dmabuf-drm: support etnaviv drm as well

Browse Source 
Reviewed-by: Derek Foreman <derekf@osg.samsung.com>
Signed-off-by: Guido Günther <agx@sigxcpu.org>
Reviewed-by: Pekka Paalanen <pekka.paalanen@collabora.co.uk>
This commit is contained in:
Guido Günther
2018-03-20 09:42:00 +01:00
committed by Pekka Paalanen
parent f9f5953b2d
commit bff906304f
3 changed files with 73 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
clients/simple-dmabuf-drm.c
+68
View File
@@ -39,6 +39,7 @@
#include <signal.h>
#include <fcntl.h>
#include <getopt.h>
#include <errno.h>
#include <xf86drm.h>
@@ -49,6 +50,9 @@
#ifdef HAVE_LIBDRM_FREEDRENO
#include <freedreno/freedreno_drmif.h>
#endif
#ifdef HAVE_LIBDRM_ETNAVIV
#include <etnaviv_drmif.h>
#endif
#include <drm_fourcc.h>
#include <wayland-client.h>
@@ -108,6 +112,10 @@ struct buffer {
struct fd_device *fd_dev;
struct fd_bo *fd_bo;
#endif /* HAVE_LIBDRM_FREEDRENO */
#if HAVE_LIBDRM_ETNAVIV
struct etna_device *etna_dev;
struct etna_bo *etna_bo;
#endif /* HAVE_LIBDRM_ETNAVIV */
uint32_t gem_handle;
int dmabuf_fd;
@@ -265,6 +273,56 @@ fd_device_destroy(struct buffer *buf)
fd_device_del(buf->fd_dev);
}
#endif /* HAVE_LIBDRM_FREEDRENO */
#ifdef HAVE_LIBDRM_ETNAVIV
static int
etna_alloc_bo(struct buffer *buf)
{
int flags = DRM_ETNA_GEM_CACHE_WC;
int size;
buf->stride = ALIGN(buf->width, 32) * buf->bpp / 8;
size = buf->stride * buf->height;
buf->etna_dev = etna_device_new(buf->drm_fd);
buf->etna_bo = etna_bo_new(buf->etna_dev, size, flags);
return buf->etna_bo != NULL;
}
static void
etna_free_bo(struct buffer *buf)
{
etna_bo_del(buf->etna_bo);
}
static int
etna_bo_export_to_prime(struct buffer *buf)
{
buf->dmabuf_fd = etna_bo_dmabuf(buf->etna_bo);
return buf->dmabuf_fd < 0;
}
static int
etna_map_bo(struct buffer *buf)
{
buf->mmap = etna_bo_map(buf->etna_bo);
return buf->mmap != NULL;
}
static void
etna_unmap_bo(struct buffer *buf)
{
if (munmap(buf->mmap, buf->stride * buf->height) < 0)
fprintf(stderr, "Failed to unmap buffer: %s", strerror(errno));
buf->mmap = NULL;
}
static void
etna_device_destroy(struct buffer *buf)
{
etna_device_del(buf->etna_dev);
}
#endif /* HAVE_LIBDRM_ENTAVIV */
static void
fill_content(struct buffer *my_buf)
@@ -332,6 +390,16 @@ drm_device_init(struct buffer *buf)
dev->unmap_bo = fd_unmap_bo;
dev->device_destroy = fd_device_destroy;
}
#endif
#ifdef HAVE_LIBDRM_ETNAVIV
else if (!strcmp(dev->name, "etnaviv")) {
dev->alloc_bo = etna_alloc_bo;
dev->free_bo = etna_free_bo;
dev->export_bo_to_prime = etna_bo_export_to_prime;
dev->map_bo = etna_map_bo;
dev->unmap_bo = etna_unmap_bo;
dev->device_destroy = etna_device_destroy;
}
#endif
else {
fprintf(stderr, "Error: drm device %s unsupported.\n",