From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-wr1-f52.google.com (mail-wr1-f52.google.com [209.85.221.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 458A920E31C for ; Thu, 23 Jan 2025 10:57:48 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.221.52 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1737629871; cv=none; b=WFaXxL04Svp0gJc/gHbxDBB9aNuSuO63hxYQhkWoLCVf5tsOEcyf3gdQHOoW1pGyCA+eQ96dB46JUNqp8IzCABigkUeWFjVmB/G5UOuT0AGpMno0d6fnChQVq1q0Q/r5WDbEyGTvrRJMKhe/tyIdrsUfAt3aEpBKFfimnCVXiWA= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1737629871; c=relaxed/simple; bh=6Oe/Q5E1mId+kmGom25DVUpVwidCg11DdhRRgkMQiJ8=; h=Message-ID:Date:MIME-Version:Subject:To:Cc:References:From: In-Reply-To:Content-Type; b=aCkw+u2HbE0AC4s7AJHn3I61KeSLK/em6hZdPjkb9VkvAd4+cY04qO/UYzdT64isLJi2SwwW7ivcJrMoYLWvQm/GU/uXlnHvyRRfrUsih56iApmAMIeB7136MT//x7Pai1gjg4OirU0HOB4HARk+aMOkagamj11tzJz3FP0RiYM= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=ursulin.net; spf=none smtp.mailfrom=ursulin.net; dkim=pass (2048-bit key) header.d=ursulin-net.20230601.gappssmtp.com header.i=@ursulin-net.20230601.gappssmtp.com header.b=dh2uQziJ; arc=none smtp.client-ip=209.85.221.52 Authentication-Results: smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=ursulin.net Authentication-Results: smtp.subspace.kernel.org; spf=none smtp.mailfrom=ursulin.net Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=ursulin-net.20230601.gappssmtp.com header.i=@ursulin-net.20230601.gappssmtp.com header.b="dh2uQziJ" Received: by mail-wr1-f52.google.com with SMTP id ffacd0b85a97d-3863494591bso356441f8f.1 for ; Thu, 23 Jan 2025 02:57:48 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ursulin-net.20230601.gappssmtp.com; s=20230601; t=1737629867; x=1738234667; darn=vger.kernel.org; h=content-transfer-encoding:in-reply-to:from:content-language :references:cc:to:subject:user-agent:mime-version:date:message-id :from:to:cc:subject:date:message-id:reply-to; bh=30gtLyVebZdKEobBArrAkfadsgu2rmW9GlB2Mmp+Z3o=; b=dh2uQziJtD/ArU0R3p/9+G/zVldCKTggt760mqayqIzHYRGjDbGf3bXbQNuHHcm1oE dMFE8Y4puIt0+gImlZmHQiR8V3EsbTqUAT3kmgWNcygr0KT/XoTDxPlubddE7wUHzmuI aNEzjL9QwxVoovwkHOlJ0ith9961p/BaEVn3Oa/jFxAMKXgpGvNgAExaAXt6io9zFjCt CN/bjvpF3xg73gN0q/EO/K7hxgM99fq51Hm3sRUGLU+nCQYHi6i5aKnuBrBG2MDw9JvU K/QLmsM8FBQBNGX49yC7SsLiA8HtKC8ls6Ve+pc4jfVOotbiz4AhW6afLuHD8GfjXyJi FdKw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1737629867; x=1738234667; h=content-transfer-encoding:in-reply-to:from:content-language :references:cc:to:subject:user-agent:mime-version:date:message-id :x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=30gtLyVebZdKEobBArrAkfadsgu2rmW9GlB2Mmp+Z3o=; b=Gu5YWpAMCuBLNhUpK7agv8WeRoffVefK/FEOs8v5iRK6r8Pp0VsmVHA6qmnqk7tzXt OheAG9vYBdAedtB3NitCQgte/K2jvhZuj9TGoZvvErfPIr8LTLc58Kij4QbkTCFNjvC9 YIaPOUojwXYl5kTUEFj40DjWURozWjnBSDI4ImHemh2/o/A06bPAtYQhR8GeHUByDiTo DEHYUzIFEaqyk2P4J177LWQrLGBIflTk6Iy+BdY4GbEs7ndSHkyWHsdrGJT9k4zzyBnC qeGk65JPbKxLi+9loNol80vq+mSXH8Qe7HQwp2LJ37nRTQBuW2gi5UZhwt+ZoPOjXxw4 roDg== X-Forwarded-Encrypted: i=1; AJvYcCV3GfFcRSv0M+e7Xi7h2B+GO2F8ttvJD+n5WKKz9Qsk14hBOSkW7mstQTiIb9P9XXlhWjJvQtD/WlSBK30=@vger.kernel.org X-Gm-Message-State: AOJu0YyU8LhbuNfoImTTVHzVUvA7ABE/p+ewLGy59VmFjJiUx0NA7IsZ wdcixDbVlU5yIH46X+iC10v9+3QUPGtYmITmuUGziqj21EwUffysQsqajJM5li4= X-Gm-Gg: ASbGnctBAaQwvZr1twEb4lJGi+ustPISM6UnJJyxqVERb3Xry3GwHXBfieh3SKgCeOh uMcDYa5vdJlu1tI5CHdIexEMRWv928xrGvseMlMI8FGHusla6m82SeHDngeXx1Qxdu06Wxu8pSd 3dHfnPTC1Il3SRKG163FnEIBHULM9iFhmQy3DaWXT2D4e5hT30m3Xv9sluWo6hVALAY8FkSLCG3 U9nFj53fvoyeuPTuy5FTdeNuXdmXLRsOi6XIhWlLb814vnOC9UswqMwgx7/nUl2ugiB6DuJlEXb OYJM8Pcet46WtjnWRztt X-Google-Smtp-Source: AGHT+IHpKgpQDCjK1YcskusgjOOfedvKDgMRGq/HKiTsnZfb2gV/B/uu8mCCB+Emo5ibqoWzbXfktQ== X-Received: by 2002:a5d:6d06:0:b0:38a:864e:29b1 with SMTP id ffacd0b85a97d-38bf59e22d2mr26981832f8f.41.1737629867331; Thu, 23 Jan 2025 02:57:47 -0800 (PST) Received: from [192.168.0.101] ([90.241.98.187]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-38bf322acdcsm19245193f8f.55.2025.01.23.02.57.45 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Thu, 23 Jan 2025 02:57:46 -0800 (PST) Message-ID: <0c46e330-33d1-4121-b073-1bd41d37a58b@ursulin.net> Date: Thu, 23 Jan 2025 10:57:45 +0000 Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 User-Agent: Mozilla Thunderbird Subject: Re: [PATCH] drm/sched: Use struct for drm_sched_init() params To: phasta@kernel.org, Danilo Krummrich Cc: Boris Brezillon , Alex Deucher , =?UTF-8?Q?Christian_K=C3=B6nig?= , 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 , Rob Herring , Steven Price , Liviu Dudau , Luben Tuikov , Matthew Brost , Melissa Wen , =?UTF-8?Q?Ma=C3=ADra_Canal?= , Lucas De Marchi , =?UTF-8?Q?Thomas_Hellstr=C3=B6m?= , Rodrigo Vivi , Sunil Khatri , Lijo Lazar , 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 References: <20250122140818.45172-3-phasta@kernel.org> <20250122181227.491b7881@collabora.com> <4ef6430c01f31659c327f688965800285b8172ac.camel@mailbox.org> Content-Language: en-GB From: Tvrtko Ursulin In-Reply-To: <4ef6430c01f31659c327f688965800285b8172ac.camel@mailbox.org> Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 8bit On 23/01/2025 09:35, Philipp Stanner wrote: > On Thu, 2025-01-23 at 10:29 +0100, Danilo Krummrich wrote: >> On Thu, Jan 23, 2025 at 08:33:01AM +0100, Philipp Stanner wrote: >>> On Wed, 2025-01-22 at 18:16 +0100, Boris Brezillon wrote: >>>> On Wed, 22 Jan 2025 15:08:20 +0100 >>>> Philipp Stanner wrote: >>>> >>>>>  int drm_sched_init(struct drm_gpu_scheduler *sched, >>>>> -    const struct drm_sched_backend_ops *ops, >>>>> -    struct workqueue_struct *submit_wq, >>>>> -    u32 num_rqs, u32 credit_limit, unsigned int hang_limit, >>>>> -    long timeout, struct workqueue_struct *timeout_wq, >>>>> -    atomic_t *score, const char *name, struct device *dev); >>>>> + const struct drm_sched_init_params *params); >>>> >>>> >>>> Another nit: indenting is messed up here. >>> >>> That was done on purpose. >> >> Let's not change this convention, it's used all over the kernel tree, >> including >> the GPU scheduler. People are used to read code that is formatted >> this way, plus >> the attempt of changing it will make code formatting inconsistent. > > Both the tree and this file are already inconsistent in regards to > this. > > Anyways, what is your proposed solution to ridiculous nonsense like > this? > > https://elixir.bootlin.com/linux/v6.13-rc3/source/drivers/gpu/drm/scheduler/sched_main.c#L1296 Apologies for budging in. Sometimes breaking 80 cols is unavoidable, or perhaps something like the below would be a bit easier on the eyes? Although it still breaks 80 columns, just a bit less. diff --git a/drivers/gpu/drm/scheduler/sched_main.c b/drivers/gpu/drm/scheduler/sched_main.c index 06b06987129d..3f7e97b240d1 100644 --- a/drivers/gpu/drm/scheduler/sched_main.c +++ b/drivers/gpu/drm/scheduler/sched_main.c @@ -1287,22 +1287,18 @@ int drm_sched_init(struct drm_gpu_scheduler *sched, return 0; } - if (submit_wq) { - sched->submit_wq = submit_wq; - sched->own_submit_wq = false; - } else { -#ifdef CONFIG_LOCKDEP - sched->submit_wq = alloc_ordered_workqueue_lockdep_map(name, - WQ_MEM_RECLAIM, - &drm_sched_lockdep_map); -#else - sched->submit_wq = alloc_ordered_workqueue(name, WQ_MEM_RECLAIM); -#endif - if (!sched->submit_wq) - return -ENOMEM; + own_wq = !!submit_wq; + if (!submit_wq && IS_ENABLED(CONFIG_LOCKDEP)) + submit_wq = alloc_ordered_workqueue_lockdep_map(name, + WQ_MEM_RECLAIM, + &drm_sched_lockdep_map); + else if (!submit_wq) + submit_wq = alloc_ordered_workqueue(name, WQ_MEM_RECLAIM); + if (!submit_wq) + return -ENOMEM; - sched->own_submit_wq = true; - } + sched->submit_wq = submit_wq; + sched->own_submit_wq = own_wq; sched->sched_rq = kmalloc_array(num_rqs, sizeof(*sched->sched_rq), GFP_KERNEL | __GFP_ZERO); Could bring it under 80 by renaming drm_sched_lockdep_map to something shorter. Which should be fine since it is local to the file. Regards, Tvrtko