From patchwork Fri Jan 26 16:45:50 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Eric Engestrom X-Patchwork-Id: 10186615 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 9AD9F60383 for ; Fri, 26 Jan 2018 16:47:06 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 8C83729E9F for ; Fri, 26 Jan 2018 16:47:06 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 810E82A1A4; Fri, 26 Jan 2018 16:47:06 +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 171AB29E9F for ; Fri, 26 Jan 2018 16:47:06 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id B82FD6E2F2; Fri, 26 Jan 2018 16:46:35 +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 709F96E3BF for ; Fri, 26 Jan 2018 16:46:20 +0000 (UTC) Received: from HHMAIL01.hh.imgtec.org (unknown [10.100.10.19]) by Forcepoint Email with ESMTPS id 35CEF4E05942D for ; Fri, 26 Jan 2018 16:46:15 +0000 (GMT) Received: from localhost.localdomain (10.60.4.28) by HHMAIL01.hh.imgtec.org (10.100.10.21) with Microsoft SMTP Server (TLS) id 14.3.361.1; Fri, 26 Jan 2018 16:46:19 +0000 From: Eric Engestrom To: Subject: [PATCH libdrm 11/13] always define HAVE_VALGRIND Date: Fri, 26 Jan 2018 16:45:50 +0000 Message-ID: <20180126164552.5473-11-eric.engestrom@imgtec.com> X-Mailer: git-send-email 2.16.1 In-Reply-To: <20180126164552.5473-1-eric.engestrom@imgtec.com> References: <20180126164552.5473-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 --- configure.ac | 2 ++ freedreno/freedreno_priv.h | 2 +- intel/intel_bufmgr_gem.c | 4 ++-- meson.build | 5 +---- 4 files changed, 6 insertions(+), 7 deletions(-) diff --git a/configure.ac b/configure.ac index 4ebebb4feb8073771ef9..321ab2c0fb4f18dad002 100644 --- a/configure.ac +++ b/configure.ac @@ -513,6 +513,8 @@ if test "x$VALGRIND" = "xyes"; then AC_MSG_ERROR([Valgrind support required but not present]) fi AC_DEFINE([HAVE_VALGRIND], 1, [Use valgrind intrinsics to suppress false warnings]) +else + AC_DEFINE([HAVE_VALGRIND], 0) fi AC_MSG_RESULT([$VALGRIND]) diff --git a/freedreno/freedreno_priv.h b/freedreno/freedreno_priv.h index 273074727375c7d6ff01..3be5767d2ebd2566734f 100644 --- a/freedreno/freedreno_priv.h +++ b/freedreno/freedreno_priv.h @@ -200,7 +200,7 @@ offset_bytes(void *end, void *start) return ((char *)end) - ((char *)start); } -#ifdef HAVE_VALGRIND +#if HAVE_VALGRIND # include /* diff --git a/intel/intel_bufmgr_gem.c b/intel/intel_bufmgr_gem.c index 71f140f54dd0e6116261..386da30e230627242be2 100644 --- a/intel/intel_bufmgr_gem.c +++ b/intel/intel_bufmgr_gem.c @@ -66,7 +66,7 @@ #include "i915_drm.h" #include "uthash.h" -#ifdef HAVE_VALGRIND +#if HAVE_VALGRIND #include #include #define VG(x) x @@ -1629,7 +1629,7 @@ int drm_intel_gem_bo_map_unsynchronized(drm_intel_bo *bo) { drm_intel_bufmgr_gem *bufmgr_gem = (drm_intel_bufmgr_gem *) bo->bufmgr; -#ifdef HAVE_VALGRIND +#if HAVE_VALGRIND drm_intel_bo_gem *bo_gem = (drm_intel_bo_gem *) bo; #endif int ret; diff --git a/meson.build b/meson.build index 31a7990bb3ee140c4de1..19413632464da9816ca1 100644 --- a/meson.build +++ b/meson.build @@ -257,16 +257,13 @@ foreach t : [[with_intel, 'INTEL'], [with_vmwgfx, 'VMWGFX'], [with_vc4, 'VC4'], [with_freedreno_kgsl, 'FREEDRENO_KGSL'], [dep_cairo.found(), 'CAIRO'], + [dep_valgrind.found(), 'VALGRIND'], [with_radeon, 'RADEON']] config.set10('HAVE_@0@'.format(t[1]), t[0]) endforeach if with_freedreno_kgsl and not with_freedreno error('cannot enable freedreno-kgsl without freedreno support') endif -if dep_valgrind.found() - config.set10('HAVE_VALGRIND', true) -endif - config.set10('_GNU_SOURCE', true) config_file = configure_file( configuration : config,