From patchwork Tue Mar 20 17:46:49 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Eric Engestrom X-Patchwork-Id: 10297651 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 42CC360349 for ; Tue, 20 Mar 2018 17:49:35 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 33DF728DCB for ; Tue, 20 Mar 2018 17:49:35 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 288A028F1E; Tue, 20 Mar 2018 17:49:35 +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.2 required=2.0 tests=BAYES_00, RCVD_IN_DNSWL_MED 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 BD0D928DCB for ; Tue, 20 Mar 2018 17:49:34 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 91B5B6E87A; Tue, 20 Mar 2018 17:48:17 +0000 (UTC) X-Original-To: dri-devel@lists.freedesktop.org Delivered-To: dri-devel@lists.freedesktop.org Received: from mailapp01.imgtec.com (mailapp01.imgtec.com [195.59.15.196]) by gabe.freedesktop.org (Postfix) with ESMTP id EF15489561 for ; Tue, 20 Mar 2018 17:48:03 +0000 (UTC) Received: from hhmail02.hh.imgtec.org (unknown [10.100.10.20]) by Forcepoint Email with ESMTPS id AE88CA6FFC6EE for ; Tue, 20 Mar 2018 17:47:58 +0000 (GMT) Received: from localhost.localdomain (10.60.4.28) by hhmail02.hh.imgtec.org (10.100.10.21) with Microsoft SMTP Server (TLS) id 14.3.382.0; Tue, 20 Mar 2018 17:48:02 +0000 From: Eric Engestrom To: Subject: [PATCH libdrm 13/23] meson: use simple option handling for intel Date: Tue, 20 Mar 2018 17:46:49 +0000 Message-ID: <20180320174659.1510-14-eric.engestrom@imgtec.com> X-Mailer: git-send-email 2.16.2 In-Reply-To: <20180320174659.1510-1-eric.engestrom@imgtec.com> References: <20180320174659.1510-1-eric.engestrom@imgtec.com> MIME-Version: 1.0 X-Originating-IP: [10.60.4.28] 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: , Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" X-Virus-Scanned: ClamAV using ClamSMTP Signed-off-by: Eric Engestrom --- meson.build | 12 +----------- 1 file changed, 1 insertion(+), 11 deletions(-) diff --git a/meson.build b/meson.build index c8b17c6cb988ed8f9330..5f88c7d5fe55249798a2 100644 --- a/meson.build +++ b/meson.build @@ -70,6 +70,7 @@ config.set10('HAVE_LIBDRM_ATOMIC_PRIMITIVES', intel_atomics) config.set10('HAVE_LIB_ATOMIC_OPS', lib_atomics) foreach d : [ + ['intel', true, host_machine.cpu_family().startswith('x86')], ] driver = d[0] require_atomics = d[1] @@ -90,17 +91,6 @@ foreach d : [ endif endforeach -with_intel = false -_intel = get_option('intel') -if _intel == 'auto' - with_intel = with_atomics and host_machine.cpu_family().startswith('x86') -else - with_intel = _intel == 'true' -endif -if with_intel and not with_atomics - error('libdrm_intel requires atomics.') -endif - with_radeon = false _radeon = get_option('radeon') if _radeon == 'auto'