diff options
| author | Rob Herring <robh@kernel.org> | 2017-10-06 17:20:05 -0500 |
|---|---|---|
| committer | Robert Foss <robert.foss@collabora.com> | 2017-10-09 14:36:19 +0200 |
| commit | aeccd89eaafec467cb9449cce5c64152a240c138 (patch) | |
| tree | 912540af41097f2f7117ad09d81732b0d0a97e1d | |
| parent | 89095cc77c719336d4e0774b03447f75bf834c87 (diff) | |
| download | drm_hwcomposer-aeccd89eaafec467cb9449cce5c64152a240c138.tar.gz | |
platformdrmgeneric: get the gralloc usage directly from the handle
There's no point in using a gralloc perform() op to retrieve the usage as
it is already stored in the handle like width, height, format, etc. So just
copy it to the hwc_drm_bo_t and get it directly.
Signed-off-by: Rob Herring <robh@kernel.org>
Reviewed-by: Robert Foss <robert.foss@collabora.com>
Tested-by: Robert Foss <robert.foss@collabora.com>
| -rw-r--r-- | drmhwcgralloc.h | 1 | ||||
| -rw-r--r-- | hwcutils.cpp | 8 | ||||
| -rw-r--r-- | platformdrmgeneric.cpp | 1 |
3 files changed, 4 insertions, 6 deletions
diff --git a/drmhwcgralloc.h b/drmhwcgralloc.h index 765c897..c4a42ea 100644 --- a/drmhwcgralloc.h +++ b/drmhwcgralloc.h @@ -56,6 +56,7 @@ typedef struct hwc_drm_bo { uint32_t width; uint32_t height; uint32_t format; /* DRM_FORMAT_* from drm_fourcc.h */ + uint32_t usage; uint32_t pitches[4]; uint32_t offsets[4]; uint32_t gem_handles[4]; diff --git a/hwcutils.cpp b/hwcutils.cpp index 0091575..53a7d82 100644 --- a/hwcutils.cpp +++ b/hwcutils.cpp @@ -159,12 +159,8 @@ int DrmHwcLayer::ImportBuffer(Importer *importer, if (ret) return ret; - ret = gralloc->perform(gralloc, GRALLOC_MODULE_PERFORM_GET_USAGE, - handle.get(), &gralloc_buffer_usage); - if (ret) { - ALOGE("Failed to get usage for buffer %p (%d)", handle.get(), ret); - return ret; - } + gralloc_buffer_usage = buffer.operator->()->usage; + return 0; } diff --git a/platformdrmgeneric.cpp b/platformdrmgeneric.cpp index aa3d0fa..741d42b 100644 --- a/platformdrmgeneric.cpp +++ b/platformdrmgeneric.cpp @@ -116,6 +116,7 @@ int DrmGenericImporter::ImportBuffer(buffer_handle_t handle, hwc_drm_bo_t *bo) { bo->width = gr_handle->width; bo->height = gr_handle->height; bo->format = ConvertHalFormatToDrm(gr_handle->format); + bo->usage = gr_handle->usage; bo->pitches[0] = gr_handle->stride; bo->gem_handles[0] = gem_handle; bo->offsets[0] = 0; |