From patchwork Thu Jul 27 08:20:52 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: 9866431 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 E327860382 for ; Thu, 27 Jul 2017 08:21:07 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id D4A411FE8B for ; Thu, 27 Jul 2017 08:21:07 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id C97AC287D8; Thu, 27 Jul 2017 08:21:07 +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 94E0A1FE8B for ; Thu, 27 Jul 2017 08:21:07 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 80DD86E068; Thu, 27 Jul 2017 08:21:06 +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 D03256EAED for ; Thu, 27 Jul 2017 08:21:03 +0000 (UTC) Received: by mail-pf0-x244.google.com with SMTP id g69so8551062pfe.1 for ; Thu, 27 Jul 2017 01:21:03 -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=EkJe+wa+OFcybjrGOkzjl4V/8rJtq3lfYHJacPOHqt8=; b=eMkF0Md3APj8KgHHOTYqwv0IDkP+q0ozbNUmn2+OZztxI47P5scVhS/IZcaPSYkKjC Dl4ERTOIChEg2fNl9vyiEM+hpDPa431ud4af29FwIzi85mSkozP3HI4rPwYx7bbh3zUt K68/0sTLhnLTwaW3OR1Tv9M3e6DDA1Hr+cdao+dk9RDGm9PCS7JTPFQQrj1kzfqVUHxH c2cYC/lD4cx5Ua+Yzu2AmZEfg0jeQQM5rM1FKm0SX649Q9u85cgitYit24dUcT6AEagv qa7QUC2QKeCmjuQ9CIMTyFg8aKXdjYnQPC89hIBp0cWetJxHs2ddYWsbM7y1MQ3SsedL kqAQ== 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=EkJe+wa+OFcybjrGOkzjl4V/8rJtq3lfYHJacPOHqt8=; b=eqwTPrHFF65I1UCcivpLPBwUs2OXfI32C51UbBIHM3SEfkupNmIoHuVN8lzdnEgRP3 yWEiTBI4pQbOLoziWqzJFUF1C9aQWGsx9B4oPMNu9ZxhHvbPjwxuOOzSAF2TsdlvOTyd s/80JPscDq+F59EYQ0nUxLf4TdCGYI0FSrzZpwi4EI4g0GPJCqwIkbTgXP7I3s4N+M0x E6cA9BcdHcWvPpBjVkKtuFcpFT5xs1xsovmrlk3JAUkIK4eRVoEuPPyl4ezGtVl2IsRw VLu1RQkk5lAJpgNjM8nOaBQXIoMUATmE9I4JQF6oWZG7QZdQIvmkFX+rkmUlnY8lkK03 HFmA== X-Gm-Message-State: AIVw1130cXyE43w9sSc4cGq+4CfttVl14HTUF+dI5jp99iVHXtcvge/M mKThjQcvJsVlF3WrZng= X-Received: by 10.101.85.132 with SMTP id j4mr3515377pgs.68.1501143663124; Thu, 27 Jul 2017 01:21:03 -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 n19sm33353323pfa.64.2017.07.27.01.21.01 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Thu, 27 Jul 2017 01:21:02 -0700 (PDT) From: Chih-Wei Huang X-Google-Original-From: Chih-Wei Huang To: dri-devel@lists.freedesktop.org Subject: [PATCH libdrm v2 2/2] android: amdgpu: fix build break Date: Thu, 27 Jul 2017 16:20:52 +0800 Message-Id: <1501143652-3066-2-git-send-email-cwhuang@linux.org.tw> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1501143652-3066-1-git-send-email-cwhuang@linux.org.tw> References: <1501143652-3066-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..88d3765 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=\"/system/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)