From patchwork Wed May 20 14:02:15 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: David Weinehall X-Patchwork-Id: 6446611 Return-Path: X-Original-To: patchwork-intel-gfx@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork2.web.kernel.org (Postfix) with ESMTP id DB674C0432 for ; Wed, 20 May 2015 14:04:17 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 0E2CC2034F for ; Wed, 20 May 2015 14:04:17 +0000 (UTC) Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) by mail.kernel.org (Postfix) with ESMTP id 3745920270 for ; Wed, 20 May 2015 14:04:16 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id D546D6E77D; Wed, 20 May 2015 07:04:15 -0700 (PDT) X-Original-To: intel-gfx@lists.freedesktop.org Delivered-To: intel-gfx@lists.freedesktop.org Received: from mga14.intel.com (mga14.intel.com [192.55.52.115]) by gabe.freedesktop.org (Postfix) with ESMTP id DE9156E77E for ; Wed, 20 May 2015 07:04:14 -0700 (PDT) Received: from fmsmga001.fm.intel.com ([10.253.24.23]) by fmsmga103.fm.intel.com with ESMTP; 20 May 2015 07:03:46 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.13,464,1427785200"; d="scan'208";a="713098600" Received: from dweineha-mobl3.fi.intel.com (HELO boom) ([10.237.72.77]) by fmsmga001.fm.intel.com with ESMTP; 20 May 2015 07:03:45 -0700 Date: Wed, 20 May 2015 17:02:15 +0300 From: David Weinehall To: intel-gfx Message-ID: <20150520140215.GD13974@boom> Mail-Followup-To: intel-gfx MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: <20150520135419.GA13974@boom> X-Editor: Vi Improved X-Accept-Language: Swedish, English X-GPG-Fingerprint: ED69 8CF5 6102 21B9 AFD1 9DB7 0B27 96FD 15DA A404 X-GPG-Key: http://www.acc.umu.se/~tao/files/pub_15daa404.gpg.asc X-Clacks-Overhead: GNU Terry Pratchett User-Agent: Mutt/1.5.23 (2014-03-12) Subject: [Intel-gfx] [PATCH 03/03] beignet: set I915_CONTEXT_PARAM_NO_ZEROMAP when initializing context X-BeenThere: intel-gfx@lists.freedesktop.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: Intel graphics driver community testing & development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: intel-gfx-bounces@lists.freedesktop.org Sender: "Intel-gfx" X-Spam-Status: No, score=-4.2 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_MED, T_RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP Set the I915_CONTEXT_PARAM_NO_ZEROMAP context parameter to disable zero mappings if libdrm is new enough to expose such functionality. Signed-off-by: David Weinehall --- CMakeLists.txt | 6 ++++++ src/CMakeLists.txt | 5 +++++ src/intel/intel_driver.c | 4 ++++ 3 files changed, 15 insertions(+) diff --git a/CMakeLists.txt b/CMakeLists.txt index 5474447dbcf1..6c57a5346d65 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -146,6 +146,12 @@ IF(DRM_INTEL_FOUND) MESSAGE(STATUS "Disable EU total query support") MESSAGE(STATUS "Disable subslice total query support") ENDIF(DRM_INTEL_VERSION VERSION_GREATER 2.4.59) + IF(DRM_INTEL_VERSION VERSION_GREATER 2.4.61) + MESSAGE(STATUS "Enable no-zeromap support" + SET(DRM_INTEL_NOZEROMAP "enable") + ELSE(DRM_INTEL_VERSION VERSION_GREATER 2.4.61) + MESSAGE(STATUS "Disable no-zeromap support") + ENDIF(DRM_intEL_VERSION VERSION_GREATER 2.4.61) ELSE(DRM_INTEL_FOUND) MESSAGE(FATAL_ERROR "Looking for DRM Intel (>= 2.4.52) - not found") ENDIF(DRM_INTEL_FOUND) diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index da695324829b..83c838ca20f6 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -119,6 +119,11 @@ SET(CMAKE_CXX_FLAGS "-DHAS_USERPTR ${CMAKE_CXX_FLAGS}") SET(CMAKE_C_FLAGS "-DHAS_USERPTR ${CMAKE_C_FLAGS}") endif (DRM_INTEL_USERPTR) +if (DRM_INTEL_NOZEROMAP) +SET(CMAKE_CXX_FLAGS "-DHAS_NOZEROMAP ${CMAKE_CXX_FLAGS}") +SET(CMAKE_C_FLAGS "-DHAS_NOZEROMAP ${CMAKE_C_FLAGS}") +endif (DRM_INTEL_NOZEROMAP) + if (DRM_INTEL_EU_TOTAL) SET(CMAKE_CXX_FLAGS "-DHAS_EU_TOTAL ${CMAKE_CXX_FLAGS}") SET(CMAKE_C_FLAGS "-DHAS_EU_TOTAL ${CMAKE_C_FLAGS}") diff --git a/src/intel/intel_driver.c b/src/intel/intel_driver.c index 755ab6b9b4fd..a33c2605fcc8 100644 --- a/src/intel/intel_driver.c +++ b/src/intel/intel_driver.c @@ -140,6 +140,10 @@ intel_driver_context_init(intel_driver_t *driver) { driver->ctx = drm_intel_gem_context_create(driver->bufmgr); assert(driver->ctx); +#ifdef HAS_ZEROMAP + drm_intel_gem_context_set_param(driver->ctx, + I915_CONTEXT_PARAM_NO_ZEROMAP, 1); +#endif /* HAS_ZEROMAP */ } static void