regression after "drm/i915: fix page flip finish vs. prepare on plane B"

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

 



Hallo all,
i have suspend problem after this patch:

commit 70565d00db6ef5735819db973fa8da95bd34a6ab
Author: Jesse Barnes <jbarnes@xxxxxxxxxxxxxxxxxxxxxxxx>
Date:   Thu Jul 1 04:45:43 2010 -0700

    drm/i915: fix page flip finish vs. prepare on plane B
    
    The refreshed patch had a copy & paste bug.
    
    Reported-by: Simon Farnsworth <simon.farnsworth@xxxxxxxxxx>
    Signed-off-by: Jesse Barnes <jbarnes@xxxxxxxxxxxxxxxx>
    Signed-off-by: Linus Torvalds <torvalds@xxxxxxxxxxxxxxxxxxxx>

diff --git a/drivers/gpu/drm/i915/i915_irq.c
b/drivers/gpu/drm/i915/i915_irq.c
index d676e55..dba53d4 100644
--- a/drivers/gpu/drm/i915/i915_irq.c
+++ b/drivers/gpu/drm/i915/i915_irq.c
@@ -947,9 +947,9 @@ irqreturn_t i915_driver_irq_handler(DRM_IRQ_ARGS)
                }
 
                if (iir & I915_DISPLAY_PLANE_B_FLIP_PENDING_INTERRUPT) {
+                       intel_prepare_page_flip(dev, 1);
                        if (dev_priv->flip_pending_is_done)
                                intel_finish_page_flip_plane(dev, 1);
-                       intel_prepare_page_flip(dev, 1);
                }
 
                if (pipea_stats & vblank_status) {

=============================================

for testing i use plain "echo mem > /sys/power/state"
after this, pc will initiate suspending and freeze with black screen and
cursor on the top left corner.
after reversing this patch suspend working again.
My conf: Intel DG45ID board (G45 + ICH10) and 64bit ubuntu 10.04

Regards,
Alexey


--
To unsubscribe from this list: send the line "unsubscribe kernel-testers" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html


[Index of Archives]     [Linux USB Devel]     [Video for Linux]     [Linux Audio Users]     [Yosemite News]     [Linux Kernel]     [Linux SCSI]

  Powered by Linux