diff --git a/[refs] b/[refs]
index c149c6069e2a..b09160175934 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 673a394b1e3b69be886ff24abfd6df97c52e8d08
+refs/heads/master: ed4c9c4acf948b42b138747fcb8843ecb1a24ce4
diff --git a/trunk/drivers/gpu/drm/i915/i915_dma.c b/trunk/drivers/gpu/drm/i915/i915_dma.c
index f167ff68a4bf..ea85d71cab04 100644
--- a/trunk/drivers/gpu/drm/i915/i915_dma.c
+++ b/trunk/drivers/gpu/drm/i915/i915_dma.c
@@ -689,6 +689,9 @@ static int i915_getparam(struct drm_device *dev, void *data,
 	case I915_PARAM_LAST_DISPATCH:
 		value = READ_BREADCRUMB(dev_priv);
 		break;
+	case I915_PARAM_CHIPSET_ID:
+		value = dev->pci_device;
+		break;
 	case I915_PARAM_HAS_GEM:
 		value = 1;
 		break;
diff --git a/trunk/include/drm/i915_drm.h b/trunk/include/drm/i915_drm.h
index 59d08fca25a4..eb4b35031a55 100644
--- a/trunk/include/drm/i915_drm.h
+++ b/trunk/include/drm/i915_drm.h
@@ -230,6 +230,7 @@ typedef struct drm_i915_irq_wait {
 #define I915_PARAM_IRQ_ACTIVE            1
 #define I915_PARAM_ALLOW_BATCHBUFFER     2
 #define I915_PARAM_LAST_DISPATCH         3
+#define I915_PARAM_CHIPSET_ID            4
 #define I915_PARAM_HAS_GEM               5
 
 typedef struct drm_i915_getparam {