drm-snapshot: Changes to 'debian-experimental'
debian/changelog | 11 +++++++++++
debian/control.modules.in | 4 ++--
debian/rules | 2 +-
shared-core/drm_pciids.txt | 2 +-
shared-core/i915_drv.h | 6 +++---
shared-core/i915_suspend.c | 2 +-
6 files changed, 19 insertions(+), 8 deletions(-)
New commits:
commit 74ab89f52badd4a2d476ac8e7b28785c5efdeef8
Author: Chris Lamb <chris@chris-lamb.co.uk>
Date: Sun Jul 6 20:14:08 2008 +0100
Use new numbering scheme after release and upload of libdrm 2.3.1.
Signed-off-by: Chris Lamb <chris@chris-lamb.co.uk>
diff --git a/debian/changelog b/debian/changelog
index 8fe9711..3b7042f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,7 +1,8 @@
-drm-snapshot (2.3.1~git+20080706+401f77a-1) experimental; urgency=low
+drm-snapshot (2.3.1+git+20080706+401f77a-1) experimental; urgency=low
* New upstream snapshot:
- i915: official name for GM45 chipset
+ * Use new numbering scheme after release and upload of libdrm 2.3.1.
* Modify generated drm-modules-<version>'s debian/control:
- Bump Standards-Version to 3.8.0.
- Add build-dependency on quilt.
diff --git a/debian/rules b/debian/rules
index bd1eba6..a7c5581 100755
--- a/debian/rules
+++ b/debian/rules
@@ -16,7 +16,7 @@ get-orig-source:
git clone git://anongit.freedesktop.org/git/mesa/drm drm-snapshot && \
cd drm-snapshot && ./autogen.sh && make distclean && \
REVISION=$$(git show --pretty=format:"%h" HEAD | head -n1) && \
- PREFIX=drm-snapshot_2.3.1~git+$$(date +%Y%m%d)+$$REVISION && cd .. && \
+ PREFIX=drm-snapshot_2.3.1+git+$$(date +%Y%m%d)+$$REVISION && cd .. && \
tar czf $$PREFIX.orig.tar.gz --exclude=autom4te.cache drm-snapshot && \
rm -rf drm-snapshot
commit 97502b15908c366ae079d797d8265afb4dea8d31
Author: Chris Lamb <chris@chris-lamb.co.uk>
Date: Sun Jul 6 20:13:23 2008 +0100
New upstream snapshot.
Signed-off-by: Chris Lamb <chris@chris-lamb.co.uk>
diff --git a/debian/changelog b/debian/changelog
index b1bd7fd..8fe9711 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,7 +1,7 @@
-drm-snapshot (2.3.1+git+20080703+301d984-2) experimental; urgency=low
+drm-snapshot (2.3.1~git+20080706+401f77a-1) experimental; urgency=low
- * Bump version number to ensure later version than libdrm 2.3.1 to
- experimental.
+ * New upstream snapshot:
+ - i915: official name for GM45 chipset
* Modify generated drm-modules-<version>'s debian/control:
- Bump Standards-Version to 3.8.0.
- Add build-dependency on quilt.
commit 9c08caaa99b10f31bc99e549cd0e5cb11a74b39e
Author: Chris Lamb <chris@chris-lamb.co.uk>
Date: Sun Jul 6 20:05:25 2008 +0100
Rework last two commits' descriptions.
Signed-off-by: Chris Lamb <chris@chris-lamb.co.uk>
diff --git a/debian/changelog b/debian/changelog
index ed3eda6..b1bd7fd 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,8 +2,9 @@ drm-snapshot (2.3.1+git+20080703+301d984-2) experimental; urgency=low
* Bump version number to ensure later version than libdrm 2.3.1 to
experimental.
- * Bump Standards-Version in generated drm-modules-<version> package.
- * Add dependency on quilt to generated drm-modules-<version> package.
+ * Modify generated drm-modules-<version>'s debian/control:
+ - Bump Standards-Version to 3.8.0.
+ - Add build-dependency on quilt.
-- Chris Lamb <chris@chris-lamb.co.uk> Sun, 06 Jul 2008 20:01:16 +0100
commit b73572e31c26b38f06cd1f1430e0bd086c06e14d
Author: Chris Lamb <chris@chris-lamb.co.uk>
Date: Sun Jul 6 20:02:22 2008 +0100
Add dependency on quilt to generated drm-modules-<version> package.
diff --git a/debian/changelog b/debian/changelog
index 3563fb7..ed3eda6 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,8 +3,9 @@ drm-snapshot (2.3.1+git+20080703+301d984-2) experimental; urgency=low
* Bump version number to ensure later version than libdrm 2.3.1 to
experimental.
* Bump Standards-Version in generated drm-modules-<version> package.
+ * Add dependency on quilt to generated drm-modules-<version> package.
- -- Chris Lamb <chris@chris-lamb.co.uk> Sun, 06 Jul 2008 19:59:31 +0100
+ -- Chris Lamb <chris@chris-lamb.co.uk> Sun, 06 Jul 2008 20:01:16 +0100
drm-snapshot (2.3.1~git+20080703+301d984-1) experimental; urgency=low
diff --git a/debian/control.modules.in b/debian/control.modules.in
index 8f60502..4d22ebd 100644
--- a/debian/control.modules.in
+++ b/debian/control.modules.in
@@ -3,7 +3,7 @@ Section: misc
Priority: optional
Maintainer: Debian X Strike Force <debian-x@lists.debian.org>
Uploaders: Chris Lamb <chris@chris-lamb.co.uk>, Matthew Johnson <mjj29@debian.org>
-Build-Depends: debhelper (>= 5), bzip2
+Build-Depends: debhelper (>= 5), quilt, bzip2
Standards-Version: 3.8.0
Package: drm-modules-_KVERS_
commit 231d19c43084e47ab33c4f5a721efdfecd48e923
Author: Chris Lamb <chris@chris-lamb.co.uk>
Date: Sun Jul 6 20:01:07 2008 +0100
Bump Standards-Version in generated drm-modules-<version> package.
diff --git a/debian/changelog b/debian/changelog
index e99cb83..3563fb7 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,8 +2,9 @@ drm-snapshot (2.3.1+git+20080703+301d984-2) experimental; urgency=low
* Bump version number to ensure later version than libdrm 2.3.1 to
experimental.
+ * Bump Standards-Version in generated drm-modules-<version> package.
- -- Chris Lamb <chris@chris-lamb.co.uk> Thu, 03 Jul 2008 14:48:11 +0100
+ -- Chris Lamb <chris@chris-lamb.co.uk> Sun, 06 Jul 2008 19:59:31 +0100
drm-snapshot (2.3.1~git+20080703+301d984-1) experimental; urgency=low
diff --git a/debian/control.modules.in b/debian/control.modules.in
index e2ab3c4..8f60502 100644
--- a/debian/control.modules.in
+++ b/debian/control.modules.in
@@ -4,7 +4,7 @@ Priority: optional
Maintainer: Debian X Strike Force <debian-x@lists.debian.org>
Uploaders: Chris Lamb <chris@chris-lamb.co.uk>, Matthew Johnson <mjj29@debian.org>
Build-Depends: debhelper (>= 5), bzip2
-Standards-Version: 3.7.3
+Standards-Version: 3.8.0
Package: drm-modules-_KVERS_
Architecture: any
commit 1310b85c5ef30bc099d85dfd52255394f27a7217
Author: Chris Lamb <chris@chris-lamb.co.uk>
Date: Thu Jul 3 14:52:51 2008 +0100
Bump version number to ensure later version than libdrm 2.3.1.
Signed-off-by: Chris Lamb <chris@chris-lamb.co.uk>
diff --git a/debian/changelog b/debian/changelog
index dd3dbfe..e99cb83 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+drm-snapshot (2.3.1+git+20080703+301d984-2) experimental; urgency=low
+
+ * Bump version number to ensure later version than libdrm 2.3.1 to
+ experimental.
+
+ -- Chris Lamb <chris@chris-lamb.co.uk> Thu, 03 Jul 2008 14:48:11 +0100
+
drm-snapshot (2.3.1~git+20080703+301d984-1) experimental; urgency=low
* New upstream snapshot:
commit 401f77a2ef1d55feaccc13cdae1e5379f4cfec7e
Author: Zhenyu Wang <zhenyu.z.wang@intel.com>
Date: Thu Jul 3 00:49:19 2008 +0800
i915: official name for GM45 chipset
Signed-off-by: Zhenyu Wang <zhenyu.z.wang@intel.com>
diff --git a/shared-core/drm_pciids.txt b/shared-core/drm_pciids.txt
index dd88eba..205fc53 100644
--- a/shared-core/drm_pciids.txt
+++ b/shared-core/drm_pciids.txt
@@ -394,7 +394,7 @@
0x8086 0x29C2 CHIP_I9XX|CHIP_I915 "Intel G33"
0x8086 0x29B2 CHIP_I9XX|CHIP_I915 "Intel Q35"
0x8086 0x29D2 CHIP_I9XX|CHIP_I915 "Intel Q33"
-0x8086 0x2A42 CHIP_I9XX|CHIP_I965 "Intel Integrated Graphics Device"
+0x8086 0x2A42 CHIP_I9XX|CHIP_I965 "Mobile Intel® GM45 Express Chipset"
0x8086 0x2E02 CHIP_I9XX|CHIP_I965 "Intel Integrated Graphics Device"
0x8086 0x2E12 CHIP_I9XX|CHIP_I965 "Intel Q45/Q43"
0x8086 0x2E22 CHIP_I9XX|CHIP_I965 "Intel G45/G43"
diff --git a/shared-core/i915_drv.h b/shared-core/i915_drv.h
index 3ba74db..fa3305b 100644
--- a/shared-core/i915_drv.h
+++ b/shared-core/i915_drv.h
@@ -1801,7 +1801,7 @@ extern int i915_wait_ring(struct drm_device * dev, int n, const char *caller);
#define IS_I965GM(dev) ((dev)->pci_device == 0x2A02)
-#define IS_IGD_GM(dev) ((dev)->pci_device == 0x2A42)
+#define IS_GM45(dev) ((dev)->pci_device == 0x2A42)
#define IS_G4X(dev) ((dev)->pci_device == 0x2E02 || \
(dev)->pci_device == 0x2E12 || \
@@ -1815,8 +1815,8 @@ extern int i915_wait_ring(struct drm_device * dev, int n, const char *caller);
IS_I945GM(dev) || IS_I965G(dev) || IS_G33(dev))
#define IS_MOBILE(dev) (IS_I830(dev) || IS_I85X(dev) || IS_I915GM(dev) || \
- IS_I945GM(dev) || IS_I965GM(dev) || IS_IGD_GM(dev))
+ IS_I945GM(dev) || IS_I965GM(dev) || IS_GM45(dev))
-#define I915_NEED_GFX_HWS(dev) (IS_G33(dev) || IS_IGD_GM(dev) || IS_G4X(dev))
+#define I915_NEED_GFX_HWS(dev) (IS_G33(dev) || IS_GM45(dev) || IS_G4X(dev))
#endif
diff --git a/shared-core/i915_suspend.c b/shared-core/i915_suspend.c
index 63cd54a..5e759b1 100644
--- a/shared-core/i915_suspend.c
+++ b/shared-core/i915_suspend.c
@@ -299,7 +299,7 @@ int i915_save_state(struct drm_device *dev)
dev_priv->saveDSPBSIZE = I915_READ(DSPBSIZE);
dev_priv->saveDSPBPOS = I915_READ(DSPBPOS);
dev_priv->saveDSPBADDR = I915_READ(DSPBADDR);
- if (IS_I965GM(dev) || IS_IGD_GM(dev)) {
+ if (IS_I965GM(dev) || IS_GM45(dev)) {
dev_priv->saveDSPBSURF = I915_READ(DSPBSURF);
dev_priv->saveDSPBTILEOFF = I915_READ(DSPBTILEOFF);
}
Reply to: