diff options
author | Neil Armstrong <narmstrong@baylibre.com> | 2019-04-25 15:17:22 +0000 |
---|---|---|
committer | Sean Paul <seanpaul@chromium.org> | 2019-06-11 13:24:42 +0000 |
commit | 17d3c8bba62abb1c646c2c2133d1d66b0b457be9 (patch) | |
tree | 1b380622cd91ca15e86f3058d0aa0dd158deb8dc | |
parent | 4c027a7d55fc32ad67240a7a7907b0a2c9bd027c (diff) |
drm_hwcomposer: Add platformmeson for Amlogic SoC support
This specific platform handler is dedicated for the Amlogic SoC,
and more precisely for the Amlogic G12A family.
OpenGL/Mali allocation is done via a slightly modified ARM Gralloc
module, thus needing a custom platform handler to handle the custom
private_handle_t structure.
This platformmeson is based on platformhisi without the AFBC YUV
management (not handled by the Amlogic SoCs).
Signed-off-by: Neil Armstrong <narmstrong@baylibre.com>
Change-Id: I1a1d20b0a84b0e17aa3417c8e9633712f258523d
-rw-r--r-- | Android.bp | 9 | ||||
-rw-r--r-- | platformmeson.cpp | 140 | ||||
-rw-r--r-- | platformmeson.h | 42 |
3 files changed, 191 insertions, 0 deletions
@@ -110,3 +110,12 @@ filegroup { "platformhisi.cpp", ], } + +// Used by hwcomposer.drm_meson +filegroup { + name: "drm_hwcomposer_platformmeson", + srcs: [ + "platformdrmgeneric.cpp", + "platformmeson.cpp", + ], +} diff --git a/platformmeson.cpp b/platformmeson.cpp new file mode 100644 index 0000000..58ec5c0 --- /dev/null +++ b/platformmeson.cpp @@ -0,0 +1,140 @@ +/* + * Copyright (C) 2019 The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +#define LOG_TAG "hwc-platform-meson" + +#include "platformmeson.h" +#include "drmdevice.h" +#include "platform.h" + +#include <drm/drm_fourcc.h> +#include <stdatomic.h> +#include <xf86drm.h> +#include <xf86drmMode.h> +#include <cinttypes> + +#include <hardware/gralloc.h> +#include <log/log.h> +#include "gralloc_priv.h" + +namespace android { + +Importer *Importer::CreateInstance(DrmDevice *drm) { + MesonImporter *importer = new MesonImporter(drm); + if (!importer) + return NULL; + + int ret = importer->Init(); + if (ret) { + ALOGE("Failed to initialize the meson importer %d", ret); + delete importer; + return NULL; + } + return importer; +} + +#if defined(MALI_GRALLOC_INTFMT_AFBC_BASIC) && \ + defined(AFBC_FORMAT_MOD_BLOCK_SIZE_16x16) +uint64_t MesonImporter::ConvertGrallocFormatToDrmModifiers(uint64_t flags) { + uint64_t features = 0UL; + + if (flags & MALI_GRALLOC_INTFMT_AFBC_BASIC) + features |= AFBC_FORMAT_MOD_BLOCK_SIZE_16x16; + + if (flags & MALI_GRALLOC_INTFMT_AFBC_SPLITBLK) + features |= (AFBC_FORMAT_MOD_SPLIT | AFBC_FORMAT_MOD_SPARSE); + + if (flags & MALI_GRALLOC_INTFMT_AFBC_WIDEBLK) + features |= AFBC_FORMAT_MOD_BLOCK_SIZE_32x8; + + if (flags & MALI_GRALLOC_INTFMT_AFBC_TILED_HEADERS) + features |= AFBC_FORMAT_MOD_TILED; + + if (features) + return DRM_FORMAT_MOD_ARM_AFBC(features | AFBC_FORMAT_MOD_YTR); + + return 0; +} +#else +uint64_t MesonImporter::ConvertGrallocFormatToDrmModifiers( + uint64_t /* flags */) { + return 0; +} +#endif + +int MesonImporter::ImportBuffer(buffer_handle_t handle, hwc_drm_bo_t *bo) { + uint64_t modifiers[4] = {0}; + + memset(bo, 0, sizeof(hwc_drm_bo_t)); + + private_handle_t const *hnd = reinterpret_cast<private_handle_t const *>( + handle); + if (!hnd) + return -EINVAL; + + // We can't import these types of buffers. + // These buffers should have been filtered out with CanImportBuffer() + if (!(hnd->usage & GRALLOC_USAGE_HW_FB)) + return -EINVAL; + + uint32_t gem_handle; + int ret = drmPrimeFDToHandle(drm_->fd(), hnd->share_fd, &gem_handle); + if (ret) { + ALOGE("failed to import prime fd %d ret=%d", hnd->share_fd, ret); + return ret; + } + + int32_t fmt = ConvertHalFormatToDrm(hnd->req_format); + if (fmt < 0) + return fmt; + + modifiers[0] = ConvertGrallocFormatToDrmModifiers(hnd->internal_format); + + bo->width = hnd->width; + bo->height = hnd->height; + bo->hal_format = hnd->req_format; + bo->format = fmt; + bo->usage = hnd->usage; + bo->pixel_stride = hnd->stride; + bo->pitches[0] = hnd->byte_stride; + bo->gem_handles[0] = gem_handle; + bo->offsets[0] = 0; + + ret = drmModeAddFB2WithModifiers(drm_->fd(), bo->width, bo->height, + bo->format, bo->gem_handles, bo->pitches, + bo->offsets, modifiers, &bo->fb_id, + modifiers[0] ? DRM_MODE_FB_MODIFIERS : 0); + + if (ret) { + ALOGE("could not create drm fb %d", ret); + return ret; + } + + return ret; +} + +bool MesonImporter::CanImportBuffer(buffer_handle_t handle) { + private_handle_t const *hnd = reinterpret_cast<private_handle_t const *>( + handle); + return hnd && (hnd->usage & GRALLOC_USAGE_HW_FB); +} + +std::unique_ptr<Planner> Planner::CreateInstance(DrmDevice *) { + std::unique_ptr<Planner> planner(new Planner); + planner->AddStage<PlanStageGreedy>(); + return planner; +} +} // namespace android diff --git a/platformmeson.h b/platformmeson.h new file mode 100644 index 0000000..7be7702 --- /dev/null +++ b/platformmeson.h @@ -0,0 +1,42 @@ +/* + * Copyright (C) 2019 The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +#ifndef ANDROID_PLATFORM_HISI_H_ +#define ANDROID_PLATFORM_HISI_H_ + +#include "drmdevice.h" +#include "platform.h" +#include "platformdrmgeneric.h" + +#include <stdatomic.h> + +#include <hardware/gralloc.h> + +namespace android { + +class MesonImporter : public DrmGenericImporter { + public: + using DrmGenericImporter::DrmGenericImporter; + + int ImportBuffer(buffer_handle_t handle, hwc_drm_bo_t *bo) override; + bool CanImportBuffer(buffer_handle_t handle) override; + + private: + uint64_t ConvertGrallocFormatToDrmModifiers(uint64_t flags); +}; +} // namespace android + +#endif |