From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-alma10-1.taild15c8.ts.net [100.103.45.18]) (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 392CB19D07A for ; Mon, 24 Aug 2026 06:10:53 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=100.103.45.18 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1787551854; cv=none; b=tW2ds8lZrNLB0P53BXPba9/1Q8sv958fomYgoV3OhKOEcWXx22jsjjdDqc7vy4CQrKlz9SleGx/yixnKyVIjHR8G6JWvfpI9FLeaff9Cri9zGQDHZ1fwwO6z6Awe/lMg0WlA2acncfQZRhwUJVLlE4+ZS4Li3QfOEgm3crgb7ys= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1787551854; c=relaxed/simple; bh=rl7QtrGVbrLquDk5/Ti0O5gH9DFmZNmcLjrtCC/Nvuw=; h=Date:From:To:Cc:Subject:Message-ID:References:MIME-Version: Content-Type:Content-Disposition:In-Reply-To; b=WIXvuIbo71ka/OmwqVP+PncA/ExGPzio04Xksl0Avt16SmU932HeNXya1jegpFWQUdkt+Z1l9zNSQZcNgR2SNhtyLnXQ4xIvYFqQQ7QdRNFDY/kqHbxGXo855xVRRosU2Fx8iSdB288zzVZa1hTxCtRYBQAUW3LlhLYl79pCpS0= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=DjvOt6dR; arc=none smtp.client-ip=100.103.45.18 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b="DjvOt6dR" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 7EAF71F000E9; Mon, 24 Aug 2026 06:10:52 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linuxfoundation.org; s=korg; t=1787551853; bh=6M+jUFODASxT6eiXDRwMJD5KWApUlWud10oJrb7EuTE=; h=Date:From:To:Cc:Subject:References:In-Reply-To; b=DjvOt6dR+fcqfIZO1tObScIdJOahe2MXHXZ2xz7cXS0mIHcqnic+REmJcISVr/73k xHo1wuvNkXWoqufNXeZedYhf1EG8d61hMM/8nZE3DsHIwH4i+JsV9rdONXboo/F3cs S9eWvXOJ2EQ+Dc+gGTDZjRHW2fErbohk2U4IP8ys= Date: Mon, 24 Aug 2026 08:10:49 +0200 From: Greg KH To: Jia Yao Cc: stable@vger.kernel.org, Gwan-gyeong Mun , Matthew Auld , Thomas =?iso-8859-1?Q?Hellstr=F6m?= Subject: Re: [PATCH 6.18.y] drm/xe/guc_ads: allocate UM queues in VRAM on dGFX Message-ID: <2026082417-chill-banshee-11e4@gregkh> References: <2026082047-manned-outer-503f@gregkh> <20260820161128.1337094-1-jia.yao@intel.com> <2026082410-arrival-blank-fcf9@gregkh> Precedence: bulk X-Mailing-List: stable@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset=iso-8859-1 Content-Disposition: inline Content-Transfer-Encoding: 8bit In-Reply-To: <2026082410-arrival-blank-fcf9@gregkh> On Mon, Aug 24, 2026 at 08:09:23AM +0200, Greg KH wrote: > On Thu, Aug 20, 2026 at 04:11:28PM +0000, Jia Yao wrote: > > On iGPU, the UM queue BO is allocated in system memory. On dGFX, the BO > > was previously created in system memory and later reallocated in > > xe_guc_realloc_post_hwconfig(). Allocate the UM queue BO directly in > > VRAM on dGFX, where it is ultimately required. > > > > Fixes: 9c57bc08652a ("drm/xe/lnl: Drop force_probe requirement") > > Cc: Gwan-gyeong Mun > > Cc: Matthew Auld > > Cc: # v6.12+ > > Signed-off-by: Jia Yao > > Reviewed-by: Matthew Auld > > Signed-off-by: Matthew Auld > > Link: https://patch.msgid.link/20260804165057.129529-3-jia.yao@intel.com > > (cherry picked from commit ace076ef0a854ab5940bacc539bf66afd61d118c) > > Signed-off-by: Thomas Hellström > > (cherry picked from commit f342810a141f8a7e8b3786a6e4b6c0695a078a74) > > --- > > drivers/gpu/drm/xe/xe_guc.c | 6 ------ > > drivers/gpu/drm/xe/xe_guc_ads.c | 8 +++++--- > > 2 files changed, 5 insertions(+), 9 deletions(-) > > > > diff --git a/drivers/gpu/drm/xe/xe_guc.c b/drivers/gpu/drm/xe/xe_guc.c > > index cc5741f751b9..ae0c88da422b 100644 > > --- a/drivers/gpu/drm/xe/xe_guc.c > > +++ b/drivers/gpu/drm/xe/xe_guc.c > > @@ -700,12 +700,6 @@ static int xe_guc_realloc_post_hwconfig(struct xe_guc *guc) > > if (ret) > > return ret; > > > > - if (guc->ads.um_queue_bo) { > > - ret = xe_managed_bo_reinit_in_vram(xe, tile, &guc->ads.um_queue_bo); > > - if (ret) > > - return ret; > > - } > > - > > return 0; > > } > > > > diff --git a/drivers/gpu/drm/xe/xe_guc_ads.c b/drivers/gpu/drm/xe/xe_guc_ads.c > > index 806c2618a7cd..4c3e21b5e60e 100644 > > --- a/drivers/gpu/drm/xe/xe_guc_ads.c > > +++ b/drivers/gpu/drm/xe/xe_guc_ads.c > > @@ -392,15 +392,17 @@ int xe_guc_ads_init(struct xe_guc_ads *ads) > > /* > > * Allocate a separate BO for the HW fault ring (UM queues). > > * > > - * Round the size up to the next power of two so that > > + * Round the size up to the next power of two so that on iGPU > > * (system memory, no IOMMU) the TTM pool issues a single > > * alloc_pages(order=N) call, maximising the chance of getting > > * a physically contiguous block. GuC requires contiguous DPA. > > */ > > - size_t um_size = roundup_pow_of_two(GUC_UM_QUEUE_SIZE * > > + size_t um_size = IS_DGFX(xe) ? > > + GUC_UM_QUEUE_SIZE * GUC_UM_HW_QUEUE_MAX : > > + roundup_pow_of_two(GUC_UM_QUEUE_SIZE * > > GUC_UM_HW_QUEUE_MAX); > > > > - u32 um_flags = XE_BO_FLAG_SYSTEM | > > + u32 um_flags = XE_BO_FLAG_VRAM_IF_DGFX(tile) | > > XE_BO_FLAG_GGTT | > > XE_BO_FLAG_GGTT_INVALIDATE | > > XE_BO_FLAG_PINNED_NORESTORE; > > -- > > 2.43.0 > > > > > > Does not apply at all, are you sure you made this properly? > > thanks, > > greg k-h Ah, it needed to be applied after a different one? Can you send these 3 patches as a patch series, as that will tell us what order to apply them in. Same for the 6.12 versions. thanks, greg k-h