From patchwork Tue Mar 13 23:51:12 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: John Stultz X-Patchwork-Id: 131541 Delivered-To: patches@linaro.org Received: by 10.46.84.17 with SMTP id i17csp187241ljb; Tue, 13 Mar 2018 16:51:17 -0700 (PDT) X-Received: by 2002:a17:902:6b02:: with SMTP id o2-v6mr2192070plk.334.1520985077303; Tue, 13 Mar 2018 16:51:17 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1520985077; cv=none; d=google.com; s=arc-20160816; b=vysD5ML0Iu+4XavYrp2ZZZ7cwz615Rp46atfr6zadtRosAX0XyEXPi8CQYMFWWmFAf JeAXOM3AXVpzzWUrNaYZQxBPYl5mMR7H6NCbRCaxxI2B3nhsWqPVkM5lkyVgHOIe2gGD omMGAy3KsK2V09mrXOOmacooADTElKDbkuvpfxwjNhvfmfq0tHjn8g6BVOH8nl90V4u/ 3BBl55cM/D0vGSb86UAMp2LksuQ0S48PuUxfZ5iSLxxg606QdDKi3TLnDtDa/hlpHofx ar/1QidlMmaFZiUo9yy7rtQ5H0oJvQOxydRL1S2M12azrX3Xrzy41IvI+Q9pBw2ZfGDk Ttkg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=message-id:date:subject:cc:to:from:dkim-signature :arc-authentication-results; bh=MDBd1kkBzuPlOELnlDpdD1ql5frLJ8gDoTxcL42bwaM=; b=hVohGPF8RKwnPqNzdwpL3UdFUMvizKiMWOdkC/J1LUTxnDjytzWKh1/ciD5P++DeSK oxmWusbuk0pKoPXAPNvdWUeReYG13h7pC+lHx3p/D/8CSAjWZyE/RCnW3jA+vCdz3reA WRaqrRuS2qHwcpRAurOrHIkAkkncZftrLQp9ZhxTz5B6rM8lOt0At02boal0iV/h22Fs 3g+pjU2mumN5cJx+rdiOch1A7vwtizhHwFFjj5sZkAOImmyo7oVTcSVqELj12K+4ejaD URfmE5qNyRlIejZ570TKlc5NHwTBfFPBrU2zFuVgHsUDXx7xzYukFofWOzIzR2BwOItj csPQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=jP4gn9hS; spf=pass (google.com: domain of john.stultz@linaro.org designates 209.85.220.65 as permitted sender) smtp.mailfrom=john.stultz@linaro.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from mail-sor-f65.google.com (mail-sor-f65.google.com. [209.85.220.65]) by mx.google.com with SMTPS id bc2-v6sor459851plb.57.2018.03.13.16.51.17 for (Google Transport Security); Tue, 13 Mar 2018 16:51:17 -0700 (PDT) Received-SPF: pass (google.com: domain of john.stultz@linaro.org designates 209.85.220.65 as permitted sender) client-ip=209.85.220.65; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=jP4gn9hS; spf=pass (google.com: domain of john.stultz@linaro.org designates 209.85.220.65 as permitted sender) smtp.mailfrom=john.stultz@linaro.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id; bh=MDBd1kkBzuPlOELnlDpdD1ql5frLJ8gDoTxcL42bwaM=; b=jP4gn9hSqhqxiP+q2/Q/6XgYexdQuRBlo70GKRC6U/qZnstwbogMYVqfBd5AzIS6Al UqOHyEQZndEIuKE4C84CaPzqdbgYMGA3va237kDmT1OdPQJNLjNA4otEhJISY3GgnUWj NRCzgYsf4pB3zpNKCilp3/iemeUP3VdVFvDO8= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id; bh=MDBd1kkBzuPlOELnlDpdD1ql5frLJ8gDoTxcL42bwaM=; b=HgGtvQjvqe+eteMWijRfQt114GcpCuHasne0mlS6dvlL3uiV4leBPh0znLgIol3/UL PDEe+bc9nMmKvWDsaX8DWRAdOql8g1HxtcI13pTqSRucNbVcNlUIgChwjlNOY3PDSGlz 5xMRQ8UnORedEeP7OesrAqQ2/1+2dADPKfl4KHo5qrc6SIVdwzNkH1YngwdT0/+3YZdU zxGnHzVxVeREzUe0t7hJ8ggkUSLpxcj67S3A8PWbDOrdgHbXbOVNG4ib8amRi2ek/iGA UPB8Fbgf54PjfUjyXrmvOsX7mgEQMB/s60CUu5JP/sz4gCAhusXyIiMtoTKWRhgWBncQ KiNQ== X-Gm-Message-State: AElRT7F2x7NgKjEpLelMpIitENBcQ81ftVhvkGby8AvnxtPw4Rsb3mKB ZFnqhnnIxsXWeJQIlE6F+IUpJRp7 X-Google-Smtp-Source: AG47ELsoIqz9Q7hMemUCglDSNQ/zXJzxcjFqFp+Q9oOpvbxzoyNKh9TuxdX1YjnknFljF5jiS+0Xwg== X-Received: by 2002:a17:902:2904:: with SMTP id g4-v6mr2161319plb.170.1520985076459; Tue, 13 Mar 2018 16:51:16 -0700 (PDT) Return-Path: Received: from localhost.localdomain ([2601:1c2:600:5100:4e72:b9ff:fe99:466a]) by smtp.gmail.com with ESMTPSA id g16sm2319770pfd.23.2018.03.13.16.51.14 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Tue, 13 Mar 2018 16:51:15 -0700 (PDT) From: John Stultz To: dri-devel Cc: John Stultz , Marissa Wall , Sean Paul , Dmitry Shmidt , Robert Foss , Matt Szczesiak , Liviu Dudau , David Hanna , Rob Herring , Alexandru-Cosmin Gheorghe , Alistair Strachan Subject: [PATCH v5] drm_hwcomposer: Add platformhisi buffer importer for hikey and hikey960 Date: Tue, 13 Mar 2018 16:51:12 -0700 Message-Id: <1520985072-21879-1-git-send-email-john.stultz@linaro.org> X-Mailer: git-send-email 2.7.4 This allows for importing buffers allocated from the hikey and hikey960 gralloc implementations. Cc: Marissa Wall Cc: Sean Paul Cc: Dmitry Shmidt Cc: Robert Foss Cc: Matt Szczesiak Cc: Liviu Dudau Cc: David Hanna Cc: Rob Herring Cc: Alexandru-Cosmin Gheorghe Cc: Alistair Strachan Acked-by: Robert Foss Signed-off-by: John Stultz --- v2: * Make platformhisi and the generic importer exclusive in the build * Fixup vendor check v3: * Unify format conversions * Subclass the platformdrmgeneric importer implementation to reduce code duplication * Rework to avoid board specific logic (tweak gralloc to be consistent between the two) v4: * Minor cleanups as suggested by Alexandru-Cosmin Gheorghe v5: * Minor spelling fix in commit message noticed by Robert Foss --- Android.mk | 13 +++++ platformdrmgeneric.h | 2 +- platformhisi.cpp | 135 +++++++++++++++++++++++++++++++++++++++++++++++++++ platformhisi.h | 48 ++++++++++++++++++ 4 files changed, 197 insertions(+), 1 deletion(-) create mode 100644 platformhisi.cpp create mode 100644 platformhisi.h -- 2.7.4 diff --git a/Android.mk b/Android.mk index 8b11e37..1add286 100644 --- a/Android.mk +++ b/Android.mk @@ -75,7 +75,20 @@ LOCAL_CPPFLAGS += \ -DHWC2_USE_CPP11 \ -DHWC2_INCLUDE_STRINGIFICATION + +ifeq ($(TARGET_PRODUCT),hikey960) +LOCAL_CPPFLAGS += -DUSE_HISI_IMPORTER +LOCAL_SRC_FILES += platformhisi.cpp +LOCAL_C_INCLUDES += device/linaro/hikey/gralloc960/ +else +ifeq ($(TARGET_PRODUCT),hikey) +LOCAL_CPPFLAGS += -DUSE_HISI_IMPORTER +LOCAL_SRC_FILES += platformhisi.cpp +LOCAL_C_INCLUDES += device/linaro/hikey/gralloc/ +else LOCAL_CPPFLAGS += -DUSE_DRM_GENERIC_IMPORTER +endif +endif LOCAL_MODULE := hwcomposer.drm LOCAL_MODULE_TAGS := optional diff --git a/platformdrmgeneric.h b/platformdrmgeneric.h index 8376580..fbe059b 100644 --- a/platformdrmgeneric.h +++ b/platformdrmgeneric.h @@ -35,8 +35,8 @@ class DrmGenericImporter : public Importer { int ImportBuffer(buffer_handle_t handle, hwc_drm_bo_t *bo) override; int ReleaseBuffer(hwc_drm_bo_t *bo) override; - private: uint32_t ConvertHalFormatToDrm(uint32_t hal_format); + private: DrmResources *drm_; diff --git a/platformhisi.cpp b/platformhisi.cpp new file mode 100644 index 0000000..16c5e6f --- /dev/null +++ b/platformhisi.cpp @@ -0,0 +1,135 @@ +/* + * Copyright (C) 2015 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-hisi" + +#include "drmresources.h" +#include "platform.h" +#include "platformhisi.h" + + +#include +#include +#include +#include +#include + +#include +#include +#include "gralloc_priv.h" + + +namespace android { + +Importer *Importer::CreateInstance(DrmResources *drm) { + HisiImporter *importer = new HisiImporter(drm); + if (!importer) + return NULL; + + int ret = importer->Init(); + if (ret) { + ALOGE("Failed to initialize the hisi importer %d", ret); + delete importer; + return NULL; + } + return importer; +} + +HisiImporter::HisiImporter(DrmResources *drm) : DrmGenericImporter(drm), drm_(drm) { +} + +HisiImporter::~HisiImporter() { +} + +int HisiImporter::Init() { + int ret = hw_get_module(GRALLOC_HARDWARE_MODULE_ID, + (const hw_module_t **)&gralloc_); + if (ret) { + ALOGE("Failed to open gralloc module %d", ret); + return ret; + } + + if (strcasecmp(gralloc_->common.author, "ARM Ltd.")) + ALOGW("Using non-ARM gralloc module: %s/%s\n", gralloc_->common.name, + gralloc_->common.author); + + return 0; +} + +EGLImageKHR HisiImporter::ImportImage(EGLDisplay egl_display, buffer_handle_t handle) { + private_handle_t const *hnd = reinterpret_cast < private_handle_t const *>(handle); + if (!hnd) + return NULL; + + EGLint fmt = ConvertHalFormatToDrm(hnd->req_format); + if (fmt < 0) + return NULL; + + EGLint attr[] = { + EGL_WIDTH, hnd->width, + EGL_HEIGHT, hnd->height, + EGL_LINUX_DRM_FOURCC_EXT, fmt, + EGL_DMA_BUF_PLANE0_FD_EXT, hnd->share_fd, + EGL_DMA_BUF_PLANE0_OFFSET_EXT, 0, + EGL_DMA_BUF_PLANE0_PITCH_EXT, hnd->byte_stride, + EGL_NONE, + }; + return eglCreateImageKHR(egl_display, EGL_NO_CONTEXT, EGL_LINUX_DMA_BUF_EXT, NULL, attr); +} + +int HisiImporter::ImportBuffer(buffer_handle_t handle, hwc_drm_bo_t *bo) { + private_handle_t const *hnd = reinterpret_cast < private_handle_t const *>(handle); + if (!hnd) + 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; + } + + EGLint fmt = ConvertHalFormatToDrm(hnd->req_format); + if (fmt < 0) + return fmt; + + memset(bo, 0, sizeof(hwc_drm_bo_t)); + bo->width = hnd->width; + bo->height = hnd->height; + bo->format = fmt; + bo->usage = hnd->usage; + bo->pitches[0] = hnd->byte_stride; + bo->gem_handles[0] = gem_handle; + bo->offsets[0] = 0; + + ret = drmModeAddFB2(drm_->fd(), bo->width, bo->height, bo->format, + bo->gem_handles, bo->pitches, bo->offsets, &bo->fb_id, 0); + if (ret) { + ALOGE("could not create drm fb %d", ret); + return ret; + } + + return ret; +} + +std::unique_ptr Planner::CreateInstance(DrmResources *) { + std::unique_ptr planner(new Planner); + planner->AddStage(); + return planner; +} +} + + diff --git a/platformhisi.h b/platformhisi.h new file mode 100644 index 0000000..46f4595 --- /dev/null +++ b/platformhisi.h @@ -0,0 +1,48 @@ +/* + * Copyright (C) 2015 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 "drmresources.h" +#include "platform.h" +#include "platformdrmgeneric.h" + +#include + +#include + +namespace android { + +class HisiImporter : public DrmGenericImporter { + public: + HisiImporter(DrmResources *drm); + ~HisiImporter() override; + + int Init(); + + EGLImageKHR ImportImage(EGLDisplay egl_display, buffer_handle_t handle) override; + int ImportBuffer(buffer_handle_t handle, hwc_drm_bo_t *bo) override; + + private: + + DrmResources *drm_; + + const gralloc_module_t *gralloc_; +}; +} + +#endif