Module: Mesa
Branch: 8.0
Commit: bf7407f631424d55354369cc66a9d27fcf888068
URL:
http://cgit.freedesktop.org/mesa/mesa/commit/?id=bf7407f631424d55354369cc66a9d27fcf888068
Author: Eugeni Dodonov <eugeni.dodo...@intel.com>
Date: Sat Mar 31 12:38:59 2012 -0300
intel: add PCI IDs for Ivy Bridge GT2 server variant
Those IDs are used by Bromolow.
Reviewed-by: Kenneth Graunke <kenn...@whitecape.org>
Signed-off-by: Eugeni Dodonov <eugeni.dodo...@intel.com>
(cherry picked from commit a45247fb1b8c30c5be21c3baf84943920ae17bfb)
Conflicts:
include/pci_ids/i965_pci_ids.h
---
include/pci_ids/i965_pci_ids.h | 1 +
src/mesa/drivers/dri/intel/intel_chipset.h | 4 +++-
src/mesa/drivers/dri/intel/intel_context.c | 1 +
3 files changed, 5 insertions(+), 1 deletions(-)
diff --git a/include/pci_ids/i965_pci_ids.h b/include/pci_ids/i965_pci_ids.h
index d37a2ee..7a54018 100644
--- a/include/pci_ids/i965_pci_ids.h
+++ b/include/pci_ids/i965_pci_ids.h
@@ -25,3 +25,4 @@ CHIPSET(0x0162, IVYBRIDGE_GT2, ivb_gt2)
CHIPSET(0x0156, IVYBRIDGE_M_GT1, ivb_gt1)
CHIPSET(0x0166, IVYBRIDGE_M_GT2, ivb_gt2)
CHIPSET(0x015a, IVYBRIDGE_S_GT1, ivb_gt1)
+CHIPSET(0x016a, IVYBRIDGE_S_GT2, ivb_gt2)
diff --git a/src/mesa/drivers/dri/intel/intel_chipset.h
b/src/mesa/drivers/dri/intel/intel_chipset.h
index 2e9fb2d..1739abe 100644
--- a/src/mesa/drivers/dri/intel/intel_chipset.h
+++ b/src/mesa/drivers/dri/intel/intel_chipset.h
@@ -85,6 +85,7 @@
#define PCI_CHIP_IVYBRIDGE_M_GT1 0x0156 /* Mobile */
#define PCI_CHIP_IVYBRIDGE_M_GT2 0x0166
#define PCI_CHIP_IVYBRIDGE_S_GT1 0x015a /* Server */
+#define PCI_CHIP_IVYBRIDGE_S_GT2 0x016a
#define IS_MOBILE(devid) (devid == PCI_CHIP_I855_GM || \
devid == PCI_CHIP_I915_GM || \
@@ -147,7 +148,8 @@
devid == PCI_CHIP_IVYBRIDGE_S_GT1)
#define IS_IVB_GT2(devid) (devid == PCI_CHIP_IVYBRIDGE_GT2 || \
- devid == PCI_CHIP_IVYBRIDGE_M_GT2)
+ devid == PCI_CHIP_IVYBRIDGE_M_GT2 || \
+ devid == PCI_CHIP_IVYBRIDGE_S_GT2)
#define IS_IVYBRIDGE(devid) (IS_IVB_GT1(devid) || IS_IVB_GT2(devid))
diff --git a/src/mesa/drivers/dri/intel/intel_context.c
b/src/mesa/drivers/dri/intel/intel_context.c
index 9cdd804..faf81ee 100644
--- a/src/mesa/drivers/dri/intel/intel_context.c
+++ b/src/mesa/drivers/dri/intel/intel_context.c
@@ -183,6 +183,7 @@ intelGetString(struct gl_context * ctx, GLenum name)
chipset = "Intel(R) Ivybridge Mobile";
break;
case PCI_CHIP_IVYBRIDGE_S_GT1:
+ case PCI_CHIP_IVYBRIDGE_S_GT2:
chipset = "Intel(R) Ivybridge Server";
break;
default:
_______________________________________________
mesa-commit mailing list
mesa-commit@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/mesa-commit
