xserver-xorg-video-intel: Changes to 'ubuntu-quantal'
src/scripts/clock-graph.5c | 174 -
src/scripts/clock.5c | 40 --
src/scripts/fix.5c | 14 ---
src/scripts/tv.5c | 128 -
src/sna/brw/brw_eu_debug.c | 95
src/sna/brw/brw_eu_util.c | 126
6 files changed, 577 deletions(-)
New commits:
commit 99f67a2fe7e1ef3eefff56880f9eedde89d29bb4
Author: Timo Aaltonen tjaal...@ubuntu.com
Date: Fri Oct 18 09:37:16 2013 +0300
clean crap from the branch to make reviewing more pleasant
diff --git a/src/scripts/clock-graph.5c b/src/scripts/clock-graph.5c
deleted file mode 100644
index 324febf..000
--- a/src/scripts/clock-graph.5c
+++ /dev/null
@@ -1,174 +0,0 @@
-autoload Cairo;
-import Cairo;
-library examples/sort.5c;
-import Sort;
-
-int width = 1000, height = 200;
-int min_vco = 14;
-int max_vco = 28;
-int min = 0x;
-int max = 0;
-
-int max_clocks = 2000;
-int[4][max_clocks] clocks;
-int[4][max_clocks] vcos;
-int[4] clock_count = {0...};
-
-int[4] p2vals = {5,10,7,14};
-
-cairo_t cr = Cairo::new(width, height);
-
-void calc_p2(int p2i)
-{
- int p2 = p2vals[p2i];
- int min_p, max_p;
-
- clocks[p2i] = (int [max_clocks]){0...};
-
- if (p2 == 7 || p2 == 14) {
- /* LVDS */
- min_p = 7;
- max_p = 98;
- } else {
- /* SDVO/DAC */
- min_p = 5;
- max_p = 80;
- }
-
- for (int m1 = 10; m1 = 22; m1++) {
- for (int m2 = 5; m2 = 9; m2++) {
- for (int n = 1; n = 5; n++) {
- for (int p1 = 1; p1 = 8; p1++) {
- int ref = 9600;
- int m = 5 * (m1 + 2) + (m2 + 2);
- int p = p1 * p2;
- int vco = floor(ref * m / (n + 2));
- int clock = floor(vco / p);
-
- if (p min_p || p max_p)
- continue;
- if (m 70 || m 120)
- continue;
- if (m2 m1)
- continue; /* won't happen */
- if (vco min_vco || vco max_vco)
- continue;
-
-/*
- printf(clock: %d (%d,%d), %d,
- (%d,%d)\n,
- floor(clock / 1000),
- m1, m2, n, p1, p2);
-*/
-
- clocks[p2i][clock_count[p2i]] = clock;
- vcos[p2i][clock_count[p2i]] = vco;
- clock_count[p2i]++;
- }
- }
- }
- }
-}
-
-bool sort_p2(poly a, poly b)
-{
- return a b;
-}
-
-int min_rate = 25000 * 1000;
-int max_rate = 20 * 1000;
-
-real scale_x(real clock)
-{
- int min_x = 75, max_x = width - 50;
-
- real frac = (clock - min_rate) / (max_rate - min_rate);
-
- return min_x + frac * (max_x - min_x);
-}
-
-for (p2i = 0; p2i dim(p2vals); p2i++) {
- int p2 = p2vals[p2i];
- calc_p2(p2i);
- real row_y1 = (p2i + 1) / (dim(p2vals) + 1) * height;
- real row_y2 = p2i / (dim(p2vals) + 1) * height;
-
- /*qsort(p2vals[p2i], sort_p2);*/
-
- switch (p2) {
- case 5:
- set_source_rgb(cr, 1,0,0);
- break;
- case 10:
- set_source_rgb(cr, 0,1,0);
- break;
- case 7:
- set_source_rgb(cr, 0,0,1);
- break;
- case 14:
- set_source_rgb(cr, 0,0,0);
- break;
- }
-
- /* draw the line for the clock */
- for (int i = 0; i clock_count[p2i]; i++) {
- int clock = clocks[p2i][i];
- real xpos;
-
- if (clock min_rate || clock max_rate)
- continue;
-
- xpos = scale_x(clock);
- move_to(cr, xpos, row_y1);
- line_to(cr, xpos, row_y2);
- stroke(cr);
- }
-
- set_source_rgb(cr, 1, 1, 1);
- /* add a mark for the vco value of the clocks at each location */
- for (int i = 0; i clock_count[p2i]; i++) {
- int clock = clocks[p2i][i];
- int vco = vcos[p2i][i];
- real mark_center;
-
- if (clock min_rate || clock max_rate)
- continue;
-
- real xpos = scale_x(clock);
- real vcofrac =
xserver-xorg-video-intel: Changes to 'ubuntu-quantal'
debian/changelog |7 +
debian/patches/fix-possible-clones-computation.patch | 126 +++
debian/patches/series|1
3 files changed, 134 insertions(+)
New commits:
commit e7c37292e6ac8a1c91554b75e80daee008fb942a
Author: Timo Aaltonen tjaal...@ubuntu.com
Date: Thu Oct 3 09:57:12 2013 +0300
commit -0u2.3
diff --git a/debian/changelog b/debian/changelog
index 527bb16..eaced1d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+xserver-xorg-video-intel (2:2.20.9-0ubuntu2.3) quantal-proposed; urgency=low
+
+ * Add fix-possible-clones-computation.patch: Backport from 2.20.10 to fix
+clone mode on haswell laptops. (LP: #1202524)
+
+ -- Robert Hooker sarv...@ubuntu.com Thu, 01 Aug 2013 09:24:13 -0400
+
xserver-xorg-video-intel (2:2.20.9-0ubuntu2.2) quantal-proposed; urgency=low
* Added patches to add/fix Haswell pci-id's (LP: #1175533)
diff --git a/debian/patches/fix-possible-clones-computation.patch
b/debian/patches/fix-possible-clones-computation.patch
new file mode 100644
index 000..f7883a6
--- /dev/null
+++ b/debian/patches/fix-possible-clones-computation.patch
@@ -0,0 +1,126 @@
+--- a/src/intel_display.c
b/src/intel_display.c
+@@ -1435,7 +1435,6 @@
+ intel_output_backlight_init(output);
+
+ output-possible_crtcs = kencoder-possible_crtcs;
+- output-possible_clones = kencoder-possible_clones;
+ output-interlaceAllowed = TRUE;
+
+ intel_output-output = output;
+@@ -1680,6 +1679,60 @@
+ drmHandleEvent(mode-fd, mode-event_context);
+ }
+
++static drmModeEncoderPtr
++intel_get_kencoder(struct intel_mode *mode, int num)
++{
++ struct intel_output *iterator;
++ int id = mode-mode_res-encoders[num];
++
++ list_for_each_entry(iterator, mode-outputs, link)
++ if (iterator-mode_encoder-encoder_id == id)
++ return iterator-mode_encoder;
++
++ return NULL;
++}
++
++/*
++ * Libdrm's possible_clones is a mask of encoders, Xorg's possible_clones is a
++ * mask of outputs. This function sets Xorg's possible_clones based on the
++ * values read from libdrm.
++ */
++static void
++intel_compute_possible_clones(ScrnInfoPtr scrn, struct intel_mode *mode)
++{
++ xf86CrtcConfigPtr config = XF86_CRTC_CONFIG_PTR(scrn);
++ struct intel_output *intel_output, *clone;
++ drmModeEncoderPtr cloned_encoder;
++ uint32_t mask;
++ int i, j, k;
++ CARD32 possible_clones;
++
++ for (i = 0; i config-num_output; i++) {
++ possible_clones = 0;
++ intel_output = config-output[i]-driver_private;
++
++ mask = intel_output-mode_encoder-possible_clones;
++ for (j = 0; mask != 0; j++, mask = 1) {
++
++ if ((mask 1) == 0)
++ continue;
++
++ cloned_encoder = intel_get_kencoder(mode, j);
++ if (!cloned_encoder)
++ continue;
++
++ for (k = 0; k config-num_output; k++) {
++ clone = config-output[k]-driver_private;
++ if (clone-mode_encoder-encoder_id ==
++ cloned_encoder-encoder_id)
++ possible_clones |= (1 k);
++ }
++ }
++
++ config-output[i]-possible_clones = possible_clones;
++ }
++}
++
+ Bool intel_mode_pre_init(ScrnInfoPtr scrn, int fd, int cpp)
+ {
+ intel_screen_private *intel = intel_get_screen_private(scrn);
+@@ -1715,6 +1768,7 @@
+
+ for (i = 0; i mode-mode_res-count_connectors; i++)
+ intel_output_init(scrn, mode, i);
++ intel_compute_possible_clones(scrn, mode);
+
+ #ifdef INTEL_PIXMAP_SHARING
+ xf86ProviderSetup(scrn, NULL, Intel);
+--- a/src/sna/sna_display.c
b/src/sna/sna_display.c
+@@ -2291,6 +2291,35 @@
+ drmModeFreeConnector(koutput);
+ }
+
++/* The kernel reports possible encoder clones, whereas X uses a list of
++ * possible connector clones. This is works when we have a 1:1 mapping
++ * between encoders and connectors, but breaks for Haswell which has a pair
++ * of DP/HDMI connectors hanging off a single encoder.
++ */
++static void
++sna_mode_compute_possible_clones(ScrnInfoPtr scrn)
++{
++ xf86CrtcConfigPtr config = XF86_CRTC_CONFIG_PTR(scrn);
++ unsigned clones[32] = { 0 };
++ int i, j;
++
++ assert(config-num_output = 32);
++
++ /* Convert from encoder numbering to output numbering */
++ for (i = 0; i config-num_output; i++) {
++ unsigned mask = config-output[i]-possible_clones;
++ for (j = 0; mask != 0; j++, mask = 1) {
++ if ((mask 1) == 0)
++ continue;
++
++ clones[j] |= 1 i;
++
xserver-xorg-video-intel: Changes to 'ubuntu-quantal'
debian/changelog |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 486fc738ae5463fc8fcd5eb9324db8826848b95f Author: Maarten Lankhorst maarten.lankho...@canonical.com Date: Wed Jul 10 09:58:02 2013 +0200 released to quantal at one point diff --git a/debian/changelog b/debian/changelog index aafe89e..527bb16 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -xserver-xorg-video-intel (2:2.20.9-0ubuntu2.2) UNRELEASED; urgency=low +xserver-xorg-video-intel (2:2.20.9-0ubuntu2.2) quantal-proposed; urgency=low * Added patches to add/fix Haswell pci-id's (LP: #1175533) - add-vlv-ids.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/e1uwphw-61...@vasks.debian.org
xserver-xorg-video-intel: Changes to 'ubuntu-quantal'
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'
debian/changelog |8
debian/xserver-xorg-video-intel.udev | 10 --
2 files changed, 8 insertions(+), 10 deletions(-)
New commits:
commit 5d05216ce23844b1f0c0b125287236c4d396a260
Author: Bryce Harrington br...@ubuntu.com
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 br...@ubuntu.com 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-quantal'
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 maarten.lankho...@canonical.com
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 maarten.lankho...@ubuntu.com 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 ch...@chris-wilson.co.uk
+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 ch...@chris-wilson.co.uk
+
+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) },
+
