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 91687C02193 for ; Wed, 29 Jan 2025 16:50:13 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 4F22F10E841; Wed, 29 Jan 2025 16:50:13 +0000 (UTC) Authentication-Results: gabe.freedesktop.org; dkim=pass (1024-bit key; unprotected) header.d=redhat.com header.i=@redhat.com header.b="MDUsDLdO"; dkim-atps=neutral Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) by gabe.freedesktop.org (Postfix) with ESMTPS id A735C10E843 for ; Wed, 29 Jan 2025 16:50:11 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1738169410; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=kIR36ENGU60LuFgFJsbN3iw30GtNfjYTyr8Iv66sXWE=; b=MDUsDLdOgH/YKWkqNVDnar0yUbfHzgYa8qjRt1QIZn7CzFowPTkkPZLWCb/gyfV2BzlUGb GNnzikvrQO1hzkSgvGqq9tLbBM2YswEPi+x+qZD3rm1lbqkq4BqDvTLWli8WXBxRDCH7QQ FaSvVKlS5iI5h3zC/meXZWtH5VUCAtg= Received: from mail-wr1-f69.google.com (mail-wr1-f69.google.com [209.85.221.69]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-573-zxrBskVAMNuKknjm-BdXvw-1; Wed, 29 Jan 2025 11:50:07 -0500 X-MC-Unique: zxrBskVAMNuKknjm-BdXvw-1 X-Mimecast-MFC-AGG-ID: zxrBskVAMNuKknjm-BdXvw Received: by mail-wr1-f69.google.com with SMTP id ffacd0b85a97d-38629a685fdso2503258f8f.2 for ; Wed, 29 Jan 2025 08:50:07 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1738169406; x=1738774206; h=in-reply-to:content-transfer-encoding:content-disposition :mime-version:references:message-id:subject:cc:to:from:date :x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=kIR36ENGU60LuFgFJsbN3iw30GtNfjYTyr8Iv66sXWE=; b=uOEuGBAa0/yslQbi0aF0CJNRMuMKDyEKXvypJfcg+qrfE1R2+kFwUxGCxxVIajNYNp 8kDRSrQLBgmVsUixwNzEnisEKgqxj8anUH9GBPJeWLFzPius0vXcsAM3U9eQnp0HsVil Iev17rwgvBHwwemej0/TYK3OEUplRVFV4AQcC8sUzwQ2CaWoU6T7VO1ktFZOdNx1m++P hfWsl3J8mEtbrIQZcteqM+qT5M+z/pV6p2s7CwtJ9AjE5QI4aq02ZZyHCx9Agg/aTm/N c/3ZpJjpunbHCH7UMM9u2q6Vt5y8uj+atRYbAbFhLX4383x1cuIZ4WuJ/I952f3+TFE4 bQhQ== X-Forwarded-Encrypted: i=1; AJvYcCXqFxe5lgDVZQ8tafP8lyznbunFZw5ip2RIZ6q+acMQl5dd6C0GXiqGkXEdPpuZL0HJFTqgWJvEow==@lists.freedesktop.org X-Gm-Message-State: AOJu0YzjeVo24zgiiMm0JrYINEq+3a8nVquSJ2a+uzJOeX5nly1zy/ZC Y/PZc/AmPPrepHSRsRrTKVAPNEFk41mJxJ72aQeKVbqiTEmYFeryPi9xYbdDl4lCowNp3iBjys8 vOBzPmCBLSlfdC1pV0T5FblCtJdY8zHX5iXU+PhPaEI02n2iGyEUc4mKZwIX0nQ4x X-Gm-Gg: ASbGnct1+K4saEutUPyHhISoOveCRl03E1R0KSKoPrioPSh44gAurAGAcXh8U8zMx86 44ueAok6SaBChej7H0uu+lHcH3go+VMrSBzarE6y1fT5HATT+ebp8Z+gIWN16PVHUDP6mi+0r9s qrk209nnORpJdVwP7Ggp64uIfoDJMZzZUrao0TBbBlBbSyM3PzcUAYwVNmARbI3wKYDhkvPTuv5 r+QiCrwx8lokVmXmHqt4P5Ki+Lsyjzh99fT8PPQCCAowpYLfU8mYVEAizK4+vIoQWzJ5g== X-Received: by 2002:a5d:4385:0:b0:38a:888c:6786 with SMTP id ffacd0b85a97d-38c520babf7mr2389821f8f.52.1738169406361; Wed, 29 Jan 2025 08:50:06 -0800 (PST) X-Google-Smtp-Source: AGHT+IGzyZbfNeHEEqdBP/FPbqU2nUqTbUVUE0bCsa9+XfxoWf8z7EMd5vNIfqC9EBVK6faAB4GzCg== X-Received: by 2002:a5d:4385:0:b0:38a:888c:6786 with SMTP id ffacd0b85a97d-38c520babf7mr2389769f8f.52.1738169405919; Wed, 29 Jan 2025 08:50:05 -0800 (PST) Received: from pollux ([2a00:79c0:60c:5a00:abf:b8ff:feee:998b]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-38c2a188673sm17194930f8f.46.2025.01.29.08.50.04 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 29 Jan 2025 08:50:05 -0800 (PST) Date: Wed, 29 Jan 2025 17:50:02 +0100 From: Danilo Krummrich To: phasta@kernel.org Cc: Alex Deucher , Christian =?iso-8859-1?Q?K=F6nig?= , Xinhui Pan , David Airlie , Simona Vetter , Lucas Stach , Russell King , Christian Gmeiner , Frank Binns , Matt Coster , Maarten Lankhorst , Maxime Ripard , Thomas Zimmermann , Qiang Yu , Rob Clark , Sean Paul , Konrad Dybcio , Abhinav Kumar , Dmitry Baryshkov , Marijn Suijten , Karol Herbst , Lyude Paul , Boris Brezillon , Rob Herring , Steven Price , Liviu Dudau , Matthew Brost , Melissa Wen , =?iso-8859-1?Q?Ma=EDra?= Canal , Lucas De Marchi , Thomas =?iso-8859-1?Q?Hellstr=F6m?= , Rodrigo Vivi , Sunil Khatri , Lijo Lazar , Hawking Zhang , Mario Limonciello , Ma Jun , Yunxiang Li , amd-gfx@lists.freedesktop.org, dri-devel@lists.freedesktop.org, linux-kernel@vger.kernel.org, etnaviv@lists.freedesktop.org, lima@lists.freedesktop.org, linux-arm-msm@vger.kernel.org, freedreno@lists.freedesktop.org, nouveau@lists.freedesktop.org, intel-xe@lists.freedesktop.org Subject: Re: [PATCH v2] drm/sched: Use struct for drm_sched_init() params Message-ID: References: <20250128142927.103290-2-phasta@kernel.org> <1a22f1bb0145996cb1159cf3cb8156aec3d5c640.camel@mailbox.org> MIME-Version: 1.0 In-Reply-To: <1a22f1bb0145996cb1159cf3cb8156aec3d5c640.camel@mailbox.org> X-Mimecast-Spam-Score: 0 X-Mimecast-MFC-PROC-ID: CDC3GClkP_Jmx_bsv5iodV-RqZwi-pMxpnUN0GRUoi0_1738169406 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset=iso-8859-1 Content-Disposition: inline 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: , Errors-To: intel-xe-bounces@lists.freedesktop.org Sender: "Intel-xe" On Wed, Jan 29, 2025 at 04:18:30PM +0100, Philipp Stanner wrote: > On Tue, 2025-01-28 at 15:56 +0100, Danilo Krummrich wrote: > > On Tue, Jan 28, 2025 at 03:29:27PM +0100, Philipp Stanner wrote: > > > diff --git a/drivers/gpu/drm/nouveau/nouveau_sched.c > > > b/drivers/gpu/drm/nouveau/nouveau_sched.c > > > index 4412f2711fb5..b5aac8eebfdd 100644 > > > --- a/drivers/gpu/drm/nouveau/nouveau_sched.c > > > +++ b/drivers/gpu/drm/nouveau/nouveau_sched.c > > > @@ -404,7 +404,15 @@ nouveau_sched_init(struct nouveau_sched > > > *sched, struct nouveau_drm *drm, > > >  { > > >   struct drm_gpu_scheduler *drm_sched = &sched->base; > > >   struct drm_sched_entity *entity = &sched->entity; > > > - const long timeout = > > > msecs_to_jiffies(NOUVEAU_SCHED_JOB_TIMEOUT_MS); > > > + const struct drm_sched_init_args args = { > > > + .ops = &nouveau_sched_ops, > > > + .submit_wq = wq, > > > + .num_rqs = DRM_SCHED_PRIORITY_COUNT, > > > + .credit_limit = credit_limit, > > > + .timeout = > > > msecs_to_jiffies(NOUVEAU_SCHED_JOB_TIMEOUT_MS), > > > + .name = "nouveau_sched", > > > + .dev = drm->dev->dev > > > + }; > > >   int ret; > > >   > > >   if (!wq) { > > > @@ -416,10 +424,7 @@ nouveau_sched_init(struct nouveau_sched > > > *sched, struct nouveau_drm *drm, > > >   sched->wq = wq; > > Do you want it set here > > args.submit_wq = wq; > > or below, outside the if-block? Should be the same AFAICS Yeah, shouldn't make a difference. Personally, I'd prefer to set it once after the if-block. > > > > > > This change breaks Nouveau, you need to set args.submit_wq here as > > well. > > I overlooked the allocation below. > > > P. > > > > > >   } > > >   > > > - ret = drm_sched_init(drm_sched, &nouveau_sched_ops, wq, > > > -      NOUVEAU_SCHED_PRIORITY_COUNT, > > > -      credit_limit, 0, timeout, > > > -      NULL, NULL, "nouveau_sched", drm- > > > >dev->dev); > > > + ret = drm_sched_init(drm_sched, &args); > > >   if (ret) > > >   goto fail_wq; > > >