Bug#671870: upcoming KMS support on GNU/kFreeBSD
On Mon, 7 May 2012, Benjamin Kaduk wrote: On Mon, 7 May 2012, Robert Millan wrote: Package: xserver-xorg-video-intel Severity: wishlist User: debian-...@lists.debian.org Usertags: kfreebsd It seems that KMS support is being integrated into kFreeBSD in upstream: http://www.phoronix.com/scan.php?page=news_item&px=MTA5MTc and will be present in 9.1 and 10.0. As for userland it should be possible to get a working xserver-xorg-video-intel now, possibly with some patching. I think the phoronix article is incorrect, in that KMS support is not in FreeBSD mainline yet. The patches that are available should work equally well on mainline and the stable/9 branch at this point, though. FreeBSD svn r235859 seems to have connected the KMS support to the build. -Ben Kaduk -- 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/alpine.gso.1.10.1205231710280.18...@multics.mit.edu
Re: xserver-xorg-video-nouveau: Changes to 'debian-unstable'
Hey, Op 23-05-12 21:09, Sven Joachim schreef: > On 2012-05-23 20:47 +0200, Maarten Lankhorst wrote: > >> Op 23-05-12 17:34, Sven Joachim schreef: >>> On 2012-05-23 10:31 +0200, Maarten Lankhorst wrote: >>> commit c20b687c6f92abb63eb019c1778cb5b465ac1b57 Author: Maarten Lankhorst Date: Wed May 23 10:08:34 2012 +0200 Add 02-drm-nouveau-newabi.patch to build with old libdrm >>> This does not really describe the patch accurately, rather the >>> new libdrm_nouveau is pulled into the source tree and the driver >>> ges statically linked with it. >>> +awful hack to remove dependency on libdrm_nouveau >>> Awful hack indeed, and it does not work for me. See the attached log >>> file, where the driver fails to initialize acceleration and the X server >>> crashes. >>> >> The failing line seems to be this: >> >> (EE) NOUVEAU(0): Failed to allocate scratch buffer: -22 >> >> aka EINVAL >> >> Is there anything in dmesg that indicates where it comes from? > No. The message only appears once in the driver's source, though; so I > conclude that nouveau_bo_new() must have returned 0 and nouveau_bo_map() > returned -EINVAL at the beginning of NVAccelCommonInit(). > Nah, both could have failed. It would be interesting to know which of the 2 failed, and where. 3 probable candidate calls that would fail: drmCommandWriteRead in abi16_bo_init called from nouveau_bo_new mmap in nouveau_bo_map drmCommandWrite in nouveau_bo_wait called from bo_map. ~Maarten -- 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/4fbd38c8@canonical.com
Re: xserver-xorg-video-nouveau: Changes to 'debian-unstable'
On 2012-05-23 20:47 +0200, Maarten Lankhorst wrote: > Op 23-05-12 17:34, Sven Joachim schreef: >> On 2012-05-23 10:31 +0200, Maarten Lankhorst wrote: >> >>> commit c20b687c6f92abb63eb019c1778cb5b465ac1b57 >>> Author: Maarten Lankhorst >>> Date: Wed May 23 10:08:34 2012 +0200 >>> >>> Add 02-drm-nouveau-newabi.patch to build with old libdrm >> This does not really describe the patch accurately, rather the >> new libdrm_nouveau is pulled into the source tree and the driver >> ges statically linked with it. >> >>> +awful hack to remove dependency on libdrm_nouveau >> Awful hack indeed, and it does not work for me. See the attached log >> file, where the driver fails to initialize acceleration and the X server >> crashes. >> > The failing line seems to be this: > > (EE) NOUVEAU(0): Failed to allocate scratch buffer: -22 > > aka EINVAL > > Is there anything in dmesg that indicates where it comes from? No. The message only appears once in the driver's source, though; so I conclude that nouveau_bo_new() must have returned 0 and nouveau_bo_map() returned -EINVAL at the beginning of NVAccelCommonInit(). Cheers, Sven -- 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/87ipfmpve5@turtle.gmx.de
Processed: Re: xfonts-100dpi: fonts not available until X restarted
Processing commands for cont...@bugs.debian.org:
> reopen 673170
Bug #673170 {Done: Julien Cristau } [xfs] xfonts-100dpi:
fonts not available until X restarted
Bug reopened
Ignoring request to alter fixed versions of bug #673170 to the same values
previously set
>
End of message, stopping processing here.
Please contact me if you need assistance.
--
673170: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=673170
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.133779889910516.transcr...@bugs.debian.org
Re: xserver-xorg-video-nouveau: Changes to 'debian-unstable'
Hey Sven, Op 23-05-12 17:34, Sven Joachim schreef: > On 2012-05-23 10:31 +0200, Maarten Lankhorst wrote: > >> commit c20b687c6f92abb63eb019c1778cb5b465ac1b57 >> Author: Maarten Lankhorst >> Date: Wed May 23 10:08:34 2012 +0200 >> >> Add 02-drm-nouveau-newabi.patch to build with old libdrm > This does not really describe the patch accurately, rather the > new libdrm_nouveau is pulled into the source tree and the driver > ges statically linked with it. > >> +awful hack to remove dependency on libdrm_nouveau > Awful hack indeed, and it does not work for me. See the attached log > file, where the driver fails to initialize acceleration and the X server > crashes. > The failing line seems to be this: (EE) NOUVEAU(0): Failed to allocate scratch buffer: -22 aka EINVAL Is there anything in dmesg that indicates where it comes from? ~Maarten -- 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/4fbd30c5.6060...@canonical.com
Processed: Re: xfonts-100dpi: fonts not available until X restarted
Processing commands for cont...@bugs.debian.org:
> severity 673170 wishlist
Bug #673170 {Done: Julien Cristau } [xfonts-utils]
xfonts-100dpi: fonts not available until X restarted
Severity set to 'wishlist' from 'normal'
> reassign 673170 xfs 1:1.0.8-7
Bug #673170 {Done: Julien Cristau } [xfonts-utils]
xfonts-100dpi: fonts not available until X restarted
Bug reassigned from package 'xfonts-utils' to 'xfs'.
No longer marked as found in versions xfonts-utils/1:7.7~1.
Ignoring request to alter fixed versions of bug #673170 to the same values
previously set
Bug #673170 {Done: Julien Cristau } [xfs] xfonts-100dpi:
fonts not available until X restarted
Marked as found in versions xfs/1:1.0.8-7.
> tags 673170 + upstream
Bug #673170 {Done: Julien Cristau } [xfs] xfonts-100dpi:
fonts not available until X restarted
Added tag(s) upstream.
> quit
Stopping processing here.
Please contact me if you need assistance.
--
673170: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=673170
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.13377983748102.transcr...@bugs.debian.org
Bug#673170: xfonts-100dpi: fonts not available until X restarted
severity 673170 wishlist reassign 673170 xfs 1:1.0.8-7 tags 673170 + upstream quit Julien Cristau wrote: > One way to "fix" it would be to have X / xfs watch its fontpath with > inotify or similar and automatically refresh things. Nobody cares > enough about core fonts to implement that. Thanks. Not sure if that's a good idea or not, but it's a place to start. Assigning to xfs. > I don't see any way package maintainer scripts can be involved in a > "fix". I think using "xset fp rehash" to at least take care of the case where one is updating with DISPLAY set to an appropriate X server would work reasonably well as a workaround. That wouldn't help remote upgrades of desktop machines or large multiseat installations, of course. Ciao, Jonathan -- 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/20120523183917.GL21608@burratino
Bug#673170: xfonts-100dpi: fonts not available until X restarted
On Tue, May 22, 2012 at 02:49:35 -0500, Jonathan Nieder wrote: > That would be a reason not to package xfonts-100dpi at all, right? > It'll probably die eventually, yes. > I was using xmessage and xlsfonts to debug. The actual affected > program was xvile. I can imagine users running into this problem with > xterm as well. > > Should I reassign this to xfonts-100dpi where it can be ignored until > someone has time for it, or to debhelper (dh_installfonts) which is > probably the right place to fix it? > One way to "fix" it would be to have X / xfs watch its fontpath with inotify or similar and automatically refresh things. Nobody cares enough about core fonts to implement that. I don't see any way package maintainer scripts can be involved in a "fix". Cheers, Julien -- 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/20120523181131.go31...@radis.cristau.org
Bug#673233: mesa: no longer builds libglw1-mesa
On 2012-05-17 14:28 +0200, Sven Joachim wrote: > On 2012-05-17 11:15 +0200, Cyril Brulebois wrote: > >> Sven Joachim (17/05/2012): >>> If nobody else wants to do it, I volunteer to prepare such a snapshot >>> in order to help getting mesa 8.0.x into wheezy, but I'm not going to >>> maintain glw since I don't use it. >> >> That would be appreciated. > > An initial packaging attempt can be seen at > http://anonscm.debian.org/gitweb/?p=users/joachim-guest/glw.git. Meanwhile, upstream bumped the version to 8.0.0 and released[1] a tarball; I have merged that into the git repository above and created a debian/watch file so that uscan can download that tarball for you. >> It would be nice if the maintainers of those packages would step up to >> maintain the bits they need. Any volunteers? Cheers, Sven 1. http://lists.freedesktop.org/archives/mesa-announce/2012-May/38.html -- 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/87vcjmq2bb@turtle.gmx.de
Re: xserver-xorg-video-nouveau: Changes to 'debian-unstable'
On 2012-05-23 10:31 +0200, Maarten Lankhorst wrote: > commit c20b687c6f92abb63eb019c1778cb5b465ac1b57 > Author: Maarten Lankhorst > Date: Wed May 23 10:08:34 2012 +0200 > > Add 02-drm-nouveau-newabi.patch to build with old libdrm This does not really describe the patch accurately, rather the new libdrm_nouveau is pulled into the source tree and the driver ges statically linked with it. > +awful hack to remove dependency on libdrm_nouveau Awful hack indeed, and it does not work for me. See the attached log file, where the driver fails to initialize acceleration and the X server crashes. Cheers, Sven [ 10309.498] X.Org X Server 1.12.1.902 (1.12.2 RC 2) Release Date: 2012-05-19 [ 10309.498] X Protocol Version 11, Revision 0 [ 10309.498] Build Operating System: Linux 2.6.32-5-686-bigmem i686 Debian [ 10309.498] Current Operating System: Linux turtle 3.4.0-nouveau #1 SMP Mon May 21 08:41:10 CEST 2012 x86_64 [ 10309.498] Kernel command line: BOOT_IMAGE=/vmlinuz-3.4.0-nouveau root=/dev/sda6 ro reboot=pci acpi_enforce_resources=lax quiet [ 10309.498] Build Date: 20 May 2012 10:23:38AM [ 10309.498] xorg-server 2:1.12.1.902-1 (Cyril Brulebois ) [ 10309.498] Current version of pixman: 0.24.4 [ 10309.498]Before reporting problems, check http://wiki.x.org to make sure that you have the latest version. [ 10309.498] Markers: (--) probed, (**) from config file, (==) default setting, (++) from command line, (!!) notice, (II) informational, (WW) warning, (EE) error, (NI) not implemented, (??) unknown. [ 10309.498] (==) Log file: "/var/log/Xorg.0.log", Time: Wed May 23 16:58:17 2012 [ 10309.499] (==) Using config file: "/etc/X11/xorg.conf" [ 10309.499] (==) Using system config directory "/usr/share/X11/xorg.conf.d" [ 10309.499] (==) No Layout section. Using the first Screen section. [ 10309.499] (==) No screen section available. Using defaults. [ 10309.499] (**) |-->Screen "Default Screen Section" (0) [ 10309.499] (**) | |-->Monitor "" [ 10309.499] (==) No device specified for screen "Default Screen Section". Using the first device section listed. [ 10309.499] (**) | |-->Device "GeForce 8500 GT" [ 10309.499] (==) No monitor specified for screen "Default Screen Section". Using a default monitor configuration. [ 10309.499] (==) Automatically adding devices [ 10309.499] (==) Automatically enabling devices [ 10309.499] (==) FontPath set to: /usr/share/fonts/X11/misc, /usr/share/fonts/X11/cyrillic, /usr/share/fonts/X11/100dpi/:unscaled, /usr/share/fonts/X11/75dpi/:unscaled, /usr/share/fonts/X11/Type1, /usr/share/fonts/X11/100dpi, /usr/share/fonts/X11/75dpi, /var/lib/defoma/x-ttcidfont-conf.d/dirs/TrueType, built-ins [ 10309.499] (==) ModulePath set to "/usr/lib/xorg/modules" [ 10309.499] (II) The server relies on udev to provide the list of input devices. If no devices become available, reconfigure udev or disable AutoAddDevices. [ 10309.499] (II) Loader magic: 0xf773d5a0 [ 10309.499] (II) Module ABI versions: [ 10309.499]X.Org ANSI C Emulation: 0.4 [ 10309.499]X.Org Video Driver: 12.0 [ 10309.499]X.Org XInput driver : 16.0 [ 10309.499]X.Org Server Extension : 6.0 [ 10309.500] (--) PCI:*(0:1:0:0) 10de:0421:1682:230b rev 161, Mem @ 0xfa00/16777216, 0xd000/268435456, 0xf800/33554432, I/O @ 0xbf00/128, BIOS @ 0x/131072 [ 10309.500] (II) Open ACPI successful (/var/run/acpid.socket) [ 10309.500] (II) LoadModule: "extmod" [ 10309.500] (II) Loading /usr/lib/xorg/modules/extensions/libextmod.so [ 10309.500] (II) Module extmod: vendor="X.Org Foundation" [ 10309.500]compiled for 1.12.1.902, module version = 1.0.0 [ 10309.500]Module class: X.Org Server Extension [ 10309.500]ABI class: X.Org Server Extension, version 6.0 [ 10309.500] (II) Loading extension SELinux [ 10309.500] (II) Loading extension MIT-SCREEN-SAVER [ 10309.500] (II) Loading extension XFree86-VidModeExtension [ 10309.500] (II) Loading extension XFree86-DGA [ 10309.500] (II) Loading extension DPMS [ 10309.500] (II) Loading extension XVideo [ 10309.500] (II) Loading extension XVideo-MotionCompensation [ 10309.500] (II) Loading extension X-Resource [ 10309.500] (II) LoadModule: "dbe" [ 10309.500] (II) Loading /usr/lib/xorg/modules/extensions/libdbe.so [ 10309.500] (II) Module dbe: vendor="X.Org Foundation" [ 10309.500]compiled for 1.12.1.902, module version = 1.0.0 [ 10309.500]Module class: X.Org Server Extension [ 10309.500]ABI class: X.Org Server Extension, version 6.0 [ 10309.500] (II) Loading extension DOUBLE-BUFFER [ 10309.500] (II) LoadModule: "glx" [ 10309.501] (II) Loading /usr/lib/xorg/modules/extensions/libglx.so [ 10309.501] (II) Module glx: vendor="X.Org Foundation" [ 10309.501]compiled for 1.12.1.902, module version = 1.0.0 [ 10309.501]ABI class: X.Org Server Extension, version 6.0 [ 10309.501] (==) AIGLX enabled [ 10309.501] (II) Lo
Bug#673669: Additional info
Forgot to say I have a laptop with VGA out - with an nvidia go 7600 with which I could test the monitor bypassing the DVI>VGA adapter, though my hunch is that the adapter is not the problem. Not only does windows work with the same hardware configuration, but I remember having resolution issues since 2006, when the monitor was being used with a different machine using an ATI video card.
Bug#642433: xserver-xorg-core: crashes on pressing random keys on the keyboard while screen locked
Hello, Excerpts from Maarten Lankhorst's message of Wed May 23 12:30:48 +0200 2012: > Hey Michael, > > Op 23-05-12 11:13, Michal Suchanek schreef: > > Package: xserver-xorg-core > > Version: 2:1.12.1.902-1 > > Followup-For: Bug #642433 > > > > With 1.12.1 and 1.12.1.902-1 the X server crashes again. > > > > Attaching patch. > > > That patch looks like it belongs upstream. Have you tried contacting upstream > about it? > Yes, I have. Thanks Michal -- 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/1337783757-sup-7...@virtual.ruk.cuni.cz
Bug#642433: xserver-xorg-core: crashes on pressing random keys on the keyboard while screen locked
Hey Michael, Op 23-05-12 11:13, Michal Suchanek schreef: > Package: xserver-xorg-core > Version: 2:1.12.1.902-1 > Followup-For: Bug #642433 > > With 1.12.1 and 1.12.1.902-1 the X server crashes again. > > Attaching patch. > That patch looks like it belongs upstream. Have you tried contacting upstream about it? ~Maarten -- 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/4fbcbc58.9070...@canonical.com
Bug#642433: xserver-xorg-core: crashes on pressing random keys on the keyboard while screen locked
Package: xserver-xorg-core
Version: 2:1.12.1.902-1
Followup-For: Bug #642433
With 1.12.1 and 1.12.1.902-1 the X server crashes again.
Attaching patch.
VGA-compatible devices on PCI bus:
--
01:00.0 VGA compatible controller [0300]: Advanced Micro Devices [AMD] nee ATI
Cedar PRO [Radeon HD 5450] [1002:68f9]
/etc/X11/xorg.conf does not exist.
Contents of /etc/X11/xorg.conf.d:
-
total 8
-rw-r--r-- 1 root root 129 Oct 6 2011 10-trackball-middle-emu.conf
-rw-r--r-- 1 root root 150 Oct 6 2011 10-trackball-middle-emu.conf~
KMS configuration files:
/etc/modprobe.d/radeon-kms.conf:
options radeon modeset=1
Kernel version (/proc/version):
---
Linux version 3.2.0-2-amd64 (Debian 3.2.16-1) (debian-ker...@lists.debian.org)
(gcc version 4.6.3 (Debian 4.6.3-1) ) #1 SMP Mon Apr 30 05:20:23 UTC 2012
Xorg X server log files on system:
--
-rw-r--r-- 1 root root 43446 Oct 7 2011 /var/log/Xorg.2.log
-rw-r--r-- 1 root root 32234 May 2 13:06 /var/log/Xorg.!.log
-rw-r--r-- 1 root root 56401 May 23 10:28 /var/log/Xorg.1.log
-rw-r--r-- 1 root root 51686 May 23 11:07 /var/log/Xorg.0.log
-- System Information:
Debian Release: wheezy/sid
APT prefers stable
APT policy: (900, 'stable'), (500, 'testing'), (410, 'unstable'), (200,
'experimental'), (111, 'oldstable')
Architecture: amd64 (x86_64)
Kernel: Linux 3.2.0-2-amd64 (SMP w/4 CPU cores)
Locale: LANG=en_US.UTF-8, LC_CTYPE=en_US.UTF-8 (charmap=UTF-8) (ignored: LC_ALL
set to en_US.UTF-8)
Shell: /bin/sh linked to /bin/bash
Versions of packages xserver-xorg-core depends on:
ii keyboard-configuration 1.68+squeeze2
ii libaudit0 1:1.7.18-1.1
ii libc6 2.13-32
ii libdrm2 2.4.33+git20120502.52887298-0ubuntu0sarvatt~precise
ii libgcrypt11 1.5.0-3
ii libpciaccess0 0.13.1-2
ii libpixman-1-0 0.24.4-1
ii libselinux1 2.1.9-2
ii libudev0164-3
ii libxau6 1:1.0.7-1
ii libxdmcp6 1:1.1.1-1
ii libxfont1 1:1.4.5-2
ii udev164-3
ii xserver-common 2:1.13+git-20120423113043~6a1fdcd
Versions of packages xserver-xorg-core recommends:
ii libgl1-mesa-dri 8.1~git20120503.1bd3dafe-0ubuntu0ricotz~precisenw1
Versions of packages xserver-xorg-core suggests:
pn xfonts-100dpi | xfonts-75dpi
pn xfonts-scalable
-- no debconf information
--- a/dix/getevents.c 2012-05-23 10:31:42.0 +0200
+++ a/dix/getevents.c 2012-05-23 10:34:38.0 +0200
@@ -1574,7 +1574,7 @@
/* Now turn the smooth-scrolling axes back into emulated button presses
* for legacy clients, based on the integer delta between before and now */
for (i = 0; i < valuator_mask_size(&mask); i++) {
-if (i >= pDev->valuator->numAxes)
+if ( !pDev->valuator || (i >= pDev->valuator->numAxes))
break;
if (!valuator_mask_isset(&mask, i))
xserver-xorg-video-nouveau: Changes to 'debian-unstable'
ChangeLog | 195 ++ configure.ac |2 debian/changelog |9 debian/patches/02-drm-nouveau-newabi.patch | 2272 + debian/patches/series |1 src/Makefile.am|4 src/drmmode_display.c | 30 src/nouveau_dri2.c | 32 src/nouveau_exa.c | 29 src/nouveau_local.h| 186 +- src/nouveau_wfb.c |4 src/nouveau_xv.c | 69 src/nv04_accel.h | 83 + src/nv04_exa.c | 524 +++--- src/nv04_xv_blit.c | 262 +-- src/nv10_exa.c | 857 -- src/nv30_exa.c | 975 ++-- src/nv30_shaders.c | 347 src/nv30_shaders.h | 72 src/nv30_xv_tex.c | 302 +-- src/nv40_exa.c | 994 +++- src/nv40_xv_tex.c | 293 +-- src/nv50_accel.c | 670 src/nv50_accel.h | 66 src/nv50_exa.c | 895 +-- src/nv50_xv.c | 381 +--- src/nv_accel_common.c | 582 +++ src/nv_dma.c | 77 src/nv_dma.h |4 src/nv_driver.c| 43 src/nv_include.h | 11 src/nv_proto.h |7 src/nv_shadow.c|3 src/nv_type.h | 53 src/nvc0_accel.c | 841 ++ src/nvc0_accel.h | 120 - src/nvc0_exa.c | 974 +--- src/nvc0_shader.h | 444 + src/nvc0_xv.c | 374 +--- src/nve0_shader.h | 460 + 40 files changed, 8045 insertions(+), 5502 deletions(-) New commits: commit c20b687c6f92abb63eb019c1778cb5b465ac1b57 Author: Maarten Lankhorst Date: Wed May 23 10:08:34 2012 +0200 Add 02-drm-nouveau-newabi.patch to build with old libdrm Until mesa 8.1 is released, we cannot build with new libdrm yet diff --git a/debian/changelog b/debian/changelog index 55d53bb..e96e86b 100644 --- a/debian/changelog +++ b/debian/changelog @@ -2,6 +2,8 @@ xserver-xorg-video-nouveau (1:0.0.16+git20120523+5815644-1) UNRELEASED; urgency= [ Maarten Lankhorst ] * New upstream snapshot. First one to have the new ABI. + * Add 02-drm-nouveau-newabi.patch to build with old libdrm + - Until mesa 8.1 is released, we cannot build with new libdrm yet -- Maarten Lankhorst Wed, 23 May 2012 09:45:06 +0200 diff --git a/debian/patches/02-drm-nouveau-newabi.patch b/debian/patches/02-drm-nouveau-newabi.patch new file mode 100644 index 000..8179f9f --- /dev/null +++ b/debian/patches/02-drm-nouveau-newabi.patch @@ -0,0 +1,2272 @@ +commit d99486bda5601cb887ac898037a2dfad795aeb8f +Author: Maarten Lankhorst +Date: Wed May 23 09:29:29 2012 +0200 + +awful hack to remove dependency on libdrm_nouveau + +diff --git a/configure.ac b/configure.ac +index afb6cde..7326144 100644 +--- a/configure.ac b/configure.ac +@@ -67,7 +67,8 @@ XORG_DRIVER_CHECK_EXT(XV, videoproto) + XORG_DRIVER_CHECK_EXT(DPMSExtension, xextproto) + + # Checks for pkg-config packages +-PKG_CHECK_MODULES(LIBDRM_NOUVEAU, [libdrm_nouveau >= 2.4.25]) ++PKG_CHECK_MODULES(LIBDRM_NOUVEAU_DUMMY, [libdrm_nouveau = 0.6]) ++PKG_CHECK_MODULES(LIBDRM_NOUVEAU, [libdrm]) + AC_SUBST(LIBDRM_NOUVEAU_CFLAGS) + AC_SUBST(LIBDRM_NOUVEAU_LIBS) + +diff --git a/drm_nouveau/abi16.c b/drm_nouveau/abi16.c +new file mode 100644 +index 000..69a0a9b +--- /dev/null b/drm_nouveau/abi16.c +@@ -0,0 +1,198 @@ ++/* ++ * Copyright 2012 Red Hat Inc. ++ * ++ * 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. I
xserver-xorg-video-nouveau: Changes to 'upstream-unstable'
configure.ac |2
src/Makefile.am |4
src/drmmode_display.c | 30 -
src/nouveau_dri2.c| 32 -
src/nouveau_exa.c | 29 -
src/nouveau_local.h | 186 ++---
src/nouveau_wfb.c |4
src/nouveau_xv.c | 69 ++-
src/nv04_accel.h | 83
src/nv04_exa.c| 524 --
src/nv04_xv_blit.c| 262 ++---
src/nv10_exa.c| 857 +++
src/nv30_exa.c| 975 +
src/nv30_shaders.c| 347 -
src/nv30_shaders.h| 72 ---
src/nv30_xv_tex.c | 302 +--
src/nv40_exa.c| 994 +++---
src/nv40_xv_tex.c | 293 ++
src/nv50_accel.c | 670 +
src/nv50_accel.h | 66 ++-
src/nv50_exa.c| 895 -
src/nv50_xv.c | 381 +++
src/nv_accel_common.c | 582 ++---
src/nv_dma.c | 77 ++-
src/nv_dma.h |4
src/nv_driver.c | 43 +-
src/nv_include.h | 11
src/nv_proto.h|7
src/nv_shadow.c |3
src/nv_type.h | 53 +-
src/nvc0_accel.c | 841 +-
src/nvc0_accel.h | 120 +++---
src/nvc0_exa.c| 974 +++-
src/nvc0_shader.h | 444 ++
src/nvc0_xv.c | 374 +++---
src/nve0_shader.h | 460 +++
36 files changed, 5568 insertions(+), 5502 deletions(-)
New commits:
commit 581564466c47ab0435ecca3cf4d82c03e1b30259
Author: Francisco Jerez
Date: Tue May 8 14:02:44 2012 +0200
dri2: Don't try to page-flip pixmaps (fdo bug 49351).
Reported-by: Marcin Slusarz
Signed-off-by: Francisco Jerez
diff --git a/src/nouveau_dri2.c b/src/nouveau_dri2.c
index 73f2fc1..7e47575 100644
--- a/src/nouveau_dri2.c
+++ b/src/nouveau_dri2.c
@@ -328,7 +328,7 @@ nouveau_dri2_finish_swap(DrawablePtr draw, unsigned int
frame,
type = DRI2_EXCHANGE_COMPLETE;
DamageRegionAppend(draw, ®);
- if (DRI2CanFlip(draw)) {
+ if (nouveau_exa_pixmap_is_onscreen(dst_pix)) {
type = DRI2_FLIP_COMPLETE;
ret = drmmode_page_flip(draw, src_pix,
violate_oml(draw) ? NULL : s,
commit b1efc807392d372e6a232aad9d16ae6e1b1c1916
Author: Marcin Slusarz
Date: Sun Apr 15 13:46:42 2012 +0200
nv50: add missing pushbuf space check in NV50SyncToVBlank
Regression from "WIP: port to new libdrm".
diff --git a/src/nv50_accel.c b/src/nv50_accel.c
index e140db9..42b27f0 100644
--- a/src/nv50_accel.c
+++ b/src/nv50_accel.c
@@ -44,6 +44,9 @@ NV50SyncToVBlank(PixmapPtr ppix, BoxPtr box)
if (!crtcs)
return;
+ if (!PUSH_SPACE(push, 10))
+ return;
+
BEGIN_NV04(push, SUBC_NVSW(0x0060), 2);
PUSH_DATA (push, pNv->vblank_sem->handle);
PUSH_DATA (push, 0);
commit 174f17072005971fee6e4eb76a273c3cc1aa10d3
Author: Ben Skeggs
Date: Tue Apr 24 21:55:03 2012 +1000
nv40/exa: return false from gradient picture setup
Not implemented yet. Shouldn't hit this anyway, fallback in
check_composite,
but, best be safe :)
Reported-by: Maarten Maathuis
Signed-off-by: Ben Skeggs
diff --git a/src/nv40_exa.c b/src/nv40_exa.c
index 10f15f1..2361552 100644
--- a/src/nv40_exa.c
+++ b/src/nv40_exa.c
@@ -233,7 +233,7 @@ NV40EXAPictSolid(NVPtr pNv, PicturePtr pPict, int unit)
static Bool
NV40EXAPictGradient(NVPtr pNv, PicturePtr pPict, int unit)
{
- return TRUE;
+ return FALSE;
}
static Bool
commit 60edf2a87b928f413385443335493cb27da30a48
Author: Ben Skeggs
Date: Tue Apr 24 10:54:51 2012 +1000
nv40/exa: support for solid pictures
Signed-off-by: Ben Skeggs
diff --git a/src/nv04_accel.h b/src/nv04_accel.h
index 7100e85..e7b76c5 100644
--- a/src/nv04_accel.h
+++ b/src/nv04_accel.h
@@ -17,6 +17,7 @@
#define PFP_NV12_BILINEAR 0x0700
#define PFP_NV12_BICUBIC 0x0800
#define XV_TABLE 0x1000
+#define SOLID(i) (0x2000 + (i) * 0x100)
/* subchannel assignments */
#define SUBC_M2MF(mthd) 0, (mthd)
diff --git a/src/nv40_exa.c b/src/nv40_exa.c
index fb9ec80..10f15f1 100644
--- a/src/nv40_exa.c
+++ b/src/nv40_exa.c
@@ -181,9 +181,64 @@ NV40_SetupBlend(ScrnInfoPtr pScrn, nv_pict_op_t *blend,
}
static Bool
-NV40EXATexture(ScrnInfoPtr pScrn, PixmapPtr pPix, PicturePtr pPict, int unit)
+NV40EXAPictSolid(NVPtr pNv, PicturePtr pPict, int unit)
+{
+ struct nouveau_pushbuf *push = pNv->pushbuf;
+
+ PUSH_DATAu(push, pNv->scratch, SOLID(unit), 2);
+ PUSH_DATA (push, pPict->pSourcePict->solidFill.colo
Bug#638542: kernel oops when closing the lid
Hi, Sylvain Archenault (22/05/2012): > I have the same problem on my dell XPS 14z, It has an intel graphic > card, Intel® HD Graphics 3000 using i915: > Intel Corporation 2nd Generation Core Processor Family Integrated > Graphics Controller (rev 09) > > Whenever I close the lid, I have a kernel panic in the i915 driver code. > My system is running SID and is up to date, I even tried the kernel from > experimental, 3.3. looks to me like you want to file a bug report against the kernel. Mraw, KiBi. signature.asc Description: Digital signature
