From patchwork Wed Jul 19 10:18:03 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Chih-Wei Huang X-Patchwork-Id: 9851289 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 40E5C602C8 for ; Wed, 19 Jul 2017 10:19:17 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 3362320881 for ; Wed, 19 Jul 2017 10:19:17 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 283A428607; Wed, 19 Jul 2017 10:19:17 +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=-4.1 required=2.0 tests=BAYES_00,DKIM_SIGNED, 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 EB82320881 for ; Wed, 19 Jul 2017 10:19:16 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 192846E445; Wed, 19 Jul 2017 10:19:16 +0000 (UTC) X-Original-To: dri-devel@lists.freedesktop.org Delivered-To: dri-devel@lists.freedesktop.org Received: from mail-pg0-x244.google.com (mail-pg0-x244.google.com [IPv6:2607:f8b0:400e:c05::244]) by gabe.freedesktop.org (Postfix) with ESMTPS id E27636E445 for ; Wed, 19 Jul 2017 10:19:14 +0000 (UTC) Received: by mail-pg0-x244.google.com with SMTP id z1so6446489pgs.0 for ; Wed, 19 Jul 2017 03:19:14 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=android-x86-org.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=83S5u6ljkjoo+6lgO0nfNtv6+WZafc1YX3Xc7p70Gf0=; b=v1QuDNTt+OeA7B5PghUK9tC2a40nZWqaGv8n5mgL3+/KsADTGO5vABPgEwSkjnWOBT zzmSHBl6ojabGLqDsWvz8wy8YfTzPflrNEArK2l7u0+xuFNBeW/+qkIJAknYluvcYxLF cBUcLsRIKJVQ/xxu5G5NOgdeXbsnmBn/te4PIYLQ5Cx7IvKLKImK+V13REXfrQL/g71U M7SzlH7rn7MgrIVkhWXRfSpC5NbD2kanicSCvp+tgWAN2luXuCgLOGIzxMGWhC//Ss4s s/baqofTVZ0jho8FVGYYa8TMP24F2j5l089VRR19wJ8HF6aIVncfzX5J6xosimTLzkGh xD/A== 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:in-reply-to :references; bh=83S5u6ljkjoo+6lgO0nfNtv6+WZafc1YX3Xc7p70Gf0=; b=BEsrQRNt+iz6U8a++MSc7+y4BqYA65U5BEen6epzF7WnFvX+9s/hSQayx8SjZmy4lJ m7RddHBuPfhhCuLnihjCBDlpH7MWOp+zfCWwCwnloKbjRmkj2V7XJGh+ChT3qJ32BgNV u//PRak5AsqIR/Dgwo5ugjMRba+mHFGu5an9gA4I2bavRIIbIpqW5SkXyodfkmEMR8Gd WuXIv/T1vkvgy26Z2jBigsVIiPCd2m9+fxcGSgc8JxdmXznOCCXlwmmPG/0TRUbJLr7i ekTQ5wlySuwb0dqUXguFRN6S+6BsYd11ByiboxcDEUkzS212YZS7muVLPGHvm4U65ssI iyUw== X-Gm-Message-State: AIVw112FGnSNn+xut29GvJqy9TJLRN0DRgCWAsd3hBrlFZSINm0260OG Ij8nf53tKYQ3IUdtysk= X-Received: by 10.99.96.150 with SMTP id u144mr963pgb.338.1500459554288; Wed, 19 Jul 2017 03:19:14 -0700 (PDT) Received: from localhost.localdomain (118-163-83-72.HINET-IP.hinet.net. [118.163.83.72]) by smtp.gmail.com with ESMTPSA id 28sm12065464pfq.125.2017.07.19.03.19.12 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Wed, 19 Jul 2017 03:19:13 -0700 (PDT) From: Chih-Wei Huang X-Google-Original-From: Chih-Wei Huang To: dri-devel@lists.freedesktop.org, amd-gfx@lists.freedesktop.org Subject: [PATCH 2/2] android: amdgpu: fix build break Date: Wed, 19 Jul 2017 18:18:03 +0800 Message-Id: <1500459483-5795-2-git-send-email-cwhuang@linux.org.tw> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1500459483-5795-1-git-send-email-cwhuang@linux.org.tw> References: <1500459483-5795-1-git-send-email-cwhuang@linux.org.tw> Cc: Chih-Wei Huang 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" X-Virus-Scanned: ClamAV using ClamSMTP Define two macros to avoid building errors. Fixes: 7e6bf88cac (amdgpu: move asic id table to a separate file) Signed-off-by: Chih-Wei Huang --- amdgpu/Android.mk | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/amdgpu/Android.mk b/amdgpu/Android.mk index bf0611b..955bd53 100644 --- a/amdgpu/Android.mk +++ b/amdgpu/Android.mk @@ -10,5 +10,11 @@ LOCAL_SHARED_LIBRARIES := libdrm LOCAL_SRC_FILES := $(LIBDRM_AMDGPU_FILES) +LOCAL_CFLAGS := \ + -DAMDGPU_ASIC_ID_TABLE=\"/etc/hwdata/amdgpu.ids\" \ + -DAMDGPU_ASIC_ID_TABLE_NUM_ENTRIES=$(shell egrep -ci '^[0-9a-f]{4},.*[0-9a-f]+,' $(LIBDRM_TOP)/data/amdgpu.ids) + +LOCAL_REQUIRED_MODULES := amdgpu.ids + include $(LIBDRM_COMMON_MK) include $(BUILD_SHARED_LIBRARY)