minigbm:amdgpu: align stride to 256

[android-x86/external-minigbm.git] / cros_gralloc / cros_gralloc_driver.cc

diff --git a/cros_gralloc/cros_gralloc_driver.cc b/cros_gralloc/cros_gralloc_driver.cc
index 7a4632e..66087f5 100644 (file)
--- a/cros_gralloc/cros_gralloc_driver.cc
+++ b/cros_gralloc/cros_gralloc_driver.cc
@@ -26,6 +26,10 @@ cros_gralloc_driver::~cros_gralloc_driver()
        }
 }
 
+int cros_gralloc_driver::get_fd() const {
+       return drv_get_fd(drv_);
+}
+
 int32_t cros_gralloc_driver::init()
 {
        /*
@@ -49,7 +53,7 @@ int32_t cros_gralloc_driver::init()
                        if (asprintf(&node, str, DRM_DIR_NAME, j) < 0)
                                continue;
 
-                       fd = open(node, O_RDWR, 0);
+                       fd = open(node, O_RDWR | O_CLOEXEC, 0);
                        free(node);
 
                        if (fd < 0)
@@ -74,6 +78,18 @@ int32_t cros_gralloc_driver::init()
        return -ENODEV;
 }
 
+int cros_gralloc_driver::init_master()
+{
+       int fd = open(DRM_DIR_NAME "/card0", O_RDWR, 0);
+       if (fd >= 0) {
+               drv_ = drv_create(fd);
+               if (drv_)
+                       return 0;
+       }
+
+       return -ENODEV;
+}
+
 bool cros_gralloc_driver::is_supported(const struct cros_gralloc_buffer_descriptor *descriptor)
 {
        struct combination *combo;
@@ -90,15 +106,26 @@ int32_t cros_gralloc_driver::allocate(const struct cros_gralloc_buffer_descripto
        uint64_t mod;
        size_t num_planes;
        uint32_t resolved_format;
+       uint32_t bytes_per_pixel;
+       uint64_t use_flags;
 
        struct bo *bo;
        struct cros_gralloc_handle *hnd;
 
        resolved_format = drv_resolve_format(drv_, descriptor->drm_format, descriptor->use_flags);
-       bo = drv_bo_create(drv_, descriptor->width, descriptor->height, resolved_format,
-                          descriptor->use_flags);
+       use_flags = descriptor->use_flags;
+       /*
+        * TODO(b/79682290): ARC++ assumes NV12 is always linear and doesn't
+        * send modifiers across Wayland protocol, so we or in the
+        * BO_USE_LINEAR flag here. We need to fix ARC++ to allocate and work
+        * with tiled buffers.
+        */
+       if (resolved_format == DRM_FORMAT_NV12)
+               use_flags |= BO_USE_LINEAR;
+
+       bo = drv_bo_create(drv_, descriptor->width, descriptor->height, resolved_format, use_flags);
        if (!bo) {
-               cros_gralloc_error("Failed to create bo.");
+               drv_log("Failed to create bo.\n");
                return -ENOMEM;
        }
 
@@ -109,7 +136,7 @@ int32_t cros_gralloc_driver::allocate(const struct cros_gralloc_buffer_descripto
         */
        if (drv_num_buffers_per_bo(bo) != 1) {
                drv_bo_destroy(bo);
-               cros_gralloc_error("Can only support one buffer per bo.");
+               drv_log("Can only support one buffer per bo.\n");
                return -EINVAL;
        }
 
@@ -135,7 +162,8 @@ int32_t cros_gralloc_driver::allocate(const struct cros_gralloc_buffer_descripto
        hnd->format = drv_bo_get_format(bo);
        hnd->use_flags[0] = static_cast<uint32_t>(descriptor->use_flags >> 32);
        hnd->use_flags[1] = static_cast<uint32_t>(descriptor->use_flags);
-       hnd->pixel_stride = drv_bo_get_stride_in_pixels(bo);
+       bytes_per_pixel = drv_bytes_per_pixel_from_format(hnd->format, 0);
+       hnd->pixel_stride = DIV_ROUND_UP(hnd->strides[0], bytes_per_pixel);
        hnd->magic = cros_gralloc_magic;
        hnd->droid_format = descriptor->droid_format;
        hnd->usage = descriptor->producer_usage;
@@ -157,7 +185,7 @@ int32_t cros_gralloc_driver::retain(buffer_handle_t handle)
 
        auto hnd = cros_gralloc_convert_handle(handle);
        if (!hnd) {
-               cros_gralloc_error("Invalid handle.");
+               drv_log("Invalid handle.\n");
                return -EINVAL;
        }
 
@@ -169,7 +197,7 @@ int32_t cros_gralloc_driver::retain(buffer_handle_t handle)
        }
 
        if (drmPrimeFDToHandle(drv_get_fd(drv_), hnd->fds[0], &id)) {
-               cros_gralloc_error("drmPrimeFDToHandle failed.");
+               drv_log("drmPrimeFDToHandle failed.\n");
                return -errno;
        }
 
@@ -214,13 +242,13 @@ int32_t cros_gralloc_driver::release(buffer_handle_t handle)
 
        auto hnd = cros_gralloc_convert_handle(handle);
        if (!hnd) {
-               cros_gralloc_error("Invalid handle.");
+               drv_log("Invalid handle.\n");
                return -EINVAL;
        }
 
        auto buffer = get_buffer(hnd);
        if (!buffer) {
-               cros_gralloc_error("Invalid Reference.");
+               drv_log("Invalid Reference.\n");
                return -EINVAL;
        }
 
@@ -235,7 +263,8 @@ int32_t cros_gralloc_driver::release(buffer_handle_t handle)
        return 0;
 }
 
-int32_t cros_gralloc_driver::lock(buffer_handle_t handle, int32_t acquire_fence, uint64_t flags,
+int32_t cros_gralloc_driver::lock(buffer_handle_t handle, int32_t acquire_fence,
+                                 const struct rectangle *rect, uint32_t map_flags,
                                  uint8_t *addr[DRV_MAX_PLANES])
 {
        int32_t ret = cros_gralloc_sync_wait(acquire_fence);
@@ -245,17 +274,17 @@ int32_t cros_gralloc_driver::lock(buffer_handle_t handle, int32_t acquire_fence,
        std::lock_guard<std::mutex> lock(mutex_);
        auto hnd = cros_gralloc_convert_handle(handle);
        if (!hnd) {
-               cros_gralloc_error("Invalid handle.");
+               drv_log("Invalid handle.\n");
                return -EINVAL;
        }
 
        auto buffer = get_buffer(hnd);
        if (!buffer) {
-               cros_gralloc_error("Invalid Reference.");
+               drv_log("Invalid Reference.\n");
                return -EINVAL;
        }
 
-       return buffer->lock(flags, addr);
+       return buffer->lock(rect, map_flags, addr);
 }
 
 int32_t cros_gralloc_driver::unlock(buffer_handle_t handle, int32_t *release_fence)
@@ -264,13 +293,13 @@ int32_t cros_gralloc_driver::unlock(buffer_handle_t handle, int32_t *release_fen
 
        auto hnd = cros_gralloc_convert_handle(handle);
        if (!hnd) {
-               cros_gralloc_error("Invalid handle.");
+               drv_log("Invalid handle.\n");
                return -EINVAL;
        }
 
        auto buffer = get_buffer(hnd);
        if (!buffer) {
-               cros_gralloc_error("Invalid Reference.");
+               drv_log("Invalid Reference.\n");
                return -EINVAL;
        }
 
@@ -290,13 +319,13 @@ int32_t cros_gralloc_driver::get_backing_store(buffer_handle_t handle, uint64_t
 
        auto hnd = cros_gralloc_convert_handle(handle);
        if (!hnd) {
-               cros_gralloc_error("Invalid handle.");
+               drv_log("Invalid handle.\n");
                return -EINVAL;
        }
 
        auto buffer = get_buffer(hnd);
        if (!buffer) {
-               cros_gralloc_error("Invalid Reference.");
+               drv_log("Invalid Reference.\n");
                return -EINVAL;
        }