xf86-video-intel: 2 commits - src/intel_module.c src/sna/gen3_render.c src/sna/gen6_render.c src/sna/kgem.c

[Chris Wilson]

 src/intel_module.c    |    9 ++++++---
 src/sna/gen3_render.c |    3 +++
 src/sna/gen6_render.c |    3 +++
 src/sna/kgem.c        |    4 ++--
 4 files changed, 14 insertions(+), 5 deletions(-)

New commits:
commit 73167711226f430cc9ef4c27f267655d0edf4622
Author: Chris Wilson <chris at chris-wilson.co.uk>
Date:   Sun Jun 5 14:56:32 2011 +0100

    sna: 915gm does not have 128-byte Y-tiling
    
    Signed-off-by: Chris Wilson <chris at chris-wilson.co.uk>

diff --git a/src/intel_module.c b/src/intel_module.c
index 9b1da49..3b8ab5e 100644
--- a/src/intel_module.c
+++ b/src/intel_module.c
@@ -53,6 +53,9 @@ static const struct intel_device_info intel_i8xx_info = {
 static const struct intel_device_info intel_i915_info = {
 	.gen = 30,
 };
+static const struct intel_device_info intel_i945_info = {
+	.gen = 31,
+};
 
 static const struct intel_device_info intel_g33_info = {
 	.gen = 33,
@@ -148,9 +151,9 @@ static const struct pci_id_match intel_device_match[] = {
 	INTEL_DEVICE_MATCH (PCI_CHIP_I915_G, &intel_i915_info ),
 	INTEL_DEVICE_MATCH (PCI_CHIP_E7221_G, &intel_i915_info ),
 	INTEL_DEVICE_MATCH (PCI_CHIP_I915_GM, &intel_i915_info ),
-	INTEL_DEVICE_MATCH (PCI_CHIP_I945_G, &intel_i915_info ),
-	INTEL_DEVICE_MATCH (PCI_CHIP_I945_GM, &intel_i915_info ),
-	INTEL_DEVICE_MATCH (PCI_CHIP_I945_GME, &intel_i915_info ),
+	INTEL_DEVICE_MATCH (PCI_CHIP_I945_G, &intel_i945_info ),
+	INTEL_DEVICE_MATCH (PCI_CHIP_I945_GM, &intel_i945_info ),
+	INTEL_DEVICE_MATCH (PCI_CHIP_I945_GME, &intel_i945_info ),
 
 	INTEL_DEVICE_MATCH (PCI_CHIP_PINEVIEW_M, &intel_g33_info ),
 	INTEL_DEVICE_MATCH (PCI_CHIP_PINEVIEW_G, &intel_g33_info ),
diff --git a/src/sna/kgem.c b/src/sna/kgem.c
index 0dee6e5..fdc2108 100644
--- a/src/sna/kgem.c
+++ b/src/sna/kgem.c
@@ -369,7 +369,7 @@ static uint32_t kgem_surface_size(struct kgem *kgem,
 	uint32_t tile_width, tile_height;
 	uint32_t size;
 
-	if (kgem->gen == 2) {
+	if (kgem->gen < 20) {
 		if (tiling) {
 			tile_width = 512;
 			tile_height = 16;
@@ -388,7 +388,7 @@ static uint32_t kgem_surface_size(struct kgem *kgem,
 		tile_height = 8;
 		break;
 	case I915_TILING_Y:
-		tile_width = 128;
+		tile_width = kgem->gen <= 30 ? 512 : 128;
 		tile_height = 32;
 		break;
 	}
commit 0260c4ce32fa4d7ae8c6ee79d5488b0114e96251
Author: Chris Wilson <chris at chris-wilson.co.uk>
Date:   Sun Jun 5 14:39:34 2011 +0100

    sna: Fallback if presented with mask under NO_COMPOSITE
    
    Just making sure that the debug paths actually work...
    
    Signed-off-by: Chris Wilson <chris at chris-wilson.co.uk>

diff --git a/src/sna/gen3_render.c b/src/sna/gen3_render.c
index 203de08..131c2e5 100644
--- a/src/sna/gen3_render.c
+++ b/src/sna/gen3_render.c
@@ -2114,6 +2114,9 @@ gen3_render_composite(struct sna *sna,
 	DBG(("%s()\n", __FUNCTION__));
 
 #if NO_COMPOSITE
+	if (mask)
+		return FALSE;
+
 	return sna_blt_composite(sna, op,
 				 src, dst,
 				 src_x, src_y,
diff --git a/src/sna/gen6_render.c b/src/sna/gen6_render.c
index 5d8eb77..3f1749f 100644
--- a/src/sna/gen6_render.c
+++ b/src/sna/gen6_render.c
@@ -2088,6 +2088,9 @@ gen6_render_composite(struct sna *sna,
 {
 
 #if NO_COMPOSITE
+	if (mask)
+		return FALSE;
+
 	return sna_blt_composite(sna, op,
 				 src, dst,
 				 src_x, src_y,