From: Maarten Lankhorst <maarten.lankhorst@linux.intel.com>
To: dri-devel@lists.freedesktop.org
Cc: intel-gfx@lists.freedesktop.org
Subject: [PATCH 1/6] drm/atomic: Use active instead of enable in wait_for_vblanks.
Date: Thu, 8 Dec 2016 14:45:24 +0100 [thread overview]
Message-ID: <1481204729-9058-2-git-send-email-maarten.lankhorst@linux.intel.com> (raw)
In-Reply-To: <1481204729-9058-1-git-send-email-maarten.lankhorst@linux.intel.com>
When DPMS was introduced to atomic, vblanks only worked when the crtc
was enabled and active. wait_for_vblanks were not converted to check for
crtc_state->active, which may cause an attempt for vblank_get to fail.
This is probably harmless, but convert from enable to active anyway.
Signed-off-by: Maarten Lankhorst <maarten.lankhorst@linux.intel.com>
---
drivers/gpu/drm/drm_atomic_helper.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/drivers/gpu/drm/drm_atomic_helper.c b/drivers/gpu/drm/drm_atomic_helper.c
index 583f47f27b36..23767df72615 100644
--- a/drivers/gpu/drm/drm_atomic_helper.c
+++ b/drivers/gpu/drm/drm_atomic_helper.c
@@ -1117,7 +1117,7 @@ drm_atomic_helper_wait_for_vblanks(struct drm_device *dev,
* vblank wait) in the ->enable boolean. */
old_crtc_state->enable = false;
- if (!crtc->state->enable)
+ if (!crtc->state->active)
continue;
/* Legacy cursor ioctls are completely unsynced, and userspace
--
2.7.4
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
next prev parent reply other threads:[~2016-12-08 13:45 UTC|newest]
Thread overview: 29+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-12-08 13:45 [PATCH 0/6] drm/atomic: Remove drm_atomic_helper_framebuffer_changed Maarten Lankhorst
2016-12-08 13:45 ` Maarten Lankhorst [this message]
2016-12-08 15:36 ` [PATCH 1/6] drm/atomic: Use active instead of enable in wait_for_vblanks Daniel Vetter
2016-12-08 13:45 ` [PATCH 2/6] drm/atomic: Unconditionally call prepare_fb Maarten Lankhorst
2016-12-08 15:41 ` Daniel Vetter
2016-12-08 22:42 ` [Intel-gfx] " Laurent Pinchart
2016-12-09 8:25 ` Daniel Vetter
2016-12-13 14:13 ` Maarten Lankhorst
2016-12-13 17:10 ` Daniel Vetter
2016-12-19 11:08 ` [PATCH v2 " Maarten Lankhorst
2016-12-19 12:07 ` Laurent Pinchart
2016-12-14 0:12 ` [Intel-gfx] [PATCH " Laurent Pinchart
2016-12-08 13:45 ` [PATCH 3/6] drm/atomic: Clean up wait_for_vblanks Maarten Lankhorst
2016-12-08 15:38 ` Daniel Vetter
2016-12-15 11:51 ` [PATCH v2 3/6] drm/atomic: Clean up wait_for_vblanks, v2 Maarten Lankhorst
2016-12-15 15:55 ` Daniel Vetter
2016-12-15 16:14 ` Maarten Lankhorst
2016-12-08 13:45 ` [PATCH 4/6] drm/atomic: Wait for vblank whenever a plane is added to state Maarten Lankhorst
2016-12-08 15:43 ` Daniel Vetter
2016-12-12 10:27 ` Maarten Lankhorst
2016-12-08 13:45 ` [PATCH 5/6] drm/atomic: Remove drm_atomic_helper_framebuffer_changed Maarten Lankhorst
2016-12-08 13:45 ` [PATCH 6/6] drm/i915: Add a cursor hack to allow converting legacy page flip to atomic Maarten Lankhorst
2016-12-08 14:07 ` Matthew Auld
2016-12-12 10:34 ` [PATCH v2 6/6] drm/i915: Add a cursor hack to allow converting legacy page flip to atomic, v3 Maarten Lankhorst
2016-12-13 13:01 ` Archit Taneja
2016-12-13 13:52 ` Maarten Lankhorst
2016-12-14 3:19 ` Archit Taneja
2016-12-20 9:26 ` Daniel Vetter
2016-12-08 15:52 ` ✓ Fi.CI.BAT: success for drm/atomic: Remove drm_atomic_helper_framebuffer_changed Patchwork
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=1481204729-9058-2-git-send-email-maarten.lankhorst@linux.intel.com \
--to=maarten.lankhorst@linux.intel.com \
--cc=dri-devel@lists.freedesktop.org \
--cc=intel-gfx@lists.freedesktop.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).