Skip to contentSkip to conversation

uxa: fix the call to PixmapSyncDirtyHelper, broken by xserver's 90db5ed

PATCH In review Martin Peres 3 participants 5 messages Jul 9, 2015 – Jul 10, 2015

lore
Share & tools
lore
#0 lore raw

PATCH 1/2 uxa: fix the call to PixmapSyncDirtyHelper, broken by xserver's 90db5ed

---
 src/compat-api.h | 4 ++++
 1 file changed, 4 insertions(+)
src/compat-api.h +4 -0
index aa93bee..1ca4380 100644
@@ -247,3 +247,7 @@ static inline void FreePixmap(PixmapPtr pixmap)
 #endif
 
 #endif
+
+#if XORG_VERSION_CURRENT >= XORG_VERSION_NUMERIC(1,17,99,0,0)
+#define PixmapSyncDirtyHelper(d, dd) PixmapSyncDirtyHelper(d)
+#endif
Signature · 6 lines
2.4.5

_______________________________________________
Intel-gfx mailing list
[email protected]
http://lists.freedesktop.org/mailman/listinfo/intel-gfx
#1 lore raw

PATCH 2/2 sna: allow the usage of buffer age without enable async swaps

---
 src/sna/sna_dri2.c | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)
src/sna/sna_dri2.c +7 -4
index 47bc046..1f34ebe 100644
@@ -3605,11 +3605,14 @@ bool sna_dri2_open(struct sna *sna, ScreenPtr screen)
 	}
 #endif
 
+#if DRI2INFOREC_VERSION >= 10
+    DBG(("%s: enabled buffer age\n", __FUNCTION__));
+    info.version = 10;
+    info.bufferAge = 1;
 #if USE_ASYNC_SWAP
-	DBG(("%s: enabled async swap and buffer age\n", __FUNCTION__));
-	info.version = 10;
-	info.scheduleSwap0 = 1;
-	info.bufferAge = 1;
+    DBG(("%s: enabled async swap\n", __FUNCTION__));
+    info.scheduleSwap0 = 1;
+#endif
 #endif
 
 	return DRI2ScreenInit(screen, &info);
Signature · 6 lines
2.4.5

_______________________________________________
Intel-gfx mailing list
[email protected]
http://lists.freedesktop.org/mailman/listinfo/intel-gfx
#2 lore raw
In reply to Martin Peres
Quoted 1 line · Martin Peres

I would prefer this to be testing for the unstable release that introduces the ABI change (i.e. > rather than >=), but it fixes the build from git today and you said you would follow through later if we can be more precise.

Thanks,
-Chris

Signature · 5 lines
Chris Wilson, Intel Open Source Technology Centre
_______________________________________________
Intel-gfx mailing list
[email protected]
http://lists.freedesktop.org/mailman/listinfo/intel-gfx
#3 lore raw

Please just use

#ifdef HAS_DIRTYTRACKING_ROTATION

avoids the pain of versions.

Dave.

Quoted 11 lines · Chris Wilson
Quoted 1 line · Martin Peres

I would prefer this to be testing for the unstable release that introduces the ABI change (i.e. > rather than >=), but it fixes the build from git today and you said you would follow through later if we can be more precise.

Thanks,
-Chris

Quoted 6 lines

--
Chris Wilson, Intel Open Source Technology Centre
_______________________________________________
Intel-gfx mailing list
[email protected]
http://lists.freedesktop.org/mailman/listinfo/intel-gfx

_______________________________________________
Intel-gfx mailing list
[email protected]
http://lists.freedesktop.org/mailman/listinfo/intel-gfx

#4 lore raw
Quoted 5 lines · Dave Airlie

Please just use

#ifdef HAS_DIRTYTRACKING_ROTATION

avoids the pain of versions.

Thanks, amended and pushed.
-Chris

Signature · 5 lines
Chris Wilson, Intel Open Source Technology Centre
_______________________________________________
Intel-gfx mailing list
[email protected]
http://lists.freedesktop.org/mailman/listinfo/intel-gfx