From mboxrd@z Thu Jan 1 00:00:00 1970 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 9D1FD6775D; Tue, 23 Jan 2024 02:01:43 +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=1705975303; cv=none; b=RwlswgoKWlG2Sc9ckHLA43HYt9G5Zy6bUO9+UEhR7X+1nBXHnDsdTcIyUZvXNTZD8dWLwfg0yS7gI+PW1wVVKy3WqPVy4mtCRx4auFIFbKQ0GwYctXmGtH40uPVQeR/rew2QJLnfT0yYKDnV3fjsYA9IyU1QJc+/h9qmtwKp/WE= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1705975303; c=relaxed/simple; bh=ZWzszK4miFrUFCF2ZNRzGbgEUsXaxEXOvVKEQVYda4M=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=cFb3qqUfLE4ACRwJ8vohx9BpOezRIZzMUcxUyBCb6PL03KsDahwAZSlfELT3Ud7FtWwaI2T8fxBBDEy96R6FTuQyGcsmoL6hHwYQ5/jyGTxk5qU0qSIkG+ZTJigTUI24Tg3Ba/An6ZeodMtrfC8kADnvGTBeuBIMUge9rTvILLI= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=yYSf9IOK; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b="yYSf9IOK" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 422F7C43390; Tue, 23 Jan 2024 02:01:43 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1705975303; bh=ZWzszK4miFrUFCF2ZNRzGbgEUsXaxEXOvVKEQVYda4M=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=yYSf9IOKqAkBv4MrimFqWPUyPRvCtBf5IXT5m/dGpcrxXyyR4yMmbA3sNivPnKjuw IL6vP7fm1iX6aQ0cHwbfEvbVPsRQt6MQBx0i3vjtfwDtgKdQiTeTQ4Occ+xdT2qvn1 fXmN47r5H7cnvTASvMtQgIbecVihtEWtKb0Hainw= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, Dmitry Baryshkov , Abhinav Kumar , Sasha Levin Subject: [PATCH 6.6 250/583] drm/msm/mdp4: flush vblank event on disable Date: Mon, 22 Jan 2024 15:55:01 -0800 Message-ID: <20240122235819.653093161@linuxfoundation.org> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20240122235812.238724226@linuxfoundation.org> References: <20240122235812.238724226@linuxfoundation.org> User-Agent: quilt/0.67 X-stable: review X-Patchwork-Hint: ignore Precedence: bulk X-Mailing-List: patches@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 6.6-stable review patch. If anyone has any objections, please let me know. ------------------ From: Dmitry Baryshkov [ Upstream commit c6721b3c6423d8a348ae885a0f4c85e14f9bf85c ] Flush queued events when disabling the crtc. This avoids timeouts when we come back and wait for dependencies (like the previous frame's flip_done). Fixes: c8afe684c95c ("drm/msm: basic KMS driver for snapdragon") Signed-off-by: Dmitry Baryshkov Reviewed-by: Abhinav Kumar Patchwork: https://patchwork.freedesktop.org/patch/569127/ Link: https://lore.kernel.org/r/20231127215401.4064128-1-dmitry.baryshkov@linaro.org Signed-off-by: Sasha Levin --- drivers/gpu/drm/msm/disp/mdp4/mdp4_crtc.c | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/drivers/gpu/drm/msm/disp/mdp4/mdp4_crtc.c b/drivers/gpu/drm/msm/disp/mdp4/mdp4_crtc.c index 169f9de4a12a..3100957225a7 100644 --- a/drivers/gpu/drm/msm/disp/mdp4/mdp4_crtc.c +++ b/drivers/gpu/drm/msm/disp/mdp4/mdp4_crtc.c @@ -269,6 +269,7 @@ static void mdp4_crtc_atomic_disable(struct drm_crtc *crtc, { struct mdp4_crtc *mdp4_crtc = to_mdp4_crtc(crtc); struct mdp4_kms *mdp4_kms = get_kms(crtc); + unsigned long flags; DBG("%s", mdp4_crtc->name); @@ -281,6 +282,14 @@ static void mdp4_crtc_atomic_disable(struct drm_crtc *crtc, mdp_irq_unregister(&mdp4_kms->base, &mdp4_crtc->err); mdp4_disable(mdp4_kms); + if (crtc->state->event && !crtc->state->active) { + WARN_ON(mdp4_crtc->event); + spin_lock_irqsave(&mdp4_kms->dev->event_lock, flags); + drm_crtc_send_vblank_event(crtc, crtc->state->event); + crtc->state->event = NULL; + spin_unlock_irqrestore(&mdp4_kms->dev->event_lock, flags); + } + mdp4_crtc->enabled = false; } -- 2.43.0