From patchwork Mon Mar 6 10:28:49 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Nirmoy Das X-Patchwork-Id: 13160911 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 02AB3C61DA4 for ; Mon, 6 Mar 2023 10:29:09 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id ED7CB10E205; Mon, 6 Mar 2023 10:29:00 +0000 (UTC) Received: from mga11.intel.com (mga11.intel.com [192.55.52.93]) by gabe.freedesktop.org (Postfix) with ESMTPS id CBC1D10E0AE; Mon, 6 Mar 2023 10:28:58 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1678098538; x=1709634538; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=sW8IhlWIeROU2d4Zt4BL332Myyi+bypEEdT0KX9wnNw=; b=DkeAY55Z89E4AHmIdXneYNr2jinDFqJk5JXXudz50qaT+S0WZcYQp3/m 83z6ftQwoE0cp+3KBRawFpUof77JnEK7pvg6ZuHBIQ6f/0wVxk2cijOyV PvTaI5u7Syx4T4HKNWd7l4WyvM2B0gcK1o6UKIRLffoajvBkUddoHHi20 bCc3AHMBM0ZZzk3F0959K+GrrUnXH36BeM4Z+IVYiA/9GcC/rgBtZOk5A 32DLXLWTh3WBt9OCxolR5VZqM23Sl/wIASNS1iXBQYsNHmafCoZeUbkHs U13opJq6+ils1++srEX57Qb4ZKY98mHGEMNJy7ZV1WW57KmL/RFmiDI6m w==; X-IronPort-AV: E=McAfee;i="6500,9779,10640"; a="332995597" X-IronPort-AV: E=Sophos;i="5.98,236,1673942400"; d="scan'208";a="332995597" Received: from orsmga002.jf.intel.com ([10.7.209.21]) by fmsmga102.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 06 Mar 2023 02:28:58 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6500,9779,10640"; a="676119853" X-IronPort-AV: E=Sophos;i="5.98,236,1673942400"; d="scan'208";a="676119853" Received: from nirmoyda-desk.igk.intel.com ([10.102.42.231]) by orsmga002-auth.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 06 Mar 2023 02:28:57 -0800 From: Nirmoy Das To: intel-gfx@lists.freedesktop.org Subject: [PATCH 2/3] drm/i915: Add a helper func for gem obj mmap Date: Mon, 6 Mar 2023 11:28:49 +0100 Message-Id: <20230306102850.18299-2-nirmoy.das@intel.com> X-Mailer: git-send-email 2.39.0 In-Reply-To: <20230306102850.18299-1-nirmoy.das@intel.com> References: <20230306102850.18299-1-nirmoy.das@intel.com> MIME-Version: 1.0 Organization: Intel Deutschland GmbH, Registered Address: Am Campeon 10, 85579 Neubiberg, Germany, Commercial Register: Amtsgericht Muenchen HRB 186928 X-BeenThere: dri-devel@lists.freedesktop.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Direct Rendering Infrastructure - Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: dri-devel@lists.freedesktop.org, Nirmoy Das Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" Move gem obj mmap code to i915_gem_object_mmap() so that this can be used by others. Signed-off-by: Nirmoy Das --- drivers/gpu/drm/i915/gem/i915_gem_dmabuf.c | 20 ++--------------- drivers/gpu/drm/i915/gem/i915_gem_mman.c | 25 ++++++++++++++++++++++ drivers/gpu/drm/i915/gem/i915_gem_mman.h | 1 + 3 files changed, 28 insertions(+), 18 deletions(-) diff --git a/drivers/gpu/drm/i915/gem/i915_gem_dmabuf.c b/drivers/gpu/drm/i915/gem/i915_gem_dmabuf.c index fd556a076d05..831dd8ebf819 100644 --- a/drivers/gpu/drm/i915/gem/i915_gem_dmabuf.c +++ b/drivers/gpu/drm/i915/gem/i915_gem_dmabuf.c @@ -12,6 +12,7 @@ #include #include "gem/i915_gem_dmabuf.h" +#include "gem/i915_gem_mman.h" #include "i915_drv.h" #include "i915_gem_object.h" #include "i915_scatterlist.h" @@ -94,27 +95,10 @@ static void i915_gem_dmabuf_vunmap(struct dma_buf *dma_buf, static int i915_gem_dmabuf_mmap(struct dma_buf *dma_buf, struct vm_area_struct *vma) { struct drm_i915_gem_object *obj = dma_buf_to_obj(dma_buf); - struct drm_i915_private *i915 = to_i915(obj->base.dev); - int ret; dma_resv_assert_held(dma_buf->resv); - if (obj->base.size < vma->vm_end - vma->vm_start) - return -EINVAL; - - if (HAS_LMEM(i915)) - return drm_gem_prime_mmap(&obj->base, vma); - - if (!obj->base.filp) - return -ENODEV; - - ret = call_mmap(obj->base.filp, vma); - if (ret) - return ret; - - vma_set_file(vma, obj->base.filp); - - return 0; + return i915_gem_object_mmap(obj, vma); } static int i915_gem_begin_cpu_access(struct dma_buf *dma_buf, enum dma_data_direction direction) diff --git a/drivers/gpu/drm/i915/gem/i915_gem_mman.c b/drivers/gpu/drm/i915/gem/i915_gem_mman.c index 2aac6bf78740..d378720ca626 100644 --- a/drivers/gpu/drm/i915/gem/i915_gem_mman.c +++ b/drivers/gpu/drm/i915/gem/i915_gem_mman.c @@ -11,6 +11,8 @@ #include +#include "gem/i915_gem_lmem.h" + #include "gt/intel_gt.h" #include "gt/intel_gt_requests.h" @@ -1043,6 +1045,29 @@ int i915_gem_mmap(struct file *filp, struct vm_area_struct *vma) return 0; } +int i915_gem_object_mmap(struct drm_i915_gem_object *obj, struct vm_area_struct *vma) +{ + struct drm_i915_private *i915 = to_i915(obj->base.dev); + int ret; + + if (obj->base.size < vma->vm_end - vma->vm_start) + return -EINVAL; + + if (HAS_LMEM(i915)) + return drm_gem_prime_mmap(&obj->base, vma); + + if (obj->base.filp) { + ret = call_mmap(obj->base.filp, vma); + if (ret) + return ret; + + vma_set_file(vma, obj->base.filp); + return 0; + } + + return -ENODEV; +} + #if IS_ENABLED(CONFIG_DRM_I915_SELFTEST) #include "selftests/i915_gem_mman.c" #endif diff --git a/drivers/gpu/drm/i915/gem/i915_gem_mman.h b/drivers/gpu/drm/i915/gem/i915_gem_mman.h index 1fa91b3033b3..303e81ddc5ba 100644 --- a/drivers/gpu/drm/i915/gem/i915_gem_mman.h +++ b/drivers/gpu/drm/i915/gem/i915_gem_mman.h @@ -30,4 +30,5 @@ void i915_gem_object_release_mmap_gtt(struct drm_i915_gem_object *obj); void i915_gem_object_runtime_pm_release_mmap_offset(struct drm_i915_gem_object *obj); void i915_gem_object_release_mmap_offset(struct drm_i915_gem_object *obj); +int i915_gem_object_mmap(struct drm_i915_gem_object *obj, struct vm_area_struct *vma); #endif