From nobody Thu Apr 9 13:32:15 2026 Received: from mail-oi1-f174.google.com (mail-oi1-f174.google.com [209.85.167.174]) (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 8DAD53290C8 for ; Sun, 8 Mar 2026 22:35:53 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.167.174 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1773009354; cv=none; b=WSmAD/Tp7PKryIDey0IhBUmaC3SyRWiAfdIEpbPApfVoJIWkj64Lhv/d2VCtm1ctyXxgTYwIrAu+zvMD98mvtntiV5Yb/bDtfw8W3fWPVn82w7I1o18budxt+1cfdl+vd+q0BysYrWJ+odr2Xen0XLx3uF+xFU/r9gfRkLByUMs= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1773009354; c=relaxed/simple; bh=NkxMLDaepMtgbKuNA6zZGFXT0aT7m043H9vPURsdbcU=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=LefgOu2Gxk1I9wmyfQLO2h+7WLZKt7Co/fhAOwIdIi/61nQAA8KNWBD6UIXu31RpIuxNRjURk4qV8Jz8OhU1VaPMup9SBELz5GmvBDV+lfGmi29TgYtEBADRndepjqbApu9z0wG9HBHWWZhrZzD6a9exsv4OQcQEtk33/9TXFdw= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com; spf=pass smtp.mailfrom=gmail.com; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b=Qnd0AbN5; arc=none smtp.client-ip=209.85.167.174 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="Qnd0AbN5" Received: by mail-oi1-f174.google.com with SMTP id 5614622812f47-46704fbf62dso304717b6e.1 for ; Sun, 08 Mar 2026 15:35:53 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1773009352; x=1773614152; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=i6rOOxNN4X1st3aHd8TmN72tYm67hCF3B9p7RWUCvP0=; b=Qnd0AbN5EJuu3VoRuZi4es8s61KaK7KGXc//FSU+yh1WZPZyS5liUruoAosYCq0+x0 im4Ik9FKhC1XmJkGUTkDmXXJCnK7psMF6AwgvqHZ7st8iaipYyILpjTuKnrieONB0iZR 5RrGCnrV+oh1ez5HeChxFyGJ1hRK3I0MZ1sh6oiEPhcLRkZ98wNAYj8CrGycusZ4Xtbg zGQIT+kLdGlINljUvRVS22BGMum7Y3EYyjXRm2NJdJ2FbXbDCZs6+otUsjUs1iIoCdND wzMZ25eF/toYlQhOnoSsT+TK2+n3CXvaCAwZab9pKtYhwUJknBdOi4Edu7aXOLTpcZ9o hnMw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1773009352; x=1773614152; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-gg:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to; bh=i6rOOxNN4X1st3aHd8TmN72tYm67hCF3B9p7RWUCvP0=; b=UtsOTdZdX8f8mOhCZocibaTctevEjvXFh5QfM3E/3G8ogepdMjjZJWS5srsKjwzwOP z1br4ZRi0JfcxpKPuCX24SdjJ1YGyiZcczAGNyhF/VV3cPdq0L/fHQQXUUxbYjPW91Sk ceFf1l+8R7JQkALMfI5fFU4A8aeztsk22JGZ52vWjp0cgNhUGOSjOXp54NbXsV50KUtl 2vNCHX49tA7FK4q5sVX/1+K+JFfKgNiAmeybrT/imgCtph9QIKet0MC6tGsd4VBAKeWu 9pc7bvoPXKE0g+Iy0T776Un13JZmU2cTUhhZaSbWWnEB15r5vkiR8yDwLzpUS+MWtFtQ 9wVw== X-Gm-Message-State: AOJu0YylFx7XJYLU+Qg46TUkcA1BEfLPa4U4ekmA7ynw1de6F81AOgtt gH/U5m5Mp9g0koplMIdYk4QE6+/n7zOpXQozxvl2ev2LaQIF3BMNSFaXbObQPg== X-Gm-Gg: ATEYQzyA7bYqytSbNGGzPYRnyQka0PHoReqqT0y+oBKKLQrnuXbSP1ABr+blnEFZEVN DdrfImzG1efJeGTxNlXCkc5tolvPs2DtJqlefVxTO38jZnb0kuS4iX7vb4Z5K2f6D9Ay+L0jnQ3 bvFzZ3ByQ+YZKRtNewPgvPFUVnL9lOpcAKvSu8iwHeu84nJjf19XtQybU1hUk3VpFucDFuKkmvM D99b3XMtVydmizmwLX1zBILDxcMvv/sVtiUrpTrFm779f4FaaIKRoYbp/gyYfRoGhGLR4+vDcU2 BTJKsTxakznLf87TVgsrSr/KnafkVLDYfQ3VJ9VgcrHl3wkwibNQbCA4WQbha4DKciZcwZA/zow btdabnxbNm78/9g1OIInNAtHnMu7AifdeoBnwRq9xGKz7nllynXr7Hw5mVj9X9eq6MkvJ7u6OXT I+E70nmyljd5I5eO4D5/LgktHCpu5Wms/+cjjKraYka2wysCw6 X-Received: by 2002:a05:6808:c228:b0:45f:434:9c1c with SMTP id 5614622812f47-466dca167cdmr4806095b6e.12.1773009352280; Sun, 08 Mar 2026 15:35:52 -0700 (PDT) Received: from frodo (c-98-38-17-99.hsd1.co.comcast.net. [98.38.17.99]) by smtp.googlemail.com with ESMTPSA id 5614622812f47-466df93ce67sm4529016b6e.1.2026.03.08.15.35.51 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 08 Mar 2026 15:35:51 -0700 (PDT) From: Jim Cromie To: linux-kernel@vger.kernel.org Cc: Jim Cromie , Matthew Auld , Arun Pravin , Christian Koenig , Maarten Lankhorst , Maxime Ripard , Thomas Zimmermann , David Airlie , Simona Vetter , Jani Nikula , Luca Coelho , dri-devel@lists.freedesktop.org Subject: [PATCH 1/2] drm_buddy: fix power-of-2 rounding errs Date: Sun, 8 Mar 2026 16:35:36 -0600 Message-ID: <20260308223538.96729-2-jim.cromie@gmail.com> X-Mailer: git-send-email 2.53.0 In-Reply-To: <20260308223538.96729-1-jim.cromie@gmail.com> References: <20260308223538.96729-1-jim.cromie@gmail.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" On DRM-CI, I encountered this kunit:arm32 failure. [23:19:40] [PASSED] drm_test_buddy_alloc_clear [23:19:40] [PASSED] drm_test_buddy_alloc_range_bias [23:19:41] [PASSED] drm_test_buddy_fragmentation_performance [23:19:41] # drm_test_buddy_alloc_exceeds_max_order: EXPECTATION FAILED= at drivers/gpu/drm/tests/drm_buddy_test.c:889 [23:19:41] Expected err =3D=3D -22, but [23:19:41] err =3D=3D 0 (0x0) [23:19:41] ------------[ cut here ]------------ [23:19:41] WARNING: drivers/gpu/drm/drm_buddy.c:405 at drm_buddy_fini+0x114= /0x1b8, CPU#0: kunit_try_catch/74 [23:19:41] CPU: 0 UID: 0 PID: 74 Comm: kunit_try_catch Tainted: G = N 7.0.0-rc1-gdfb0bcedd08a #1 VOLUNTARY [23:19:41] Tainted: [N]=3DTEST [23:19:41] Hardware name: Generic DT based system [23:19:41] Call trace: [23:19:41] unwind_backtrace from show_stack+0x10/0x14 [23:19:41] show_stack from dump_stack_lvl+0x3c/0x4c [23:19:41] dump_stack_lvl from __warn+0xe8/0x1c4 [23:19:41] __warn from warn_slowpath_fmt+0xa4/0xc0 [23:19:41] warn_slowpath_fmt from drm_buddy_fini+0x114/0x1b8 [23:19:41] drm_buddy_fini from drm_test_buddy_alloc_exceeds_max_order+0x1c= 8/0x36c [23:19:41] drm_test_buddy_alloc_exceeds_max_order from kunit_try_run_case+= 0x78/0x1c8 [23:19:41] kunit_try_run_case from kunit_generic_run_threadfn_adapter+0x1c= /0x34 [23:19:41] kunit_generic_run_threadfn_adapter from kthread+0x108/0x134 [23:19:41] kthread from ret_from_fork+0x14/0x28 [23:19:41] Exception stack(0xf0bd5fb0 to 0xf0bd5ff8) [23:19:41] 5fa0: 00000000 00000000 0000= 0000 00000000 [23:19:41] 5fc0: 00000000 00000000 00000000 00000000 00000000 00000000 0000= 0000 00000000 [23:19:41] 5fe0: 00000000 00000000 00000000 00000000 00000013 00000000 [23:19:41] ---[ end trace 0000000000000000 ]--- [23:19:41] # drm_test_buddy_alloc_exceeds_max_order: drivers/gpu/drm/dr= m_buddy.c:406: buddy_fini() root [23:19:41] ------------[ cut here ]------------ [23:19:41] WARNING: drivers/gpu/drm/drm_buddy.c:414 at drm_buddy_fini+0x1b4= /0x1b8, CPU#0: kunit_try_catch/74 [23:19:41] CPU: 0 UID: 0 PID: 74 Comm: kunit_try_catch Tainted: G W = N 7.0.0-rc1-gdfb0bcedd08a #1 VOLUNTARY [23:19:41] Tainted: [W]=3DWARN, [N]=3DTEST [23:19:41] Hardware name: Generic DT based system [23:19:41] Call trace: [23:19:41] unwind_backtrace from show_stack+0x10/0x14 [23:19:41] show_stack from dump_stack_lvl+0x3c/0x4c [23:19:41] dump_stack_lvl from __warn+0xe8/0x1c4 [23:19:41] __warn from warn_slowpath_fmt+0xa4/0xc0 [23:19:41] warn_slowpath_fmt from drm_buddy_fini+0x1b4/0x1b8 [23:19:41] drm_buddy_fini from drm_test_buddy_alloc_exceeds_max_order+0x1c= 8/0x36c [23:19:41] drm_test_buddy_alloc_exceeds_max_order from kunit_try_run_case+= 0x78/0x1c8 [23:19:41] kunit_try_run_case from kunit_generic_run_threadfn_adapter+0x1c= /0x34 [23:19:41] kunit_generic_run_threadfn_adapter from kthread+0x108/0x134 [23:19:41] kthread from ret_from_fork+0x14/0x28 [23:19:41] Exception stack(0xf0bd5fb0 to 0xf0bd5ff8) [23:19:41] 5fa0: 00000000 00000000 0000= 0000 00000000 [23:19:41] 5fc0: 00000000 00000000 00000000 00000000 00000000 00000000 0000= 0000 00000000 [23:19:41] 5fe0: 00000000 00000000 00000000 00000000 00000013 00000000 [23:19:41] ---[ end trace 0000000000000000 ]--- [23:19:41] [FAILED] drm_test_buddy_alloc_exceeds_max_order [23:19:41] # drm_buddy: Testing DRM buddy manager, with random_seed=3D0= xacce106c [23:19:41] # module: drm_buddy_test [23:19:41] # drm_buddy: pass:8 fail:1 skip:0 total:9 This error in drm_test_buddy_alloc_exceeds_max_order (Expected -22, got 0) is caused by a 64-bit truncation bug in the DRM buddy allocator's core logic. On 32-bit architectures (like arm32), the standard roundup_pow_of_two() and rounddown_pow_of_two() macros use unsigned long internally. When these are called with u64 memory sizes (as drm_buddy.c does), any size above 4GB is truncated. The test tries to allocate ~9GB on a ~10GB manager. Due to truncation, it actually asks for ~1GB on a ~2GB manager, which unexpectedly succeeds. This then causes a mm->avail mismatch warning when the test finishes. Use 64-bit safe power-of-two calculations. Since ilog2() is already safe for u64, I'll use it to implement safe rounding. Signed-off-by: Jim Cromie --- drivers/gpu/drm/drm_buddy.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/gpu/drm/drm_buddy.c b/drivers/gpu/drm/drm_buddy.c index dbf984f8e301..8f23fb615d47 100644 --- a/drivers/gpu/drm/drm_buddy.c +++ b/drivers/gpu/drm/drm_buddy.c @@ -919,7 +919,7 @@ static int __alloc_contig_try_harder(struct drm_buddy *= mm, u64 modify_size; int err; =20 - modify_size =3D rounddown_pow_of_two(size); + modify_size =3D 1ULL << ilog2(size); pages =3D modify_size >> ilog2(mm->chunk_size); order =3D fls(pages) - 1; if (order =3D=3D 0) @@ -1140,7 +1140,7 @@ int drm_buddy_alloc_blocks(struct drm_buddy *mm, =20 /* Roundup the size to power of 2 */ if (flags & DRM_BUDDY_CONTIGUOUS_ALLOCATION) { - size =3D roundup_pow_of_two(size); + size =3D 1ULL << (ilog2(size - 1) + 1); min_block_size =3D size; /* Align size value to min_block_size */ } else if (!IS_ALIGNED(size, min_block_size)) { --=20 2.53.0 From nobody Thu Apr 9 13:32:15 2026 Received: from mail-ot1-f44.google.com (mail-ot1-f44.google.com [209.85.210.44]) (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 6B40F35A3B0 for ; Sun, 8 Mar 2026 22:35:55 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.210.44 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1773009356; cv=none; b=O1CKHPPQlEUchqCwNfm828WpMdplBPYoO5UZsDcwC+jq8DmpZ/lnYE1kdr0ZU9HnMup4y2eErO68q1SBR5K/BPx9qu7AbL/h9biwo1O5CBxgsiDu9/FOxeLpjK1DKZZNE+FSWHp9tAEGU2zG6optkZfiYCrOy4ZKeFUk4Mm3i8M= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1773009356; c=relaxed/simple; bh=Ay/WNBlWeZWbkjSgly8nxNlBi5X2XX/8rQLhXfG1YU8=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=MFnlQ/vXAzXHrCwfnVTO4m9qPUyjIXlxLGVHMgzQnkiQBb/rIU+eUS7dmPbuRr8qDxn+YQeqGoQE/rRAvtCwDLEXwwlyrXZPBRwr7klN1EwDevAPTqBr8QjPgjMEdBFM9V/WfcPzK3j0PsejSSOiTsaBQKeFidaAexclfX7oP+A= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com; spf=pass smtp.mailfrom=gmail.com; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b=lNKdkB4M; arc=none smtp.client-ip=209.85.210.44 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="lNKdkB4M" Received: by mail-ot1-f44.google.com with SMTP id 46e09a7af769-7d73ccee442so1173817a34.1 for ; Sun, 08 Mar 2026 15:35:55 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1773009354; x=1773614154; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=kMKCTB0JgA7UPGciIJUTWbaxDO5eSFF+/kzpE0aUa0Y=; b=lNKdkB4MwLZT4UR2P5gcN7a6eZrMDUIzC3eCnlrUH/OaJTnwJjFgMfavI3LpO4W0Eq uHRCDHjHYLUUK7d/2jDeOlQEZ85v5NQ43UW36sot3laQ3Cu6H92OlEW5hatC4u0/E14d 5XCYnxXxSyQFWmXXmlr7Jp6TQnICEDLO6O6IR1kuSocUS22NCUqpznH2h15GlwtXbDku 7MZEOpaHsRsN8NWa0X0AsFaU29oI+kr9S/ggQkSv8tJywokGbo0KrOvz+mCGmAmerQRI 6K69D2Xx35p8NiFiaVFUKccM4JezCywjq2DI2PQc4LWSvhwQ0OkQ3yD0GTbsdcS2QZjM gnRQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1773009354; x=1773614154; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-gg:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to; bh=kMKCTB0JgA7UPGciIJUTWbaxDO5eSFF+/kzpE0aUa0Y=; b=FxUz/oT9qwo2o7cHou7Sme+VzXd0LafdZb8XNDKBiGqmmKKD4L32C07kcmV92rin3y c9C/XB91HpzA0e5e0lhHdQSJl0viq6F9DfbFyDate2JLP+e/e0G+5Qn4QRfGTbdToX7Y 52cL7L6G9V8Ro+YYtH7fDcE3pGt/QNP9biUb1ruzRvbXOw4dSAUy7GRpSGBXN0FZzttp qQFLu/YXoi0CjavjqNGIU3zQGUAcIs+YMoEaac6J6qD6zL5e03azks+6+Qy51Vg4TSx5 /hdWcmFcIIP1jGkoO+IY+Zgn+vasD2+fwvdYk1xaExWvdv2GDqnFbaV0Cld1lJxzW8HI M1jw== X-Gm-Message-State: AOJu0YzpZY78Mv0+7UlTpS7iu4QeySzkezYlq6HQxq0UTkFUK5MJ0Q8S tK8wdA3yS/tlPjpqS2Z8j1A6GvtYzzqEhz4i1VvzdQpB9PVSKRW2B2ZWXXEYAg== X-Gm-Gg: ATEYQzwO3LLZlQrPS1JNh4tBbcJfDHquea7fDUMrHxJyzVmztGppt6pu9dPdvtmbEq4 kXCYneguEhAxvD7RatZlkSFy8BM1FeUYzh6f2D5HKHx782V71RQr80j7RXYvIwBlbHZL1nIw3Qz ktfGX1IUwmH1XUzjY5vUdyRID52KSTzp8xZ7Fjyo3IwGwMclOSbmvsQpn5ZVZUtfbn89eXMeCXX g1QZcmnvWaF7gk2g4rpHLmPSfz5G5x54POaj5m+uZPKB5CfT/OrqwhQ7r7S0FSdniolE91Ic8GJ o5suWDU+gNJeBC20T5bmGJaLGLzM3353HMtwO73knwkuLsj1pFL74ROeLQEYYRfdvYBOC7C83Zm DGWgdo8KTh5wcZXOGYJUgrH5dIyaM5IFWCV+IQ0T1Gf1iL3lvpvHS09AuFNV8s0959aLCLvs23t VCrtWqOHpIM1HMYmXEw8lUGCBJDl6DlvI0KuOuJslKRvO6hnN64KCQd9unqG8= X-Received: by 2002:a05:6808:6b8a:b0:45e:e173:f9ac with SMTP id 5614622812f47-466dcb9baffmr5337559b6e.55.1773009354099; Sun, 08 Mar 2026 15:35:54 -0700 (PDT) Received: from frodo (c-98-38-17-99.hsd1.co.comcast.net. [98.38.17.99]) by smtp.googlemail.com with ESMTPSA id 5614622812f47-466df93ce67sm4529016b6e.1.2026.03.08.15.35.52 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 08 Mar 2026 15:35:53 -0700 (PDT) From: Jim Cromie To: linux-kernel@vger.kernel.org Cc: Jim Cromie , Matthew Auld , Arun Pravin , Christian Koenig , Maarten Lankhorst , Maxime Ripard , Thomas Zimmermann , David Airlie , Simona Vetter , Luca Coelho , Jani Nikula , dri-devel@lists.freedesktop.org Subject: [PATCH 2/2] drivers/gpu/drm/drm_print: fix drm_printer dynamic debug bypass Date: Sun, 8 Mar 2026 16:35:37 -0600 Message-ID: <20260308223538.96729-3-jim.cromie@gmail.com> X-Mailer: git-send-email 2.53.0 In-Reply-To: <20260308223538.96729-1-jim.cromie@gmail.com> References: <20260308223538.96729-1-jim.cromie@gmail.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" drm_debug_enabled() is the canonical bit-test for drm.debug. Commit 6ce6fae84536 ("drm_print: optimize drm_debug_enabled for jump-label") renamed the original bit-test to drm_debug_enabled_raw() and introduced an internal bypass for dyndbg. When [1]=3Dy, it defined __drm_debug_enabled() to evaluate to 'true', allowing dyndbg's static-key to handle the filtering at the callsite. It also provided drm_debug_enabled() for cases where an explicit bit-mask check is still required. Later, commit 9fd6f61a297e ("drm/print: add drm_dbg_printer() for drm device specific printer") added __drm_printfn_dbg(), but mistakenly used the internal bypass __drm_debug_enabled() instead of the canonical drm_debug_enabled(). This went unnoticed because at the time, [1]=3Dy was marked BROKEN. Because __drm_printfn_dbg() is a shared helper where the callsite is not directly guarded by dyndbg's static-key, this caused it to hit the 'true' bypass and always print, ignoring the drm.debug bit-mask. This results in a flood of messages in environments with slow serial consoles, as seen in DRM-CI on i915 CML devices. When IGT causes a mismatch in intel_pipe_config_compare(), the resulting UART storm causes a hard timeout after 20 minutes. To fix this, change __drm_printfn_dbg() to use drm_debug_enabled_instrumented() instead. This ensures the bit-test is performed at runtime even when dyndbg is enabled. It also adds a pr_debug() to help track the frequency of this bit-test. Additionally, update __drm_dev_dbg() to use the canonical drm_debug_enabled() instead of the internal __drm_debug_enabled(). While __drm_dev_dbg() is wrapped by a dyndbg factory and thus safe, this change ensures consistency and clarifies the intended usage. [1] CONFIG_DRM_USE_DYNAMIC_DEBUG Fixes: 9fd6f61a297e ("drm/print: add drm_dbg_printer() for drm device speci= fic printer") Signed-off-by: Jim Cromie --- drivers/gpu/drm/drm_print.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/gpu/drm/drm_print.c b/drivers/gpu/drm/drm_print.c index ded9461df5f2..9b622345e2eb 100644 --- a/drivers/gpu/drm/drm_print.c +++ b/drivers/gpu/drm/drm_print.c @@ -218,7 +218,7 @@ void __drm_printfn_dbg(struct drm_printer *p, struct va= _format *vaf) const struct device *dev =3D drm ? drm->dev : NULL; enum drm_debug_category category =3D p->category; =20 - if (!__drm_debug_enabled(category)) + if (!drm_debug_enabled_instrumented(category)) return; =20 __drm_dev_vprintk(dev, KERN_DEBUG, p->origin, p->prefix, vaf); @@ -335,7 +335,7 @@ void __drm_dev_dbg(struct _ddebug *desc, const struct d= evice *dev, struct va_format vaf; va_list args; =20 - if (!__drm_debug_enabled(category)) + if (!drm_debug_enabled(category)) return; =20 /* we know we are printing for either syslog, tracefs, or both */ --=20 2.53.0