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 59DA8C433FE for ; Mon, 21 Mar 2022 23:06:01 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 569BA10E4A1; Mon, 21 Mar 2022 23:06:00 +0000 (UTC) Received: from mga06.intel.com (mga06.intel.com [134.134.136.31]) by gabe.freedesktop.org (Postfix) with ESMTPS id 7F36210E4BF; Mon, 21 Mar 2022 23:05: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=1647903958; x=1679439958; h=date:from:to:cc:subject:message-id:references: mime-version:in-reply-to; bh=7mb+7LOxADD/P9KW1yvKKamtfI2JCBSWx9CNrUxbauA=; b=ePcka/iofuXci9zTeV/XdvQxtqS97TFFGo7qf847DujXgEuwF5xnrO1A 9icpLgjzQESAb0SUgXQzk+fqjk3NpKHRhwBkeGKhyGxtR9HtRwaowz01D uiVcx2TPfknu3jgJ/hO6iiuyPt6yU5DzNEwlVKNkvRS5liJJNmOx0gUZY LXu5lj6buVnSxc7n2bgnpi5eGwv2lP8HhnL4Mblu4B28r6tzOE4zDdAbW /QHYxZ0wJEM9eFg/jAtpgOnDqqUg1exHYsCp/5YjV/4uTXPr3hsoTlWs9 Z0vIJ5JjAikV93jSUmtiryW5FFLVpkItygQ/93SBmglosIialc2EhjRD9 g==; X-IronPort-AV: E=McAfee;i="6200,9189,10293"; a="318378256" X-IronPort-AV: E=Sophos;i="5.90,199,1643702400"; d="scan'208";a="318378256" Received: from fmsmga001.fm.intel.com ([10.253.24.23]) by orsmga104.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 21 Mar 2022 16:05:57 -0700 X-IronPort-AV: E=Sophos;i="5.90,199,1643702400"; d="scan'208";a="692334364" Received: from ramaling-i9x.iind.intel.com (HELO intel.com) ([10.203.144.108]) by fmsmga001-auth.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 21 Mar 2022 16:05:55 -0700 Date: Tue, 22 Mar 2022 04:36:30 +0530 From: Ramalingam C To: "Das, Nirmoy" Subject: Re: [Intel-gfx] [PATCH v4 6/8] drm/ttm: Add a parameter to add extra pages into ttm_tt Message-ID: <20220321230630.GC12356@intel.com> References: <20220319204229.9846-1-ramalingam.c@intel.com> <20220319204229.9846-7-ramalingam.c@intel.com> MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Disposition: inline In-Reply-To: User-Agent: Mutt/1.10.1 (2018-07-13) 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: Thomas Hellstrom , intel-gfx , dri-devel , Hellstrom Thomas , Matthew Auld , Christian Koenig Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" On 2022-03-21 at 11:11:33 +0100, Das, Nirmoy wrote: > In the previous version I replied only to the mailing list email so probably > my email slipped through. Sorry for the miss. Thank so much for the review. Ram > > Reviewed-by: Nirmoy Das for patch 6-7 > > On 3/19/2022 9:42 PM, Ramalingam C wrote: > > Add a parameter called "extra_pages" for ttm_tt_init, to indicate that > > driver needs extra pages in ttm_tt. > > > > v2: > > Used imperative wording [Thomas and Christian] > > > > Signed-off-by: Ramalingam C > > cc: Christian Koenig > > cc: Hellstrom Thomas > > Reviewed-by: Thomas Hellstrom > > Reviewed-by: Christian Konig > > --- > > drivers/gpu/drm/drm_gem_vram_helper.c | 2 +- > > drivers/gpu/drm/i915/gem/i915_gem_ttm.c | 2 +- > > drivers/gpu/drm/qxl/qxl_ttm.c | 2 +- > > drivers/gpu/drm/ttm/ttm_agp_backend.c | 2 +- > > drivers/gpu/drm/ttm/ttm_tt.c | 12 +++++++----- > > drivers/gpu/drm/vmwgfx/vmwgfx_ttm_buffer.c | 2 +- > > include/drm/ttm/ttm_tt.h | 4 +++- > > 7 files changed, 15 insertions(+), 11 deletions(-) > > > > diff --git a/drivers/gpu/drm/drm_gem_vram_helper.c b/drivers/gpu/drm/drm_gem_vram_helper.c > > index dc7f938bfff2..123045b58fec 100644 > > --- a/drivers/gpu/drm/drm_gem_vram_helper.c > > +++ b/drivers/gpu/drm/drm_gem_vram_helper.c > > @@ -867,7 +867,7 @@ static struct ttm_tt *bo_driver_ttm_tt_create(struct ttm_buffer_object *bo, > > if (!tt) > > return NULL; > > - ret = ttm_tt_init(tt, bo, page_flags, ttm_cached); > > + ret = ttm_tt_init(tt, bo, page_flags, ttm_cached, 0); > > if (ret < 0) > > goto err_ttm_tt_init; > > diff --git a/drivers/gpu/drm/i915/gem/i915_gem_ttm.c b/drivers/gpu/drm/i915/gem/i915_gem_ttm.c > > index e4a06fcf741a..3b9f99c765c4 100644 > > --- a/drivers/gpu/drm/i915/gem/i915_gem_ttm.c > > +++ b/drivers/gpu/drm/i915/gem/i915_gem_ttm.c > > @@ -290,7 +290,7 @@ static struct ttm_tt *i915_ttm_tt_create(struct ttm_buffer_object *bo, > > i915_tt->is_shmem = true; > > } > > - ret = ttm_tt_init(&i915_tt->ttm, bo, page_flags, caching); > > + ret = ttm_tt_init(&i915_tt->ttm, bo, page_flags, caching, 0); > > if (ret) > > goto err_free; > > diff --git a/drivers/gpu/drm/qxl/qxl_ttm.c b/drivers/gpu/drm/qxl/qxl_ttm.c > > index b2e33d5ba5d0..52156b54498f 100644 > > --- a/drivers/gpu/drm/qxl/qxl_ttm.c > > +++ b/drivers/gpu/drm/qxl/qxl_ttm.c > > @@ -113,7 +113,7 @@ static struct ttm_tt *qxl_ttm_tt_create(struct ttm_buffer_object *bo, > > ttm = kzalloc(sizeof(struct ttm_tt), GFP_KERNEL); > > if (ttm == NULL) > > return NULL; > > - if (ttm_tt_init(ttm, bo, page_flags, ttm_cached)) { > > + if (ttm_tt_init(ttm, bo, page_flags, ttm_cached, 0)) { > > kfree(ttm); > > return NULL; > > } > > diff --git a/drivers/gpu/drm/ttm/ttm_agp_backend.c b/drivers/gpu/drm/ttm/ttm_agp_backend.c > > index 6ddc16f0fe2b..d27691f2e451 100644 > > --- a/drivers/gpu/drm/ttm/ttm_agp_backend.c > > +++ b/drivers/gpu/drm/ttm/ttm_agp_backend.c > > @@ -134,7 +134,7 @@ struct ttm_tt *ttm_agp_tt_create(struct ttm_buffer_object *bo, > > agp_be->mem = NULL; > > agp_be->bridge = bridge; > > - if (ttm_tt_init(&agp_be->ttm, bo, page_flags, ttm_write_combined)) { > > + if (ttm_tt_init(&agp_be->ttm, bo, page_flags, ttm_write_combined, 0)) { > > kfree(agp_be); > > return NULL; > > } > > diff --git a/drivers/gpu/drm/ttm/ttm_tt.c b/drivers/gpu/drm/ttm/ttm_tt.c > > index d234aab800a0..1a66d9fc589a 100644 > > --- a/drivers/gpu/drm/ttm/ttm_tt.c > > +++ b/drivers/gpu/drm/ttm/ttm_tt.c > > @@ -134,9 +134,10 @@ void ttm_tt_destroy(struct ttm_device *bdev, struct ttm_tt *ttm) > > static void ttm_tt_init_fields(struct ttm_tt *ttm, > > struct ttm_buffer_object *bo, > > uint32_t page_flags, > > - enum ttm_caching caching) > > + enum ttm_caching caching, > > + unsigned long extra_pages) > > { > > - ttm->num_pages = PAGE_ALIGN(bo->base.size) >> PAGE_SHIFT; > > + ttm->num_pages = (PAGE_ALIGN(bo->base.size) >> PAGE_SHIFT) + extra_pages; > > ttm->caching = ttm_cached; > > ttm->page_flags = page_flags; > > ttm->dma_address = NULL; > > @@ -146,9 +147,10 @@ static void ttm_tt_init_fields(struct ttm_tt *ttm, > > } > > int ttm_tt_init(struct ttm_tt *ttm, struct ttm_buffer_object *bo, > > - uint32_t page_flags, enum ttm_caching caching) > > + uint32_t page_flags, enum ttm_caching caching, > > + unsigned long extra_pages) > > { > > - ttm_tt_init_fields(ttm, bo, page_flags, caching); > > + ttm_tt_init_fields(ttm, bo, page_flags, caching, extra_pages); > > if (ttm_tt_alloc_page_directory(ttm)) { > > pr_err("Failed allocating page table\n"); > > @@ -180,7 +182,7 @@ int ttm_sg_tt_init(struct ttm_tt *ttm, struct ttm_buffer_object *bo, > > { > > int ret; > > - ttm_tt_init_fields(ttm, bo, page_flags, caching); > > + ttm_tt_init_fields(ttm, bo, page_flags, caching, 0); > > if (page_flags & TTM_TT_FLAG_EXTERNAL) > > ret = ttm_sg_tt_alloc_page_directory(ttm); > > diff --git a/drivers/gpu/drm/vmwgfx/vmwgfx_ttm_buffer.c b/drivers/gpu/drm/vmwgfx/vmwgfx_ttm_buffer.c > > index b84ecc6d6611..4e3938e62c08 100644 > > --- a/drivers/gpu/drm/vmwgfx/vmwgfx_ttm_buffer.c > > +++ b/drivers/gpu/drm/vmwgfx/vmwgfx_ttm_buffer.c > > @@ -517,7 +517,7 @@ static struct ttm_tt *vmw_ttm_tt_create(struct ttm_buffer_object *bo, > > ttm_cached); > > else > > ret = ttm_tt_init(&vmw_be->dma_ttm, bo, page_flags, > > - ttm_cached); > > + ttm_cached, 0); > > if (unlikely(ret != 0)) > > goto out_no_init; > > diff --git a/include/drm/ttm/ttm_tt.h b/include/drm/ttm/ttm_tt.h > > index f20832139815..17a0310e8aaa 100644 > > --- a/include/drm/ttm/ttm_tt.h > > +++ b/include/drm/ttm/ttm_tt.h > > @@ -140,6 +140,7 @@ int ttm_tt_create(struct ttm_buffer_object *bo, bool zero_alloc); > > * @bo: The buffer object we create the ttm for. > > * @page_flags: Page flags as identified by TTM_TT_FLAG_XX flags. > > * @caching: the desired caching state of the pages > > + * @extra_pages: Extra pages needed for the driver. > > * > > * Create a struct ttm_tt to back data with system memory pages. > > * No pages are actually allocated. > > @@ -147,7 +148,8 @@ int ttm_tt_create(struct ttm_buffer_object *bo, bool zero_alloc); > > * NULL: Out of memory. > > */ > > int ttm_tt_init(struct ttm_tt *ttm, struct ttm_buffer_object *bo, > > - uint32_t page_flags, enum ttm_caching caching); > > + uint32_t page_flags, enum ttm_caching caching, > > + unsigned long extra_pages); > > int ttm_sg_tt_init(struct ttm_tt *ttm_dma, struct ttm_buffer_object *bo, > > uint32_t page_flags, enum ttm_caching caching);