Attachment 100438 Details for Bug 79354 – Don't do vblank wait unconditionally

[patch] Don't do vblank wait unconditionally

0001-drm-i915-Only-wait-one-vblank-when-disabling-crc-if-.patch (text/plain), 1.48 KB, created by Daniel Vetter on 2014-06-05 06:46:41 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Daniel Vetter

Created: 2014-06-05 06:46:41 UTC

Size: 1.48 KB

patch

obsolete

>From 1cfeb66a14f24ed7903ab5a8b380443633ccf2df Mon Sep 17 00:00:00 2001
>From: Daniel Vetter <daniel.vetter@ffwll.ch>
>Date: Thu, 5 Jun 2014 08:42:18 +0200
>Subject: [PATCH] drm/i915: Only wait one vblank when disabling crc if the pipe
> is on
>
>Otherwise we incur an unsightly WARNING. The mutex locking is a bit
>overkill, but it curbs races and eventially we might grow a locking
>check in the vblank wait code to make sure the right crtc lock is
>held.
>
>Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=79354
>Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
>---
> drivers/gpu/drm/i915/i915_debugfs.c | 7 ++++++-
> 1 file changed, 6 insertions(+), 1 deletion(-)
>
>diff --git a/drivers/gpu/drm/i915/i915_debugfs.c b/drivers/gpu/drm/i915/i915_debugfs.c
>index 601caa88c092..cf94e9640627 100644
>--- a/drivers/gpu/drm/i915/i915_debugfs.c
>+++ b/drivers/gpu/drm/i915/i915_debugfs.c
>@@ -2927,11 +2927,16 @@ static int pipe_crc_set_source(struct drm_device *dev, enum pipe pipe,
> 	/* real source -> none transition */
> 	if (source == INTEL_PIPE_CRC_SOURCE_NONE) {
> 		struct intel_pipe_crc_entry *entries;
>+		struct intel_crtc *crtc =
>+			crtc = to_intel_crtc(dev_priv->pipe_to_crtc_mapping[pipe]);
> 
> 		DRM_DEBUG_DRIVER("stopping CRCs for pipe %c\n",
> 				 pipe_name(pipe));
> 
>-		intel_wait_for_vblank(dev, pipe);
>+		mutex_lock(&crtc->base.mutex);
>+		if (crtc->active)
>+			intel_wait_for_vblank(dev, pipe);
>+		mutex_unlock(&crtc->base.mutex);
> 
> 		spin_lock_irq(&pipe_crc->lock);
> 		entries = pipe_crc->entries;
>-- 
>2.0.0
>

Actions: View | Splinter Review

Attachments on bug 79354: 100009 | 100438 | 101610 | 101638

Use of freedesktop.org services, including Bugzilla, is subject to our Code of Conduct. How we collect and use information is described in our Privacy Policy.