Message ID | 20240206122822.12a2df89@canb.auug.org.au |
---|---|
State | New |
Headers |
Return-Path: <linux-kernel+bounces-54151-ouuuleilei=gmail.com@vger.kernel.org> Delivered-To: ouuuleilei@gmail.com Received: by 2002:a05:7301:168b:b0:106:860b:bbdd with SMTP id ma11csp1257223dyb; Mon, 5 Feb 2024 17:28:48 -0800 (PST) X-Google-Smtp-Source: AGHT+IHucOivUBZxg0A2TFi/Q6sjU3uiegU7ctGZEa9OLHLx7r4A6RY43TaCEnD1EzyMMa4JkVM0 X-Received: by 2002:a05:651c:10a3:b0:2d0:a464:5937 with SMTP id k3-20020a05651c10a300b002d0a4645937mr469187ljn.0.1707182928392; Mon, 05 Feb 2024 17:28:48 -0800 (PST) ARC-Seal: i=2; a=rsa-sha256; t=1707182928; cv=pass; d=google.com; s=arc-20160816; b=xZ+N/HQoItZcVqmkhpdNy/K9VmCvzUjIeg/tEvThbtD+BAxUCFdGnU1yxSbb/MzFkO pEj9AsRONmz25iUv1t4b29VH3/MFLC9N/CKnHr4ATcJyPkgHXL/wHasRGv58JVC+9iG2 a4Ol3guzqyUtwQdOWnOzwLUvpCfkzNL+LqRmMEm8urunNUrRh7RS6yFN+Vs+z8CAqlue Pq1laTTCK5ww6ri5YRkP6ZfnIQP1djwIbXjCg2FgsM18QlAmvCrkzNTpWjHCiTQwl/3D P7Jgu0qbgf1xIjM//1SdllmtAy2c5QSkLfOJAtz8Ry5J7L8E4x650ToJGTVW0vPwqsw1 SNrQ== ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=mime-version:list-unsubscribe:list-subscribe:list-id:precedence :message-id:subject:cc:to:from:date:dkim-signature; bh=zKY0CiN5eVCwjR4J5nAX4GlXw1p1JS0IYgVBmlyJXhU=; fh=5kq1MVyUnwMRLlQ3roPXTNAx1mOzoNv4LCaRtMP36Mk=; b=OvhULdmi7tkDOTuPsYKAIzzabirvapYaMvaQDHMs+TSNyDh4OaFrNIljBjEsi880K+ B3V+4a49LORzEB2qwKntPYRV+Z5OCgSPEEYZlNqXZPwYcQ1qf1Bqq49oshggo6Z8W5v2 am2szXnKjCWW3SHPDhE6wl8+QknWXAL1BkR+LcFpnhhmKckA9FbuTRuKxnIYn3H27pdt nucXsTcpFORsrxe3ieq0RKDhPP8w0T71ttGeQ4qpspK3rjaDIc3x+22UmKfCtEDsld5s Rovcp4c+2Lu03yo4luMlfrbLAK5OBhSDwc+vaP0TctTqDWdfHwF+WvQPjF7XvUS/52Dw hH1Q==; dara=google.com ARC-Authentication-Results: i=2; mx.google.com; dkim=pass header.i=@canb.auug.org.au header.s=201702 header.b=p3Xvi+hM; arc=pass (i=1 spf=pass spfdomain=canb.auug.org.au dkim=pass dkdomain=canb.auug.org.au dmarc=pass fromdomain=canb.auug.org.au); spf=pass (google.com: domain of linux-kernel+bounces-54151-ouuuleilei=gmail.com@vger.kernel.org designates 147.75.80.249 as permitted sender) smtp.mailfrom="linux-kernel+bounces-54151-ouuuleilei=gmail.com@vger.kernel.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=canb.auug.org.au X-Forwarded-Encrypted: i=1; AJvYcCVleIcZzCqyOswkG4p1H7Al62Rq9C4SaMCUYLAMvrvPKEgv5JCXc3mZL2QBHb5MxyKZlabdKYuE6sEtcXmdis2j1dbVvg== Received: from am.mirrors.kernel.org (am.mirrors.kernel.org. [147.75.80.249]) by mx.google.com with ESMTPS id n10-20020aa7c44a000000b0055c0cd8db38si476614edr.629.2024.02.05.17.28.48 for <ouuuleilei@gmail.com> (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 05 Feb 2024 17:28:48 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel+bounces-54151-ouuuleilei=gmail.com@vger.kernel.org designates 147.75.80.249 as permitted sender) client-ip=147.75.80.249; Authentication-Results: mx.google.com; dkim=pass header.i=@canb.auug.org.au header.s=201702 header.b=p3Xvi+hM; arc=pass (i=1 spf=pass spfdomain=canb.auug.org.au dkim=pass dkdomain=canb.auug.org.au dmarc=pass fromdomain=canb.auug.org.au); spf=pass (google.com: domain of linux-kernel+bounces-54151-ouuuleilei=gmail.com@vger.kernel.org designates 147.75.80.249 as permitted sender) smtp.mailfrom="linux-kernel+bounces-54151-ouuuleilei=gmail.com@vger.kernel.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=canb.auug.org.au Received: from smtp.subspace.kernel.org (wormhole.subspace.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by am.mirrors.kernel.org (Postfix) with ESMTPS id 031621F2553F for <ouuuleilei@gmail.com>; Tue, 6 Feb 2024 01:28:48 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id 98A0F469E; Tue, 6 Feb 2024 01:28:34 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=canb.auug.org.au header.i=@canb.auug.org.au header.b="p3Xvi+hM" Received: from gandalf.ozlabs.org (gandalf.ozlabs.org [150.107.74.76]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id F242C1109; Tue, 6 Feb 2024 01:28:26 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=150.107.74.76 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1707182911; cv=none; b=irpQVRRkL4H0YR5EHIuu0EbX27rs4nOJJVYeukTN3n/OSDPB28gGQW2o4Eu6ShbWKI4Z4PxYtJxV+MZNIqd6fL4AwLLXRmw9Me/80GD0mjDvQ9aGos4mlxjBJvPwY6sMnIza3tcLOxvDksMwW0NA0qjUARsu/W/YphE9KKH4+h0= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1707182911; c=relaxed/simple; bh=FK0LAAXd0iQ5ZyxzXGxUaI+ge6k/xBudQVnCEI9DX5k=; h=Date:From:To:Cc:Subject:Message-ID:MIME-Version:Content-Type; b=Ht1lzo7JDumPg0EUWtQ0c05G1yZAUZpn1PPpVY+6MF7n3YD7kV9V+XJZtCnZmT9DkaGovjWtTuNETY1axabaOnrAGquuBhSpFLLej6Mt5lHg99tW1Tc1BLUQiudEyxkq0pcZ3eluGFL/LDwvR/nNob5/DqijSHDrvQaIgRomWIQ= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=canb.auug.org.au; spf=pass smtp.mailfrom=canb.auug.org.au; dkim=pass (2048-bit key) header.d=canb.auug.org.au header.i=@canb.auug.org.au header.b=p3Xvi+hM; arc=none smtp.client-ip=150.107.74.76 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=canb.auug.org.au Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=canb.auug.org.au DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=canb.auug.org.au; s=201702; t=1707182905; bh=zKY0CiN5eVCwjR4J5nAX4GlXw1p1JS0IYgVBmlyJXhU=; h=Date:From:To:Cc:Subject:From; b=p3Xvi+hMgs/tLQ65WhXY7emQZorkU4vGyAiUEQbvWBp1E981nzdmSgyKCCXXuf7Na blaobyUTeSuF1zEg0PR5GrBjvuOgKjy+D+XB/AiawYhwC1Z6Z4DdVUJZezpvl/6OkZ +xplFY/nIQV5Bfu0dUqTUlnEHdEAKoDBrpBC9lUCkRNrbZjuqDlDCrpfXj2Ir4BOLA CkrTYUobEbgY0e7DYRsUUkc2xxG7MgDjbIP95NJsY8diIbX7AyAxgj5mMu86Ml/lv4 BWk5g1OMgbHjtRIuOAmzM14lqUw1KD6LP9KbDI8AT5ev+rJN9Fn+SxH5mk5RpQLEnw fBfhei6CorH1w== Received: from authenticated.ozlabs.org (localhost [127.0.0.1]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by mail.ozlabs.org (Postfix) with ESMTPSA id 4TTQcR1p92z4wcJ; Tue, 6 Feb 2024 12:28:23 +1100 (AEDT) Date: Tue, 6 Feb 2024 12:28:22 +1100 From: Stephen Rothwell <sfr@canb.auug.org.au> To: Daniel Vetter <daniel.vetter@ffwll.ch> Cc: Matthew Brost <matthew.brost@intel.com>, Rodrigo Vivi <rodrigo.vivi@intel.com>, Christian =?utf-8?b?S8O2bmln?= <christian.koenig@amd.com>, Somalapuram Amaranath <Amaranath.Somalapuram@amd.com>, Intel Graphics <intel-gfx@lists.freedesktop.org>, DRI <dri-devel@lists.freedesktop.org>, Linux Kernel Mailing List <linux-kernel@vger.kernel.org>, Linux Next Mailing List <linux-next@vger.kernel.org> Subject: linux-next: build failure after merge of the drm-misc tree Message-ID: <20240206122822.12a2df89@canb.auug.org.au> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: <linux-kernel.vger.kernel.org> List-Subscribe: <mailto:linux-kernel+subscribe@vger.kernel.org> List-Unsubscribe: <mailto:linux-kernel+unsubscribe@vger.kernel.org> MIME-Version: 1.0 Content-Type: multipart/signed; boundary="Sig_/qoofQSLe6__zbq+lF9FrpkO"; protocol="application/pgp-signature"; micalg=pgp-sha256 X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1790111045790085569 X-GMAIL-MSGID: 1790111045790085569 |
Series |
linux-next: build failure after merge of the drm-misc tree
|
|
Commit Message
Stephen Rothwell
Feb. 6, 2024, 1:28 a.m. UTC
Hi all, After merging the drm-misc tree, today's linux-next build (x86_64 allmodconfig) failed like this: Caused by commit a78a8da51b36 ("drm/ttm: replace busy placement with flags v6") interacting with commit dd08ebf6c352 ("drm/xe: Introduce a new DRM driver for Intel GPUs") (and maybe others) from Linus' tree (v6.8-rc1). I have applied the following merge fix patch for today. This makes it build, but more is likely needed ... From: Stephen Rothwell <sfr@canb.auug.org.au> Date: Tue, 6 Feb 2024 12:21:07 +1100 Subject: [PATCH] fix up for "drm/ttm: replace busy placement with flags v6" interacting with commit dd08ebf6c352 ("drm/xe: Introduce a new DRM driver for Intel GPUs") Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au> --- drivers/gpu/drm/xe/xe_bo.c | 11 ----------- 1 file changed, 11 deletions(-)
Comments
On Tue, 06 Feb 2024, Stephen Rothwell <sfr@canb.auug.org.au> wrote: > Hi all, > > After merging the drm-misc tree, today's linux-next build (x86_64 > allmodconfig) failed like this: > > > Caused by commit > > a78a8da51b36 ("drm/ttm: replace busy placement with flags v6") > > interacting with commit > > dd08ebf6c352 ("drm/xe: Introduce a new DRM driver for Intel GPUs") > > (and maybe others) from Linus' tree (v6.8-rc1). > > I have applied the following merge fix patch for today. This makes it build, > but more is likely needed ... > > From: Stephen Rothwell <sfr@canb.auug.org.au> > Date: Tue, 6 Feb 2024 12:21:07 +1100 > Subject: [PATCH] fix up for "drm/ttm: replace busy placement with flags v6" > > interacting with commit > > dd08ebf6c352 ("drm/xe: Introduce a new DRM driver for Intel GPUs") > > Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au> > --- > drivers/gpu/drm/xe/xe_bo.c | 11 ----------- > 1 file changed, 11 deletions(-) Please see the new MAINTAINERS entry for drm/xe changes: INTEL DRM XE DRIVER (Lunar Lake and newer) M: Lucas De Marchi <lucas.demarchi@intel.com> M: Oded Gabbay <ogabbay@kernel.org> M: Thomas Hellström <thomas.hellstrom@linux.intel.com> L: intel-xe@lists.freedesktop.org BR, Jani.
Hi On Tue, 2024-02-06 at 12:28 +1100, Stephen Rothwell wrote: > Hi all, > > After merging the drm-misc tree, today's linux-next build (x86_64 > allmodconfig) failed like this: > > > Caused by commit > > a78a8da51b36 ("drm/ttm: replace busy placement with flags v6") > > interacting with commit > > dd08ebf6c352 ("drm/xe: Introduce a new DRM driver for Intel GPUs") > > (and maybe others) from Linus' tree (v6.8-rc1). > > I have applied the following merge fix patch for today. This makes > it build, > but more is likely needed ... There was a manual fixup for the drm-misc-next merge into drm-tip that did the right thing here. How do we ensure these are included into the linux-next builds? Thanks, Thomas > > From: Stephen Rothwell <sfr@canb.auug.org.au> > Date: Tue, 6 Feb 2024 12:21:07 +1100 > Subject: [PATCH] fix up for "drm/ttm: replace busy placement with > flags v6" > > interacting with commit > > dd08ebf6c352 ("drm/xe: Introduce a new DRM driver for Intel GPUs") > > Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au> > --- > drivers/gpu/drm/xe/xe_bo.c | 11 ----------- > 1 file changed, 11 deletions(-) > > diff --git a/drivers/gpu/drm/xe/xe_bo.c b/drivers/gpu/drm/xe/xe_bo.c > index 0b0e262e2166..280dbda8ae5a 100644 > --- a/drivers/gpu/drm/xe/xe_bo.c > +++ b/drivers/gpu/drm/xe/xe_bo.c > @@ -38,8 +38,6 @@ 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 = { > @@ -52,8 +50,6 @@ static const struct ttm_place tt_placement_flags = > { > static struct ttm_placement tt_placement = { > .num_placement = 1, > .placement = &tt_placement_flags, > - .num_busy_placement = 1, > - .busy_placement = &sys_placement_flags, > }; > > bool mem_type_is_vram(u32 mem_type) > @@ -230,8 +226,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 +245,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; > } > > @@ -1353,8 +1346,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; > @@ -2112,9 +2103,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 > -- > 2.43.0 >
On Tue, Feb 06, 2024 at 01:39:28PM +0100, Thomas Hellström wrote: >Hi > >On Tue, 2024-02-06 at 12:28 +1100, Stephen Rothwell wrote: >> Hi all, >> >> After merging the drm-misc tree, today's linux-next build (x86_64 >> allmodconfig) failed like this: >> >> >> Caused by commit >> >> a78a8da51b36 ("drm/ttm: replace busy placement with flags v6") >> >> interacting with commit >> >> dd08ebf6c352 ("drm/xe: Introduce a new DRM driver for Intel GPUs") >> >> (and maybe others) from Linus' tree (v6.8-rc1). >> >> I have applied the following merge fix patch for today. This makes >> it build, >> but more is likely needed ... > >There was a manual fixup for the drm-misc-next merge into drm-tip that >did the right thing here. > >How do we ensure these are included into the linux-next builds? I think it should have been done in commit 4db102dcb039 ("Merge drm/drm-next into drm-misc-next") when drm-next merged back into drm-misc-next. Now one option is probably a commit on drm-misc-next with this content: https://cgit.freedesktop.org/drm-tip/tree/fixups/drm-misc-next.patch?h=rerere-cache&id=c39c6e3d74203820ef630884a5323237696bd36c Lucas De Marchi
Hi all, On Tue, 6 Feb 2024 12:28:22 +1100 Stephen Rothwell <sfr@canb.auug.org.au> wrote: > > After merging the drm-misc tree, today's linux-next build (x86_64 > allmodconfig) failed like this: drivers/gpu/drm/xe/xe_bo.c:41:10: error: 'struct ttm_placement' has no member named 'num_busy_placement'; did you mean 'num_placement'? 41 | .num_busy_placement = 1, | ^~~~~~~~~~~~~~~~~~ | num_placement drivers/gpu/drm/xe/xe_bo.c:41:31: error: excess elements in struct initializer [-Werror] 41 | .num_busy_placement = 1, | ^ drivers/gpu/drm/xe/xe_bo.c:41:31: note: (near initialization for 'sys_placement') drivers/gpu/drm/xe/xe_bo.c:42:10: error: 'struct ttm_placement' has no member named 'busy_placement'; did you mean 'num_placement'? 42 | .busy_placement = &sys_placement_flags, | ^~~~~~~~~~~~~~ | num_placement drivers/gpu/drm/xe/xe_bo.c:42:27: error: excess elements in struct initializer [-Werror] 42 | .busy_placement = &sys_placement_flags, | ^ drivers/gpu/drm/xe/xe_bo.c:42:27: note: (near initialization for 'sys_placement') drivers/gpu/drm/xe/xe_bo.c:55:10: error: 'struct ttm_placement' has no member named 'num_busy_placement'; did you mean 'num_placement'? 55 | .num_busy_placement = 1, | ^~~~~~~~~~~~~~~~~~ | num_placement drivers/gpu/drm/xe/xe_bo.c:55:31: error: excess elements in struct initializer [-Werror] 55 | .num_busy_placement = 1, | ^ drivers/gpu/drm/xe/xe_bo.c:55:31: note: (near initialization for 'tt_placement') drivers/gpu/drm/xe/xe_bo.c:56:10: error: 'struct ttm_placement' has no member named 'busy_placement'; did you mean 'num_placement'? 56 | .busy_placement = &sys_placement_flags, | ^~~~~~~~~~~~~~ | num_placement drivers/gpu/drm/xe/xe_bo.c:56:27: error: excess elements in struct initializer [-Werror] 56 | .busy_placement = &sys_placement_flags, | ^ drivers/gpu/drm/xe/xe_bo.c:56:27: note: (near initialization for 'tt_placement') drivers/gpu/drm/xe/xe_bo.c: In function '__xe_bo_placement_for_flags': drivers/gpu/drm/xe/xe_bo.c:233:18: error: 'struct ttm_placement' has no member named 'num_busy_placement'; did you mean 'num_placement'? 233 | .num_busy_placement = c, | ^~~~~~~~~~~~~~~~~~ | num_placement drivers/gpu/drm/xe/xe_bo.c:233:39: error: excess elements in struct initializer [-Werror] 233 | .num_busy_placement = c, | ^ drivers/gpu/drm/xe/xe_bo.c:233:39: note: (near initialization for '(anonymous)') drivers/gpu/drm/xe/xe_bo.c:234:18: error: 'struct ttm_placement' has no member named 'busy_placement'; did you mean 'num_placement'? 234 | .busy_placement = bo->placements, | ^~~~~~~~~~~~~~ | num_placement drivers/gpu/drm/xe/xe_bo.c:234:35: error: excess elements in struct initializer [-Werror] 234 | .busy_placement = bo->placements, | ^~ drivers/gpu/drm/xe/xe_bo.c:234:35: note: (near initialization for '(anonymous)') drivers/gpu/drm/xe/xe_bo.c: In function 'xe_evict_flags': drivers/gpu/drm/xe/xe_bo.c:254:36: error: 'struct ttm_placement' has no member named 'num_busy_placement'; did you mean 'num_placement'? 254 | placement->num_busy_placement = 0; | ^~~~~~~~~~~~~~~~~~ | num_placement drivers/gpu/drm/xe/xe_bo.c: In function '__xe_bo_fixed_placement': drivers/gpu/drm/xe/xe_bo.c:1356:18: error: 'struct ttm_placement' has no member named 'num_busy_placement'; did you mean 'num_placement'? 1356 | .num_busy_placement = 1, | ^~~~~~~~~~~~~~~~~~ | num_placement drivers/gpu/drm/xe/xe_bo.c:1356:39: error: excess elements in struct initializer [-Werror] 1356 | .num_busy_placement = 1, | ^ drivers/gpu/drm/xe/xe_bo.c:1356:39: note: (near initialization for '(anonymous)') drivers/gpu/drm/xe/xe_bo.c:1357:18: error: 'struct ttm_placement' has no member named 'busy_placement'; did you mean 'num_placement'? 1357 | .busy_placement = place, | ^~~~~~~~~~~~~~ | num_placement drivers/gpu/drm/xe/xe_bo.c:1357:35: error: excess elements in struct initializer [-Werror] 1357 | .busy_placement = place, | ^~~~~ drivers/gpu/drm/xe/xe_bo.c:1357:35: note: (near initialization for '(anonymous)') drivers/gpu/drm/xe/xe_bo.c: In function 'xe_bo_migrate': drivers/gpu/drm/xe/xe_bo.c:2115:19: error: 'struct ttm_placement' has no member named 'num_busy_placement'; did you mean 'num_placement'? 2115 | placement.num_busy_placement = 1; | ^~~~~~~~~~~~~~~~~~ | num_placement drivers/gpu/drm/xe/xe_bo.c:2117:19: error: 'struct ttm_placement' has no member named 'busy_placement'; did you mean 'num_placement'? 2117 | placement.busy_placement = &requested; | ^~~~~~~~~~~~~~ | num_placement > Caused by commit > > a78a8da51b36 ("drm/ttm: replace busy placement with flags v6") > > interacting with commit > > dd08ebf6c352 ("drm/xe: Introduce a new DRM driver for Intel GPUs") > > (and maybe others) from Linus' tree (v6.8-rc1). Given that the latter above commit(s) are also in the drm-misc tree, I have just used the drm-misc tree from next-20240205 for today.
On Tue, 2024-02-06 at 14:21 -0600, Lucas De Marchi wrote: > On Tue, Feb 06, 2024 at 01:39:28PM +0100, Thomas Hellström wrote: > > Hi > > > > On Tue, 2024-02-06 at 12:28 +1100, Stephen Rothwell wrote: > > > Hi all, > > > > > > After merging the drm-misc tree, today's linux-next build (x86_64 > > > allmodconfig) failed like this: > > > > > > > > > Caused by commit > > > > > > a78a8da51b36 ("drm/ttm: replace busy placement with flags v6") > > > > > > interacting with commit > > > > > > dd08ebf6c352 ("drm/xe: Introduce a new DRM driver for Intel > > > GPUs") > > > > > > (and maybe others) from Linus' tree (v6.8-rc1). > > > > > > I have applied the following merge fix patch for today. This > > > makes > > > it build, > > > but more is likely needed ... > > > > There was a manual fixup for the drm-misc-next merge into drm-tip > > that > > did the right thing here. > > > > How do we ensure these are included into the linux-next builds? > > I think it should have been done in commit 4db102dcb039 ("Merge > drm/drm-next into drm-misc-next") > when drm-next merged back into drm-misc-next. Now one option is > probably a > commit on drm-misc-next with this content: > https://cgit.freedesktop.org/drm-tip/tree/fixups/drm-misc-next.patch?h=rerere-cache&id=c39c6e3d74203820ef630884a5323237696bd36c > > > Lucas De Marchi Indeed. Not even drm-misc itself compiles with xe enabled. I'll ping drm-misc maintainers. /Thomas
On Wed, 07 Feb 2024, Thomas Hellström <thomas.hellstrom@linux.intel.com> wrote: > Indeed. Not even drm-misc itself compiles with xe enabled. I'll ping > drm-misc maintainers. We'll need CONFIG_DRM_XE=m enabled in drm-rerere/drm-misc-*_defconfig, and get people to use that. BR, Jani.
diff --git a/drivers/gpu/drm/xe/xe_bo.c b/drivers/gpu/drm/xe/xe_bo.c index 0b0e262e2166..280dbda8ae5a 100644 --- a/drivers/gpu/drm/xe/xe_bo.c +++ b/drivers/gpu/drm/xe/xe_bo.c @@ -38,8 +38,6 @@ 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 = { @@ -52,8 +50,6 @@ static const struct ttm_place tt_placement_flags = { static struct ttm_placement tt_placement = { .num_placement = 1, .placement = &tt_placement_flags, - .num_busy_placement = 1, - .busy_placement = &sys_placement_flags, }; bool mem_type_is_vram(u32 mem_type) @@ -230,8 +226,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 +245,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; } @@ -1353,8 +1346,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; @@ -2112,9 +2103,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