Attachment 134562 Details for Bug 102818 – Reverting 608b20506941969ea30d8c08dc9ae02bb87dbf7d for use with 4.13.3

[patch] Reverting 608b20506941969ea30d8c08dc9ae02bb87dbf7d for use with 4.13.3

rev-608b2050.patch (text/plain), 1.20 KB, created by freedesktop on 2017-09-29 08:11:34 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: freedesktop

Created: 2017-09-29 08:11:34 UTC

Size: 1.20 KB

patch

obsolete

>diff --git a/drivers/gpu/drm/drm_vblank.c b/drivers/gpu/drm/drm_vblank.c
>index e9f33cd..0857b74 100644
>--- a/drivers/gpu/drm/drm_vblank.c
>+++ b/drivers/gpu/drm/drm_vblank.c
>@@ -1038,9 +1038,9 @@ static void drm_vblank_put(struct drm_device *dev, unsigned int pipe)
> 	if (atomic_dec_and_test(&vblank->refcount)) {
> 		if (drm_vblank_offdelay == 0)
> 			return;
>-		else if (drm_vblank_offdelay < 0)
>+		else if (dev->vblank_disable_immediate || drm_vblank_offdelay < 0)
> 			vblank_disable_fn((unsigned long)vblank);
>-		else if (!dev->vblank_disable_immediate)
>+		else
> 			mod_timer(&vblank->disable_timer,
> 				  jiffies + ((drm_vblank_offdelay * HZ)/1000));
> 	}
>@@ -1614,17 +1614,10 @@ bool drm_handle_vblank(struct drm_device *dev, unsigned int pipe)
> 	 * been signaled. The disable has to be last (after
> 	 * drm_handle_vblank_events) so that the timestamp is always accurate.
> 	 */
>-	disable_irq = (dev->vblank_disable_immediate &&
>-		       drm_vblank_offdelay > 0 &&
>-		       !atomic_read(&vblank->refcount));
>-
> 	drm_handle_vblank_events(dev, pipe);
> 
> 	spin_unlock_irqrestore(&dev->event_lock, irqflags);
> 
>-	if (disable_irq)
>-		vblank_disable_fn((unsigned long)vblank);
>-
> 	return true;
> }
> EXPORT_SYMBOL(drm_handle_vblank);
>

Actions: View | Splinter Review

Attachments on bug 102818: 134287 | 134288 | 134289 | 134290 | 134407 | 134408 | 134562 | 134563 | 134760

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.