xserver-xorg-video-intel: Changes to 'upstream-experimental'
NEWS | 18
configure.ac |2
src/i965_3d.c|4
src/i965_render.c| 32
src/i965_video.c |6
src/intel_batchbuffer.c |6
src/intel_dri.c | 10
src/intel_driver.c | 14
src/intel_driver.h |8
src/intel_hwmc.c |6
src/intel_memory.c |6
src/intel_module.c | 30
src/intel_uxa.c |8
src/intel_video.c| 48
src/sna/Makefile.am |1
src/sna/brw/brw_disasm.c | 43
src/sna/brw/brw_eu.c |2
src/sna/brw/brw_eu.h |4
src/sna/brw/brw_eu_emit.c| 132 -
src/sna/brw/brw_wm.c | 64
src/sna/g4x_render.c | 3695 ---
src/sna/gen2_render.c|6
src/sna/gen4_render.c| 284 +--
src/sna/gen5_render.c| 40
src/sna/gen6_render.c| 14
src/sna/gen7_render.c| 20
src/sna/kgem.c | 103 -
src/sna/kgem.h |6
src/sna/kgem_debug.c | 34
src/sna/kgem_debug_gen6.c|8
src/sna/sna.h|2
src/sna/sna_accel.c | 61
src/sna/sna_blt.c| 44
src/sna/sna_display.c| 33
src/sna/sna_dri.c|4
src/sna/sna_driver.c | 19
src/sna/sna_glyphs.c |4
src/sna/sna_io.c |8
src/sna/sna_render.c |2
src/sna/sna_render.h |1
src/sna/sna_video.c |6
src/sna/sna_video_hwmc.c | 16
src/sna/sna_video_overlay.c |8
src/sna/sna_video_sprite.c |2
src/sna/sna_video_textured.c |2
45 files changed, 568 insertions(+), 4298 deletions(-)
New commits:
commit 6f675eeaeade4728af566891b2afbe5b44fbdc2e
Author: Chris Wilson
Date: Mon Dec 3 10:47:35 2012 +
2.20.15 release
Signed-off-by: Chris Wilson
diff --git a/NEWS b/NEWS
index 8e48fbb..2809dcb 100644
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,21 @@
+Release 2.20.15 (2012-12-03)
+
+And lo, enabling more of the common acceleration paths for gen4 revealed
+another lurking bug - something is wrong with how we prepare Y-tiling
+surfaces for rendering. For the time being, we can surreptiously disable
+them for gen4 and avoid hitting GPU hangs.
+
+ * Avoid clobbering the render state after failing to convert the
+ operation to use the blitter.
+ https://bugs.freedesktop.org/show_bug.cgi?id=57601
+
+ * Disable shadow tracking upon server regeneration, and so fix a crash
+ if you restart the server whilst a RandR transform (e.g. rotation) is
+ in effect.
+ https://bugs.freedesktop.org/show_bug.cgi?id=52255
+ https://bugs.freedesktop.org/show_bug.cgi?id=56608
+
+
Release 2.20.14 (2012-11-26)
The highlight of this release is gen4, from 965g to gm45. Quite an old
diff --git a/configure.ac b/configure.ac
index 9004ce5..8ada660 100644
--- a/configure.ac
+++ b/configure.ac
@@ -23,7 +23,7 @@
# Initialize Autoconf
AC_PREREQ([2.60])
AC_INIT([xf86-video-intel],
-[2.20.14],
+[2.20.15],
[https://bugs.freedesktop.org/enter_bug.cgi?product=xorg],
[xf86-video-intel])
AC_CONFIG_SRCDIR([Makefile.am])
commit 37eb7343be1aeeb90a860096756603a577df1a77
Author: Chris Wilson
Date: Sat Dec 1 09:40:11 2012 +
sna/gen5: Inspired by gen4, reorder the flushing
This may not be totally safe, but it is a nicer explanation for random
single character corruption.
References: https://bugs.freedesktop.org/show_bug.cgi?id=51422
Signed-off-by: Chris Wilson
diff --git a/src/sna/gen5_render.c b/src/sna/gen5_render.c
index 7dd6dee..17c221e 100644
--- a/src/sna/gen5_render.c
+++ b/src/sna/gen5_render.c
@@ -1206,12 +1206,12 @@ gen5_align_vertex(struct sna *sna, const struct
sna_composite_op *op)
}
}
-static bool
+static void
gen5_emit_binding_table(struct sna *sna, uint16_t offset)
{
if (!DBG_NO_STATE_CACHE &&
sna->render_state.gen5.surface_table == offset)
- return false;
+ return;
sna->render_state.gen5.surface_table = offset;
@@ -1223,8 +1223,6 @@ gen5_emit_binding_table(struct sna *sna, uint16_t offset)
OUT_BATCH(0); /* sf */
/* Only the PS uses the binding table */
OUT_BATCH(offset*4);
-
- return true;
}
static bool
@@ -1371,23 +1369,21 @@ gen5_emit_state(struct sna *sna,
const struct sna_composite_op *op,
uint16_t offset)
{
- bool flush;
+ if (kgem_bo_is_dirty(op->src.bo) || kgem_bo_is_dirty(op->mask.bo)) {
+ DBG(("%s: flushing dirty (%d, %d)\n", __FUNCTION__,
+kgem_bo_is_dirty(op->src.bo),
+kgem_bo_is_dirty(op->mask.bo)));
+ OUT_BATCH(MI_FLUSH);
+ kgem_clear
xserver-xorg-video-intel: Changes to 'debian-experimental'
ChangeLog| 156 + NEWS | 18 configure.ac |2 debian/changelog |6 src/i965_3d.c|4 src/i965_render.c| 32 src/i965_video.c |6 src/intel_batchbuffer.c |6 src/intel_dri.c | 10 src/intel_driver.c | 14 src/intel_driver.h |8 src/intel_hwmc.c |6 src/intel_memory.c |6 src/intel_module.c | 30 src/intel_uxa.c |8 src/intel_video.c| 48 src/sna/Makefile.am |1 src/sna/brw/brw_disasm.c | 43 src/sna/brw/brw_eu.c |2 src/sna/brw/brw_eu.h |4 src/sna/brw/brw_eu_emit.c| 132 - src/sna/brw/brw_wm.c | 64 src/sna/g4x_render.c | 3695 --- src/sna/gen2_render.c|6 src/sna/gen4_render.c| 284 +-- src/sna/gen5_render.c| 40 src/sna/gen6_render.c| 14 src/sna/gen7_render.c| 20 src/sna/kgem.c | 103 - src/sna/kgem.h |6 src/sna/kgem_debug.c | 34 src/sna/kgem_debug_gen6.c|8 src/sna/sna.h|2 src/sna/sna_accel.c | 61 src/sna/sna_blt.c| 44 src/sna/sna_display.c| 33 src/sna/sna_dri.c|4 src/sna/sna_driver.c | 19 src/sna/sna_glyphs.c |4 src/sna/sna_io.c |8 src/sna/sna_render.c |2 src/sna/sna_render.h |1 src/sna/sna_video.c |6 src/sna/sna_video_hwmc.c | 16 src/sna/sna_video_overlay.c |8 src/sna/sna_video_sprite.c |2 src/sna/sna_video_textured.c |2 47 files changed, 730 insertions(+), 4298 deletions(-) New commits: commit e83eda4e08916a996d1055c7604bb711e74a7702 Author: Timo Aaltonen Date: Fri Dec 7 10:01:04 2012 +0200 update the changelogs diff --git a/ChangeLog b/ChangeLog index ae97de6..fd1c096 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,159 @@ +commit 6f675eeaeade4728af566891b2afbe5b44fbdc2e +Author: Chris Wilson +Date: Mon Dec 3 10:47:35 2012 + + +2.20.15 release + +Signed-off-by: Chris Wilson + +commit 37eb7343be1aeeb90a860096756603a577df1a77 +Author: Chris Wilson +Date: Sat Dec 1 09:40:11 2012 + + +sna/gen5: Inspired by gen4, reorder the flushing + +This may not be totally safe, but it is a nicer explanation for random +single character corruption. + +References: https://bugs.freedesktop.org/show_bug.cgi?id=51422 +Signed-off-by: Chris Wilson + +commit a8a99428c14c8aed2082853cc60d0f98a1fa2d86 +Author: Chris Wilson +Date: Sat Dec 1 09:44:49 2012 + + +sna/dri: Unknown generations are given the max value and presume i965_dri.so + +Signed-off-by: Chris Wilson + +commit 382bb7bf77fca412fdefd7c304f395d1fe9483b5 +Author: Chris Wilson +Date: Fri Nov 30 16:24:30 2012 + + +sna/gen6+: Only apply the BLT w/a for self-copies + +Signed-off-by: Chris Wilson + +commit 1aee8acacfe5869a072d9f20f3b8290b16683260 +Author: Chris Wilson +Date: Fri Nov 30 12:17:25 2012 + + +sna: Unify gen4 acceleration again + +After disabling render-to-Y, 965g seems just as happy with the new code +paths as g4x. + +Signed-off-by: Chris Wilson + +commit 5d6dd9c5a7eeb1f879525430ad89ab74d427e469 +Author: Chris Wilson +Date: Fri Nov 30 12:12:49 2012 + + +Convert generation counter to octal + +Signed-off-by: Chris Wilson + +commit 131600020638ef15166361214cd5e1a0c08c2ea6 +Author: Chris Wilson +Date: Fri Nov 30 11:43:56 2012 + + +sna: Prevent gen4 from rendering to I915_TILING_Y + +It always seems to end up in a hang... + +Signed-off-by: Chris Wilson + +commit ee4d1873ff504c2150b51d13864164b02b85dd53 +Author: Chris Wilson +Date: Fri Nov 30 09:52:49 2012 + + +sna/g4x: And remove one more flush point + +Signed-off-by: Chris Wilson + +commit 1b6c1a30723b1d13e9bd3df0b59a8d75639c89be +Author: Chris Wilson +Date: Fri Nov 30 09:27:57 2012 + + +sna: Increase tiling alignment to an even tile + +Seems to help g4x. + +Signed-off-by: Chris Wilson + +commit 6aeb6fdf75fa322d8f5ffe393337d8195d7a6a62 +Author: Chris Wilson +Date: Fri Nov 30 09:03:53 2012 + + +sna/g4x: Remove the flush before the pipelined pointer changes + +This one appears unneeded. Hopefully. + +Signed-off-by: Chris Wilson + +commit 8be2c6695509809c0ab0c5c014e11dc733f73006 +Author: Chris Wilson +Date: Thu Nov 29 19:56:15 2012 + + +sna/g4x: Emit the flush prior to changing pipelined state + +Signed-off-by: Chris Wilson + +commit 2d5d55702bb8eced32d5b8cb3c0cd125fd99d6dc +Author: Chris Wilson +Date: Wed Nov 28 15:46:29 2012 + + +sna/gen6+: Overri
xorg-server: Changes to 'upstream-experimental'
Xext/saver.c|2 ++
Xi/xipassivegrab.c |8 +++-
configure.ac|6 +++---
dix/window.c|2 ++
hw/dmx/dmxcursor.c |2 ++
hw/xfree86/modes/xf86Crtc.c |7 ++-
include/xkbsrv.h|1 +
randr/randr.c |2 ++
xfixes/cursor.c | 12 ++--
xkb/xkbAccessX.c|6 --
10 files changed, 35 insertions(+), 13 deletions(-)
New commits:
commit ede07c1af35926c77c4e766cc02c00333b498460
Author: Matt Dew
Date: Thu Dec 6 22:46:46 2012 -0700
Bump version
diff --git a/configure.ac b/configure.ac
index 590b773..ffd8a97 100644
--- a/configure.ac
+++ b/configure.ac
@@ -26,9 +26,9 @@ dnl
dnl Process this file with autoconf to create configure.
AC_PREREQ(2.60)
-AC_INIT([xorg-server], 1.13.0.901,
[https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], xorg-server)
-RELEASE_DATE="2012-11-22"
-RELEASE_NAME="Puer Tea"
+AC_INIT([xorg-server], 1.13.0.902,
[https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], xorg-server)
+RELEASE_DATE="2012-12-06"
+RELEASE_NAME="Jasmine Tea"
AC_CONFIG_SRCDIR([Makefile.am])
AM_INIT_AUTOMAKE([foreign dist-bzip2])
AM_MAINTAINER_MODE
commit 79220f4390127d9971cbcf378530bf36172ef35a
Author: Daniel Martin
Date: Wed Nov 7 11:31:01 2012 +0100
Xi: Fix modifier swapping in XIPassiveGrabDevice
XIPassiveGrabDevice uses a list of uint32_t as modifier sets.
The ModifierInfo struct represents the current modifier states and is
therefor used in XIQueryPointer and various events.
Signed-off-by: Daniel Martin
Reviewed-by: Peter Hutterer
Signed-off-by: Peter Hutterer
(cherry picked from commit aa9a9ad08b8a6e7e95de7c2bf45d93dd50f9ca87)
diff --git a/Xi/xipassivegrab.c b/Xi/xipassivegrab.c
index ddab53d..62a3a46 100644
--- a/Xi/xipassivegrab.c
+++ b/Xi/xipassivegrab.c
@@ -50,7 +50,7 @@ int
SProcXIPassiveGrabDevice(ClientPtr client)
{
int i;
-xXIModifierInfo *mods;
+uint32_t *mods;
REQUEST(xXIPassiveGrabDeviceReq);
@@ -63,12 +63,10 @@ SProcXIPassiveGrabDevice(ClientPtr client)
swaps(&stuff->mask_len);
swaps(&stuff->num_modifiers);
-mods = (xXIModifierInfo *) &stuff[1];
+mods = (uint32_t *) &stuff[1];
for (i = 0; i < stuff->num_modifiers; i++, mods++) {
-swapl(&mods->base_mods);
-swapl(&mods->latched_mods);
-swapl(&mods->locked_mods);
+swapl(mods);
}
return ProcXIPassiveGrabDevice(client);
commit 521f3fb566e67330a486874928a21ce201dba02b
Author: Sybren van Elderen
Date: Tue Nov 27 19:27:10 2012 +0100
hw/dmx: add update_desktop_dimensions() call
The Xdmx server did not update the desktop dimensions when computing screen
origins.
Signed-off-by: Sybren van Elderen
Reviewed-by: Peter Hutterer
Signed-off-by: Peter Hutterer
(cherry picked from commit 6e18599d691036eca6ff082c17727d9ffb926984)
diff --git a/hw/dmx/dmxcursor.c b/hw/dmx/dmxcursor.c
index 1a77c7d..35aca81 100644
--- a/hw/dmx/dmxcursor.c
+++ b/hw/dmx/dmxcursor.c
@@ -346,6 +346,8 @@ dmxComputeScreenOrigins(void)
screenInfo.screens[i]->y -= minY;
}
}
+
+update_desktop_dimensions();
}
/** Recompute origin information in the #dmxScreens list. This is
commit 73bd33b4d4e3df4a8097826695a8dbdc2fb5c920
Author: Peter Hutterer
Date: Tue Jun 26 10:30:35 2012 +1000
xkb: fill in keycode and event type for slow keys enablement
eventType is set for the type that triggered a XkbControlsNotify event.
Technically, SlowKeys is triggered by a timer which doesn't have a matching
core event type. So we used to use 0 here.
Practically, the timer is triggered by a key press + hold and cancelled when
the key is released before the timeout expires. So we might as well set
KeyPress (keycode) in the ControlsNotify to give clients a chance to differ
between timer-triggered SlowKeys and client-triggered ones.
This is a chance in behaviour, though I suspect with little impact.
Signed-off-by: Peter Hutterer
Acked-by: Daniel Stone
(cherry picked from commit 2c4388a00ec308bc2d48ba751ff510cd5c1b2384)
diff --git a/include/xkbsrv.h b/include/xkbsrv.h
index d584785..78b8f5a 100644
--- a/include/xkbsrv.h
+++ b/include/xkbsrv.h
@@ -171,6 +171,7 @@ typedef struct _XkbSrvInfo {
KeyCode mouseKey;
KeyCode inactiveKey;
KeyCode slowKey;
+KeyCode slowKeyEnableKey;
KeyCode repeatKey;
CARD8 krgTimerActive;
CARD8 beepType;
diff --git a/xkb/xkbAccessX.c b/xkb/xkbAccessX.c
index c1af32e..21df85d 100644
--- a/xkb/xkbAccessX.c
+++ b/xkb/xkbAccessX.c
@@ -291,8 +291,8 @@ AccessXKRGExpire(OsTimerPtr timer, CARD32 now, pointer arg)
return 4000;
}
xkbi->krgTimerActive = _OFF_TIMER;
-cn.keycode = 0;
-cn.eventType = 0;
+cn.keycode = xkbi->slowKeyEnableKey;
+cn.eventType = KeyPress;
xorg-server: Changes to 'debian-experimental'
ChangeLog | 154 Xext/saver.c|2 Xi/xipassivegrab.c |8 -- configure.ac|6 - debian/changelog|5 - debian/serverminver |2 dix/window.c|2 hw/dmx/dmxcursor.c |2 hw/xfree86/modes/xf86Crtc.c |7 +- include/xkbsrv.h|1 randr/randr.c |2 xfixes/cursor.c | 12 ++- xkb/xkbAccessX.c|6 + 13 files changed, 192 insertions(+), 17 deletions(-) New commits: commit fef80d8bab86e75d2eb202b33e11e2e17584b2f6 Author: Maarten Lankhorst Date: Fri Dec 7 09:17:43 2012 +0100 Bump ABI_VIDEODRV_VERSION to 13.1 xf86UpdateDesktopDimensions is newly exported for nvidia blob diff --git a/debian/serverminver b/debian/serverminver index 41482e2..b6b99d6 100644 --- a/debian/serverminver +++ b/debian/serverminver @@ -1,3 +1,3 @@ 2:1.12.99.901 -ABI_VIDEODRV_VERSION:13.0 +ABI_VIDEODRV_VERSION:13.1 ABI_XINPUT_VERSION:18.0 commit f5e11c2d708e819fcb1f131f1fe0e8cb20b8ee0e Author: Maarten Lankhorst Date: Fri Dec 7 09:07:18 2012 +0100 New upstream release diff --git a/ChangeLog b/ChangeLog index 3fed06c..8a45f13 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,157 @@ +commit ede07c1af35926c77c4e766cc02c00333b498460 +Author: Matt Dew +Date: Thu Dec 6 22:46:46 2012 -0700 + +Bump version + +commit e2369dd404024415853108848c8d052e73e95461 +Merge: d71a17c 79220f4 +Author: Matt Dew +Date: Thu Dec 6 21:53:42 2012 -0700 + +Merge branch 'server-1.13-branch' of git://people.freedesktop.org/~whot/xserver into server-1.13-branch + +commit 79220f4390127d9971cbcf378530bf36172ef35a +Author: Daniel Martin +Date: Wed Nov 7 11:31:01 2012 +0100 + +Xi: Fix modifier swapping in XIPassiveGrabDevice + +XIPassiveGrabDevice uses a list of uint32_t as modifier sets. + +The ModifierInfo struct represents the current modifier states and is +therefor used in XIQueryPointer and various events. + +Signed-off-by: Daniel Martin +Reviewed-by: Peter Hutterer +Signed-off-by: Peter Hutterer +(cherry picked from commit aa9a9ad08b8a6e7e95de7c2bf45d93dd50f9ca87) + +commit 521f3fb566e67330a486874928a21ce201dba02b +Author: Sybren van Elderen +Date: Tue Nov 27 19:27:10 2012 +0100 + +hw/dmx: add update_desktop_dimensions() call + +The Xdmx server did not update the desktop dimensions when computing screen +origins. + +Signed-off-by: Sybren van Elderen +Reviewed-by: Peter Hutterer +Signed-off-by: Peter Hutterer +(cherry picked from commit 6e18599d691036eca6ff082c17727d9ffb926984) + +commit 73bd33b4d4e3df4a8097826695a8dbdc2fb5c920 +Author: Peter Hutterer +Date: Tue Jun 26 10:30:35 2012 +1000 + +xkb: fill in keycode and event type for slow keys enablement + +eventType is set for the type that triggered a XkbControlsNotify event. +Technically, SlowKeys is triggered by a timer which doesn't have a matching +core event type. So we used to use 0 here. + +Practically, the timer is triggered by a key press + hold and cancelled when +the key is released before the timeout expires. So we might as well set +KeyPress (keycode) in the ControlsNotify to give clients a chance to differ +between timer-triggered SlowKeys and client-triggered ones. + +This is a chance in behaviour, though I suspect with little impact. + +Signed-off-by: Peter Hutterer +Acked-by: Daniel Stone +(cherry picked from commit 2c4388a00ec308bc2d48ba751ff510cd5c1b2384) + +commit 2def985466683cf3746c03f9ac318e5941d22f86 +Author: Jasper St. Pierre +Date: Tue Nov 20 14:50:41 2012 -0500 + +cursor: Revise edge cases for the pointer moving towards barriers + +Since barriers block the invisible line between pixels, that means +that we need to explicitly check the boundaries, or else we'll have +a potential off-by-one error. This fixes issues when trying to move +down or right across a barrier and having the pointer visibly bounce. + +Signed-off-by: Jasper St. Pierre +Reviewed-by: Peter Hutterer +Signed-off-by: Peter Hutterer +(cherry picked from commit a51b2c3913fc8556f6bd1c76805d045fc424c4bb) + +commit 4a957c9e81233344da0b5b9388ca2d97eedde7d5 +Author: Peter Hutterer +Date: Thu Nov 15 14:00:57 2012 +1000 + +When resetting device idle time, reset XIAll(Master)Devices too (#56649) + +When the screen saver is forcibly deactivated, the idle time counter is +reset for all devices but not for the fake XIAllDevices and +XIAllMasterDevices. XScreenSaverQueryInfo uses XIAlldevices to fill the +"idle" field, thus returning the wrong value. + +Regression introduced in +commit 6aef209ebc2e54f5465da505a780f7b4cc273ee0 +Author: Peter Hutterer +Date: Mon Mar 12 13:51:02 2012 +1000 + +Change
xorg-server: Changes to 'ubuntu'
ChangeLog| 154 +++ Xext/saver.c |2 Xi/xipassivegrab.c |8 configure.ac |6 debian/changelog | 15 + debian/patches/230-fix-compat-output-selection.patch | 33 debian/patches/series|1 debian/serverminver |2 dix/window.c |2 hw/dmx/dmxcursor.c |2 hw/xfree86/modes/xf86Crtc.c |7 include/xkbsrv.h |1 randr/randr.c|2 xfixes/cursor.c | 12 + xkb/xkbAccessX.c |6 15 files changed, 201 insertions(+), 52 deletions(-) New commits: commit 6f0486a6c08542b3ebc8f63a0a91babbb8612088 Author: Maarten Lankhorst Date: Fri Dec 7 09:25:23 2012 +0100 Release to raring. diff --git a/debian/changelog b/debian/changelog index 6ef3fe8..8ed12d2 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -xorg-server (2:1.13.0.902-0ubuntu1) UNRELEASED; urgency=low +xorg-server (2:1.13.0.902-0ubuntu1) raring; urgency=low [ Timo Aaltonen ] * Merge from unreleased debian git. commit 24163e60f44acd0ac1bc4f38539eb31dc55a9d4c Author: Maarten Lankhorst Date: Fri Dec 7 09:17:43 2012 +0100 Bump ABI_VIDEODRV_VERSION to 13.1 xf86UpdateDesktopDimensions is newly exported for nvidia blob diff --git a/debian/changelog b/debian/changelog index a68790e..6ef3fe8 100644 --- a/debian/changelog +++ b/debian/changelog @@ -12,8 +12,10 @@ xorg-server (2:1.13.0.902-0ubuntu1) UNRELEASED; urgency=low * Dropped upstream patches: - 230-fix-compat-output-selection.patch * Merge 1.13.1.rc2 from unreleased debian git. + * Bump ABI_VIDEODRV_VERSION to 13.1 +- xf86UpdateDesktopDimensions is newly exported for nvidia blob - -- Timo Aaltonen Fri, 23 Nov 2012 10:02:42 +0200 + -- Maarten Lankhorst Fri, 07 Dec 2012 09:14:37 +0100 xorg-server (2:1.13.0.902-1) UNRELEASED; urgency=low diff --git a/debian/serverminver b/debian/serverminver index 41482e2..b6b99d6 100644 --- a/debian/serverminver +++ b/debian/serverminver @@ -1,3 +1,3 @@ 2:1.12.99.901 -ABI_VIDEODRV_VERSION:13.0 +ABI_VIDEODRV_VERSION:13.1 ABI_XINPUT_VERSION:18.0 commit 6d9e8cf38ee9e5c5647f7c4ce8929ff036d4f7e7 Author: Maarten Lankhorst Date: Fri Dec 7 09:12:39 2012 +0100 Update changelog entry. diff --git a/debian/changelog b/debian/changelog index 55e09fb..a68790e 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,20 @@ +xorg-server (2:1.13.0.902-0ubuntu1) UNRELEASED; urgency=low + + [ Timo Aaltonen ] + * Merge from unreleased debian git. + * Dropped upstream patches: +- 229_udev-fix.diff +- 231-scan-pci-after-probing-devices.patch +- 235-composite-tracking.patch +- 237-dix-set-the-device-transformation-matrix.patch + + [ Maarten Lankhorst ] + * Dropped upstream patches: +- 230-fix-compat-output-selection.patch + * Merge 1.13.1.rc2 from unreleased debian git. + + -- Timo Aaltonen Fri, 23 Nov 2012 10:02:42 +0200 + xorg-server (2:1.13.0.902-1) UNRELEASED; urgency=low [ Maarten Lankhorst ] @@ -12,17 +29,6 @@ xorg-server (2:1.13.0.902-1) UNRELEASED; urgency=low -- Robert Hooker Wed, 22 Aug 2012 11:12:17 -0400 -xorg-server (2:1.13.0.901-0ubuntu1) UNRELEASED; urgency=low - - * Merge from unreleased debian git. - * Dropped upstream patches: -- 229_udev-fix.diff -- 231-scan-pci-after-probing-devices.patch -- 235-composite-tracking.patch -- 237-dix-set-the-device-transformation-matrix.patch - - -- Timo Aaltonen Fri, 23 Nov 2012 10:02:42 +0200 - xorg-server (2:1.13.0-0ubuntu8) raring; urgency=low * Revert the change to 500_pointer_barrier_thresholds.diff, causes diff --git a/debian/patches/230-fix-compat-output-selection.patch b/debian/patches/230-fix-compat-output-selection.patch deleted file mode 100644 index 893d10e..000 --- a/debian/patches/230-fix-compat-output-selection.patch +++ /dev/null @@ -1,33 +0,0 @@ -From 37d956e3ac9513b74078882dff489f9b0a7a5a28 Mon Sep 17 00:00:00 2001 -From: Keith Packard -Date: Mon, 10 Sep 2012 01:14:20 + -Subject: xf86: fix compat output selection for no output GPUs - -This should work properly with dynamic outputs. - -Reviewed-by: Dave Airlie -Signed-off-by: Dave Airlie -diff --git a/hw/xfree86/modes/xf86Crtc.c b/hw/xfree86/modes/xf86Crtc.c -index e3eaf5f..177f7ac 100644 a/hw/xfree86/modes/xf86Crtc.c -+++ b/hw/xfree86/modes/xf86Crtc.c -@@ -66,6 +66,7 @@ xf86CrtcConfigInit(ScrnInfoPtr scrn, const xf86CrtcConfigFuncsRec * funcs) - config = xnfcalloc(1, sizeof(xf86CrtcConfigRec)); - - config->funcs = funcs; -
Bug#640499: libxvmc: please add multiarch support
On Fri, Dec 7, 2012 at 00:43:55 +0100, Carlos Alberto Lopez Perez wrote: > MultiArch support is a release goal, and the fix for this bug is > clearly not invasive nor big: > The release goal was to get rid of ia32-libs. Which is now done. Anything beyond that can, and will, wait for jessie. Cheers, Julien signature.asc Description: Digital signature
Processed: Re: Bug#695320: xorg: Brightness switches from minimum to maximum multiple times a second
Processing control commands: > reassign -1 src:linux 3.2.32-1 Bug #695320 [xorg] xorg: Brightness switches from minimum to maximum multiple times a second Bug reassigned from package 'xorg' to 'src:linux'. No longer marked as found in versions xorg/1:7.7+1. Ignoring request to alter fixed versions of bug #695320 to the same values previously set Bug #695320 [src:linux] xorg: Brightness switches from minimum to maximum multiple times a second Marked as found in versions linux/3.2.32-1. > retitle -1 disfunctional samsung backlight control on NP300E5X-A01 Bug #695320 [src:linux] xorg: Brightness switches from minimum to maximum multiple times a second Changed Bug title to 'disfunctional samsung backlight control on NP300E5X-A01' from 'xorg: Brightness switches from minimum to maximum multiple times a second' -- 695320: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=695320 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.b695320.135487392829101.transcr...@bugs.debian.org
Bug#695320: xorg: Brightness switches from minimum to maximum multiple times a second
Control: reassign -1 src:linux 3.2.32-1 Control: retitle -1 disfunctional samsung backlight control on NP300E5X-A01 On Fri, Dec 7, 2012 at 01:25:11 +0100, Kim Twain wrote: > Starting my computer (Samsung NP300E5X-A01, Intel Celeron B815 APU) the > brightness is set at its minimum; when I try to change it via my DE or via > xbacklight -set, the brightness changes almost randomly multiple times a > second, rendering the gui unusable until I kill xbacklight or I restart > gnome- > shell. > > I can however change it flawlessly via > "/sys/class/backlight/acpi_video0/brightness" > > Note that the problem isn't present in other (more updated?) distros, such > as > archlinux or fedora 17/18 > On Fri, Dec 7, 2012 at 01:42:14 +0100, Kim Twain wrote: > Reading the log, I noticed that xorg is using > "/sys/class/backlight/samsung/brightness" to set the brightness. > I tried to set the brightness via "echo -n 3 > > /sys/class/backlight/samsung/brightness" and the same problem showed up, so > this isn't an xorg problem. Sorry to have wasted your time. Should I report > again on the linux-image package? Reassigning to the kernel. Can you check which backlight driver is used on the other distros you mentioned? Also which kernel versions? Cheers, Julien signature.asc Description: Digital signature
Processed: mesa: FTBFS on ppc64: symbols marked with 'D' on powerpc64 instead
Processing commands for cont...@bugs.debian.org: > found 695067 mesa/8.0.5-3 Bug #695067 [src:mesa] mesa: FTBFS on ppc64: symbols marked with 'D' on powerpc64 instead of 'T' Marked as found in versions mesa/8.0.5-3. > thanks Stopping processing here. Please contact me if you need assistance. -- 695067: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=695067 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.c.135487666017879.transcr...@bugs.debian.org
Processed: unmerge
Processing commands for cont...@bugs.debian.org:
> unmerge 449480
Bug #449480 {Done: Julien Cristau } [xterm] some common
Chinese characters missing
Bug #408666 {Done: Julien Cristau } [xterm] uxterm: bold
attribute causes some glyphs to fail rendering
Bug #469943 {Done: Julien Cristau } [xterm] xterm: Unicode
display problems
Disconnected #449480 from all other report(s).
> --
Stopping processing here.
Please contact me if you need assistance.
--
408666: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=408666
449480: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=449480
469943: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=469943
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.c.13548769131.transcr...@bugs.debian.org
Processed: bug #449480
Processing commands for cont...@bugs.debian.org:
> tags 449480 - fixed-upstream
Bug #449480 {Done: Julien Cristau } [xterm] some common
Chinese characters missing
Removed tag(s) fixed-upstream.
> reopen 449480
Bug #449480 {Done: Julien Cristau } [xterm] some common
Chinese characters missing
'reopen' may be inappropriate when a bug has been closed with a version;
all fixed versions will be cleared, and you may need to re-add them.
Bug reopened
No longer marked as fixed in versions xterm/287-1.
> --
Stopping processing here.
Please contact me if you need assistance.
--
449480: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=449480
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.c.135487713622086.transcr...@bugs.debian.org
Processed: bug #449480
Processing commands for cont...@bugs.debian.org: > notfixed 449480 xterm/287-1 Bug #449480 [xterm] some common Chinese characters missing Ignoring request to alter fixed versions of bug #449480 to the same values previously set > -- Stopping processing here. Please contact me if you need assistance. -- 449480: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=449480 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.c.135487728224167.transcr...@bugs.debian.org
Processed: Re: Bug#695067: mesa: FTBFS on ppc64: symbols marked with 'D' on powerpc64 instead of 'T'
Processing control commands: > tag -1 moreinfo Bug #695067 [src:mesa] mesa: FTBFS on ppc64: symbols marked with 'D' on powerpc64 instead of 'T' Added tag(s) moreinfo. -- 695067: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=695067 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.b695067.135487772226836.transcr...@bugs.debian.org
Bug#695067: mesa: FTBFS on ppc64: symbols marked with 'D' on powerpc64 instead of 'T'
Control: tag -1 moreinfo On Tue, Dec 4, 2012 at 02:33:28 +0900, Hiroyuki Yamamoto wrote: > Source: mesa > Version: 8.0.5-2 > Severity: normal > Tags: patch upstream > > Hi, > > In output of nm utility, symbols are marked with 'D' on powerpc64-linux > instead of 'T'. > Here is a patch and a buildlog attached. > > http://buildd.debian-ports.org/status/package.php?p=mesa&suite=sid > Sending a 3M attachment means your mail never makes it anywhere, this is less than helpful. Also, please: - explain why nm is being different on ppc64 than everywhere else - explain why we should be building the vmware driver on ppc64 - if you think it still makes sense, send the patch upstream to mesa-...@lists.freedesktop.org Cheers, Julien signature.asc Description: Digital signature
Bug#695067: mesa: FTBFS on ppc64: symbols marked with 'D' on powerpc64 instead of 'T'
(2012-12-07 20:38 +0100), Julien Cristau wrote: >> Hi, Hi, >> In output of nm utility, symbols are marked with 'D' on powerpc64-linux >> instead of 'T'. >> Here is a patch and a buildlog attached. >> >> http://buildd.debian-ports.org/status/package.php?p=mesa&suite=sid >> > Sending a 3M attachment means your mail never makes it anywhere, this is > less than helpful. Oh, sorry, I only wanted to show that it can build satisfactorily. > Also, please: > - explain why nm is being different on ppc64 than everywhere else 32-bit PowerPC Linux (powerpc port) uses "SVR4 ABI", but 64-bit PowerPC Linux (ppc64 port) uses "64-bit PowerPC ELF ABI". http://refspecs.linuxfoundation.org/ELF/ppc64/PPC-elf64abi.html In 64-bit PowerPC ELF ABI, function descriptors are found in data section. > - explain why we should be building the vmware driver on ppc64 Do you ask me for the justification for existence of libxatracker1 package in mesa source? > - if you think it still makes sense, send the patch upstream to > mesa-...@lists.freedesktop.org Hmmm, In order to get maintainers' refereeing and judgment that this patch should be sent to upstream, I contributed to BTS. Do you say that it shoudn't be sent to upstream? Regards, -- Hiroyuki Yamamoto A75D B285 7050 4BF9 AEDA 91AC 3A10 59C6 5203 04DC -- 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/50c1fba1.2050...@gmail.com
Bug#695067: mesa: FTBFS on ppc64: symbols marked with 'D' on powerpc64 instead of 'T'
On Fri, Dec 7, 2012 at 23:22:25 +0900, Hiroyuki Yamamoto wrote: > (2012-12-07 20:38 +0100), Julien Cristau wrote: > >> Hi, > > Hi, > > >> In output of nm utility, symbols are marked with 'D' on powerpc64-linux > >> instead of 'T'. > >> Here is a patch and a buildlog attached. > >> > >> http://buildd.debian-ports.org/status/package.php?p=mesa&suite=sid > >> > > Sending a 3M attachment means your mail never makes it anywhere, this is > > less than helpful. > > Oh, sorry, I only wanted to show that it can build satisfactorily. > > > Also, please: > > - explain why nm is being different on ppc64 than everywhere else > > 32-bit PowerPC Linux (powerpc port) uses "SVR4 ABI", but 64-bit PowerPC Linux > (ppc64 port) uses "64-bit PowerPC ELF ABI". > http://refspecs.linuxfoundation.org/ELF/ppc64/PPC-elf64abi.html > > In 64-bit PowerPC ELF ABI, function descriptors are found in data section. > See, that's exactly the information should be included together with the patch. > > - explain why we should be building the vmware driver on ppc64 > > Do you ask me for the justification for existence of libxatracker1 > package in mesa source? > I guess it doesn't make much sense on non-x86, indeed. Cheers, Julien signature.asc Description: Digital signature
Bug#695067: mesa: FTBFS on ppc64: symbols marked with 'D' on powerpc64 instead of 'T'
(2012-12-08 00:20 +0100), Julien Cristau wrote: >>> - explain why we should be building the vmware driver on ppc64 >> >> Do you ask me for the justification for existence of libxatracker1 >> package in mesa source? >> > I guess it doesn't make much sense on non-x86, indeed. I think so, too, but FTBFS on ppc64 is no good. So, I don't care that maintainers decide whether this patch should be forwarded to upstream or not. Regards, -- Hiroyuki Yamamoto A75D B285 7050 4BF9 AEDA 91AC 3A10 59C6 5203 04DC -- 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/50c20e58.1040...@gmail.com
