OSDN Git Service

android: fix gralloc_drm_pipe building error with mesa 11.3
authorMauro Rossi <issor.oruam@gmail.com>
Mon, 28 Mar 2016 20:13:20 +0000 (22:13 +0200)
committerChih-Wei Huang <cwhuang@linux.org.tw>
Mon, 13 Jun 2016 13:13:23 +0000 (21:13 +0800)
Fixes a building error introduced by commit 82db518
"gallium: add external usage flags to resource_from(get)_handle (v2)"

parameter usage is required as a  combination of PIPE_HANDLE_USAGE_* flags,
PIPE_HANDLE_USAGE_READ_WRITE was used as the most general case

gralloc_drm_pipe.c

index 5cc7dc8..00909bf 100644 (file)
@@ -150,7 +150,7 @@ static struct pipe_buffer *get_pipe_buffer_locked(struct pipe_manager *pm,
                buf->winsys.stride = handle->stride;
 
                buf->resource = pm->screen->resource_from_handle(pm->screen,
-                               &templ, &buf->winsys);
+                               &templ, &buf->winsys, PIPE_HANDLE_USAGE_READ_WRITE);
                if (!buf->resource)
                        goto fail;
        }
@@ -162,7 +162,7 @@ static struct pipe_buffer *get_pipe_buffer_locked(struct pipe_manager *pm,
 
                buf->winsys.type = DRM_API_HANDLE_TYPE_SHARED;
                if (!pm->screen->resource_get_handle(pm->screen,
-                                       buf->resource, &buf->winsys))
+                                       buf->resource, &buf->winsys, PIPE_HANDLE_USAGE_READ_WRITE))
                        goto fail;
        }
 
@@ -173,7 +173,7 @@ static struct pipe_buffer *get_pipe_buffer_locked(struct pipe_manager *pm,
                memset(&tmp, 0, sizeof(tmp));
                tmp.type = DRM_API_HANDLE_TYPE_KMS;
                if (!pm->screen->resource_get_handle(pm->screen,
-                                       buf->resource, &tmp))
+                                       buf->resource, &tmp, PIPE_HANDLE_USAGE_READ_WRITE))
                        goto fail;
 
                buf->base.fb_handle = tmp.handle;