summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorWolfgang Wiedmeyer <wolfgit@wiedmeyer.de>2017-02-12 03:18:18 +0100
committerWolfgang Wiedmeyer <wolfgit@wiedmeyer.de>2017-02-12 03:18:18 +0100
commitd0492704378754ae67a603b5edb71a8939fd50bb (patch)
treec8e06a2c9e17399685a3104d29fa5101161826db
parentb3271125eea1ccaef904b0d7eb8e97c4499b3603 (diff)
parent2f394b35e903912ceb302842e2ed530a2991ccb9 (diff)
downloadexternal_drm_gralloc-replicant-6.0.zip
external_drm_gralloc-replicant-6.0.tar.gz
external_drm_gralloc-replicant-6.0.tar.bz2
Merge remote-tracking branch 'androidx86/marshmallow-x86' into replicant-6.0HEADreplicant-6.0-0001replicant-6.0
-rw-r--r--gralloc_drm_pipe.c9
1 files changed, 2 insertions, 7 deletions
diff --git a/gralloc_drm_pipe.c b/gralloc_drm_pipe.c
index 05395ff..f18ecef 100644
--- a/gralloc_drm_pipe.c
+++ b/gralloc_drm_pipe.c
@@ -98,11 +98,6 @@ static unsigned get_pipe_bind(int usage)
{
unsigned bind = PIPE_BIND_SHARED;
- if (usage & GRALLOC_USAGE_SW_READ_MASK)
- bind |= PIPE_BIND_TRANSFER_READ;
- if (usage & GRALLOC_USAGE_SW_WRITE_MASK)
- bind |= PIPE_BIND_TRANSFER_WRITE;
-
if (usage & GRALLOC_USAGE_HW_TEXTURE)
bind |= PIPE_BIND_SAMPLER_VIEW;
if (usage & GRALLOC_USAGE_HW_RENDER)
@@ -162,7 +157,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, PIPE_HANDLE_USAGE_READ_WRITE))
+ buf->resource, NULL, &buf->winsys, PIPE_HANDLE_USAGE_READ_WRITE))
goto fail;
}
@@ -173,7 +168,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, PIPE_HANDLE_USAGE_READ_WRITE))
+ buf->resource, NULL, &tmp, PIPE_HANDLE_USAGE_READ_WRITE))
goto fail;
buf->base.fb_handle = tmp.handle;