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=-15.3 required=3.0 tests=BAYES_00, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,NICE_REPLY_A,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED, USER_AGENT_SANE_1 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 6DE77C47082 for ; Tue, 8 Jun 2021 10:08:50 +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 38270610C7 for ; Tue, 8 Jun 2021 10:08:50 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 38270610C7 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 B11496E0E6; Tue, 8 Jun 2021 10:08:49 +0000 (UTC) Received: from mga07.intel.com (mga07.intel.com [134.134.136.100]) by gabe.freedesktop.org (Postfix) with ESMTPS id 9C20C6E0E6; Tue, 8 Jun 2021 10:08:48 +0000 (UTC) IronPort-SDR: HZzun275fdzUUmC+ddPYpRYNbzuVnP0Q14v/kP36EgdqxeuyhJjcGr8I0SehqWKfwY2xzU2Omw 5JskMO37UcqQ== X-IronPort-AV: E=McAfee;i="6200,9189,10008"; a="268668612" X-IronPort-AV: E=Sophos;i="5.83,257,1616482800"; d="scan'208";a="268668612" Received: from fmsmga002.fm.intel.com ([10.253.24.26]) by orsmga105.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 08 Jun 2021 03:08:47 -0700 IronPort-SDR: gsP/29VvM5ukt5STobYH6h3ZJ9sp2ZApUYhvyM4OyaXKbWMAOBnJDAc+idND/w3PuDHUjNRziq lFth4QREu38Q== X-IronPort-AV: E=Sophos;i="5.83,257,1616482800"; d="scan'208";a="485160029" Received: from mrahim1x-mobl.gar.corp.intel.com (HELO [10.215.170.251]) ([10.215.170.251]) by fmsmga002-auth.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 08 Jun 2021 03:08:44 -0700 Subject: Re: [PATCH v2 5/6] drm/i915/ttm: switch over to ttm_buddy_man To: =?UTF-8?Q?Thomas_Hellstr=c3=b6m?= , intel-gfx@lists.freedesktop.org References: <20210608084428.142676-1-matthew.auld@intel.com> <20210608084428.142676-6-matthew.auld@intel.com> <8e8a5115-730e-c892-a241-c69a5662b2c7@linux.intel.com> From: Matthew Auld Message-ID: Date: Tue, 8 Jun 2021 11:08:38 +0100 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:78.0) Gecko/20100101 Thunderbird/78.10.1 MIME-Version: 1.0 In-Reply-To: <8e8a5115-730e-c892-a241-c69a5662b2c7@linux.intel.com> Content-Type: text/plain; charset=utf-8; format=flowed Content-Language: en-GB Content-Transfer-Encoding: 8bit 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 Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" On 08/06/2021 10:53, Thomas Hellström wrote: > > On 6/8/21 10:44 AM, Matthew Auld wrote: >> Move back to the buddy allocator for managing device local memory, and >> restore the lost mock selftests. Keep around the range manager related >> bits, since we likely need this for managing stolen at some point. For >> stolen we also don't need to reserve anything so no need to support a >> generic reserve interface. >> >> v2(Thomas): >>      - bo->page_alignment is in page units, not bytes >> >> Signed-off-by: Matthew Auld >> Cc: Thomas Hellström >> Reviewed-by: Thomas Hellström >> --- >>   drivers/gpu/drm/i915/gem/i915_gem_ttm.c       |  26 +-- >>   drivers/gpu/drm/i915/intel_memory_region.c    |  55 +----- >>   drivers/gpu/drm/i915/intel_memory_region.h    |  17 -- >>   drivers/gpu/drm/i915/intel_region_ttm.c       | 100 +++-------- >>   .../drm/i915/selftests/intel_memory_region.c  | 170 ++++++++++++------ >>   drivers/gpu/drm/i915/selftests/mock_region.c  |  15 +- >>   6 files changed, 168 insertions(+), 215 deletions(-) >> >> diff --git a/drivers/gpu/drm/i915/gem/i915_gem_ttm.c >> b/drivers/gpu/drm/i915/gem/i915_gem_ttm.c >> index c612275c36c9..5bf1d1945dd6 100644 >> --- a/drivers/gpu/drm/i915/gem/i915_gem_ttm.c >> +++ b/drivers/gpu/drm/i915/gem/i915_gem_ttm.c >> @@ -181,11 +181,7 @@ static bool i915_ttm_eviction_valuable(struct >> ttm_buffer_object *bo, >>       struct drm_i915_gem_object *obj = i915_ttm_to_gem(bo); >>       /* Will do for now. Our pinned objects are still on TTM's LRU >> lists */ >> -    if (!i915_gem_object_evictable(obj)) >> -        return false; >> - >> -    /* This isn't valid with a buddy allocator */ >> -    return ttm_bo_eviction_valuable(bo, place); >> +    return i915_gem_object_evictable(obj); >>   } >>   static void i915_ttm_evict_flags(struct ttm_buffer_object *bo, >> @@ -328,11 +324,15 @@ i915_ttm_resource_get_st(struct >> drm_i915_gem_object *obj, >>       struct ttm_buffer_object *bo = i915_gem_to_ttm(obj); >>       struct ttm_resource_manager *man = >>           ttm_manager_type(bo->bdev, res->mem_type); >> +    struct intel_memory_region *mr = obj->mm.region; >>       if (man->use_tt) >>           return i915_ttm_tt_get_st(bo->ttm); >> -    return intel_region_ttm_node_to_st(obj->mm.region, res->mm_node); >> +    if (mr->is_range_manager) > > Did you look at moving this test into intel_region_ttm_node_to_st()) I guess I didn't like the _node since that seems to suggest drm_mm_node to me. What about something like: i915_ttm_resource_to_st(res, mr) intel_region_ttm_resource_to_st(mr, res) ? > >> +        return intel_region_ttm_node_to_st(mr, res); >> +    else >> +        return i915_sg_from_buddy_resource(res, mr->region.start); >>   } > > Thanks, > > Thomas > >