From patchwork Wed May 2 23:56:29 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alistair Strachan X-Patchwork-Id: 10377255 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id A45346037D for ; Thu, 3 May 2018 07:17:27 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 8F35628F3A for ; Thu, 3 May 2018 07:17:27 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 840CF28F45; Thu, 3 May 2018 07:17:27 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-5.1 required=2.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED, MAILING_LIST_MULTI, RCVD_IN_DNSWL_MED, T_DKIM_INVALID autolearn=ham version=3.3.1 Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) (using TLSv1.2 with cipher DHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 20D8A28F3A for ; Thu, 3 May 2018 07:17:27 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 090016E6DB; Thu, 3 May 2018 07:15:55 +0000 (UTC) X-Original-To: dri-devel@lists.freedesktop.org Delivered-To: dri-devel@lists.freedesktop.org Received: from mail-pf0-x244.google.com (mail-pf0-x244.google.com [IPv6:2607:f8b0:400e:c00::244]) by gabe.freedesktop.org (Postfix) with ESMTPS id 1440F6E5FB for ; Wed, 2 May 2018 23:56:40 +0000 (UTC) Received: by mail-pf0-x244.google.com with SMTP id f20so4347274pfn.0 for ; Wed, 02 May 2018 16:56:40 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20161025; h=from:to:cc:subject:date:message-id; bh=rVSxy/n+foWmeDP1gLAXhkS0bhYUPU86m0oq9AIttE0=; b=lGO9bC3kC5kESiRclfgOsB77H7z/Gi1iD3xgwHwKRC40KCHArY9gIyPpwv7XS5uxw+ Af46py18w/L/XMYLl5dmu5r667DP7JhfTbhM2M/7WHKILCPEVJZ28TeETrkf0/Qk2Wn2 oCuea73dzoplo/Pwy0EZ0cuRZofcfZ7lP2ULomeHB2T9hSD3H859EZBctWhxAtu1LVJi /pAptYGDTWEA0h/gwwnazC1FXxzfhCrxMHKTo9xP1yTxjTGwBhrPa+O6rjzUjgPtLS8q klq3MlugTJfNeH9UuJyZOSaS2wNkqHn6BlkCpY84hnNyUV0Jyz/clygaiJwip+REzh4R PD/w== 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=rVSxy/n+foWmeDP1gLAXhkS0bhYUPU86m0oq9AIttE0=; b=mF6GCH2DduDQZoZO/rg2dgBoAiLlEed7RYbSoeZu1j5ACF6bZ22HWpA+EpObZEBwBw 09Rsq0ri/3uNm9t59nTV8iRvzLgkRmjAs1vQ72W3OfKnISYbfO3RVlN0kh38RUYojkJS YaNa39AyrdPvIBR8kUcRuGaooZEndXNJG7CtsQu5P/TtX1qiYDv9GQGY6/krWR8cVsCl zSOO/djG6m3VZLv1wPSczT9F/rjMfXGNkvXkrSgqaqGqlcVAPkQwNcn/wg3hEqQB7iap aUtdrpE9BqtXbF21fn+aBegaKJCduQICq9PDCJ3qCQ3BWZ678aVrlqGlS9tovXGQw2WQ ZbcA== X-Gm-Message-State: ALQs6tAy7eBzlc2IlXcieMRtrJ5dg91xznZ1b3cRZfB0Se48nzHuqBNm H3eh7zXVmW9gDTBXCPN+fTSV86EePU8= X-Google-Smtp-Source: AB8JxZrU+ty+8xAzqko4sSBpClUFOzXkw5AnFDqHUPbyUKep64doIhI90WGdtD8nNIvGcr5xUqTi4A== X-Received: by 2002:a65:4648:: with SMTP id k8-v6mr18095733pgr.47.1525305400224; Wed, 02 May 2018 16:56:40 -0700 (PDT) Received: from astrachan.mtv.corp.google.com ([2620:0:1000:1600:4394:e3d:8eee:a828]) by smtp.gmail.com with ESMTPSA id w85sm19149106pfa.35.2018.05.02.16.56.39 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 02 May 2018 16:56:39 -0700 (PDT) From: Alistair Strachan To: dri-devel@lists.freedesktop.org Subject: [PATCH 2/3] drm_hwcomposer: Stop using libsync to provide sw_sync wrappers Date: Wed, 2 May 2018 16:56:29 -0700 Message-Id: <20180502235629.105155-1-astrachan@google.com> X-Mailer: git-send-email 2.17.0.441.gb46fe60e1d-goog X-Mailman-Approved-At: Thu, 03 May 2018 07:15:48 +0000 X-BeenThere: dri-devel@lists.freedesktop.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: Direct Rendering Infrastructure - Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Rob Herring , Alistair Strachan , Sean Paul MIME-Version: 1.0 Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" X-Virus-Scanned: ClamAV using ClamSMTP Use of the sw_sync API is not allowed any more. Until drm_hwcomposer is weaned off of sw_sync, build our own copy. Cc: John Stultz Cc: Rob Herring Cc: Sean Paul Signed-off-by: Alistair Strachan --- Android.mk | 37 +++++++++++++++++++++++++++++-------- 1 file changed, 29 insertions(+), 8 deletions(-) diff --git a/Android.mk b/Android.mk index 573c5aa..747bf27 100644 --- a/Android.mk +++ b/Android.mk @@ -14,15 +14,38 @@ ifeq ($(strip $(BOARD_USES_DRM_HWCOMPOSER)),true) -LOCAL_PATH := $(call my-dir) +__this_dir := $(call my-dir) + +# ===================== +# libdrmhwc_sync.a +# ===================== +include $(CLEAR_VARS) + +LOCAL_PATH := system/core/libsync + +LOCAL_SRC_FILES := sync.c + +LOCAL_CFLAGS := -Wno-unused-variable + +LOCAL_MODULE := libdrmhwc_sync + +LOCAL_VENDOR_MODULE := true + +LOCAL_C_INCLUDES := $(LOCAL_PATH)/include + +LOCAL_EXPORT_C_INCLUDE_DIRS := \ + $(LOCAL_PATH) $(LOCAL_PATH)/include + +include $(BUILD_STATIC_LIBRARY) # ===================== # libdrmhwc_utils.a # ===================== include $(CLEAR_VARS) -LOCAL_SRC_FILES := \ - worker.cpp +LOCAL_PATH := $(__this_dir) + +LOCAL_SRC_FILES := worker.cpp LOCAL_MODULE := libdrmhwc_utils LOCAL_VENDOR_MODULE := true @@ -34,6 +57,8 @@ include $(BUILD_STATIC_LIBRARY) # ===================== include $(CLEAR_VARS) +LOCAL_PATH := $(__this_dir) + LOCAL_SHARED_LIBRARIES := \ libcutils \ libdrm \ @@ -41,14 +66,10 @@ LOCAL_SHARED_LIBRARIES := \ libGLESv2 \ libhardware \ liblog \ - libsync \ libui \ libutils -LOCAL_STATIC_LIBRARIES := libdrmhwc_utils - -LOCAL_C_INCLUDES := \ - system/core/libsync +LOCAL_STATIC_LIBRARIES := libdrmhwc_utils libdrmhwc_sync LOCAL_SRC_FILES := \ autolock.cpp \