From: Brian Norris <briannorris@chromium.org>
To: "Heiko Stübner" <heiko@sntech.de>, "Sean Paul" <seanpaul@chromium.org>
Cc: "Sandy Huang" <hjc@rock-chips.com>,
"Michel Dänzer" <michel.daenzer@mailbox.org>,
linux-kernel@vger.kernel.org, linux-rockchip@lists.infradead.org,
dri-devel@lists.freedesktop.org,
"Brian Norris" <briannorris@chromium.org>,
stable@vger.kernel.org
Subject: [PATCH 1/2] drm/atomic: Allow vblank-enabled + self-refresh "disable"
Date: Thu, 5 Jan 2023 17:40:17 -0800 [thread overview]
Message-ID: <20230105174001.1.I3904f697863649eb1be540ecca147a66e42bfad7@changeid> (raw)
The self-refresh helper framework overloads "disable" to sometimes mean
"go into self-refresh mode," and this mode activates automatically
(e.g., after some period of unchanging display output). In such cases,
the display pipe is still considered "on", and user-space is not aware
that we went into self-refresh mode. Thus, users may expect that
vblank-related features (such as DRM_IOCTL_WAIT_VBLANK) still work
properly.
However, we trigger the WARN_ONCE() here if a CRTC driver tries to leave
vblank enabled here.
Add a new exception, such that we allow CRTCs to be "disabled" (with
self-refresh active) with vblank interrupts still enabled.
Cc: <stable@vger.kernel.org> # dependency for subsequent patch
Signed-off-by: Brian Norris <briannorris@chromium.org>
---
drivers/gpu/drm/drm_atomic_helper.c | 6 ++++++
1 file changed, 6 insertions(+)
diff --git a/drivers/gpu/drm/drm_atomic_helper.c b/drivers/gpu/drm/drm_atomic_helper.c
index d579fd8f7cb8..7b5eddadebd5 100644
--- a/drivers/gpu/drm/drm_atomic_helper.c
+++ b/drivers/gpu/drm/drm_atomic_helper.c
@@ -1207,6 +1207,12 @@ disable_outputs(struct drm_device *dev, struct drm_atomic_state *old_state)
if (!drm_dev_has_vblank(dev))
continue;
+ /*
+ * Self-refresh is not a true "disable"; let vblank remain
+ * enabled.
+ */
+ if (new_crtc_state->self_refresh_active)
+ continue;
ret = drm_crtc_vblank_get(crtc);
WARN_ONCE(ret != -EINVAL, "driver forgot to call drm_crtc_vblank_off()\n");
--
2.39.0.314.g84b9a713c41-goog
next reply other threads:[~2023-01-06 1:40 UTC|newest]
Thread overview: 16+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-01-06 1:40 Brian Norris [this message]
2023-01-06 1:40 ` [PATCH 2/2] drm/rockchip: vop: Leave vblank enabled in self-refresh Brian Norris
2023-01-06 11:42 ` Michel Dänzer
2023-01-07 1:21 ` Brian Norris
2023-01-06 7:04 ` [PATCH 1/2] drm/atomic: Allow vblank-enabled + self-refresh "disable" Greg KH
2023-01-06 17:49 ` Daniel Vetter
2023-01-06 17:53 ` Daniel Vetter
2023-01-06 18:08 ` Brian Norris
2023-01-06 18:20 ` Daniel Vetter
2023-01-06 19:25 ` Brian Norris
2023-01-06 18:17 ` Daniel Vetter
2023-01-06 19:33 ` Brian Norris
2023-01-06 20:30 ` Daniel Vetter
2023-01-06 21:30 ` Brian Norris
2023-01-06 22:44 ` Daniel Vetter
2023-01-11 15:03 ` Ville Syrjälä
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20230105174001.1.I3904f697863649eb1be540ecca147a66e42bfad7@changeid \
--to=briannorris@chromium.org \
--cc=dri-devel@lists.freedesktop.org \
--cc=heiko@sntech.de \
--cc=hjc@rock-chips.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-rockchip@lists.infradead.org \
--cc=michel.daenzer@mailbox.org \
--cc=seanpaul@chromium.org \
--cc=stable@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).