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

[Chris Wilson]

 src/sna/sna_display.c |    3 +--
 src/sna/sna_present.c |    6 +++---
 2 files changed, 4 insertions(+), 5 deletions(-)

New commits:
commit 50f911b19f71b5d4117b88fa129a4533f7a1a28a
Author: Chris Wilson <chris at chris-wilson.co.uk>
Date:   Wed Feb 18 10:13:00 2015 +0000

    sna/present: Fixup a few DBG
    
    event_id is now an array - but the misprint was hidden on 64bit systems,
    the warning only apparent because of the pointer mismatch on 32bit
    systems.
    
    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 aef8685..836c89d 100644
--- a/src/sna/sna_present.c
+++ b/src/sna/sna_present.c
@@ -146,7 +146,7 @@ static CARD32 sna_fake_vblank_handler(OsTimerPtr timer, CARD32 now, void *data)
 		ust = ust64(vbl.reply.tval_sec, vbl.reply.tval_usec);
 		msc = sna_crtc_record_vblank(info->crtc, &vbl);
 		DBG(("%s: event=%lld, target msc=%lld, now %lld\n",
-		     __FUNCTION__, (long long)info->event_id, (long long)info->target_msc, (long long)msc));
+		     __FUNCTION__, (long long)info->event_id[0], (long long)info->target_msc, (long long)msc));
 		if (msc < info->target_msc) {
 			uint32_t delay = msc_to_delay(info->crtc, info->target_msc);
 			if (delay)
@@ -157,7 +157,7 @@ static CARD32 sna_fake_vblank_handler(OsTimerPtr timer, CARD32 now, void *data)
 		ust = swap_ust(swap);
 		msc = swap->msc;
 		DBG(("%s: event=%lld, CRTC OFF, target msc=%lld, was %lld\n",
-		     __FUNCTION__, (long long)info->event_id, (long long)info->target_msc, (long long)msc));
+		     __FUNCTION__, (long long)info->event_id[0], (long long)info->target_msc, (long long)msc));
 	}
 
 	vblank_complete(info, ust, msc);
@@ -178,7 +178,7 @@ static bool sna_fake_vblank(struct sna_present_event *info)
 		delay = 0;
 
 	DBG(("%s(event=%lld, target_msc=%lld, msc=%lld, delay=%ums)\n",
-	     __FUNCTION__, (long long)info->event_id, (long long)info->target_msc, msc, delay));
+	     __FUNCTION__, (long long)info->event_id[0], (long long)info->target_msc, msc, delay));
 	if (delay == 0) {
 		const struct ust_msc *swap = sna_crtc_last_swap(info->crtc);
 		present_event_notify(info->event_id[0], swap_ust(swap), swap->msc);
commit e293991f408ba7ba4fd02b7bcfeff0051f9eb8f4
Author: Chris Wilson <chris at chris-wilson.co.uk>
Date:   Wed Feb 18 09:59:58 2015 +0000

    sna: Reuse the old cursor on the current CRTC
    
    We only want to prevent sharing of physical handles across CRTC (on old
    kernels). If we already have one assigned to a CRTC we know that it is
    unshared and can keep using it.
    
    Signed-off-by: Chris Wilson <chris at chris-wilson.co.uk>

diff --git a/src/sna/sna_display.c b/src/sna/sna_display.c
index de0cbec..b984550 100644
--- a/src/sna/sna_display.c
+++ b/src/sna/sna_display.c
@@ -4674,11 +4674,10 @@ static struct sna_cursor *__sna_get_cursor(struct sna *sna, xf86CrtcPtr crtc)
 				return cursor;
 			}
 		}
-
-		cursor = to_sna_crtc(crtc)->cursor;
 	}
 
 	size = sna->cursor.size;
+	cursor = to_sna_crtc(crtc)->cursor;
 	if (cursor && cursor->alloc < 4*size*size)
 		cursor = NULL;