exynos: fimg2d: fix return codes

[android-x86/external-libdrm.git] / exynos / exynos_drm.c

diff --git a/exynos/exynos_drm.c b/exynos/exynos_drm.c
index b7acdf5..df9b8ed 100644 (file)
--- a/exynos/exynos_drm.c
+++ b/exynos/exynos_drm.c
@@ -38,6 +38,7 @@
 
 #include <xf86drm.h>
 
+#include "libdrm_macros.h"
 #include "exynos_drm.h"
 #include "exynos_drmif.h"
 
@@ -88,7 +89,7 @@ void exynos_device_destroy(struct exynos_device *dev)
  * if true, return a exynos buffer object else NULL.
  */
 struct exynos_bo * exynos_bo_create(struct exynos_device *dev,
-                                               size_t size, uint32_t flags)
+                                              size_t size, uint32_t flags)
 {
        struct exynos_bo *bo;
        struct drm_exynos_gem_create req = {
@@ -142,7 +143,7 @@ fail:
  * if true, return 0 else negative.
  */
 int exynos_bo_get_info(struct exynos_device *dev, uint32_t handle,
-                       size_t *size, uint32_t *flags)
+                                 size_t *size, uint32_t *flags)
 {
        int ret;
        struct drm_exynos_gem_info req = {
@@ -199,7 +200,8 @@ void exynos_bo_destroy(struct exynos_bo *bo)
  * if true, return a exynos buffer object else NULL.
  *
  */
-struct exynos_bo * exynos_bo_from_name(struct exynos_device *dev, uint32_t name)
+struct exynos_bo *
+exynos_bo_from_name(struct exynos_device *dev, uint32_t name)
 {
        struct exynos_bo *bo;
        struct drm_gem_open req = {
@@ -281,20 +283,25 @@ void *exynos_bo_map(struct exynos_bo *bo)
 {
        if (!bo->vaddr) {
                struct exynos_device *dev = bo->dev;
-               struct drm_exynos_gem_mmap req = {
-                       .handle = bo->handle,
-                       .size   = bo->size,
-               };
+               struct drm_mode_map_dumb arg;
+               void *map = NULL;
                int ret;
 
-               ret = drmIoctl(dev->fd, DRM_IOCTL_EXYNOS_GEM_MMAP, &req);
+               memset(&arg, 0, sizeof(arg));
+               arg.handle = bo->handle;
+
+               ret = drmIoctl(dev->fd, DRM_IOCTL_MODE_MAP_DUMB, &arg);
                if (ret) {
-                       fprintf(stderr, "failed to mmap[%s].\n",
+                       fprintf(stderr, "failed to map dumb buffer[%s].\n",
                                strerror(errno));
                        return NULL;
                }
 
-               bo->vaddr = (void *)(uintptr_t)req.mapped;
+               map = drm_mmap(0, bo->size, PROT_READ | PROT_WRITE, MAP_SHARED,
+                               dev->fd, arg.offset);
+
+               if (map != MAP_FAILED)
+                       bo->vaddr = map;
        }
 
        return bo->vaddr;
@@ -303,59 +310,31 @@ void *exynos_bo_map(struct exynos_bo *bo)
 /*
  * Export gem object to dmabuf as file descriptor.
  *
- * @dev: a exynos device object.
- * @handle: gem handle to be exported into dmabuf as file descriptor.
- * @fd: file descriptor to dmabuf exported from gem handle and
- *     returned by kernel side.
+ * @dev: exynos device object
+ * @handle: gem handle to export as file descriptor of dmabuf
+ * @fd: file descriptor returned from kernel
  *
- * if true, return 0 else negative.
+ * @return: 0 on success, -1 on error, and errno will be set
  */
-int exynos_prime_handle_to_fd(struct exynos_device *dev, uint32_t handle,
-                                       int *fd)
+int
+exynos_prime_handle_to_fd(struct exynos_device *dev, uint32_t handle, int *fd)
 {
-       int ret;
-       struct drm_prime_handle req = {
-               .handle = handle,
-       };
-
-       ret = drmIoctl(dev->fd, DRM_IOCTL_PRIME_HANDLE_TO_FD, &req);
-       if (ret) {
-               fprintf(stderr, "failed to mmap[%s].\n",
-                       strerror(errno));
-               return ret;
-       }
-
-       *fd = req.fd;
-       return 0;
+       return drmPrimeHandleToFD(dev->fd, handle, 0, fd);
 }
 
 /*
  * Import file descriptor into gem handle.
  *
- * @dev: a exynos device object.
- * @fd: file descriptor exported into dmabuf.
- * @handle: gem handle to gem object imported from file descriptor
- *     and returned by kernel side.
+ * @dev: exynos device object
+ * @fd: file descriptor of dmabuf to import
+ * @handle: gem handle returned from kernel
  *
- * if true, return 0 else negative.
+ * @return: 0 on success, -1 on error, and errno will be set
  */
-int exynos_prime_fd_to_handle(struct exynos_device *dev, int fd,
-                                       uint32_t *handle)
+int
+exynos_prime_fd_to_handle(struct exynos_device *dev, int fd, uint32_t *handle)
 {
-       int ret;
-       struct drm_prime_handle req = {
-               .fd     = fd,
-       };
-
-       ret = drmIoctl(dev->fd, DRM_IOCTL_PRIME_FD_TO_HANDLE, &req);
-       if (ret) {
-               fprintf(stderr, "failed to mmap[%s].\n",
-                       strerror(errno));
-               return ret;
-       }
-
-       *handle = req.handle;
-       return 0;
+       return drmPrimeFDToHandle(dev->fd, fd, handle);
 }
 
 
@@ -375,8 +354,9 @@ int exynos_prime_fd_to_handle(struct exynos_device *dev, int fd,
  *
  * if true, return 0 else negative.
  */
-int exynos_vidi_connection(struct exynos_device *dev, uint32_t connect,
-                               uint32_t ext, void *edid)
+int
+exynos_vidi_connection(struct exynos_device *dev, uint32_t connect,
+                      uint32_t ext, void *edid)
 {
        struct drm_exynos_vidi_connection req = {
                .connection     = connect,