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=-16.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,USER_AGENT_GIT autolearn=unavailable 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 6CEE5C63777 for ; Fri, 27 Nov 2020 12:14:02 +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 1CFD9208D5 for ; Fri, 27 Nov 2020 12:14:02 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 1CFD9208D5 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=intel.com Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=dri-devel-bounces@lists.freedesktop.org Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id AD5E46ED23; Fri, 27 Nov 2020 12:11:51 +0000 (UTC) Received: from mga05.intel.com (mga05.intel.com [192.55.52.43]) by gabe.freedesktop.org (Postfix) with ESMTPS id 5D6F76ED16; Fri, 27 Nov 2020 12:11:50 +0000 (UTC) IronPort-SDR: sD73h9JEILHCLWgQhKjqKB3+Q15QfzSAozZEzUXqcFgUcUDOw5l6Hvb0Jh46qRZMnvxdtO+Dk/ AfLrlrA/9sHg== X-IronPort-AV: E=McAfee;i="6000,8403,9817"; a="257092953" X-IronPort-AV: E=Sophos;i="5.78,374,1599548400"; d="scan'208";a="257092953" X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from orsmga005.jf.intel.com ([10.7.209.41]) by fmsmga105.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 27 Nov 2020 04:11:50 -0800 IronPort-SDR: OL4cnQI1SgYbkTM1vaomcOB3BQI7jOexcmukqC4bgoPLl0w9+1xDxd/xzvlcKq7BKsQxwqZdAB 22FFoeoqBsEw== X-IronPort-AV: E=Sophos;i="5.78,374,1599548400"; d="scan'208";a="548029892" Received: from mjgleeso-mobl.ger.corp.intel.com (HELO mwauld-desk1.ger.corp.intel.com) ([10.251.85.2]) by orsmga005-auth.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 27 Nov 2020 04:11:48 -0800 From: Matthew Auld To: intel-gfx@lists.freedesktop.org Subject: [RFC PATCH 135/162] drm/i915: define intel_partial_pages_for_sg_table Date: Fri, 27 Nov 2020 12:06:51 +0000 Message-Id: <20201127120718.454037-136-matthew.auld@intel.com> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20201127120718.454037-1-matthew.auld@intel.com> References: <20201127120718.454037-1-matthew.auld@intel.com> MIME-Version: 1.0 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: CQ Tang , dri-devel@lists.freedesktop.org Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" From: Ramalingam C Function to retrieve the partial pages from the object, from mentioned offset(pages). This is created as a subset of intel_partial pages to be used for window blt copy feature which is introduced in forthcoming patches. This takes the sg_table to be filled in with pages and also passes out the ptr to last scatterlist used. sg_table is trimmed based on the parameter. Signed-off-by: Ramalingam C Cc: Matthew Auld Cc: CQ Tang --- drivers/gpu/drm/i915/gt/intel_ggtt.c | 59 +++++++++++++++++----------- drivers/gpu/drm/i915/gt/intel_gtt.h | 4 ++ 2 files changed, 40 insertions(+), 23 deletions(-) diff --git a/drivers/gpu/drm/i915/gt/intel_ggtt.c b/drivers/gpu/drm/i915/gt/intel_ggtt.c index eed5b640e493..21804c4cef9c 100644 --- a/drivers/gpu/drm/i915/gt/intel_ggtt.c +++ b/drivers/gpu/drm/i915/gt/intel_ggtt.c @@ -1383,25 +1383,17 @@ intel_remap_pages(struct intel_remapped_info *rem_info, return ERR_PTR(ret); } -static noinline struct sg_table * -intel_partial_pages(const struct i915_ggtt_view *view, - struct drm_i915_gem_object *obj) +void intel_partial_pages_for_sg_table(struct drm_i915_gem_object *obj, + struct sg_table *st, + u32 obj_offset, u32 page_count, + struct scatterlist **sgl) { - struct sg_table *st; struct scatterlist *sg, *iter; - unsigned int count = view->partial.size; unsigned int offset; - int ret = -ENOMEM; - st = kmalloc(sizeof(*st), GFP_KERNEL); - if (!st) - goto err_st_alloc; + GEM_BUG_ON(!st); - ret = sg_alloc_table(st, count, GFP_KERNEL); - if (ret) - goto err_sg_alloc; - - iter = i915_gem_object_get_sg_dma(obj, view->partial.offset, &offset, true); + iter = i915_gem_object_get_sg_dma(obj, obj_offset, &offset, true); GEM_BUG_ON(!iter); sg = st->sgl; @@ -1410,30 +1402,51 @@ intel_partial_pages(const struct i915_ggtt_view *view, unsigned int len; len = min(sg_dma_len(iter) - (offset << PAGE_SHIFT), - count << PAGE_SHIFT); + page_count << PAGE_SHIFT); + sg_set_page(sg, NULL, len, 0); sg_dma_address(sg) = sg_dma_address(iter) + (offset << PAGE_SHIFT); sg_dma_len(sg) = len; st->nents++; - count -= len >> PAGE_SHIFT; - if (count == 0) { + page_count -= len >> PAGE_SHIFT; + if (page_count == 0) { sg_mark_end(sg); - i915_sg_trim(st); /* Drop any unused tail entries. */ + if (sgl) + *sgl = sg; - return st; + return; } sg = __sg_next(sg); iter = __sg_next(iter); offset = 0; } while (1); +} -err_sg_alloc: - kfree(st); -err_st_alloc: - return ERR_PTR(ret); +static noinline struct sg_table * +intel_partial_pages(const struct i915_ggtt_view *view, + struct drm_i915_gem_object *obj) +{ + struct sg_table *st; + int ret; + + st = kmalloc(sizeof(*st), GFP_KERNEL); + if (!st) + return ERR_PTR(-ENOMEM); + + ret = sg_alloc_table(st, view->partial.size, GFP_KERNEL); + if (ret) { + kfree(st); + return ERR_PTR(ret); + } + + intel_partial_pages_for_sg_table(obj, st, view->partial.offset, + view->partial.size, NULL); + i915_sg_trim(st); + + return st; } static int diff --git a/drivers/gpu/drm/i915/gt/intel_gtt.h b/drivers/gpu/drm/i915/gt/intel_gtt.h index db3626c0ee20..37d2c692c0af 100644 --- a/drivers/gpu/drm/i915/gt/intel_gtt.h +++ b/drivers/gpu/drm/i915/gt/intel_gtt.h @@ -506,6 +506,10 @@ static inline bool i915_ggtt_has_aperture(const struct i915_ggtt *ggtt) return ggtt->mappable_end > 0; } +void intel_partial_pages_for_sg_table(struct drm_i915_gem_object *obj, + struct sg_table *st, + u32 obj_offset, u32 page_count, + struct scatterlist **sgl); int i915_ppgtt_init_hw(struct intel_gt *gt); struct i915_ppgtt *i915_ppgtt_create(struct intel_gt *gt); -- 2.26.2 _______________________________________________ dri-devel mailing list dri-devel@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/dri-devel