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 X-Spam-Level: X-Spam-Status: No, score=-13.7 required=3.0 tests=BAYES_00, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id DC8ECC4338F for ; Mon, 2 Aug 2021 06:30:04 +0000 (UTC) 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 mail.kernel.org (Postfix) with ESMTPS id 9B8D261042 for ; Mon, 2 Aug 2021 06:30:04 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.4.1 mail.kernel.org 9B8D261042 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=intel.com Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=lists.freedesktop.org Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 20B466E027; Mon, 2 Aug 2021 06:30:04 +0000 (UTC) Received: from mga02.intel.com (mga02.intel.com [134.134.136.20]) by gabe.freedesktop.org (Postfix) with ESMTPS id D1BAF6E027; Mon, 2 Aug 2021 06:30:02 +0000 (UTC) X-IronPort-AV: E=McAfee;i="6200,9189,10063"; a="200567996" X-IronPort-AV: E=Sophos;i="5.84,288,1620716400"; d="scan'208";a="200567996" Received: from fmsmga004.fm.intel.com ([10.253.24.48]) by orsmga101.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 01 Aug 2021 23:30:00 -0700 X-IronPort-AV: E=Sophos;i="5.84,288,1620716400"; d="scan'208";a="501656436" Received: from adixit-mobl1.amr.corp.intel.com (HELO adixit-arch.intel.com) ([10.209.17.228]) by fmsmga004-auth.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 01 Aug 2021 23:29:59 -0700 Date: Sun, 01 Aug 2021 23:29:59 -0700 Message-ID: <87pmuw5pg8.wl-ashutosh.dixit@intel.com> From: "Dixit, Ashutosh" To: Matthew Auld Cc: , , Maarten Lankhorst , Daniel Vetter , Ramalingam C In-Reply-To: <20210730085348.2326899-3-matthew.auld@intel.com> References: <20210730085348.2326899-1-matthew.auld@intel.com> <20210730085348.2326899-3-matthew.auld@intel.com> User-Agent: Wanderlust/2.15.9 (Almost Unreal) SEMI-EPG/1.14.7 (Harue) FLIM-LB/1.14.9 (=?ISO-8859-4?Q?Goj=F2?=) APEL-LB/10.8 EasyPG/1.0.0 Emacs/27.2 (x86_64-pc-linux-gnu) MULE/6.0 (HANACHIRUSATO) MIME-Version: 1.0 (generated by SEMI-EPG 1.14.7 - "Harue") Content-Type: text/plain; charset=US-ASCII Subject: Re: [Intel-gfx] [PATCH i-g-t v3 03/11] lib/i915/gem_mman: add fixed mode to gem_mmap_offset__cpu X-BeenThere: intel-gfx@lists.freedesktop.org X-Mailman-Version: 2.1.29 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" On Fri, 30 Jul 2021 01:53:40 -0700, Matthew Auld wrote: > > On discrete we only support the new fixed mode. > > Signed-off-by: Matthew Auld > Cc: Maarten Lankhorst > Cc: Ashutosh Dixit > Cc: Daniel Vetter > Cc: Ramalingam C > --- > lib/i915/gem_mman.c | 8 +++++++- > 1 file changed, 7 insertions(+), 1 deletion(-) > > diff --git a/lib/i915/gem_mman.c b/lib/i915/gem_mman.c > index c432bb16..563a7ccf 100644 > --- a/lib/i915/gem_mman.c > +++ b/lib/i915/gem_mman.c > @@ -474,8 +474,14 @@ void *gem_mmap__cpu(int fd, uint32_t handle, uint64_t offset, uint64_t size, uns > void *__gem_mmap_offset__cpu(int fd, uint32_t handle, uint64_t offset, > uint64_t size, unsigned prot) > { > - return __gem_mmap_offset(fd, handle, offset, size, prot, > + void *ptr; > + > + ptr = __gem_mmap_offset(fd, handle, offset, size, prot, > I915_MMAP_OFFSET_WB); > + if (!ptr) > + ptr = __gem_mmap_offset__fixed(fd, handle, offset, size, prot); > + > + return ptr; Imo there's some asymmetry here. If we are adding fixed mode to mmap__device_coherent (in the previous patch) then we should also be adding it to mmap__cpu_coherent (as before). Or, if we are adding fixed mode to __gem_mmap_offset__cpu we should also be adding it to __gem_mmap_offset__wc. Thanks.