From nobody Wed Dec 17 07:30:21 2025 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (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 282B6229B3C; Wed, 16 Apr 2025 20:25:38 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1744835139; cv=none; b=Y5Yx5NeDLwJbTkaAPBSE1Xx8g6hYQYqcwZ0nQA1hQfxay7E/EAkq5ux+WBVWTZN/NrOqPCFBOa/TTHL2VQpQknKHjSkRChuIhwAdUs1uIQHsCPFqAb0PjsJgbu33lL/kKZVvKdi+PmVHmgmycFy4N9M53xeBBzDcRZTzqkfD8B4= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1744835139; c=relaxed/simple; bh=XnnBNksMm5ojgSXvbjygQ/y6w6yIrJGF73TgHSL9u5M=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=rJHzfLSty+OgKLddChfQMA/AekNndR6nWqC7HCN2hI0M/FtDu7v7QndSIcuHDj6IM0x8UENx/ePsAHmoAyQo4zLRRUthWbSe9vSMiFu8B1eK9FPvCdR3zPUjmLBbb7pfbwkcv5j3i8xBm+zgnqq5MDFASUQeQWIdWwYppIvjdEI= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=GVqwjIqJ; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="GVqwjIqJ" Received: by smtp.kernel.org (Postfix) with ESMTPS id 96F84C4CEEA; Wed, 16 Apr 2025 20:25:38 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1744835138; bh=XnnBNksMm5ojgSXvbjygQ/y6w6yIrJGF73TgHSL9u5M=; h=From:Date:Subject:References:In-Reply-To:To:Cc:Reply-To:From; b=GVqwjIqJ+7l1u/45t8zVpzniUqphvxw4udZs+tWLdFoAzMt6BJL1+ITONdgc8TAYD +p0Mi1dWCbION/KZ3yin9t8a5Ac2vD5EX2VIueUPK4oAQxgKg6Q2/+o/p1S9WReXo9 CyvLYNWf8Y6zf/z2V+LYeOY3q4p1bPLOCEHnKdrRpdDeXZf6e8LO9/gpppjUMRt7pG 80hxUFrUzJR/AfcsE71SOUpW/yld+a43uuyqoZOkZbbyjI79Z5hCYoTrKzaLS0cnvQ rqYkdulWYQbo4+2pOdoZQF+h+l0r8G/CnB2t8tJVe+WH9z+mLq4uaHnEIE/knQ4jnY IYVX/iNWCoVuQ== Received: from aws-us-west-2-korg-lkml-1.web.codeaurora.org (localhost.localdomain [127.0.0.1]) by smtp.lore.kernel.org (Postfix) with ESMTP id 83F35C369C9; Wed, 16 Apr 2025 20:25:38 +0000 (UTC) From: Janne Grunau via B4 Relay Date: Wed, 16 Apr 2025 22:25:27 +0200 Subject: [PATCH 1/4] drm: adp: Use spin_lock_irqsave for drm device event_lock Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Message-Id: <20250416-drm_adp_fixes-v1-1-772699f13293@jannau.net> References: <20250416-drm_adp_fixes-v1-0-772699f13293@jannau.net> In-Reply-To: <20250416-drm_adp_fixes-v1-0-772699f13293@jannau.net> To: Sasha Finkelstein , Maarten Lankhorst , Maxime Ripard , Thomas Zimmermann , David Airlie , Simona Vetter , Neal Gompa , Alyssa Rosenzweig , Dmitry Baryshkov Cc: dri-devel@lists.freedesktop.org, asahi@lists.linux.dev, linux-kernel@vger.kernel.org, Janne Grunau X-Mailer: b4 0.14.2 X-Developer-Signature: v=1; a=openpgp-sha256; l=1532; i=j@jannau.net; s=yk2024; h=from:subject:message-id; bh=ly1cyHZpQncU8CCBgaANZV7W5N8jcPXVe2vzXSXplD4=; b=owGbwMvMwCW2UNrmdq9+ahrjabUkhgwGIftXfJ+f5ahOn5pQYii11/ncc6PfC/zfmSo27xaqk vm1slG6o5SFQYyLQVZMkSVJ+2UHw+oaxZjaB2Ewc1iZQIYwcHEKwEQ+KTH8z1uyXPrpRYdL+xaK XEh99Xi1kHLfJtvKDQbHXbd1ft3pfoeR4b2d+ed1ehucMjX/Lt3g+aIkWmnVvaORn66U8C16m5a ZzAwA X-Developer-Key: i=j@jannau.net; a=openpgp; fpr=8B336A6BE4E5695E89B8532B81E806F586338419 X-Endpoint-Received: by B4 Relay for j@jannau.net/yk2024 with auth_id=264 X-Original-From: Janne Grunau Reply-To: j@jannau.net From: Janne Grunau The lock is used in the interrupt handler so use spin_lock_irqsave to disable interrupts and avoid deadlocks with the irq handler. Fixes: 332122eba628 ("drm: adp: Add Apple Display Pipe driver") Signed-off-by: Janne Grunau Reviewed-by: Alyssa Rosenzweig --- drivers/gpu/drm/adp/adp_drv.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/drivers/gpu/drm/adp/adp_drv.c b/drivers/gpu/drm/adp/adp_drv.c index c98c647f981d5383149647126762a5cdec8f4e4b..157298a8ff42b95275411dd4a7a= 0c70780fd86fd 100644 --- a/drivers/gpu/drm/adp/adp_drv.c +++ b/drivers/gpu/drm/adp/adp_drv.c @@ -310,6 +310,7 @@ static void adp_crtc_atomic_flush(struct drm_crtc *crtc, struct drm_atomic_state *state) { u32 frame_num =3D 1; + unsigned long flags; struct adp_drv_private *adp =3D crtc_to_adp(crtc); struct drm_crtc_state *new_state =3D drm_atomic_get_new_crtc_state(state,= crtc); u64 new_size =3D ALIGN(new_state->mode.hdisplay * @@ -330,13 +331,13 @@ static void adp_crtc_atomic_flush(struct drm_crtc *cr= tc, } writel(ADBE_FIFO_SYNC | frame_num, adp->be + ADBE_FIFO); //FIXME: use adbe flush interrupt - spin_lock_irq(&crtc->dev->event_lock); + spin_lock_irqsave(&crtc->dev->event_lock, flags); if (crtc->state->event) { drm_crtc_vblank_get(crtc); adp->event =3D crtc->state->event; } crtc->state->event =3D NULL; - spin_unlock_irq(&crtc->dev->event_lock); + spin_unlock_irqrestore(&crtc->dev->event_lock, flags); } =20 static const struct drm_crtc_funcs adp_crtc_funcs =3D { --=20 2.49.0