libdrm: Changes to 'ubuntu-raring'

2013-06-19 Thread Maarten Lankhorst
New branch 'ubuntu-raring' available with the following commits:


-- 
To UNSUBSCRIBE, email to debian-x-requ...@lists.debian.org
with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org
Archive: http://lists.debian.org/e1updbc-0006zx...@vasks.debian.org



libdrm: Changes to 'ubuntu-raring'

2013-06-19 Thread Maarten Lankhorst
 debian/changelog  |9 +
 debian/patches/add-more-reserved-hsw-ids.diff |  136 ++
 debian/patches/fix-hsw-crw-ids.diff   |   40 +++
 debian/patches/fix-hsw-gt3-names.diff |  110 +
 debian/patches/series |3 
 5 files changed, 298 insertions(+)

New commits:
commit a58ab9b24e75e0131af8167f5c00db05dd4f7560
Author: Maarten Lankhorst 
Date:   Wed Jun 19 10:25:17 2013 +0200

release to raring-proposed

diff --git a/debian/changelog b/debian/changelog
index c45a477..064431e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,11 +1,11 @@
-libdrm (2.4.43-0ubuntu1.1) UNRELEASED; urgency=low
+libdrm (2.4.43-0ubuntu1.1) raring-proposed; urgency=low
 
   * Added patches to add/fix Haswell pci-id's (LP: #1175533)
 - fix-hsw-crw-ids.diff
 - fix-hsw-gt3-names.diff
 - add-more-reserved-hsw-ids.diff
 
- -- Maarten Lankhorst   Wed, 19 Jun 2013 
10:19:21 +0200
+ -- Maarten Lankhorst   Wed, 19 Jun 2013 
10:24:58 +0200
 
 libdrm (2.4.43-0ubuntu1) raring; urgency=low
 

commit 2243b5c84846deedd3e0ad6542a17644a6c8ca2d
Author: Timo Aaltonen 
Date:   Thu Jun 6 14:10:45 2013 +0300

Added patches to add/fix Haswell pci-id's (LP: #1175533)

(cherry picked from commit ef3e0628bf05f9a182c0614a8b14d5bce820acbd)

diff --git a/debian/changelog b/debian/changelog
index 8ca09a8..c45a477 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,12 @@
+libdrm (2.4.43-0ubuntu1.1) UNRELEASED; urgency=low
+
+  * Added patches to add/fix Haswell pci-id's (LP: #1175533)
+- fix-hsw-crw-ids.diff
+- fix-hsw-gt3-names.diff
+- add-more-reserved-hsw-ids.diff
+
+ -- Maarten Lankhorst   Wed, 19 Jun 2013 
10:19:21 +0200
+
 libdrm (2.4.43-0ubuntu1) raring; urgency=low
 
   * Sync from unreleased debian git.
diff --git a/debian/patches/add-more-reserved-hsw-ids.diff 
b/debian/patches/add-more-reserved-hsw-ids.diff
new file mode 100644
index 000..5586818
--- /dev/null
+++ b/debian/patches/add-more-reserved-hsw-ids.diff
@@ -0,0 +1,136 @@
+commit 1669a67d063e82a58dae4d906015172d471e9a2a
+Author: Rodrigo Vivi 
+Date:   Mon May 13 17:48:40 2013 -0300
+
+intel: Adding more reserved PCI IDs for Haswell.
+
+At DDX commit Chris mentioned the tendency we have of finding out more
+PCI IDs only when users report. So Let's add all new reserved Haswell IDs.
+
+Bugzilla: http://bugs.freedesktop.org/show_bug.cgi?id=63701
+Signed-off-by: Rodrigo Vivi 
+Acked-by: Kenneth Graunke 
+
+diff --git a/intel/intel_chipset.h b/intel/intel_chipset.h
+index 3350def..aeb439e 100644
+--- a/intel/intel_chipset.h
 b/intel/intel_chipset.h
+@@ -97,6 +97,12 @@
+ #define PCI_CHIP_HASWELL_S_GT10x040A /* Server */
+ #define PCI_CHIP_HASWELL_S_GT20x041A
+ #define PCI_CHIP_HASWELL_S_GT30x042A
++#define PCI_CHIP_HASWELL_B_GT10x040B /* Reserved */
++#define PCI_CHIP_HASWELL_B_GT20x041B
++#define PCI_CHIP_HASWELL_B_GT30x042B
++#define PCI_CHIP_HASWELL_E_GT10x040E /* Reserved */
++#define PCI_CHIP_HASWELL_E_GT20x041E
++#define PCI_CHIP_HASWELL_E_GT30x042E
+ #define PCI_CHIP_HASWELL_SDV_GT1  0x0C02 /* Desktop */
+ #define PCI_CHIP_HASWELL_SDV_GT2  0x0C12
+ #define PCI_CHIP_HASWELL_SDV_GT3  0x0C22
+@@ -106,6 +112,12 @@
+ #define PCI_CHIP_HASWELL_SDV_S_GT10x0C0A /* Server */
+ #define PCI_CHIP_HASWELL_SDV_S_GT20x0C1A
+ #define PCI_CHIP_HASWELL_SDV_S_GT30x0C2A
++#define PCI_CHIP_HASWELL_SDV_B_GT10x0C0B /* Reserved */
++#define PCI_CHIP_HASWELL_SDV_B_GT20x0C1B
++#define PCI_CHIP_HASWELL_SDV_B_GT30x0C2B
++#define PCI_CHIP_HASWELL_SDV_E_GT10x0C0E /* Reserved */
++#define PCI_CHIP_HASWELL_SDV_E_GT20x0C1E
++#define PCI_CHIP_HASWELL_SDV_E_GT30x0C2E
+ #define PCI_CHIP_HASWELL_ULT_GT1  0x0A02 /* Desktop */
+ #define PCI_CHIP_HASWELL_ULT_GT2  0x0A12
+ #define PCI_CHIP_HASWELL_ULT_GT3  0x0A22
+@@ -115,6 +127,12 @@
+ #define PCI_CHIP_HASWELL_ULT_S_GT10x0A0A /* Server */
+ #define PCI_CHIP_HASWELL_ULT_S_GT20x0A1A
+ #define PCI_CHIP_HASWELL_ULT_S_GT30x0A2A
++#define PCI_CHIP_HASWELL_ULT_B_GT10x0A0B /* Reserved */
++#define PCI_CHIP_HASWELL_ULT_B_GT20x0A1B
++#define PCI_CHIP_HASWELL_ULT_B_GT30x0A2B
++#define PCI_CHIP_HASWELL_ULT_E_GT10x0A0E /* Reserved */
++#define PCI_CHIP_HASWELL_ULT_E_GT20x0A1E
++#define PCI_CHIP_HASWELL_ULT_E_GT30x0A2E
+ #define PCI_CHIP_HASWELL_CRW_GT1  0x0D02 /* Desktop */
+ #define PCI_CHIP_HASWELL_CRW_GT2  0x0D12
+ #define PCI_CHIP_HASWELL_CRW_GT3  0x0D22
+@@ -124,6 +142,12 @@
+ #define PCI_CHIP_HASWELL_CRW_S_GT10x0D0A /* Server */
+ #define PCI_CHIP_HASWELL_CRW_S_GT20x0D1A
+ #define PCI_CHIP_HASWELL_CRW_S_GT30x0D2A
++#define PCI_CHIP_HASWELL_CRW_B_GT10x0D0B /* Reserved */
++#define PCI_CHIP_HASWELL_CRW_B_GT20x0D1B
+

libdrm: Changes to 'ubuntu-quantal'

2013-06-19 Thread Maarten Lankhorst
 debian/changelog  |9 +
 debian/patches/add-more-reserved-hsw-ids.diff |  136 ++
 debian/patches/fix-hsw-crw-ids.diff   |   40 +++
 debian/patches/fix-hsw-gt3-names.diff |  110 +
 debian/patches/series |3 
 5 files changed, 298 insertions(+)

New commits:
commit a58ab9b24e75e0131af8167f5c00db05dd4f7560
Author: Maarten Lankhorst 
Date:   Wed Jun 19 10:25:17 2013 +0200

release to raring-proposed

diff --git a/debian/changelog b/debian/changelog
index c45a477..064431e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,11 +1,11 @@
-libdrm (2.4.43-0ubuntu1.1) UNRELEASED; urgency=low
+libdrm (2.4.43-0ubuntu1.1) raring-proposed; urgency=low
 
   * Added patches to add/fix Haswell pci-id's (LP: #1175533)
 - fix-hsw-crw-ids.diff
 - fix-hsw-gt3-names.diff
 - add-more-reserved-hsw-ids.diff
 
- -- Maarten Lankhorst   Wed, 19 Jun 2013 
10:19:21 +0200
+ -- Maarten Lankhorst   Wed, 19 Jun 2013 
10:24:58 +0200
 
 libdrm (2.4.43-0ubuntu1) raring; urgency=low
 

commit 2243b5c84846deedd3e0ad6542a17644a6c8ca2d
Author: Timo Aaltonen 
Date:   Thu Jun 6 14:10:45 2013 +0300

Added patches to add/fix Haswell pci-id's (LP: #1175533)

(cherry picked from commit ef3e0628bf05f9a182c0614a8b14d5bce820acbd)

diff --git a/debian/changelog b/debian/changelog
index 8ca09a8..c45a477 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,12 @@
+libdrm (2.4.43-0ubuntu1.1) UNRELEASED; urgency=low
+
+  * Added patches to add/fix Haswell pci-id's (LP: #1175533)
+- fix-hsw-crw-ids.diff
+- fix-hsw-gt3-names.diff
+- add-more-reserved-hsw-ids.diff
+
+ -- Maarten Lankhorst   Wed, 19 Jun 2013 
10:19:21 +0200
+
 libdrm (2.4.43-0ubuntu1) raring; urgency=low
 
   * Sync from unreleased debian git.
diff --git a/debian/patches/add-more-reserved-hsw-ids.diff 
b/debian/patches/add-more-reserved-hsw-ids.diff
new file mode 100644
index 000..5586818
--- /dev/null
+++ b/debian/patches/add-more-reserved-hsw-ids.diff
@@ -0,0 +1,136 @@
+commit 1669a67d063e82a58dae4d906015172d471e9a2a
+Author: Rodrigo Vivi 
+Date:   Mon May 13 17:48:40 2013 -0300
+
+intel: Adding more reserved PCI IDs for Haswell.
+
+At DDX commit Chris mentioned the tendency we have of finding out more
+PCI IDs only when users report. So Let's add all new reserved Haswell IDs.
+
+Bugzilla: http://bugs.freedesktop.org/show_bug.cgi?id=63701
+Signed-off-by: Rodrigo Vivi 
+Acked-by: Kenneth Graunke 
+
+diff --git a/intel/intel_chipset.h b/intel/intel_chipset.h
+index 3350def..aeb439e 100644
+--- a/intel/intel_chipset.h
 b/intel/intel_chipset.h
+@@ -97,6 +97,12 @@
+ #define PCI_CHIP_HASWELL_S_GT10x040A /* Server */
+ #define PCI_CHIP_HASWELL_S_GT20x041A
+ #define PCI_CHIP_HASWELL_S_GT30x042A
++#define PCI_CHIP_HASWELL_B_GT10x040B /* Reserved */
++#define PCI_CHIP_HASWELL_B_GT20x041B
++#define PCI_CHIP_HASWELL_B_GT30x042B
++#define PCI_CHIP_HASWELL_E_GT10x040E /* Reserved */
++#define PCI_CHIP_HASWELL_E_GT20x041E
++#define PCI_CHIP_HASWELL_E_GT30x042E
+ #define PCI_CHIP_HASWELL_SDV_GT1  0x0C02 /* Desktop */
+ #define PCI_CHIP_HASWELL_SDV_GT2  0x0C12
+ #define PCI_CHIP_HASWELL_SDV_GT3  0x0C22
+@@ -106,6 +112,12 @@
+ #define PCI_CHIP_HASWELL_SDV_S_GT10x0C0A /* Server */
+ #define PCI_CHIP_HASWELL_SDV_S_GT20x0C1A
+ #define PCI_CHIP_HASWELL_SDV_S_GT30x0C2A
++#define PCI_CHIP_HASWELL_SDV_B_GT10x0C0B /* Reserved */
++#define PCI_CHIP_HASWELL_SDV_B_GT20x0C1B
++#define PCI_CHIP_HASWELL_SDV_B_GT30x0C2B
++#define PCI_CHIP_HASWELL_SDV_E_GT10x0C0E /* Reserved */
++#define PCI_CHIP_HASWELL_SDV_E_GT20x0C1E
++#define PCI_CHIP_HASWELL_SDV_E_GT30x0C2E
+ #define PCI_CHIP_HASWELL_ULT_GT1  0x0A02 /* Desktop */
+ #define PCI_CHIP_HASWELL_ULT_GT2  0x0A12
+ #define PCI_CHIP_HASWELL_ULT_GT3  0x0A22
+@@ -115,6 +127,12 @@
+ #define PCI_CHIP_HASWELL_ULT_S_GT10x0A0A /* Server */
+ #define PCI_CHIP_HASWELL_ULT_S_GT20x0A1A
+ #define PCI_CHIP_HASWELL_ULT_S_GT30x0A2A
++#define PCI_CHIP_HASWELL_ULT_B_GT10x0A0B /* Reserved */
++#define PCI_CHIP_HASWELL_ULT_B_GT20x0A1B
++#define PCI_CHIP_HASWELL_ULT_B_GT30x0A2B
++#define PCI_CHIP_HASWELL_ULT_E_GT10x0A0E /* Reserved */
++#define PCI_CHIP_HASWELL_ULT_E_GT20x0A1E
++#define PCI_CHIP_HASWELL_ULT_E_GT30x0A2E
+ #define PCI_CHIP_HASWELL_CRW_GT1  0x0D02 /* Desktop */
+ #define PCI_CHIP_HASWELL_CRW_GT2  0x0D12
+ #define PCI_CHIP_HASWELL_CRW_GT3  0x0D22
+@@ -124,6 +142,12 @@
+ #define PCI_CHIP_HASWELL_CRW_S_GT10x0D0A /* Server */
+ #define PCI_CHIP_HASWELL_CRW_S_GT20x0D1A
+ #define PCI_CHIP_HASWELL_CRW_S_GT30x0D2A
++#define PCI_CHIP_HASWELL_CRW_B_GT10x0D0B /* Reserved */
++#define PCI_CHIP_HASWELL_CRW_B_GT20x0D1B
+

xserver-xorg-video-intel: Changes to 'ubuntu-raring'

2013-06-19 Thread Maarten Lankhorst
New branch 'ubuntu-raring' available with the following commits:


-- 
To UNSUBSCRIBE, email to debian-x-requ...@lists.debian.org
with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org
Archive: http://lists.debian.org/e1upe22-0006em...@vasks.debian.org



xserver-xorg-video-intel: Changes to 'ubuntu-quantal'

2013-06-19 Thread Maarten Lankhorst
New branch 'ubuntu-quantal' available with the following commits:


-- 
To UNSUBSCRIBE, email to debian-x-requ...@lists.debian.org
with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org
Archive: http://lists.debian.org/e1upeae-0006ss...@vasks.debian.org



xserver-xorg-video-intel: Changes to 'ubuntu-quantal'

2013-06-19 Thread Maarten Lankhorst
 debian/changelog |8 
 debian/xserver-xorg-video-intel.udev |   10 --
 2 files changed, 8 insertions(+), 10 deletions(-)

New commits:
commit 5d05216ce23844b1f0c0b125287236c4d396a260
Author: Bryce Harrington 
Date:   Thu Apr 11 13:24:19 2013 -0700

debian/xserver-xorg-video-intel.udev: Drop udev rule for gpu lockup apport 
hook.

This hook is now provided by the xdiagnose package. (LP: #997470)

diff --git a/debian/changelog b/debian/changelog
index a3a7306..e26 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+xserver-xorg-video-intel (2:2.20.9-0ubuntu2.1) quantal-proposed; urgency=low
+
+  * debian/xserver-xorg-video-intel.udev: Drop udev rule for gpu lockup
+apport hook.  This hook is now provided by the xdiagnose package.
+(LP: #997470)
+
+ -- Bryce Harrington   Thu, 11 Apr 2013 13:24:19 -0700
+
 xserver-xorg-video-intel (2:2.20.9-0ubuntu2) quantal; urgency=low
 
   [ Maarten Lankhorst ]
diff --git a/debian/xserver-xorg-video-intel.udev 
b/debian/xserver-xorg-video-intel.udev
deleted file mode 100644
index bd0ca5d..000
--- a/debian/xserver-xorg-video-intel.udev
+++ /dev/null
@@ -1,10 +0,0 @@
-# do not edit this file, it will be overwritten on update
-
-# Jesse Barnes on ubuntu-de...@lists.ubuntu.com:
-#   You'll get three events, one when the error is detected, one before the
-#   reset and one after.  Each has a different environment variable set; the
-#   initial error has ERROR=1, the pre-reset event has RESET=1 and the
-#   post-reset event has ERROR=0.
-
-# Disable freeze hook.
-SUBSYSTEM=="drm", ACTION=="change", ENV{ERROR}=="1", 
RUN+="/usr/share/apport/apport-gpu-error-intel.py"


-- 
To UNSUBSCRIBE, email to debian-x-requ...@lists.debian.org
with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org
Archive: http://lists.debian.org/e1upeeq-0007rd...@vasks.debian.org



xserver-xorg-video-intel: Changes to 'ubuntu-raring'

2013-06-19 Thread Maarten Lankhorst
 debian/changelog  |   11 +++
 debian/patches/series |5 +
 2 files changed, 16 insertions(+)

New commits:
commit a7810f2743cafcf6ff4b4ee74280978d89a50637
Author: Maarten Lankhorst 
Date:   Wed Jun 19 11:14:12 2013 +0200

Added patches to add/fix Haswell pci-id's (LP: #1175533)

add-reserved-hsw-ids.diff
fix-hsw-gt3-names.diff
add-more-reserved-hsw-ids.diff
add-known-hsw-names.diff
add-more-correct-hsw-names.diff

diff --git a/debian/changelog b/debian/changelog
index be1fca2..b016f34 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,14 @@
+xserver-xorg-video-intel (2:2.21.6-0ubuntu4.1) UNRELEASED; urgency=low
+
+  * Added patches to add/fix Haswell pci-id's (LP: #1175533)
+- add-reserved-hsw-ids.diff
+- fix-hsw-gt3-names.diff
+- add-more-reserved-hsw-ids.diff
+- add-known-hsw-names.diff
+- add-more-correct-hsw-names.diff
+
+ -- Maarten Lankhorst   Wed, 19 Jun 2013 
11:12:48 +0200
+
 xserver-xorg-video-intel (2:2.21.6-0ubuntu4) raring-proposed; urgency=low
 
   [Chris Arges]
diff --git a/debian/patches/series b/debian/patches/series
index df7cb15..f2bcc76 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1,7 @@
 0002-Update-manpage-for-new-accelmethod-option.patch
 sna-flush-scanout-cache-after-resizing.patch
+add-reserved-hsw-ids.diff
+fix-hsw-gt3-names.diff
+add-more-reserved-hsw-ids.diff
+add-known-hsw-names.diff
+add-more-correct-hsw-names.diff


-- 
To UNSUBSCRIBE, email to debian-x-requ...@lists.debian.org
with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org
Archive: http://lists.debian.org/e1upet2-ci...@vasks.debian.org



xserver-xorg-video-intel: Changes to 'ubuntu-raring'

2013-06-19 Thread Maarten Lankhorst
 debian/changelog   |2 
 debian/patches/add-known-hsw-names.diff|   60 ++
 debian/patches/add-more-correct-hsw-names.diff |   73 
 debian/patches/add-more-reserved-hsw-ids.diff  |  204 +++
 debian/patches/add-reserved-hsw-ids.diff   |  107 
 debian/patches/fix-hsw-gt3-names.diff  |  217 +
 6 files changed, 662 insertions(+), 1 deletion(-)

New commits:
commit 3545a63802a367866f3649d68beabd6328140384
Author: Maarten Lankhorst 
Date:   Wed Jun 19 11:32:07 2013 +0200

not forgetting to git add the patches

diff --git a/debian/patches/add-known-hsw-names.diff 
b/debian/patches/add-known-hsw-names.diff
new file mode 100644
index 000..8c4fecd
--- /dev/null
+++ b/debian/patches/add-known-hsw-names.diff
@@ -0,0 +1,60 @@
+commit b507796679529b14c99e8937870561cd8eebebb9
+Author: Chris Wilson 
+Date:   Tue May 28 12:13:02 2013 +0100
+
+Add the known marketing names for the performance Haswell parts
+
+Start filling in the names for the parts that have been announced, the
+Iris branded Haswell GT3 parts.
+
+Signed-off-by: Chris Wilson 
+
+diff --git a/src/intel_module.c b/src/intel_module.c
+index 1e402f0..8b3b196 100644
+--- a/src/intel_module.c
 b/src/intel_module.c
+@@ -192,34 +192,34 @@ static const SymTabRec intel_chipsets[] = {
+   {PCI_CHIP_HASWELL_SDV_E_GT3,"Haswell SDV (GT3)" },
+   {PCI_CHIP_HASWELL_ULT_D_GT1,"Haswell ULT Desktop (GT1)" },
+   {PCI_CHIP_HASWELL_ULT_D_GT2,"Haswell ULT Desktop (GT2)" },
+-  {PCI_CHIP_HASWELL_ULT_D_GT3,"Haswell ULT Desktop (GT3)" },
++  {PCI_CHIP_HASWELL_ULT_D_GT3,"Iris(TM) Graphics 5100" },
+   {PCI_CHIP_HASWELL_ULT_M_GT1,"Haswell ULT Mobile (GT1)" },
+   {PCI_CHIP_HASWELL_ULT_M_GT2,"Haswell ULT Mobile (GT2)" },
+-  {PCI_CHIP_HASWELL_ULT_M_GT3,"Haswell ULT Mobile (GT3)" },
++  {PCI_CHIP_HASWELL_ULT_M_GT3,"Iris(TM) Graphics 5100" },
+   {PCI_CHIP_HASWELL_ULT_S_GT1,"Haswell ULT Server (GT1)" },
+   {PCI_CHIP_HASWELL_ULT_S_GT2,"Haswell ULT Server (GT2)" },
+-  {PCI_CHIP_HASWELL_ULT_S_GT3,"Haswell ULT Server (GT3)" },
++  {PCI_CHIP_HASWELL_ULT_S_GT3,"Iris(TM) Graphics 5100" },
+   {PCI_CHIP_HASWELL_ULT_B_GT1,"Haswell ULT (GT1)" },
+   {PCI_CHIP_HASWELL_ULT_B_GT2,"Haswell ULT (GT2)" },
+-  {PCI_CHIP_HASWELL_ULT_B_GT3,"Haswell ULT (GT3)" },
++  {PCI_CHIP_HASWELL_ULT_B_GT3,"Iris(TM) Graphics 5100" },
+   {PCI_CHIP_HASWELL_ULT_E_GT1,"Haswell ULT (GT1)" },
+   {PCI_CHIP_HASWELL_ULT_E_GT2,"Haswell ULT (GT2)" },
+-  {PCI_CHIP_HASWELL_ULT_E_GT3,"Haswell ULT (GT3)" },
++  {PCI_CHIP_HASWELL_ULT_E_GT3,"Iris(TM) Graphics 5100" },
+   {PCI_CHIP_HASWELL_CRW_D_GT1,"Haswell CRW Desktop (GT1)" },
+   {PCI_CHIP_HASWELL_CRW_D_GT2,"Haswell CRW Desktop (GT2)" },
+-  {PCI_CHIP_HASWELL_CRW_D_GT3,"Haswell CRW Desktop (GT3)" },
++  {PCI_CHIP_HASWELL_CRW_D_GT3,"Iris(TM) Pro Graphics 5200" },
+   {PCI_CHIP_HASWELL_CRW_M_GT1,"Haswell CRW Mobile (GT1)" },
+   {PCI_CHIP_HASWELL_CRW_M_GT2,"Haswell CRW Mobile (GT2)" },
+-  {PCI_CHIP_HASWELL_CRW_M_GT3,"Haswell CRW Mobile (GT3)" },
++  {PCI_CHIP_HASWELL_CRW_M_GT3,"Iris(TM) Pro Graphics 5200" },
+   {PCI_CHIP_HASWELL_CRW_S_GT1,"Haswell CRW Server (GT1)" },
+   {PCI_CHIP_HASWELL_CRW_S_GT2,"Haswell CRW Server (GT2)" },
+-  {PCI_CHIP_HASWELL_CRW_S_GT3,"Haswell CRW Server (GT3)" },
++  {PCI_CHIP_HASWELL_CRW_S_GT3,"Iris(TM) Pro Graphics 5200" },
+   {PCI_CHIP_HASWELL_CRW_B_GT1,"Haswell CRW (GT1)" },
+   {PCI_CHIP_HASWELL_CRW_B_GT2,"Haswell CRW (GT2)" },
+-  {PCI_CHIP_HASWELL_CRW_B_GT3,"Haswell CRW (GT3)" },
++  {PCI_CHIP_HASWELL_CRW_B_GT3,"Iris(TM) Pro Graphics 5200" },
+   {PCI_CHIP_HASWELL_CRW_E_GT1,"Haswell CRW (GT1)" },
+   {PCI_CHIP_HASWELL_CRW_E_GT2,"Haswell CRW (GT2)" },
+-  {PCI_CHIP_HASWELL_CRW_E_GT3,"Haswell CRW (GT3)" },
++  {PCI_CHIP_HASWELL_CRW_E_GT3,"Iris(TM) Pro Graphics 5200" },
+   {PCI_CHIP_VALLEYVIEW_PO,"ValleyView PO board" },
+   {-1,NULL}
+ };
diff --git a/debian/patches/add-more-correct-hsw-names.diff 
b/debian/patches/add-more-correct-hsw-names.diff
new file mode 100644
index 000..acc08ec
--- /dev/null
+++ b/debian/patches/add-more-correct-hsw-names.diff
@@ -0,0 +1,73 @@
+commit 45c09bfe58c37bbf7965af25bdd4fa5c37c0908f
+Author: Rodrigo Vivi 
+Date:   Wed Jun 5 13:07:13 2013 -0300
+
+

xserver-xorg-video-intel: Changes to 'ubuntu-quantal'

2013-06-19 Thread Maarten Lankhorst
 debian/changelog   |   13 +
 debian/patches/add-known-hsw-names.diff|   60 ++
 debian/patches/add-more-correct-hsw-names.diff |   73 
 debian/patches/add-more-reserved-hsw-ids.diff  |  204 +++
 debian/patches/add-reserved-hsw-ids.diff   |  107 
 debian/patches/add-vlv-ids.diff|   36 
 debian/patches/fix-hsw-crw-ids.diff|   40 
 debian/patches/fix-hsw-gt3-names.diff  |  217 +
 debian/patches/series  |7 
 9 files changed, 757 insertions(+)

New commits:
commit bf78fc9f86e56c6ef58373311d574fc1e377e214
Author: Maarten Lankhorst 
Date:   Wed Jun 19 11:14:12 2013 +0200

Added patches to add/fix Haswell pci-id's (LP: #1175533)

add-reserved-hsw-ids.diff
fix-hsw-gt3-names.diff
add-more-reserved-hsw-ids.diff
add-known-hsw-names.diff
add-more-correct-hsw-names.diff

(cherry picked from commit a7810f2743cafcf6ff4b4ee74280978d89a50637)

Conflicts:
debian/patches/series

Added:
add-vlv-ids.diff
fix-hsw-crw-ids.diff

diff --git a/debian/changelog b/debian/changelog
index e26..aafe89e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,16 @@
+xserver-xorg-video-intel (2:2.20.9-0ubuntu2.2) UNRELEASED; urgency=low
+
+  * Added patches to add/fix Haswell pci-id's (LP: #1175533)
+- add-vlv-ids.diff
+- fix-hsw-crw-ids.diff
+- add-reserved-hsw-ids.diff
+- fix-hsw-gt3-names.diff
+- add-more-reserved-hsw-ids.diff
+- add-known-hsw-names.diff
+- add-more-correct-hsw-names.diff
+
+ -- Maarten Lankhorst   Wed, 19 Jun 2013 
11:12:48 +0200
+
 xserver-xorg-video-intel (2:2.20.9-0ubuntu2.1) quantal-proposed; urgency=low
 
   * debian/xserver-xorg-video-intel.udev: Drop udev rule for gpu lockup
diff --git a/debian/patches/add-known-hsw-names.diff 
b/debian/patches/add-known-hsw-names.diff
new file mode 100644
index 000..8c4fecd
--- /dev/null
+++ b/debian/patches/add-known-hsw-names.diff
@@ -0,0 +1,60 @@
+commit b507796679529b14c99e8937870561cd8eebebb9
+Author: Chris Wilson 
+Date:   Tue May 28 12:13:02 2013 +0100
+
+Add the known marketing names for the performance Haswell parts
+
+Start filling in the names for the parts that have been announced, the
+Iris branded Haswell GT3 parts.
+
+Signed-off-by: Chris Wilson 
+
+diff --git a/src/intel_module.c b/src/intel_module.c
+index 1e402f0..8b3b196 100644
+--- a/src/intel_module.c
 b/src/intel_module.c
+@@ -192,34 +192,34 @@ static const SymTabRec intel_chipsets[] = {
+   {PCI_CHIP_HASWELL_SDV_E_GT3,"Haswell SDV (GT3)" },
+   {PCI_CHIP_HASWELL_ULT_D_GT1,"Haswell ULT Desktop (GT1)" },
+   {PCI_CHIP_HASWELL_ULT_D_GT2,"Haswell ULT Desktop (GT2)" },
+-  {PCI_CHIP_HASWELL_ULT_D_GT3,"Haswell ULT Desktop (GT3)" },
++  {PCI_CHIP_HASWELL_ULT_D_GT3,"Iris(TM) Graphics 5100" },
+   {PCI_CHIP_HASWELL_ULT_M_GT1,"Haswell ULT Mobile (GT1)" },
+   {PCI_CHIP_HASWELL_ULT_M_GT2,"Haswell ULT Mobile (GT2)" },
+-  {PCI_CHIP_HASWELL_ULT_M_GT3,"Haswell ULT Mobile (GT3)" },
++  {PCI_CHIP_HASWELL_ULT_M_GT3,"Iris(TM) Graphics 5100" },
+   {PCI_CHIP_HASWELL_ULT_S_GT1,"Haswell ULT Server (GT1)" },
+   {PCI_CHIP_HASWELL_ULT_S_GT2,"Haswell ULT Server (GT2)" },
+-  {PCI_CHIP_HASWELL_ULT_S_GT3,"Haswell ULT Server (GT3)" },
++  {PCI_CHIP_HASWELL_ULT_S_GT3,"Iris(TM) Graphics 5100" },
+   {PCI_CHIP_HASWELL_ULT_B_GT1,"Haswell ULT (GT1)" },
+   {PCI_CHIP_HASWELL_ULT_B_GT2,"Haswell ULT (GT2)" },
+-  {PCI_CHIP_HASWELL_ULT_B_GT3,"Haswell ULT (GT3)" },
++  {PCI_CHIP_HASWELL_ULT_B_GT3,"Iris(TM) Graphics 5100" },
+   {PCI_CHIP_HASWELL_ULT_E_GT1,"Haswell ULT (GT1)" },
+   {PCI_CHIP_HASWELL_ULT_E_GT2,"Haswell ULT (GT2)" },
+-  {PCI_CHIP_HASWELL_ULT_E_GT3,"Haswell ULT (GT3)" },
++  {PCI_CHIP_HASWELL_ULT_E_GT3,"Iris(TM) Graphics 5100" },
+   {PCI_CHIP_HASWELL_CRW_D_GT1,"Haswell CRW Desktop (GT1)" },
+   {PCI_CHIP_HASWELL_CRW_D_GT2,"Haswell CRW Desktop (GT2)" },
+-  {PCI_CHIP_HASWELL_CRW_D_GT3,"Haswell CRW Desktop (GT3)" },
++  {PCI_CHIP_HASWELL_CRW_D_GT3,"Iris(TM) Pro Graphics 5200" },
+   {PCI_CHIP_HASWELL_CRW_M_GT1,"Haswell CRW Mobile (GT1)" },
+   {PCI_CHIP_HASWELL_CRW_M_GT2,"Haswell CRW Mobile (GT2)" },
+-  {PCI_CHIP_HASWELL_CRW_M_GT3,"Haswell CRW Mobile (GT3)" },
++  {PCI_CHIP_HASWELL_CRW_M_GT3,"Iris(TM) Pro Graphics 5200" },
+   {PCI_CHIP_HASWELL_CRW_S_GT1,"Haswell CRW Server (GT1)" },
+   {PCI_CHIP_HASWELL_CRW_S_GT2,"Haswell CRW

Processed: Re: Bug#710058: gdm3: GNOME 3 windows are blank, solid blue, no text More INfo

2013-06-19 Thread Debian Bug Tracking System
Processing control commands:

> reassign -1 libgl1-mesa-dri 8.0.5-4+deb7u1
Bug #710058 [gdm3] gdm3: GNOME 3 windows are blank, solid blue, no text
Bug reassigned from package 'gdm3' to 'libgl1-mesa-dri'.
No longer marked as found in versions gdm3/3.4.1-8.
Ignoring request to alter fixed versions of bug #710058 to the same values 
previously set
Bug #710058 [libgl1-mesa-dri] gdm3: GNOME 3 windows are blank, solid blue, no 
text
Marked as found in versions mesa/8.0.5-4+deb7u1.
> tags -1 - moreinfo
Bug #710058 [libgl1-mesa-dri] gdm3: GNOME 3 windows are blank, solid blue, no 
text
Removed tag(s) moreinfo.

-- 
710058: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=710058
Debian Bug Tracking System
Contact ow...@bugs.debian.org with problems


--
To UNSUBSCRIBE, email to debian-x-requ...@lists.debian.org
with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org
Archive: 
http://lists.debian.org/handler.s.b710058.137165174326372.transcr...@bugs.debian.org



Bug#710058: gdm3: GNOME 3 windows are blank, solid blue, no text More INfo

2013-06-19 Thread Gerhard Pircher
> Gesendet: Mittwoch, 19. Juni 2013 um 16:22 Uhr
> Von: "Sébastien Villemot" 
> An: "Gerhard Pircher" 
> Cc: 710...@bugs.debian.org
> Betreff: Re: Bug#710058: gdm3: GNOME 3 windows are blank, solid blue, no text 
> More INfo
>
> Control: reassign -1 libgl1-mesa-dri 8.0.5-4+deb7u1
> Control: tags -1 - moreinfo
>
> Le lundi 17 juin 2013 à 21:12 +0200, Gerhard Pircher a écrit :
>
> > Should we file another bug report or can this one be rededicated to X?
>
> I am reassigning to libgl1-mesa-dri, where I think this belongs.
But shouldn't GNOME3 then work with the proprietary nvidia (v96.43.23-3)
driver, which should come with it's own GL library implementation?

I guess using the GNOME debug packages to gather more information isn't
that easy!?

Thanks!

regards,
Gerhard


--
To UNSUBSCRIBE, email to debian-x-requ...@lists.debian.org
with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org
Archive: 
http://lists.debian.org/trinity-588a5eb9-f0b8-40eb-b9eb-735db4ab2446-1371657049238@3capp-gmx-bs22



Bug#712556: python-gtk2: Fails with undefined symbol

2013-06-19 Thread Christian PERRIER
Quoting Emilio Pozuelo Monfort (po...@debian.org):
> reassign 712556 libgbm1
> thanks
> 
> On 17/06/13 07:41, Christian Perrier wrote:
> > Not usre if that belongs to python-gtk2. When I launch pytrainer (a
> > logging tool for sports activities, written in Python and using, among
> > others , the GTK2 Python libraries), I get:
> > 
> > cperrier@mykerinos:~/travail/debian/rewrite/LCFC $ pytrainer 
> > Traceback (most recent call last):
> >   File "/usr/bin/pytr", line 24, in 
> >   import gtk.glade
> > File "/usr/lib/python2.7/dist-packages/gtk-2.0/gtk/__init__.py", 
> > line 40, in 
> > from gtk import _gtk
> > ImportError: /usr/lib/i386-linux-gnu/libgbm.so.1: undefined symbol: 
> > wayland_buffer_is_drm
> 
> Looks like libgbm1 needs to depend on libegl1-mesa

Is that enough?

If it was, manually installing libegl1-mesa on my system should solve
the issue originally met with pytrainer. However, it doesn't.




signature.asc
Description: Digital signature