Bug#514791: libgl1-mesa-glx: segfault calling glGenLists();
On Tue, 2009-02-10 at 22:18 +0100, Kurt Roeckx wrote:
> Package: libgl1-mesa-glx
> Version: 7.0.3-7
> Severity: important
>
> Hi,
>
> This little test program causes a segfault on amd64:
> #include
>
> int main()
> {
> glGenLists(1);
> return 0;
> }
>
> But the same thing works with the version from experimental (7.3-1).
That's purely luck; the result of calling GL functions is undefined
without a current GLX context.
--
Earthling Michel Dänzer |http://www.vmware.com
Libre software enthusiast | Debian, X and DRI developer
--
To UNSUBSCRIBE, email to debian-x-requ...@lists.debian.org
with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org
Bug#514395: LUT settings are not restored after switching to console.
On Sat, 2009-02-07 at 01:37 +0100, Kurt Roeckx wrote: > > I'm using a tool called dispwin from the argyll packages (not yet in > Debian), to change the VideoLUT settings. This all works like it should. > > My problem now is that when I switch from X to console and then back to X > those settings are removed and not restored. > > I would either like to see them stay the way they are when switching > to the console, That's not really possible; the X driver is supposed to save and restore the console hardware state unmodified. > or atleast get them restored when switching back to X. What method does dispwin use for changing the LUT settings? -- Earthling Michel Dänzer |http://www.vmware.com Libre software enthusiast | Debian, X and DRI developer -- To UNSUBSCRIBE, email to debian-x-requ...@lists.debian.org with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org
libdrm: Changes to 'ubuntu'
debian/changelog| 23
debian/control | 30
debian/libdrm-nouveau1.install |1
debian/libdrm-nouveau1.symbols | 50
debian/patches/02_add_libdrm-nouveau.patch |11470
debian/patches/03_fix_unfreed_buffers.patch | 64
debian/patches/series |3
debian/rules|2
8 files changed, 11635 insertions(+), 8 deletions(-)
New commits:
commit ee5f7cb7a175c0ec32599bae7942ccc90bb306ab
Author: Christopher James Halse Rogers
Date: Wed Feb 11 21:20:35 2009 +1100
Add populated symbols file
diff --git a/debian/changelog b/debian/changelog
index 9a5f80c..8943b71 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -11,7 +11,10 @@ libdrm (2.4.4-0ubuntu7) UNRELEASED; urgency=low
Required for libdrm-nouveau.
* debian/rules:
* debian/control:
+ * debian/libdrm-nouveau1.install
+ Add libdrm-nouveau1 and libdrm-nouveau1-dbg package
+ * debian/libdrm-nouveau1.symbols:
++ Add initial symbols file.
* debian/control:
+ Remove scary 'built from DRM snapshot' warning from long description of
libdrm-intel1{,-dbg}
diff --git a/debian/libdrm-nouveau1.symbols b/debian/libdrm-nouveau1.symbols
new file mode 100644
index 000..775e5ed
--- /dev/null
+++ b/debian/libdrm-nouveau1.symbols
@@ -0,0 +1,50 @@
+libdrm_nouveau.so.1 libdrm2 #MINVER#
+ d...@base 2.4.4
+ nouveau_bo_b...@base 2.4.4
+ nouveau_bo_emit_buf...@base 2.4.4
+ nouveau_bo_f...@base 2.4.4
+ nouveau_bo_handle_...@base 2.4.4
+ nouveau_bo_handle_...@base 2.4.4
+ nouveau_bo_i...@base 2.4.4
+ nouveau_bo_...@base 2.4.4
+ nouveau_bo_...@base 2.4.4
+ nouveau_bo_...@base 2.4.4
+ nouveau_bo_...@base 2.4.4
+ nouveau_bo_taked...@base 2.4.4
+ nouveau_bo_t...@base 2.4.4
+ nouveau_bo_un...@base 2.4.4
+ nouveau_bo_un...@base 2.4.4
+ nouveau_bo_u...@base 2.4.4
+ nouveau_bo_validate_n...@base 2.4.4
+ nouveau_channel_al...@base 2.4.4
+ nouveau_channel_f...@base 2.4.4
+ nouveau_device_cl...@base 2.4.4
+ nouveau_device_get_pa...@base 2.4.4
+ nouveau_device_o...@base 2.4.4
+ nouveau_device_open_exist...@base 2.4.4
+ nouveau_device_set_pa...@base 2.4.4
+ nouveau_dma_channel_i...@base 2.4.4
+ nouveau_dma_kick...@base 2.4.4
+ nouveau_dma_w...@base 2.4.4
+ nouveau_fence_e...@base 2.4.4
+ nouveau_fence_fl...@base 2.4.4
+ nouveau_fence_...@base 2.4.4
+ nouveau_fence_...@base 2.4.4
+ nouveau_fence_signal...@base 2.4.4
+ nouveau_fence_w...@base 2.4.4
+ nouveau_grobj_al...@base 2.4.4
+ nouveau_grobj_autob...@base 2.4.4
+ nouveau_grobj_f...@base 2.4.4
+ nouveau_grobj_...@base 2.4.4
+ nouveau_notifier_al...@base 2.4.4
+ nouveau_notifier_f...@base 2.4.4
+ nouveau_notifier_re...@base 2.4.4
+ nouveau_notifier_return_...@base 2.4.4
+ nouveau_notifier_sta...@base 2.4.4
+ nouveau_notifier_wait_sta...@base 2.4.4
+ nouveau_pushbuf_emit_re...@base 2.4.4
+ nouveau_pushbuf_fl...@base 2.4.4
+ nouveau_pushbuf_i...@base 2.4.4
+ nouveau_resource_al...@base 2.4.4
+ nouveau_resource_f...@base 2.4.4
+ nouveau_resource_i...@base 2.4.4
commit 314569bf5bd2ab0b34d43b426248222eb25b7f16
Author: Christopher James Halse Rogers
Date: Wed Feb 11 18:56:20 2009 +1100
Add patch to update nouveau_drm.h to new patchlevel
diff --git a/debian/changelog b/debian/changelog
index 5e6fd78..9a5f80c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -5,6 +5,10 @@ libdrm (2.4.4-0ubuntu7) UNRELEASED; urgency=low
+ Add commits from drm master adding a libdrm-nouveau library, and
include the latest fixes. This library is now required by the DDX
component.
+ * debian/patchs/04_update_nouveau_header
++ Update the nouveau DRM header to the new patchlevel. Pulled from
+ upstream, with the non-userspace components removed from the patch.
+ Required for libdrm-nouveau.
* debian/rules:
* debian/control:
+ Add libdrm-nouveau1 and libdrm-nouveau1-dbg package
diff --git a/debian/patches/series b/debian/patches/series
index 660ce57..300de28 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,4 @@
01_default_perms.diff
02_add_libdrm-nouveau.patch
03_fix_unfreed_buffers.patch
+04_update_nouveau_header.patch
commit 371b78f94d84d816a6b1877ac85bd34786328ee7
Author: Christopher James Halse Rogers
Date: Wed Feb 11 18:53:41 2009 +1100
Remove accidental 'expect this to be unstable' warning from long
description of libdrm-intel
diff --git a/debian/changelog b/debian/changelog
index 894e567..5e6fd78 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -6,7 +6,11 @@ libdrm (2.4.4-0ubuntu7) UNRELEASED; urgency=low
include the latest fixes. This library is now required by the DDX
component.
* debian/rules:
-+ Add libdrm-nouveau1 package
+ * debian/control:
++ Add libdrm-nouveau1 and libdrm-nouveau1-dbg package
+ * debian/control:
++ Remove scary 'built from DRM snapshot' warning from long description of
+
Bug#514844: xserver-xorg-input-synaptics: SHMConfig should default to true not false in order to support configurator programs
Package: xserver-xorg-input-synaptics Version: 0.14.7~git20070706-3 Severity: normal These days it is assumed that xorg should be useable with no configuration file, as the code will figure out the configuration for itself. If you do this on a system with a Synaptics touchpanel it will (for the most part) correctly configure the touchpanel. But if you try to use the ksynaptics, it complains that SHMConfig is not set to true and therefore the config program can not work. The default should be set so that programs like ksynaptics can operate. -- System Information: Debian Release: 5.0 APT prefers unstable APT policy: (500, 'unstable') Architecture: i386 (i686) Kernel: Linux 2.6.26-1-686 (SMP w/1 CPU core) Locale: LANG=en_GB.UTF-8, LC_CTYPE=en_GB.UTF-8 (charmap=UTF-8) Shell: /bin/sh linked to /bin/bash Versions of packages xserver-xorg-input-synaptics depends on: ii libc6 2.7-18 GNU C Library: Shared libraries ii libx11-6 2:1.1.5-2 X11 client-side library ii libxext6 2:1.0.4-1 X11 miscellaneous extension librar ii libxi62:1.1.4-1 X11 Input extension library ii xserver-xorg-core 2:1.4.2-10 Xorg X server - core server xserver-xorg-input-synaptics recommends no packages. Versions of packages xserver-xorg-input-synaptics suggests: ii ksynaptics0.3.3-2Synaptics TouchPad configuration t -- no debconf information -- To UNSUBSCRIBE, email to debian-x-requ...@lists.debian.org with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org
Bug#514846: UK AT keyboard does not work on IBM compatible computers
Package: xkb-data Severity: important The xkb-data package renders the keyboard inoperable from with an X windows session. The keyboard behaves fine from the console outside of X. When X is running, if a letter is typed into the x terminal window, the letter appears in the terminal, but the scroll lock light comes on. When another letter is typed, the scroll lock light goes out, and either the previous letter typed is deleted, or the key behaves as an enter key, entering the previously typed single letter as a shell command in the x terminal window. If a letter key is pressed again, the cycle repeats, with the scroll lock lighting up again, and a single letter appearing, followed by the scroll lock going out, and again a deletion or false enter. This problem was observed on an IBM compatible PC, using a traditional 101 key United Kingdom AT keyboard connected to the keyboard input connector on the back of the computer (In this case via an AT to PS/2 adapter cable). The keyboard works fine from Debian Etch, and works ok from the console in Debian Lenny (apart from an insert key bug, which occasionally requires the insert key to be pressed in order to operate the cursor keys from the shell command line.) -- System Information: Debian Release: 5.0 APT prefers testing APT policy: (990, 'testing'), (500, 'unstable'), (1, 'experimental') Architecture: i386 (i686) Kernel: Linux 2.6.26-1-486 Locale: LANG=en_GB, LC_CTYPE=en_GB (charmap=ISO-8859-1) Shell: /bin/sh linked to /bin/dash -- To UNSUBSCRIBE, email to debian-x-requ...@lists.debian.org with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org
Bug#514840: (Xorg on HP dc7900)
Following up on myself, here is another working xorg.conf, minimally changed from the autogenerated one. I only changed the "Device" section. # xorg.conf (X.Org X Window System server configuration file) # # This file was generated by dexconf, the Debian X Configuration tool, using # values from the debconf database. # # Edit this file with caution, and see the xorg.conf manual page. # (Type "man xorg.conf" at the shell prompt.) # # This file is automatically updated on xserver-xorg package upgrades *only* # if it has not been modified since the last upgrade of the xserver-xorg # package. # # If you have edited this file but would like it to be automatically updated # again, run the following command: # sudo dpkg-reconfigure -phigh xserver-xorg Section "InputDevice" Identifier "Generic Keyboard" Driver "kbd" Option "XkbRules" "xorg" Option "XkbModel" "pc105" Option "XkbLayout" "se" Option "XkbVariant""nodeadkeys" EndSection Section "InputDevice" Identifier "Configured Mouse" Driver "mouse" EndSection Section "Device" Identifier "Intel 4 Series Chipset IGC" Driver "intel" EndSection Section "Monitor" Identifier "Configured Monitor" EndSection Section "Screen" Identifier "Default Screen" Monitor "Configured Monitor" EndSection
Bug#514875: xterm: please make "eightBitInput: true" by default
Package: xterm Version: 241-1 Severity: normal Hi, The Euro character doesn't display unless eightBitInput is true. Please consider making it the default. It could be very confusing for newbies having set up euro support properly for all apps, that xterm requires a special switch (unlike other apps). -- System Information: Debian Release: 5.0 APT prefers unstable APT policy: (500, 'unstable'), (500, 'testing'), (500, 'stable'), (499, 'experimental') Architecture: amd64 (x86_64) Kernel: Linux 2.6.28.3-1-pyrrhus64 (SMP w/4 CPU cores) Locale: LANG=en_CA, lc_ctype=fr...@euro (charmap=ISO-8859-15) Shell: /bin/sh linked to /bin/bash Versions of packages xterm depends on: ii libc6 2.7-18 GNU C Library: Shared libraries ii libfontconfig12.6.0-3generic font configuration library ii libice6 2:1.0.4-1 X11 Inter-Client Exchange library ii libncurses5 5.7+20090124-1 shared libraries for terminal hand ii libx11-6 2:1.1.5-2 X11 client-side library ii libxaw7 2:1.0.4-2 X11 Athena Widget library ii libxft2 2.1.12-3 FreeType-based font drawing librar ii libxmu6 2:1.0.4-1 X11 miscellaneous utility library ii libxt61:1.0.5-3 X11 toolkit intrinsics library ii xbitmaps 1.0.1-2Base X bitmaps Versions of packages xterm recommends: ii x11-utils 7.3+2+nmu1 X11 utilities Versions of packages xterm suggests: pn xfonts-cyrillic(no description available) -- no debconf information -- http://www.critikart.net -- To UNSUBSCRIBE, email to debian-x-requ...@lists.debian.org with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org
Bug#514395: LUT settings are not restored after switching to console.
On Wed, Feb 11, 2009 at 10:30:30AM +0100, Michel Dänzer wrote:
> On Sat, 2009-02-07 at 01:37 +0100, Kurt Roeckx wrote:
> >
> > I'm using a tool called dispwin from the argyll packages (not yet in
> > Debian), to change the VideoLUT settings. This all works like it should.
> >
> > My problem now is that when I switch from X to console and then back to X
> > those settings are removed and not restored.
> >
> > I would either like to see them stay the way they are when switching
> > to the console,
>
> That's not really possible; the X driver is supposed to save and restore
> the console hardware state unmodified.
>
> > or atleast get them restored when switching back to X.
>
> What method does dispwin use for changing the LUT settings?
It uses this for randr 1.2:
XRRCrtcGamma *crtcgam;
debugr("Setting gamma using Randr 1.2\n");
if ((crtcgam = XRRAllocGamma(r->nent)) == NULL) {
debugr(" XRRAllocGamma failed\n");
return 1;
}
for (i = 0; i < r->nent; i++) {
crtcgam->red[i] = vals[0][i];
crtcgam->green[i] = vals[1][i];
crtcgam->blue[i] = vals[2][i];
}
XRRSetCrtcGamma(p->mydisplay, p->crtc, crtcgam);
XSync(p->mydisplay, False); /* Flush the change out
*/
XRRFreeGamma(crtcgam);
Else it would use XF86VidModeSetGammaRamp()
Kurt
--
To UNSUBSCRIBE, email to debian-x-requ...@lists.debian.org
with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org
Bug#514395: LUT settings are not restored after switching to console.
On Wed, 2009-02-11 at 18:35 +0100, Kurt Roeckx wrote:
> >
> > > or atleast get them restored when switching back to X.
> >
> > What method does dispwin use for changing the LUT settings?
>
> It uses this for randr 1.2:
> XRRCrtcGamma *crtcgam;
>
> debugr("Setting gamma using Randr 1.2\n");
>
> if ((crtcgam = XRRAllocGamma(r->nent)) == NULL) {
> debugr(" XRRAllocGamma failed\n");
> return 1;
> }
>
> for (i = 0; i < r->nent; i++) {
> crtcgam->red[i] = vals[0][i];
> crtcgam->green[i] = vals[1][i];
> crtcgam->blue[i] = vals[2][i];
> }
>
> XRRSetCrtcGamma(p->mydisplay, p->crtc, crtcgam);
> XSync(p->mydisplay, False); /* Flush the change
> out */
>
> XRRFreeGamma(crtcgam);
>
> Else it would use XF86VidModeSetGammaRamp()
At least with RandR 1.2, I suspect this could be an issue in the X
server rather than the driver.
--
Earthling Michel Dänzer |http://www.vmware.com
Libre software enthusiast | Debian, X and DRI developer
--
To UNSUBSCRIBE, email to debian-x-requ...@lists.debian.org
with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org
Bug#514791: libgl1-mesa-glx: segfault calling glGenLists();
On Wed, Feb 11, 2009 at 08:55:44AM +0100, Michel Dänzer wrote:
> On Tue, 2009-02-10 at 22:18 +0100, Kurt Roeckx wrote:
> > Package: libgl1-mesa-glx
> > Version: 7.0.3-7
> > Severity: important
> >
> > Hi,
> >
> > This little test program causes a segfault on amd64:
> > #include
> >
> > int main()
> > {
> > glGenLists(1);
> > return 0;
> > }
> >
> > But the same thing works with the version from experimental (7.3-1).
>
> That's purely luck; the result of calling GL functions is undefined
> without a current GLX context.
I was trying to use iccexamine which you can get at:
http://sourceforge.net/project/showfiles.php?group_id=177017&package_id=247078
But it has a few depedencies that aren't available Debian.
I have no idea how GLX works, I've never looked at it before.
iccexamine works with the versions from experimental and segfaults
with the version from testing/unstable.
Kurt
--
To UNSUBSCRIBE, email to debian-x-requ...@lists.debian.org
with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org
Bug#514395: LUT settings are not restored after switching to console.
On Wed, Feb 11, 2009 at 06:55:15PM +0100, Michel D?nzer wrote:
> On Wed, 2009-02-11 at 18:35 +0100, Kurt Roeckx wrote:
> > >
> > > > or atleast get them restored when switching back to X.
> > >
> > > What method does dispwin use for changing the LUT settings?
> >
> > It uses this for randr 1.2:
> > XRRCrtcGamma *crtcgam;
> >
> > debugr("Setting gamma using Randr 1.2\n");
> >
> > if ((crtcgam = XRRAllocGamma(r->nent)) == NULL) {
> > debugr(" XRRAllocGamma failed\n");
> > return 1;
> > }
> >
> > for (i = 0; i < r->nent; i++) {
> > crtcgam->red[i] = vals[0][i];
> > crtcgam->green[i] = vals[1][i];
> > crtcgam->blue[i] = vals[2][i];
> > }
> >
> > XRRSetCrtcGamma(p->mydisplay, p->crtc, crtcgam);
> > XSync(p->mydisplay, False); /* Flush the change
> > out */
> >
> > XRRFreeGamma(crtcgam);
> >
> > Else it would use XF86VidModeSetGammaRamp()
>
> At least with RandR 1.2, I suspect this could be an issue in the X
> server rather than the driver.
I've tried using xgamma (from x11-xserver-utils 7.3+5) and then the setting
are kept. xgamma uses the XF86VidModeSetGamma() call.
I've rebuild dispwin so it uses the XF86VidModeSetGammaRamp() call instead
and then the settings are also kept.
Kurt
--
To UNSUBSCRIBE, email to debian-x-requ...@lists.debian.org
with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org
libdrm: Changes to 'ubuntu'
debian/patches/04_update_nouveau_header.patch | 174 ++
1 file changed, 174 insertions(+)
New commits:
commit 9f4e58ac7f1130c20d4927a873d6a2fdc8fe7126
Author: Christopher James Halse Rogers
Date: Thu Feb 12 08:21:48 2009 +1100
BAH! Actually commit 04_update_nouveau_header.patch
diff --git a/debian/patches/04_update_nouveau_header.patch
b/debian/patches/04_update_nouveau_header.patch
new file mode 100644
index 000..eee110b
--- /dev/null
+++ b/debian/patches/04_update_nouveau_header.patch
@@ -0,0 +1,174 @@
+From cb85630c02ddb46f168064befb2296d46b69f57a Mon Sep 17 00:00:00 2001
+From: Ben Skeggs
+Date: Fri, 30 Jan 2009 01:18:54 +
+Subject: nouveau: bring in new mm api definitions, without the actual mm code
+
+Use of the new bits is guarded with a mm_enabled=0 hardcode.
+---
+diff --git a/shared-core/nouveau_drm.h b/shared-core/nouveau_drm.h
+index a99c615..4147f35 100644
+--- a/shared-core/nouveau_drm.h
b/shared-core/nouveau_drm.h
+@@ -25,13 +25,26 @@
+ #ifndef __NOUVEAU_DRM_H__
+ #define __NOUVEAU_DRM_H__
+
+-#define NOUVEAU_DRM_HEADER_PATCHLEVEL 11
++#define NOUVEAU_DRM_HEADER_PATCHLEVEL 12
+
+ struct drm_nouveau_channel_alloc {
+ uint32_t fb_ctxdma_handle;
+ uint32_t tt_ctxdma_handle;
+
+ int channel;
++
++ /* Notifier memory */
++ drm_handle_t notifier;
++ int notifier_size;
++
++ /* DRM-enforced subchannel assignments */
++ struct {
++ uint32_t handle;
++ uint32_t grclass;
++ } subchan[8];
++ uint32_t nr_subchan;
++
++/* !MM_ENABLED ONLY */
+ uint32_t put_base;
+ /* FIFO control regs */
+ drm_handle_t ctrl;
+@@ -39,9 +52,6 @@ struct drm_nouveau_channel_alloc {
+ /* DMA command buffer */
+ drm_handle_t cmdbuf;
+ int cmdbuf_size;
+- /* Notifier memory */
+- drm_handle_t notifier;
+- int notifier_size;
+ };
+
+ struct drm_nouveau_channel_free {
+@@ -126,6 +136,8 @@ struct drm_nouveau_mem_tile {
+ #define NOUVEAU_GETPARAM_AGP_SIZE9
+ #define NOUVEAU_GETPARAM_PCI_PHYSICAL10
+ #define NOUVEAU_GETPARAM_CHIPSET_ID 11
++#define NOUVEAU_GETPARAM_MM_ENABLED 12
++#define NOUVEAU_GETPARAM_VM_VRAM_BASE13
+ struct drm_nouveau_getparam {
+ uint64_t param;
+ uint64_t value;
+@@ -138,6 +150,100 @@ struct drm_nouveau_setparam {
+ uint64_t value;
+ };
+
++#define NOUVEAU_GEM_DOMAIN_CPU (1 << 0)
++#define NOUVEAU_GEM_DOMAIN_VRAM (1 << 1)
++#define NOUVEAU_GEM_DOMAIN_GART (1 << 2)
++#define NOUVEAU_GEM_DOMAIN_NOMAP (1 << 3)
++#define NOUVEAU_GEM_DOMAIN_TILE (1 << 30)
++#define NOUVEAU_GEM_DOMAIN_TILE_ZETA (1 << 31)
++
++struct drm_nouveau_gem_new {
++ uint64_t size;
++ uint32_t channel_hint;
++ uint32_t align;
++ uint32_t handle;
++ uint32_t domain;
++ uint32_t offset;
++};
++
++struct drm_nouveau_gem_pushbuf_bo {
++ uint64_t user_priv;
++ uint32_t handle;
++ uint32_t read_domains;
++ uint32_t write_domains;
++ uint32_t valid_domains;
++ uint32_t presumed_ok;
++ uint32_t presumed_domain;
++ uint64_t presumed_offset;
++};
++
++#define NOUVEAU_GEM_RELOC_LOW (1 << 0)
++#define NOUVEAU_GEM_RELOC_HIGH (1 << 1)
++#define NOUVEAU_GEM_RELOC_OR (1 << 2)
++struct drm_nouveau_gem_pushbuf_reloc {
++ uint32_t bo_index;
++ uint32_t reloc_index;
++ uint32_t flags;
++ uint32_t data;
++ uint32_t vor;
++ uint32_t tor;
++};
++
++#define NOUVEAU_GEM_MAX_BUFFERS 1024
++#define NOUVEAU_GEM_MAX_RELOCS 1024
++
++struct drm_nouveau_gem_pushbuf {
++ uint32_t channel;
++ uint32_t nr_dwords;
++ uint32_t nr_buffers;
++ uint32_t nr_relocs;
++ uint64_t dwords;
++ uint64_t buffers;
++ uint64_t relocs;
++};
++
++struct drm_nouveau_gem_pushbuf_call {
++ uint32_t channel;
++ uint32_t handle;
++ uint32_t offset;
++ uint32_t nr_buffers;
++ uint32_t nr_relocs;
++ uint32_t pad0;
++ uint64_t buffers;
++ uint64_t relocs;
++};
++
++struct drm_nouveau_gem_pin {
++ uint32_t handle;
++ uint32_t domain;
++ uint64_t offset;
++};
++
++struct drm_nouveau_gem_unpin {
++ uint32_t handle;
++};
++
++struct drm_nouveau_gem_mmap {
++ uint32_t handle;
++ uint32_t pad;
++ uint64_t vaddr;
++};
++
++struct drm_nouveau_gem_cpu_prep {
++ uint32_t handle;
++};
++
++struct drm_nouveau_gem_cpu_fini {
++ uint32_t handle;
++};
++
++struct drm_nouveau_gem_tile {
++ uint32_t handle;
++ uint32_t delta;
++ uint32_t size;
++ uint32_t flags;
++};
++
+ enum nouveau_card_type {
+ NV_UNKNOWN =0,
+ NV_04 =4,
+@@ -180,5 +286,14 @@ struct drm_nouveau_sarea {
+ #define DRM_NOUVEAU_MEM_TILE 0x0a
+ #define DRM_NOUVEAU_SUSPEND0x0b
+ #define DRM_NOUVEAU_RESUME 0x0c
++#define DRM_NOUVEAU_GEM_NEW0x40
++#define
Bug#514922: xinit: startx should pass error code from xinit
Package: xinit Version: 1.0.9-2 The following command ends up showing "0" for $? regardless of whether or not startx actually succeeded: startx; echo $? Within the startx script, xinit's return code may be 1, but the commands after the xinit run clobber $?. It should really be passed up to the user. I'd suggest the attached patch. Let me know if I should propose this upstream, too.. --- /usr/bin/startx.orig 2009-02-11 16:39:23.0 -0500 +++ /usr/bin/startx 2009-02-11 16:40:10.0 -0500 @@ -188,6 +188,7 @@ xinit $client $clientargs -- $server $display $serverargs +retval=$? if [ x"$enable_xauth" = x1 ] ; then @@ -207,9 +208,5 @@ - - - - - +exit $retval
Bug#514922: xinit: startx should pass error code from xinit
Hrm, after looking at the source package.. This patch would probably be more useful. >From a51fc675ebffae0e55dd65f2453b4b7615882f43 Mon Sep 17 00:00:00 2001 From: Andres Salomon Date: Wed, 11 Feb 2009 17:02:05 -0500 Subject: [PATCH] startx: use the same exit code that xinit exits with Signed-off-by: Andres Salomon --- startx.cpp |4 1 files changed, 4 insertions(+), 0 deletions(-) diff --git a/startx.cpp b/startx.cpp index 9266341..753f470 100644 --- a/startx.cpp +++ b/startx.cpp @@ -303,6 +303,7 @@ fi #else XINIT $client $clientargs -- $server $display $serverargs #endif +retval=$? if [ x"$enable_xauth" = x1 ] ; then if [ x"$removelist" != x ]; then @@ -330,3 +331,6 @@ screenrestore #if defined(sun) kbd_mode -a #endif + +exit $retval + -- 1.5.6.5
libdrm: Changes to 'ubuntu'
debian/changelog |3 +++
debian/libdrm-dev.install |2 ++
2 files changed, 5 insertions(+)
New commits:
commit eed39a160b13198866b6e73e7610d4e4b3f4bdef
Author: Christopher James Halse Rogers
Date: Thu Feb 12 09:56:59 2009 +1100
nouveau_drmif.h is part of the userspace headers. Include it in libdrm-dev
diff --git a/debian/libdrm-dev.install b/debian/libdrm-dev.install
index 54a927a..076ed9c 100644
--- a/debian/libdrm-dev.install
+++ b/debian/libdrm-dev.install
@@ -2,6 +2,7 @@ usr/include/nouveau/*
usr/include/drm/drm_mode.h
usr/include/drm/mach64_drm.h
usr/include/drm/nouveau_drm.h
+usr/include/drm/nouveau_drmif.h
usr/include/intel_bufmgr.h
usr/include/xf86drm.h
usr/include/xf86drmMode.h
commit b1953800960b15881dd6b2a70356c17c8389e82a
Author: Christopher James Halse Rogers
Date: Thu Feb 12 09:44:38 2009 +1100
Install the libdrm-nouveau headers in libdrm-dev
The DDX needs them to build, and the kernel's not going to be shipping them
anytime soon
diff --git a/debian/changelog b/debian/changelog
index 8943b71..8bac015 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -18,6 +18,9 @@ libdrm (2.4.4-0ubuntu7) UNRELEASED; urgency=low
* debian/control:
+ Remove scary 'built from DRM snapshot' warning from long description of
libdrm-intel1{,-dbg}
+ * debian/libdrm-dev.install:
++ Also install the libdrm-nouveau headers; these aren't going to be shipped
+ by the kernel any time soon.
-- Christopher James Halse Rogers Wed, 11 Feb 2009
18:12:41 +1100
diff --git a/debian/libdrm-dev.install b/debian/libdrm-dev.install
index e0a6e8d..54a927a 100644
--- a/debian/libdrm-dev.install
+++ b/debian/libdrm-dev.install
@@ -1,3 +1,4 @@
+usr/include/nouveau/*
usr/include/drm/drm_mode.h
usr/include/drm/mach64_drm.h
usr/include/drm/nouveau_drm.h
--
To UNSUBSCRIBE, email to debian-x-requ...@lists.debian.org
with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org
libdrm: Changes to 'ubuntu'
debian/changelog |4 +++- debian/copyright | 23 +++ 2 files changed, 26 insertions(+), 1 deletion(-) New commits: commit 2efeaa933a66bf82941889d65826ac3dbd4d9346 Author: Christopher James Halse Rogers Date: Thu Feb 12 10:41:23 2009 +1100 Add some copyright love diff --git a/debian/changelog b/debian/changelog index 8bac015..0152a06 100644 --- a/debian/changelog +++ b/debian/changelog @@ -21,8 +21,10 @@ libdrm (2.4.4-0ubuntu7) UNRELEASED; urgency=low * debian/libdrm-dev.install: + Also install the libdrm-nouveau headers; these aren't going to be shipped by the kernel any time soon. + * debian/copyright: ++ Update to include new files from add_libdrm-nouveau.patch - -- Christopher James Halse Rogers Wed, 11 Feb 2009 18:12:41 +1100 + -- Christopher James Halse Rogers Thu, 12 Feb 2009 10:40:22 +1100 libdrm (2.4.4-0ubuntu6) jaunty; urgency=low diff --git a/debian/copyright b/debian/copyright index 60c5785..807538a 100644 --- a/debian/copyright +++ b/debian/copyright @@ -56,3 +56,26 @@ License: WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + + + +Files: debian/patches/02_add_libdrm-nouveau.patch +Copyright: © 2007-2008 Nouveau Project +License: BSD + Permission is hereby granted, free of charge, to any person obtaining a + copy of this software and associated documentation files (the "Software"), + to deal in the Software without restriction, including without limitation + the rights to use, copy, modify, merge, publish, distribute, sublicense, + and/or sell copies of the Software, and to permit persons to whom the + Software is furnished to do so, subject to the following conditions: + . + The above copyright notice and this permission notice shall be included in + all copies or substantial portions of the Software. + . + THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL + THE AUTHORS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, + WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF + OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE + SOFTWARE. -- To UNSUBSCRIBE, email to debian-x-requ...@lists.debian.org with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org
