xf86-video-intel: 2 commits - src/intel_module.c src/sna/fb

[Chris Wilson]

 src/intel_module.c  |    2 +-
 src/sna/fb/fbpict.c |   28 ++++++++++++++++++++++++++--
 2 files changed, 27 insertions(+), 3 deletions(-)

New commits:
commit c262d02fb5defe9100df54cf83cc00e11e335745
Author: Chris Wilson <chris at chris-wilson.co.uk>
Date:   Thu Jul 26 01:12:11 2012 +0100

    Limit PCI matching to VGA devices
    
    Fixes X -configure
    
    Signed-off-by: Chris Wilson <chris at chris-wilson.co.uk>

diff --git a/src/intel_module.c b/src/intel_module.c
index 5e7a330..e1755ff 100644
--- a/src/intel_module.c
+++ b/src/intel_module.c
@@ -154,7 +154,7 @@ static const SymTabRec _intel_chipsets[] = {
 SymTabRec *intel_chipsets = (SymTabRec *) _intel_chipsets;
 
 #define INTEL_DEVICE_MATCH(d,i) \
-    { 0x8086, (d), PCI_MATCH_ANY, PCI_MATCH_ANY, 0, 0, (intptr_t)(i) }
+    { 0x8086, (d), PCI_MATCH_ANY, PCI_MATCH_ANY, 0x3 << 16, 0xff << 16, (intptr_t)(i) }
 
 static const struct pci_id_match intel_device_match[] = {
 #if !KMS_ONLY
commit ad6355311b8b80777bc0fec95f6bf6cd1b4969d9
Author: Chris Wilson <chris at chris-wilson.co.uk>
Date:   Thu Jul 26 01:02:53 2012 +0100

    sna: Compile against xorg-1.10
    
    Signed-off-by: Chris Wilson <chris at chris-wilson.co.uk>

diff --git a/src/sna/fb/fbpict.c b/src/sna/fb/fbpict.c
index f6bcb64..a203851 100644
--- a/src/sna/fb/fbpict.c
+++ b/src/sna/fb/fbpict.c
@@ -31,6 +31,30 @@
 #include <mipict.h>
 #include "fbpict.h"
 
+static void
+SourceValidateOnePicture(PicturePtr picture)
+{
+	DrawablePtr drawable = picture->pDrawable;
+	ScreenPtr screen;
+
+	if (!drawable)
+		return;
+
+	screen = drawable->pScreen;
+	if (screen->SourceValidate)
+		screen->SourceValidate(drawable,
+				       0, 0, drawable->width, drawable->height,
+				       picture->subWindowMode);
+}
+
+static void
+fbCompositeSourceValidate(PicturePtr picture)
+{
+	SourceValidateOnePicture(picture);
+	if (picture->alphaMap)
+		SourceValidateOnePicture(picture->alphaMap);
+}
+
 void
 fbComposite(CARD8 op,
             PicturePtr pSrc,
@@ -46,9 +70,9 @@ fbComposite(CARD8 op,
 	int msk_xoff, msk_yoff;
 	int dst_xoff, dst_yoff;
 
-	miCompositeSourceValidate(pSrc);
+	fbCompositeSourceValidate(pSrc);
 	if (pMask)
-		miCompositeSourceValidate(pMask);
+		fbCompositeSourceValidate(pMask);
 
 	src = image_from_pict(pSrc, FALSE, &src_xoff, &src_yoff);
 	mask = image_from_pict(pMask, FALSE, &msk_xoff, &msk_yoff);