xf86-video-intel: src/intel_driver.c src/intel_module.c src/sna/kgem.c src/sna/kgem.h

[Chris Wilson]

 src/intel_driver.c |    2 +-
 src/intel_module.c |    2 +-
 src/sna/kgem.c     |    8 ++++----
 src/sna/kgem.h     |    2 +-
 4 files changed, 7 insertions(+), 7 deletions(-)

New commits:
commit 8c5077e4ed055a97bf9deda59c0e9a45e42317ca
Author: Chris Wilson <chris at chris-wilson.co.uk>
Date:   Wed Jul 25 16:59:11 2012 +0100

    Assume all unknown chipsets are future gen
    
    I think the likelihood of a new product being launched based on a 8xx
    design is remote enough not to worry about.
    
    Signed-off-by: Chris Wilson <chris at chris-wilson.co.uk>

diff --git a/src/intel_driver.c b/src/intel_driver.c
index cab7b4e..8cb098a 100644
--- a/src/intel_driver.c
+++ b/src/intel_driver.c
@@ -387,7 +387,7 @@ static Bool has_relaxed_fencing(struct intel_screen_private *intel)
 
 static Bool can_accelerate_blt(struct intel_screen_private *intel)
 {
-	if (INTEL_INFO(intel)->gen == 0)
+	if (INTEL_INFO(intel)->gen == -1)
 		return FALSE;
 
 	if (0 && (IS_I830(intel) || IS_845G(intel))) {
diff --git a/src/intel_module.c b/src/intel_module.c
index 845b40e..5e7a330 100644
--- a/src/intel_module.c
+++ b/src/intel_module.c
@@ -47,7 +47,7 @@
 static struct intel_device_info *chipset_info;
 
 static const struct intel_device_info intel_generic_info = {
-	.gen = 0,
+	.gen = -1,
 };
 
 static const struct intel_device_info intel_i81x_info = {
diff --git a/src/sna/kgem.c b/src/sna/kgem.c
index 1aa8af9..19ebdef 100644
--- a/src/sna/kgem.c
+++ b/src/sna/kgem.c
@@ -556,12 +556,12 @@ static struct list *active(struct kgem *kgem, int num_pages, int tiling)
 }
 
 static size_t
-agp_aperture_size(struct pci_device *dev, int gen)
+agp_aperture_size(struct pci_device *dev, unsigned gen)
 {
 	/* XXX assume that only future chipsets are unknown and follow
 	 * the post gen2 PCI layout.
 	 */
-	return dev->regions[(gen && gen < 30) ? 0 : 2].size;
+	return dev->regions[gen < 30 ? 0 : 2].size;
 }
 
 static size_t
@@ -649,7 +649,7 @@ static bool is_hw_supported(struct kgem *kgem,
 	if (DBG_NO_HW)
 		return false;
 
-	if (kgem->gen == 0) /* unknown chipset, assume future gen */
+	if (kgem->gen == (unsigned)-1) /* unknown chipset, assume future gen */
 		return kgem->has_blt;
 
 	if (kgem->gen <= 20) /* dynamic GTT is fubar */
@@ -791,7 +791,7 @@ void kgem_init(struct kgem *kgem, int fd, struct pci_device *dev, int gen)
 	DBG(("%s: semaphores enabled? %d\n", __FUNCTION__,
 	     kgem->has_semaphores));
 
-	kgem->can_blt_cpu = gen == 0 || gen >= 30;
+	kgem->can_blt_cpu = gen >= 30;
 	DBG(("%s: can blt to cpu? %d\n", __FUNCTION__,
 	     kgem->can_blt_cpu));
 
diff --git a/src/sna/kgem.h b/src/sna/kgem.h
index d7c3812..8227538 100644
--- a/src/sna/kgem.h
+++ b/src/sna/kgem.h
@@ -108,7 +108,7 @@ enum {
 struct kgem {
 	int fd;
 	int wedged;
-	int gen;
+	unsigned gen;
 
 	uint32_t unique_id;