xf86-video-intel: 2 commits - src/sna/sna_dri2.c src/sna/sna_present.c

[Chris Wilson]

 src/sna/sna_dri2.c    |    1 +
 src/sna/sna_present.c |    2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

New commits:
commit 376037e6336dfc3b32c51b774ab8a80f64390e02
Author: Chris Wilson <chris at chris-wilson.co.uk>
Date:   Sun Sep 21 19:51:47 2014 +0100

    sna: Skip present unflip if the output is rotated
    
    With a rotated output and shadow buffers, we never perform the flip in
    the first place and so can ignore the unflip request as well.
    
    Reported-by: Mihail Kasadjikov <hamer.mk at gmail.com>
    References: https://bugs.freedesktop.org/show_bug.cgi?id=84105
    Signed-off-by: Chris Wilson <chris at chris-wilson.co.uk>

diff --git a/src/sna/sna_present.c b/src/sna/sna_present.c
index a1dfc91..6036fbb 100644
--- a/src/sna/sna_present.c
+++ b/src/sna/sna_present.c
@@ -416,7 +416,7 @@ sna_present_unflip(ScreenPtr screen, uint64_t event_id)
 	struct kgem_bo *bo;
 
 	DBG(("%s(event=%lld)\n", __FUNCTION__, (long long)event_id));
-	if (sna->mode.front_active == 0) {
+	if (sna->mode.front_active == 0 || sna->mode.shadow_active) {
 		const struct ust_msc *swap;
 
 		DBG(("%s: no CRTC active, perform no-op flip\n", __FUNCTION__));
commit 061785b1688de8dbf7ce9a423d16fb6d52518dc7
Author: Chris Wilson <chris at chris-wilson.co.uk>
Date:   Sun Sep 21 16:44:25 2014 +0100

    sna/dri2: Decouple the Client event link on Drawable free
    
    We need to keep the two lists in check across asynchronous client/window
    destruction.
    
    Signed-off-by: Chris Wilson <chris at chris-wilson.co.uk>

diff --git a/src/sna/sna_dri2.c b/src/sna/sna_dri2.c
index 61917cf..a43cdf1 100644
--- a/src/sna/sna_dri2.c
+++ b/src/sna/sna_dri2.c
@@ -1494,6 +1494,7 @@ void sna_dri2_destroy_window(WindowPtr win)
 		while ((info = chain)) {
 			info->draw = NULL;
 			info->client = NULL;
+			list_del(&info->link);
 
 			chain = info->chain;
 			info->chain = NULL;