dri-devel Archive on lore.kernel.org
 help / color / mirror / Atom feed
From: Thierry Reding <thierry.reding@gmail.com>
To: dri-devel@lists.freedesktop.org
Cc: Daniel Vetter <daniel.vetter@ffwll.ch>
Subject: [PATCH 03/13] drm/bochs: Store correct CRTC index in events
Date: Wed, 12 Aug 2015 17:00:25 +0200	[thread overview]
Message-ID: <1439391635-29166-3-git-send-email-thierry.reding@gmail.com> (raw)
In-Reply-To: <1439391635-29166-1-git-send-email-thierry.reding@gmail.com>

From: Thierry Reding <treding@nvidia.com>

Previously a negative pipe caused a special case to be triggered for
drivers that didn't have proper VBLANK support. The trigger for this
special case is now independent of the pipe, so the correct CRTC index
can now be stored in events.

Cc: Gerd Hoffmann <kraxel@redhat.com>
Signed-off-by: Thierry Reding <treding@nvidia.com>
---
 drivers/gpu/drm/bochs/bochs_kms.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/drivers/gpu/drm/bochs/bochs_kms.c b/drivers/gpu/drm/bochs/bochs_kms.c
index 26bcd03a8cb6..c219c1de3722 100644
--- a/drivers/gpu/drm/bochs/bochs_kms.c
+++ b/drivers/gpu/drm/bochs/bochs_kms.c
@@ -113,13 +113,14 @@ static int bochs_crtc_page_flip(struct drm_crtc *crtc,
 	struct bochs_device *bochs =
 		container_of(crtc, struct bochs_device, crtc);
 	struct drm_framebuffer *old_fb = crtc->primary->fb;
+	unsigned int pipe = drm_crtc_index(crtc);
 	unsigned long irqflags;
 
 	crtc->primary->fb = fb;
 	bochs_crtc_mode_set_base(crtc, 0, 0, old_fb);
 	if (event) {
 		spin_lock_irqsave(&bochs->dev->event_lock, irqflags);
-		drm_send_vblank_event(bochs->dev, -1, event);
+		drm_send_vblank_event(bochs->dev, pipe, event);
 		spin_unlock_irqrestore(&bochs->dev->event_lock, irqflags);
 	}
 	return 0;
-- 
2.4.5

_______________________________________________
dri-devel mailing list
dri-devel@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/dri-devel

  parent reply	other threads:[~2015-08-12 15:01 UTC|newest]

Thread overview: 34+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2015-08-12 15:00 [PATCH 01/13] drm/gma500: Sanity-check pipe index Thierry Reding
2015-08-12 15:00 ` [PATCH 02/13] drm/irq: Remove negative CRTC index special-case Thierry Reding
2015-08-12 15:28   ` Daniel Vetter
2015-08-12 15:00 ` Thierry Reding [this message]
2015-08-12 15:26   ` [PATCH 03/13] drm/bochs: Store correct CRTC index in events Daniel Vetter
2015-08-12 15:00 ` [PATCH 04/13] drm/imx: Make pipe number unsigned Thierry Reding
2015-08-12 15:24   ` Daniel Vetter
2015-08-13  9:05     ` Thierry Reding
2015-08-12 15:00 ` [PATCH 05/13] drm/imx: Store correct CRTC index in events Thierry Reding
2015-08-12 15:00 ` [PATCH 06/13] drm/rockchip: " Thierry Reding
2015-08-12 15:00 ` [PATCH 07/13] drm/sti: " Thierry Reding
2015-08-12 15:26   ` Benjamin Gaignard
2015-08-13  9:06     ` Thierry Reding
2015-08-12 15:00 ` [PATCH 08/13] drm/irq: Check for valid VBLANK before dereference Thierry Reding
2015-08-12 15:40   ` Daniel Vetter
2015-08-13  9:20     ` Thierry Reding
2015-08-13 13:05       ` Daniel Vetter
2015-08-12 15:00 ` [PATCH 09/13] drm/irq: Make pipe unsigned and name consistent Thierry Reding
2015-08-12 15:32   ` Daniel Vetter
2015-10-30 18:38     ` Ilia Mirkin
2015-08-13  9:38   ` [PATCH] drm/irq: More pipe/crtc consistency cleanups Thierry Reding
2015-08-13 13:02     ` Daniel Vetter
2015-08-12 15:00 ` [PATCH 10/13] drm/irq: Add drm_crtc_vblank_count_and_time() Thierry Reding
2015-08-12 15:35   ` Daniel Vetter
2015-08-13  9:12     ` Thierry Reding
2015-08-13 13:04       ` Daniel Vetter
2015-08-12 15:00 ` [PATCH 11/13] drm/irq: Document return values more consistently Thierry Reding
2015-08-12 15:00 ` [PATCH 12/13] drm/armada: Use drm_crtc_vblank_*() API Thierry Reding
2015-08-14 13:59   ` Russell King - ARM Linux
2015-08-14 14:24     ` Thierry Reding
2015-08-12 15:00 ` [PATCH 13/13] drm/atomic: Use KMS VBLANK API Thierry Reding
2015-08-12 15:41   ` Daniel Vetter
2015-08-12 15:42   ` Daniel Vetter
2015-08-13 10:51 ` [PATCH 01/13] drm/gma500: Sanity-check pipe index Patrik Jakobsson

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=1439391635-29166-3-git-send-email-thierry.reding@gmail.com \
    --to=thierry.reding@gmail.com \
    --cc=daniel.vetter@ffwll.ch \
    --cc=dri-devel@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