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 530C0C47DB3 for ; Mon, 29 Jan 2024 20:25:46 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id EBCF3112AEE; Mon, 29 Jan 2024 20:25:45 +0000 (UTC) Received: from mgamail.intel.com (mgamail.intel.com [198.175.65.13]) by gabe.freedesktop.org (Postfix) with ESMTPS id 05611112AE6; Mon, 29 Jan 2024 20:25:44 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1706559946; x=1738095946; h=message-id:date:mime-version:subject:to:cc:references: from:in-reply-to:content-transfer-encoding; bh=peeLZGLRvzgisLKMNrGaJCPsRGoE6sGpU8+vQnsVRng=; b=kd81Q1opNeBRtgt9WuqLLh+XRCGeKse3ymeNmyWZmyctxsPLTgA4xMHt Rm9fAq9Os7pb6RnlzFE4zOWo3/DVIj/yPb4R96M2ERJ64WCPgDJn1pvSn 46DbnjvWeHS/PuTmuk4+EjVgMvGsQNx7+SCroCSJj8VEdtGF6JofroNGJ aNczTNLzIFEPmBvjWsj4xi47BT6JebYzNjAmyvlIRSvvbCDWcL9p+Bia8 Rs04u66NE06K50v/H6lUG4D/miocgNUpAWmi2iGjt60dDYvgNY0nIN4kC T6Y5/ryXRHdbML4wVSnxxfL2ez8Rw7XYh9hvLMYqRT/Bru29ZsKn6hNTW g==; X-IronPort-AV: E=McAfee;i="6600,9927,10968"; a="10188687" X-IronPort-AV: E=Sophos;i="6.05,227,1701158400"; d="scan'208";a="10188687" Received: from fmsmga003.fm.intel.com ([10.253.24.29]) by orvoesa105.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 29 Jan 2024 12:25:44 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6600,9927,10968"; a="878202568" X-IronPort-AV: E=Sophos;i="6.05,227,1701158400"; d="scan'208";a="878202568" Received: from fvaneerd-mobl1.ger.corp.intel.com (HELO [10.249.254.11]) ([10.249.254.11]) by fmsmga003-auth.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 29 Jan 2024 12:25:41 -0800 Message-ID: <0d1e2c15-c951-4c97-b242-a1231ae4f608@linux.intel.com> Date: Mon, 29 Jan 2024 21:25:39 +0100 MIME-Version: 1.0 User-Agent: Mozilla Thunderbird Subject: Re: [PATCH] drm/xe: Fix a build error Content-Language: en-US To: =?UTF-8?Q?Christian_K=C3=B6nig?= , Oak Zeng , dri-devel@lists.freedesktop.org, intel-xe@lists.freedesktop.org References: <20240127155327.423294-1-oak.zeng@intel.com> <21f2b595-0690-4372-bd81-86d23ac7498b@gmail.com> From: =?UTF-8?Q?Thomas_Hellstr=C3=B6m?= In-Reply-To: <21f2b595-0690-4372-bd81-86d23ac7498b@gmail.com> Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 8bit X-BeenThere: intel-xe@lists.freedesktop.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Intel Xe graphics driver List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Amaranath.Somalapuram@amd.com, lucas.demarchi@intel.com Errors-To: intel-xe-bounces@lists.freedesktop.org Sender: "Intel-xe" Hi, On 1/29/24 17:48, Christian König wrote: > Am 27.01.24 um 16:53 schrieb Oak Zeng: >> This fixes a build failure on drm-tip. This issue was introduced during >> merge of "drm/ttm: replace busy placement with flags v6". For some >> reason, the xe_bo.c part of above change is not merged. Manually merge >> the missing part to drm_tip > > Mhm, I provided this as manual fixup for drm-tip in this rerere commit: > > commit afc5797e8c03bed3ec47a34f2bc3cf03fce24411 > Author: Christian König > Date:   Thu Jan 25 10:44:54 2024 +0100 > >     2024y-01m-25d-09h-44m-07s UTC: drm-tip rerere cache update > >     git version 2.34.1 > > > And for me compiling xe in drm-tip worked fine after that. No idea why > that didn't work for you. > > Anyway feel free to add my rb to this patch here if it helps in any way. > > Regards, > Christian. I reverted that rerere cache update and added another one, so now it works. Not sure exactly what the difference was, but the resulting patch was for the drm-misc-next merge in my case, and It was for drm-xe-something in your case. /Thomas > >> >> Signed-off-by: Oak Zeng >> --- >>   drivers/gpu/drm/xe/xe_bo.c | 33 +++++++++++++++------------------ >>   1 file changed, 15 insertions(+), 18 deletions(-) >> >> diff --git a/drivers/gpu/drm/xe/xe_bo.c b/drivers/gpu/drm/xe/xe_bo.c >> index 686d716c5581..d6a193060cc0 100644 >> --- a/drivers/gpu/drm/xe/xe_bo.c >> +++ b/drivers/gpu/drm/xe/xe_bo.c >> @@ -38,22 +38,26 @@ static const struct ttm_place sys_placement_flags >> = { >>   static struct ttm_placement sys_placement = { >>       .num_placement = 1, >>       .placement = &sys_placement_flags, >> -    .num_busy_placement = 1, >> -    .busy_placement = &sys_placement_flags, >>   }; >>   -static const struct ttm_place tt_placement_flags = { >> -    .fpfn = 0, >> -    .lpfn = 0, >> -    .mem_type = XE_PL_TT, >> -    .flags = 0, >> +static const struct ttm_place tt_placement_flags[] = { >> +    { >> +        .fpfn = 0, >> +        .lpfn = 0, >> +        .mem_type = XE_PL_TT, >> +        .flags = TTM_PL_FLAG_DESIRED, >> +    }, >> +    { >> +        .fpfn = 0, >> +        .lpfn = 0, >> +        .mem_type = XE_PL_SYSTEM, >> +        .flags = TTM_PL_FLAG_FALLBACK, >> +    } >>   }; >>     static struct ttm_placement tt_placement = { >> -    .num_placement = 1, >> -    .placement = &tt_placement_flags, >> -    .num_busy_placement = 1, >> -    .busy_placement = &sys_placement_flags, >> +    .num_placement = 2, >> +    .placement = tt_placement_flags, >>   }; >>     bool mem_type_is_vram(u32 mem_type) >> @@ -230,8 +234,6 @@ static int __xe_bo_placement_for_flags(struct >> xe_device *xe, struct xe_bo *bo, >>       bo->placement = (struct ttm_placement) { >>           .num_placement = c, >>           .placement = bo->placements, >> -        .num_busy_placement = c, >> -        .busy_placement = bo->placements, >>       }; >>         return 0; >> @@ -251,7 +253,6 @@ static void xe_evict_flags(struct >> ttm_buffer_object *tbo, >>           /* Don't handle scatter gather BOs */ >>           if (tbo->type == ttm_bo_type_sg) { >>               placement->num_placement = 0; >> -            placement->num_busy_placement = 0; >>               return; >>           } >>   @@ -1391,8 +1392,6 @@ static int __xe_bo_fixed_placement(struct >> xe_device *xe, >>       bo->placement = (struct ttm_placement) { >>           .num_placement = 1, >>           .placement = place, >> -        .num_busy_placement = 1, >> -        .busy_placement = place, >>       }; >>         return 0; >> @@ -2150,9 +2149,7 @@ int xe_bo_migrate(struct xe_bo *bo, u32 mem_type) >>         xe_place_from_ttm_type(mem_type, &requested); >>       placement.num_placement = 1; >> -    placement.num_busy_placement = 1; >>       placement.placement = &requested; >> -    placement.busy_placement = &requested; >>         /* >>        * Stolen needs to be handled like below VRAM handling if we >> ever need >