xf86-video-intel: 2 commits - src/intel_driver.h src/intel_module.c src/sna/sna_display.c

[Chris Wilson]

 src/intel_driver.h    |    3 +++
 src/intel_module.c    |    5 ++++-
 src/sna/sna_display.c |    2 ++
 3 files changed, 9 insertions(+), 1 deletion(-)

New commits:
commit 9c80a0337ec12b6baab5aab380503e672e925677
Author: Chris Wilson <chris at chris-wilson.co.uk>
Date:   Tue Feb 5 14:56:10 2013 +0000

    sna: ValleyView uses the same scanline registers as SandyBridge
    
    Signed-off-by: Chris Wilson <chris at chris-wilson.co.uk>

diff --git a/src/intel_module.c b/src/intel_module.c
index 8f681c9..da078f8 100644
--- a/src/intel_module.c
+++ b/src/intel_module.c
@@ -104,7 +104,7 @@ static const struct intel_device_info intel_ivybridge_info = {
 };
 
 static const struct intel_device_info intel_valleyview_info = {
-	.gen = 070,
+	.gen = 071,
 };
 
 static const struct intel_device_info intel_haswell_info = {
diff --git a/src/sna/sna_display.c b/src/sna/sna_display.c
index 432b341..748417d 100644
--- a/src/sna/sna_display.c
+++ b/src/sna/sna_display.c
@@ -2989,6 +2989,8 @@ sna_wait_for_scanline(struct sna *sna,
 
 	if (sna->kgem.gen >= 0100)
 		ret = false;
+	else if (sna->kgem.gen == 071)
+		ret =sna_emit_wait_for_scanline_gen6(sna, crtc, pipe, y1, y2, full_height);
 	else if (sna->kgem.gen >= 070)
 		ret = sna_emit_wait_for_scanline_gen7(sna, crtc, pipe, y1, y2, full_height);
 	else if (sna->kgem.gen >= 060)
commit 4c45e3fe456d211afc6ba69878b413a72ef5d0bf
Author: Chris Wilson <chris at chris-wilson.co.uk>
Date:   Tue Feb 5 14:45:39 2013 +0000

    intel: add more ValleyView PCI IDs
    
    Signed-off-by: Chris Wilson <chris at chris-wilson.co.uk>

diff --git a/src/intel_driver.h b/src/intel_driver.h
index b77b8d1..c98025b 100644
--- a/src/intel_driver.h
+++ b/src/intel_driver.h
@@ -230,6 +230,9 @@
 #define PCI_CHIP_HASWELL_CRW_S_GT2_PLUS	0x0D3A
 
 #define PCI_CHIP_VALLEYVIEW_PO		0x0f30
+#define PCI_CHIP_VALLEYVIEW_1		0x0f31
+#define PCI_CHIP_VALLEYVIEW_2		0x0f32
+#define PCI_CHIP_VALLEYVIEW_3		0x0f33
 
 #endif
 
diff --git a/src/intel_module.c b/src/intel_module.c
index e15dd90..8f681c9 100644
--- a/src/intel_module.c
+++ b/src/intel_module.c
@@ -306,6 +306,9 @@ static const struct pci_id_match intel_device_match[] = {
 	INTEL_DEVICE_MATCH (PCI_CHIP_HASWELL_CRW_S_GT2_PLUS, &intel_haswell_info ),
 
 	INTEL_DEVICE_MATCH (PCI_CHIP_VALLEYVIEW_PO, &intel_valleyview_info ),
+	INTEL_DEVICE_MATCH (PCI_CHIP_VALLEYVIEW_1, &intel_valleyview_info ),
+	INTEL_DEVICE_MATCH (PCI_CHIP_VALLEYVIEW_2, &intel_valleyview_info ),
+	INTEL_DEVICE_MATCH (PCI_CHIP_VALLEYVIEW_3, &intel_valleyview_info ),
 
 	INTEL_DEVICE_MATCH (PCI_MATCH_ANY, &intel_generic_info ),
 #endif