From patchwork Tue Oct 31 14:59:20 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Rob Herring X-Patchwork-Id: 117640 Delivered-To: patch@linaro.org Received: by 10.80.245.45 with SMTP id t42csp4053539edm; Tue, 31 Oct 2017 07:59:25 -0700 (PDT) X-Google-Smtp-Source: ABhQp+SYk1KBt1pPt+C5D3gc79kEBC/mCk7DyOmPo5Ro4n6EAvEk64B/S0QFxsYFeMtRtDzN/vKT X-Received: by 10.98.214.143 with SMTP id a15mr2363024pfl.154.1509461965460; Tue, 31 Oct 2017 07:59:25 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1509461965; cv=none; d=google.com; s=arc-20160816; b=R4HXRpADg6TtE/4OvlyWAM6YScLCwpn3Ih86QMUW7vkx57VJJfmgadTcgdbGQsDcH4 TGnx10VXFb51U5mcw3Xt73tzICsZetck29asc3DQt5IoH1DJr98Jsu5wHGp4MNwn2UEV g/55VOa0sYfF2VfkQjHj/sdsLk+OOrJETFfAjGLTn/JZHJcIWb0n9uq2V3r7c4enRZr9 2/7q+hAZp8FWO009kiT+9QtStZGu7bTqsKTZ24SopCGhZmWfqI0OiiSKVlnppUsPvt53 rtrBOjT/WXwGsRrHzT7VOzpll12x1JyIBWHpSy89wxl6EfaPVqiNw9MaZCCxzvuSIfIG xNrw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:mime-version :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:message-id:date:subject:to:from:delivered-to :arc-authentication-results; bh=+KrQMyMFuwwjVSCbiUfObtxH9AblV7rNQ6xNrTKtah4=; b=MfholBaK4gBy5UwJOlKDh4xaxguVAq8KxuTPwuvu1zp+OFCSRS/5dg2+5aBUHhQifm nGK3dpjqHZTRCOl1UwBh+cwB7ji+8ethWOP9n+eznWu+tj4jGeyBbhdo9Q4/b/+8KOBS NgjpWtyAMl4kdEZXuR3zjf5N3KtCEtwn/QGJgbmaKq7Efp+xQDGd5r4ProjZbAYWfTgu rIq7JYMhKLQjjQYdgPJDHltoqkEbBBViinUZe9pYXo93DFZTpG693U1argYTtQFwxt/f N34A/syLqeIgLZDIE2+DJyLqeHdPjWkWlcBsMWTK7c7rRQS4KMRMEbLDx0WbBSP31pOW +1tg== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: best guess record for domain of dri-devel-bounces@lists.freedesktop.org designates 131.252.210.177 as permitted sender) smtp.mailfrom=dri-devel-bounces@lists.freedesktop.org Return-Path: Received: from gabe.freedesktop.org (gabe.freedesktop.org. [131.252.210.177]) by mx.google.com with ESMTPS id j7si1731437pgn.37.2017.10.31.07.59.25 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 31 Oct 2017 07:59:25 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of dri-devel-bounces@lists.freedesktop.org designates 131.252.210.177 as permitted sender) client-ip=131.252.210.177; Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of dri-devel-bounces@lists.freedesktop.org designates 131.252.210.177 as permitted sender) smtp.mailfrom=dri-devel-bounces@lists.freedesktop.org Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 850576E5E5; Tue, 31 Oct 2017 14:59:24 +0000 (UTC) X-Original-To: dri-devel@lists.freedesktop.org Delivered-To: dri-devel@lists.freedesktop.org Received: from mail-oi0-f67.google.com (mail-oi0-f67.google.com [209.85.218.67]) by gabe.freedesktop.org (Postfix) with ESMTPS id D1D2F6E5E5 for ; Tue, 31 Oct 2017 14:59:22 +0000 (UTC) Received: by mail-oi0-f67.google.com with SMTP id q4so27041406oic.7 for ; Tue, 31 Oct 2017 07:59:22 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id; bh=4Oz8nXvS8IYUX9vvQOQTMPLD8tdEI7oNBbF4PrEFCPA=; b=b8tj9UPR8vRT2mXmGnH1OeuctU3XqHGaQSLgETMExoQJqaeZEqKaKt8MPe6t+bVOrw a1SgeL+MjCkEVoaeJ/d1ycAcS/JmrIjrM1DQ8UV/6ISRq9Eqb7sAGg3Th7nceCrQ5Hn1 RG1vJNLQjnDVxwjRhBLoDo5CiiX/DwhAJTwA8Gdu2zUm2T/AHTHhGtruvHkcJvoapg61 I/ecoXas9idHws3NS0OIxRcAv0Itk0ZcUskmzgFaePfEtY2+P6G4WHto8HXk+DdjzNP9 GDxrr9JdosNnUM6EQR63kpWdplPgWRCRTC8jankz8FI7xlbSPVvr+bYmed6ALZSSHnu1 BR9g== X-Gm-Message-State: AMCzsaWNJEkzFICiuW6+XkdLKiwP8dTC06vT/B4e5+2/jycUIHaemgO+ qUKJhc4FEtTwt+bqq5/GZ3aF50k= X-Received: by 10.157.60.170 with SMTP id z39mr1043670otc.49.1509461961681; Tue, 31 Oct 2017 07:59:21 -0700 (PDT) Received: from xps15.herring.priv (216-188-254-6.dyn.grandenetworks.net. [216.188.254.6]) by smtp.googlemail.com with ESMTPSA id c9sm719218otc.40.2017.10.31.07.59.20 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 31 Oct 2017 07:59:21 -0700 (PDT) From: Rob Herring To: dri-devel@lists.freedesktop.org Subject: [PATCH v2 hwc] drm_hwcomposer: provide a common gralloc handle definition Date: Tue, 31 Oct 2017 09:59:20 -0500 Message-Id: <20171031145920.20343-1-robh@kernel.org> X-Mailer: git-send-email 2.14.1 X-BeenThere: dri-devel@lists.freedesktop.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: Direct Rendering Infrastructure - Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" EGL, gralloc, and HWC must all have a common definition of fd's and int's in native_handle_t to share the fd and width, height, format, etc. of a dmabuf. Move the definition into HWC so we aren't dependent on a specific gralloc implementation and so we don't have to create an importer just for different native_handle_t layouts. This will allow supporting multiple gralloc implementations that conform to this layout. For now, this is aligned with gbm_gralloc's struct. Once we change gbm_gralloc and mesa to point to this copy, we can make modifications to the struct. Signed-off-by: Rob Herring --- Android.mk | 1 - gralloc_drm_handle.h | 87 ++++++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 87 insertions(+), 1 deletion(-) create mode 100644 gralloc_drm_handle.h diff --git a/Android.mk b/Android.mk index 8b11e375adde..ee5b8bfb44d0 100644 --- a/Android.mk +++ b/Android.mk @@ -47,7 +47,6 @@ LOCAL_SHARED_LIBRARIES := \ LOCAL_STATIC_LIBRARIES := libdrmhwc_utils LOCAL_C_INCLUDES := \ - external/drm_gralloc \ system/core/libsync LOCAL_SRC_FILES := \ diff --git a/gralloc_drm_handle.h b/gralloc_drm_handle.h new file mode 100644 index 000000000000..e2f35dda539b --- /dev/null +++ b/gralloc_drm_handle.h @@ -0,0 +1,87 @@ +/* + * Copyright (C) 2010-2011 Chia-I Wu + * Copyright (C) 2010-2011 LunarG Inc. + * Copyright (C) 2016-2017 Linaro, Ltd., Rob Herring + * + * Permission is hereby granted, free of charge, to any person obtaining a + * copy of this software and associated documentation files (the "Software"), + * to deal in the Software without restriction, including without limitation + * the rights to use, copy, modify, merge, publish, distribute, sublicense, + * and/or sell copies of the Software, and to permit persons to whom the + * Software is furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included + * in all copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL + * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING + * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER + * DEALINGS IN THE SOFTWARE. + */ + +#ifndef _GRALLOC_DRM_HANDLE_H_ +#define _GRALLOC_DRM_HANDLE_H_ + +#include + +#ifdef __cplusplus +extern "C" { +#endif + +struct gralloc_drm_handle_t { + native_handle_t base; + + /* file descriptors */ + int prime_fd; + + /* integers */ + int magic; + + int width; + int height; + int format; + int usage; + + int name; /* the name of the bo */ + int stride; /* the stride in bytes */ + int data_owner; /* owner of data (for validation) */ + + uint64_t modifier __attribute__((aligned(8))); /* buffer modifiers */ + union { + void *data; /* private pointer for gralloc */ + uint64_t reserved; + } __attribute__((aligned(8))); +}; +#define GRALLOC_HANDLE_MAGIC 0x5f47424d +#define GRALLOC_HANDLE_NUM_FDS 1 +#define GRALLOC_HANDLE_NUM_INTS ( \ + ((sizeof(struct gralloc_drm_handle_t) - sizeof(native_handle_t))/sizeof(int)) \ + - GRALLOC_HANDLE_NUM_FDS) + +static inline struct gralloc_drm_handle_t *gralloc_drm_handle(buffer_handle_t _handle) +{ + struct gralloc_drm_handle_t *handle = + (struct gralloc_drm_handle_t *) _handle; + + if (handle && (handle->base.version != sizeof(handle->base) || + handle->base.numInts != GRALLOC_HANDLE_NUM_INTS || + handle->base.numFds != GRALLOC_HANDLE_NUM_FDS || + handle->magic != GRALLOC_HANDLE_MAGIC)) + return NULL; + + return handle; +} + +static inline int gralloc_drm_get_prime_fd(buffer_handle_t _handle) +{ + struct gralloc_drm_handle_t *handle = gralloc_drm_handle(_handle); + return (handle) ? handle->prime_fd : -1; +} + +#ifdef __cplusplus +} +#endif +#endif /* _GRALLOC_DRM_HANDLE_H_ */