From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 7D504C27C4F for ; Tue, 18 Jun 2024 05:23:50 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 191B310E562; Tue, 18 Jun 2024 05:23:50 +0000 (UTC) Authentication-Results: gabe.freedesktop.org; dkim=pass (2048-bit key; unprotected) header.d=intel.com header.i=@intel.com header.b="SApN3woF"; dkim-atps=neutral Received: from mgamail.intel.com (mgamail.intel.com [198.175.65.13]) by gabe.freedesktop.org (Postfix) with ESMTPS id F265810E569 for ; Tue, 18 Jun 2024 05:23:47 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1718688228; x=1750224228; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=9UltuhtMwyeoVsRmlCkwCIApXMwVfV+yUrSAg+vEONc=; b=SApN3woFXkAogoLWbkTl+aMAPZmyQfwiWzR+sc0m5yXj7FttQhtghFvk WeRoJMB1iuSR/auaTGpm4+5Bt7hk1Ur1x4ozzHRpKyX4hgbDsq2KwQMdb I70D6qTzGS/dAx4fPoLGnqwxVjeYYqSrWYlarxSL3T1wdKq9Wp9Fpg8og 8Wc/lxqyfysqOiI2t3C+AwHL/6E1Lvfw0vLJd32RwA9QT6uozAdqqBuPw 5hdgTRwSHhIinDiQizKX+aFGraiY+a4jPfRmigSUUkd1DLRIGjREO+b/6 Z+FYyCSQYKA4DzuO0K2TYQB+evVRKtngcEW+MsBIcSRmzVGvOx9kaoE9R A==; X-CSE-ConnectionGUID: IFnKFiCLQOa48Zm8YoZBpA== X-CSE-MsgGUID: nHtpVo1QR1O+6VCHYZTGZw== X-IronPort-AV: E=McAfee;i="6700,10204,11106"; a="26660065" X-IronPort-AV: E=Sophos;i="6.08,246,1712646000"; d="scan'208";a="26660065" Received: from fmviesa010.fm.intel.com ([10.60.135.150]) by orvoesa105.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 17 Jun 2024 22:23:48 -0700 X-CSE-ConnectionGUID: sRWf+WpHSTy4t+oL7GyWgg== X-CSE-MsgGUID: mhIAWyD2T5qq5bbjMz+vkA== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="6.08,246,1712646000"; d="scan'208";a="41525149" Received: from bergbenj-mobl1.ger.corp.intel.com (HELO localhost) ([10.245.246.150]) by fmviesa010-auth.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 17 Jun 2024 22:23:46 -0700 From: =?UTF-8?q?Zbigniew=20Kempczy=C5=84ski?= To: igt-dev@lists.freedesktop.org Cc: =?UTF-8?q?Zbigniew=20Kempczy=C5=84ski?= , Juha-Pekka Heikkila Subject: [PATCH i-g-t v2 02/12] lib/intel_bufops: Fix mapping/unmapping for i915 and xe Date: Tue, 18 Jun 2024 07:23:25 +0200 Message-Id: <20240618052335.152588-3-zbigniew.kempczynski@intel.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20240618052335.152588-1-zbigniew.kempczynski@intel.com> References: <20240618052335.152588-1-zbigniew.kempczynski@intel.com> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: igt-dev@lists.freedesktop.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Development mailing list for IGT GPU Tools List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: igt-dev-bounces@lists.freedesktop.org Sender: "igt-dev" It looks previously there was no user of intel-buf mapping code so missing xe path wasn't notice. Lets add xe path along with correct buffer size mapping. Signed-off-by: Zbigniew Kempczyński Cc: Juha-Pekka Heikkila Reviewed-by: Juha-Pekka Heikkila --- lib/intel_bufops.c | 39 ++++++++++++++++++++++++--------------- 1 file changed, 24 insertions(+), 15 deletions(-) diff --git a/lib/intel_bufops.c b/lib/intel_bufops.c index 313c2665ae..b4ccf4c093 100644 --- a/lib/intel_bufops.c +++ b/lib/intel_bufops.c @@ -1232,37 +1232,46 @@ void intel_buf_destroy(struct intel_buf *buf) void *intel_buf_cpu_map(struct intel_buf *buf, bool write) { - int i915 = buf_ops_get_fd(buf->bops); + int fd = buf_ops_get_fd(buf->bops); igt_assert(buf); igt_assert(buf->ptr == NULL); /* already mapped */ buf->cpu_write = write; - buf->ptr = gem_mmap__cpu_coherent(i915, buf->handle, 0, - buf->surface[0].size, - write ? PROT_WRITE : PROT_READ); - gem_set_domain(i915, buf->handle, - I915_GEM_DOMAIN_CPU, - write ? I915_GEM_DOMAIN_CPU : 0); + if (is_xe_device(fd)) { + buf->ptr = xe_bo_map(fd, buf->handle, buf->bo_size); + } else { + buf->ptr = gem_mmap__cpu_coherent(fd, buf->handle, 0, + buf->bo_size, + write ? PROT_WRITE : PROT_READ); + + gem_set_domain(fd, buf->handle, + I915_GEM_DOMAIN_CPU, + write ? I915_GEM_DOMAIN_CPU : 0); + } return buf->ptr; } void *intel_buf_device_map(struct intel_buf *buf, bool write) { - int i915 = buf_ops_get_fd(buf->bops); + int fd = buf_ops_get_fd(buf->bops); igt_assert(buf); igt_assert(buf->ptr == NULL); /* already mapped */ - buf->ptr = gem_mmap__device_coherent(i915, buf->handle, 0, - buf->surface[0].size, - write ? PROT_WRITE : PROT_READ); + if (is_xe_device(fd)) { + buf->ptr = xe_bo_map(fd, buf->handle, buf->bo_size); + } else { + buf->ptr = gem_mmap__device_coherent(fd, buf->handle, 0, + buf->bo_size, + write ? PROT_WRITE : PROT_READ); - gem_set_domain(i915, buf->handle, - I915_GEM_DOMAIN_WC, - write ? I915_GEM_DOMAIN_WC : 0); + gem_set_domain(fd, buf->handle, + I915_GEM_DOMAIN_WC, + write ? I915_GEM_DOMAIN_WC : 0); + } return buf->ptr; } @@ -1272,7 +1281,7 @@ void intel_buf_unmap(struct intel_buf *buf) igt_assert(buf); igt_assert(buf->ptr); - munmap(buf->ptr, buf->surface[0].size); + munmap(buf->ptr, buf->bo_size); buf->ptr = NULL; } -- 2.34.1