Bug#671800: xserver-xorg-video-savage: segfaults under X.Org X Server 1.12.1
Hi On Wednesday 09 May 2012, Julien Cristau wrote: On Mon, May 7, 2012 at 09:08:54 +0200, Tormod Volden wrote: […] Wow, a savage user! I am hoping to get a newer savage version done soon, unless someone beats me to it. Anyway, this issue might be outside the driver. Do you have libpciaccess 13.1? This is in my experience necessary in order to run xserver 1.12. We need c3eaacd25358c225e355a1ea7d64dece8188b69a, which is in savage 2.3.4. Thanks a lot, xserver-xorg-video-savage 1:2.3.4-1 is working perfectly. Regards Stefan Lippers-Hollmann -- 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/201205090437.24776.s@gmx.de
Bug#671800: xserver-xorg-video-savage: segfaults under X.Org X Server 1.12.1
Hi On Tuesday 08 May 2012, Tormod Volden wrote: On Mon, May 7, 2012 at 9:08 AM, Tormod Volden wrote: On Mon, May 7, 2012 at 2:02 AM, Cyril Brulebois wrote: Hi Stefan, Stefan Lippers-Hollmann (07/05/2012): Backtrace: 0: /usr/bin/X (xorg_backtrace+0x49) [0xb76bb919] 1: /usr/bin/X (0xb7533000+0x18c38a) [0xb76bf38a] 2: (vdso) (__kernel_rt_sigreturn+0x0) [0xb7515410] Segmentation fault at address (nil) From the previous entries in the Xorg.0.log before the crash it looks like it crashes in the vgaHW* functions. hmm, doesn't look too helpful. Does gdb help? Starters' doc available at: http://x.debian.net/howto/use-gdb.html [excerpt from the previous mail] | Wow, a savage user! I am hoping to get a newer savage version done | soon, unless someone beats me to it. Anyway, this issue might be | outside the driver. Do you have libpciaccess 13.1? This is in my | experience necessary in order to run xserver 1.12. libpciaccess 0.13.1 was installed in both (successful with xserver-xorg-core 2:1.11.4-1 and now with 2:1.12.1-2) cases. Please install xserver-xorg-core-dbg package at least, and see if we can get a more meaningful backtrace. A bt full full backtrace from gdb would be great. ii libpciaccess0:i3860.13.1-2 Generic PCI access library for X ii xserver-xorg-core 2:1.12.1-2 Xorg X server - core server ii xserver-xorg-core-dbg 2:1.12.1-2 Xorg - the X.Org X server (debugging symbols) with plain xserver-xorg-video-savage 1:2.3.3-1+b1: # LANG= gdb -c /etc/X11/core /usr/bin/Xorg GNU gdb (GDB) 7.4.1-debian Copyright (C) 2012 Free Software Foundation, Inc. License GPLv3+: GNU GPL version 3 or later http://gnu.org/licenses/gpl.html This is free software: you are free to change and redistribute it. There is NO WARRANTY, to the extent permitted by law. Type show copying and show warranty for details. This GDB was configured as i486-linux-gnu. For bug reporting instructions, please see: http://www.gnu.org/software/gdb/bugs
Bug#671800: xserver-xorg-video-savage: segfaults under X.Org X Server 1.12.1
Package: xserver-xorg-video-savage Version: 1:2.3.3-1+b1 Severity: normal Hi Starting with xserver-xorg-core 2:1.12.1-1, I'm expieriencing this segfault with xserver-xorg-video-savage: [kdm.log] X.Org X Server 1.12.1 Release Date: 2012-04-13 X Protocol Version 11, Revision 0 Build Operating System: Linux 2.6.32-5-686-bigmem i686 Debian Current Operating System: Linux fsc-cy23 3.2.0-2-486 #1 Mon Apr 30 05:10:18 UTC 2012 i686 Kernel command line: BOOT_IMAGE=/boot/vmlinuz-3.2.0-2-486 root=UUID=22060915-d947-4635-be76-7c2f557197e3 ro vga=791 quiet Build Date: 01 May 2012 01:04:39AM xorg-server 2:1.12.1-1 (Cyril Brulebois k...@debian.org) Current version of pixman: 0.24.4 Before reporting problems, check http://wiki.x.org to make sure that you have the latest version. Markers: (--) probed, (**) from config file, (==) default setting, (++) from command line, (!!) notice, (II) informational, (WW) warning, (EE) error, (NI) not implemented, (??) unknown. (==) Log file: /var/log/Xorg.0.log, Time: Sun May 6 18:21:07 2012 (==) Using system config directory /usr/share/X11/xorg.conf.d Backtrace: 0: /usr/bin/X (xorg_backtrace+0x49) [0xb76bb919] 1: /usr/bin/X (0xb7533000+0x18c38a) [0xb76bf38a] 2: (vdso) (__kernel_rt_sigreturn+0x0) [0xb7515410] Segmentation fault at address (nil) Fatal server error: Caught signal 11 (Segmentation fault). Server aborting Please consult the The X.Org Foundation support at http://wiki.x.org for help. Please also check the log file at /var/log/Xorg.0.log for additional information. Server terminated with error (1). Closing log file. this was working fine with xserver-xorg-core 2:1.11.4-1 and xserver-xorg-video-savage 1:2.3.3-1+b1. I'm seeing the same symptoms with kernel 3.3.5-rc1. This is the last successful kdm.log (unfortunately Xorg.log* was already overwritten) excerpt, still using xserver-xorg-core 2:1.11.4-1: [kdm.log] X.Org X Server 1.11.4 Release Date: 2012-01-27 X Protocol Version 11, Revision 0 Build Operating System: Linux 2.6.32-5-amd64 i686 Debian Current Operating System: Linux fsc-cy23 3.3-4.slh.1-aptosid-686 #1 SMP PREEMPT Sat Apr 28 00:33:17 UTC 2012 i686 Kernel command line: BOOT_IMAGE=/boot/vmlinuz-3.3-4.slh.1-aptosid-686 root=UUID=22060915-d947-4635-be76-7c2f557197e3 ro vga=791 quiet Build Date: 05 March 2012 04:16:09AM xorg-server 2:1.11.4-1 (Cyril Brulebois k...@debian.org) Current version of pixman: 0.24.4 Before reporting problems, check http://wiki.x.org to make sure that you have the latest version. Markers: (--) probed, (**) from config file, (==) default setting, (++) from command line, (!!) notice, (II) informational, (WW) warning, (EE) error, (NI) not implemented, (??) unknown. (==) Log file: /var/log/Xorg.0.log, Time: Thu May 3 03:58:28 2012 (==) Using system config directory /usr/share/X11/xorg.conf.d error setting MTRR (base = 0xf200, size = 0x0500, type = 1) Invalid argument (22) [10e] 320 x 200, 70Hz [111] 640 x 480, 60Hz, 72Hz, 75Hz, 85Hz [114] 800 x 600, 60Hz, 72Hz, 75Hz, 85Hz [117] 1024 x 768, 60Hz, 70Hz, 75Hz, 85Hz [11a] 1280 x 1024, 60Hz, 75Hz [11d] 640 x 400, 70Hz [122] 1600 x 1200, 60Hz [133] 320 x 240, 72Hz [13c] 1400 x 1050, 60Hz, 75Hz [143] 400 x 300, 72Hz [153] 512 x 384, 70Hz [173] 720 x 480, 75Hz [17e] 720 x 576, 75Hz The XKEYBOARD keymap compiler (xkbcomp) reports: Warning: Type ONE_LEVEL has 1 levels, but RALT has 2 symbols Ignoring extra symbols Errors from xkbcomp are not fatal to the X server klauncher(1780) kdemain: No DBUS session-bus found. Check if you have started the DBUS server. kdeinit4: Communication error with launcher. Exiting! kdmgreet(1772)/kdecore (K*TimeZone*): KSystemTimeZones: ktimezoned initialize() D-Bus call failed: Not connected to D-Bus server kdmgreet(1772)/kdecore (K*TimeZone*): No time zone information obtained from ktimezoned Server terminated successfully (0). Closing log file. Regards Stefan Lippers-Hollmann -- Package-specific info: X server symlink status: lrwxrwxrwx 1 root root 13 Nov 22 2006 /etc/X11/X - /usr/bin/Xorg -rwxr-xr-x 1 root root 2072872 May 1 03:12 /usr/bin/Xorg VGA-compatible devices on PCI bus: -- 01:00.0 VGA compatible controller [0300]: S3 Inc. 86C380 [ProSavageDDR K4M266] [5333:8d01] (rev 02) /etc/X11/xorg.conf does not exist. /etc/X11/xorg.conf.d does not exist. KMS configuration files: /etc/modprobe.d/i915-kms.conf: options i915 modeset=1 /etc/modprobe.d/radeon-kms.conf: options radeon modeset=1 Kernel version (/proc/version): --- Linux version 3.2.0-2-486 (Debian 3.2.16-1) (debian-ker...@lists.debian.org) (gcc version 4.6.3 (Debian 4.6.3-4) ) #1 Mon Apr 30 05:10:18 UTC 2012 Xorg X server log files on system: -- -rw-r--r-- 1
Bug#651316: libdrm-intel1: X.org crashes when I try to play a video
Hi On Thursday 08 December 2011, Cyril Brulebois wrote: Cyril Brulebois k...@debian.org (08/12/2011): Thanks for the bisect. Upstream pinged, let's see what happens next. Upstream proposed a patch against libva[1]. I've published packages for i386 and amd64 with that patch[2]. Please report success or failure on the upstream bug[1]. 1. https://bugs.freedesktop.org/show_bug.cgi?id=43554#c3 2. http://mraw.org/~kibi/libva-fdo43554/ ii libdrm-dev2.4.28-1 Userspace interface to kernel DRM services -- development files ii libdrm-intel1 2.4.28-1 Userspace interface to intel-specific kernel DRM services -- runtime ii libdrm-nouveau1a 2.4.28-1 Userspace interface to nouveau-specific kernel DRM services -- runtime ii libdrm-radeon12.4.28-1 Userspace interface to radeon-specific kernel DRM services -- runtime ii libdrm2 2.4.28-1 Userspace interface to kernel DRM services -- runtime ii libkms1 2.4.28-1 Userspace interface to kernel DRM buffer management ii libva-x11-1 1.0.14-1.1 Video Acceleration (VA) API for Linux -- X11 runtime ii libva11.0.14-1.1 Video Acceleration (VA) API for Linux -- runtime No change, X is restarting and dumping to kdm within seconds after displaying any video is started, while reverting the afforementioned patch still avoids the issue. I'll look into creating a freedesktop bugzilla account this evening. Regards Stefan Lippers-Hollmann -- 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/201112081357.41140.s@gmx.de
Bug#651316: libdrm-intel1: X.org crashes when I try to play a video
On Thursday 08 December 2011, Cyril Brulebois wrote:
Hi Stefan.
(That upstream bug was a bad lead, upstream didn't realize it was about
an X server rather than a client crash.)
Stefan Lippers-Hollmann s@gmx.de (08/12/2011):
No change, X is restarting and dumping to kdm within seconds after
displaying any video is started, while reverting the afforementioned
patch still avoids the issue.
Could you please get a full backtrace (see x.debian.net)?
I hope to have installed all required -dbg packages (libc6-dbg,
libdrm2-dbg, libdrm-intel1-dbg, libkms1-dbg, xserver-xorg-core-dbg,
xserver-xorg-video-intel-dbg):
unpatched libva1/ libva-x11-1 (1.0.14-1):
# LANG= gdb -c /etc/X11/core /usr/bin/Xorg
GNU gdb (GDB) 7.3-debian
Copyright (C) 2011 Free Software Foundation, Inc.
License GPLv3+: GNU GPL version 3 or later http://gnu.org/licenses/gpl.html
This is free software: you are free to change and redistribute it.
There is NO WARRANTY, to the extent permitted by law. Type show copying
and show warranty for details.
This GDB was configured as x86_64-linux-gnu.
For bug reporting instructions, please see:
http://www.gnu.org/software/gdb/bugs/...
Reading symbols from /usr/bin/Xorg...Reading symbols from
/usr/lib/debug/usr/bin/Xorg...done.
done.
[New LWP 3063]
warning: Can't read pathname for load map: Input/output error.
[Thread debugging using libthread_db enabled]
Core was generated by `/usr/bin/X :0 vt7 -br -nolisten tcp -core -auth
/var/run/xauth/A:0-CoJICb'.
Program terminated with signal 6, Aborted.
#0 0x7fba3237f405 in *__GI_raise (sig=optimized out) at
../nptl/sysdeps/unix/sysv/linux/raise.c:64
64 ../nptl/sysdeps/unix/sysv/linux/raise.c: No such file or directory.
in ../nptl/sysdeps/unix/sysv/linux/raise.c
(gdb) bt full
#0 0x7fba3237f405 in *__GI_raise (sig=optimized out) at
../nptl/sysdeps/unix/sysv/linux/raise.c:64
pid = optimized out
selftid = optimized out
#1 0x7fba32382680 in *__GI_abort () at abort.c:92
act = {__sigaction_handler = {sa_handler = 0x7fba3013f7a7, sa_sigaction
= 0x7fba3013f7a7}, sa_mask = {__val = {140437684306760, 140734872454256, 1016,
140734872454496, 140437683370966, 206158430232, 140734872454512,
140734872454288, 140437683282824, 206158430256, 140734872454536,
140437750700624, 109664, 3273383998825390688, 8462091486410927422,
140734872465025}},
sa_flags = 843654047, sa_restorer = 0x7fba3013fa10}
sigs = {__val = {32, 0 repeats 15 times}}
#2 0x7fba323785b1 in *__GI___assert_fail (assertion=0x7fba3013f7a7
bo_gem-map_count == 0, file=optimized out, line=1016,
function=0x7fba3013fe70 drm_intel_gem_bo_map) at assert.c:81
buf = 0x7fba363e5a50 X: ../../intel/intel_bufmgr_gem.c:1016:
drm_intel_gem_bo_map: Assertion `bo_gem-map_count == 0' failed.\n
#3 0x7fba3013cb10 in drm_intel_gem_bo_map (bo=0x7fba36509050,
write_enable=1) at ../../intel/intel_bufmgr_gem.c:1016
mmap_arg = {handle = 911249488, pad = 32698, offset = 252, size = 0,
addr_ptr = 140437647249678}
bufmgr_gem = 0x7fba35ad89e0
bo_gem = 0x7fba36509050
set_domain = {handle = 845991520, read_domains = 32698, write_domain =
911249656}
ret = optimized out
__PRETTY_FUNCTION__ = drm_intel_gem_bo_map
#4 0x7fba3036076a in i965_create_dst_surface_state (scrn=optimized out,
pixmap=0x7fba35e13570, surf_bo=0x7fba36509050, offset=0) at
../../src/i965_video.c:411
intel = 0x7fba35acc0a0
dest_surf_state = optimized out
pixmap_bo = 0x7fba35ae12a0
#5 0x7fba30362ff7 in Gen6DisplayVideoTextured (scrn=0x7fba35acb370,
adaptor_priv=0x7fba35df9500, id=optimized out, dstRegion=0x7fff64148a70,
width=optimized out, height=optimized out, video_pitch=272,
video_pitch2=544, src_w=544, src_h=576, drw_w=768, drw_h=576,
pixmap=0x7fba35e13570) at ../../src/i965_video.c:1884
intel = 0x7fba35acc0a0
pbox = optimized out
nbox = optimized out
dxo = optimized out
dyo = optimized out
pix_xoff = optimized out
pix_yoff = optimized out
src_scale_x = optimized out
src_scale_y = optimized out
src_surf = optimized out
n_src_surf = 6
src_surf_format = 320
src_surf_base = {0, 0, 391680, 391680, 313344, 313344}
src_width = {544, 544, 272, 272, 272, 272}
src_height = {576, 576, 288, 288, 288, 288}
src_pitch = {544, 544, 272, 272, 272, 272}
surface_state_binding_table_bo = 0x7fba36509050
create_dst_surface_state = 0x7fba30360720
i965_create_dst_surface_state
create_src_surface_state = 0x7fba30360f30
i965_create_src_surface_state
emit_video_setup = 0x7fba303616f0 gen6_emit_video_setup
#6 0x7fba3035947b in I830PutImageTextured (scrn=0x7fba35acb370, src_x=0,
src_y=optimized out, drw_x=optimized out, drw_y=optimized out, src_w=544,
src_h=576, drw_w=768, drw_h=576, id=842094169, buf=0x7fba341bc000 '\020'
repeats
Bug#651316: libdrm-intel1: X.org crashes when I try to play a video
Hi On Thursday 08 December 2011, Cyril Brulebois wrote: Stefan Lippers-Hollmann s@gmx.de (08/12/2011): I hope to have installed all required -dbg packages (libc6-dbg, libdrm2-dbg, libdrm-intel1-dbg, libkms1-dbg, xserver-xorg-core-dbg, xserver-xorg-video-intel-dbg): […] perfect, thanks! Upstream suggests trying this new driver version, along with the patched libva: http://mraw.org/~kibi/libva-xxvintel/ ii libdrm-dev2.4.28-1 Userspace interface to kernel DRM services -- development files ii libdrm-intel1 2.4.28-1 Userspace interface to intel-specific kernel DRM services -- runtime ii libdrm-intel1-dbg 2.4.28-1 Userspace interface to intel-specific kernel DRM services -- debugging symbols ii libdrm-nouveau1a 2.4.28-1 Userspace interface to nouveau-specific kernel DRM services -- runtime ii libdrm-radeon12.4.28-1 Userspace interface to radeon-specific kernel DRM services -- runtime ii libdrm2 2.4.28-1 Userspace interface to kernel DRM services -- runtime ii libdrm2-dbg 2.4.28-1 Userspace interface to kernel DRM services -- debugging symbols ii libkms1 2.4.28-1 Userspace interface to kernel DRM buffer management ii libkms1-dbg 2.4.28-1 Userspace interface to kernel DRM buffer management -- debugging symbols ii libva-x11-1 1.0.14-1.1 Video Acceleration (VA) API for Linux -- X11 runtime ii libva11.0.14-1.1 Video Acceleration (VA) API for Linux -- runtime ii xserver-xorg-video-intel 2:2.17.0-1+kibi1 X.Org X server -- Intel i8xx, i9xx display driver ii xserver-xorg-video-intel-dbg 2:2.17.0-1+kibi1 X.Org X server -- Intel i8xx, i9xx display driver (debug symbols) X doesn't crash anymore, however video content isn't displayed (using xv) either (the video plays, but the player window remains black (rarely parts of the desktop are visible), the whole overlay isn't filled), after a few moments fonts and windows gain heavy artefacts (drop shadows, wrong colours, weird effects all around [1]). If I force the video player to x11 (e.g. -vo x11 for mplayer2) the video is displayed normally. If I downgrade libdrm-intel1 to 2.4.27-1 again, while keeping libva1/ libva-x11-1 1.0.14-1.1 and xserver-xorg-video-intel 2:2.17.0-1+kibi1 installed, I can't reproduce the window/ font corruption anymore, but video overlays using xv remain black. Regards Stefan Lippers-Hollmann [1] I don't use any 3d effects for KDE/ kwin. -- 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/201112081858.36454.s@gmx.de
Bug#651316: libdrm-intel1: X.org crashes when I try to play a video
Hi We can confirm this issue on sandy bridge graphics (h67/ i7-2600k), bisecting between 2.4.27-1 and 2.4.28-1 points at this patch: From c549a777c1b6227a724942c64aa5cd181eb93c6c Mon Sep 17 00:00:00 2001 From: Chris Wilson ch...@chris-wilson.co.uk Date: Mon, 5 Dec 2011 10:14:34 + Subject: intel: Unmap buffers during drm_intel_gem_bo_unmap We cannot afford to cache the vma per open bo as this may exhaust the per-process limits. References: https://bugs.freedesktop.org/show_bug.cgi?id=43075 References: https://bugs.freedesktop.org/show_bug.cgi?id=40066 Signed-off-by: Chris Wilson ch...@chris-wilson.co.uk --- intel/intel_bufmgr_gem.c | 27 +-- 1 files changed, 21 insertions(+), 6 deletions(-) Reverting just this patch from 2.4.28-1 indeed fixes the problem again. Regards Stefan Lippers-Hollmann signature.asc Description: This is a digitally signed message part.
Bug#577769: xserver-xorg-core: ignores /usr/lib/X11/xorg.conf.d/ in the presence of /etc/X11/xorg.conf.d/
Package: xserver-xorg-core Version: 2:1.7.6-2 Severity: important Hi If /etc/X11/xorg.conf.d/ is in use, it does not augment the package preconfiguration in /usr/lib/X11/xorg.conf.d/, but totally ignores the contents of /usr/lib/X11/xorg.conf.d/ - thereby breaking essential preconfiguration like 05-evdev.conf and killing keyboard/ mouse support in X. My system does not use a /etc/X11/xorg.conf anymore, but I nevertheless need to configure my dual-screen setup for radeon through the attached /etc/X11/xorg.conf.d/20-device.conf. With today's upload of xserver-xorg-input-evdev 1:2.3.2-5, evdev starts to depend on the (new) preconfiguration in /usr/lib/X11/xorg.conf.d/05-evdev.conf, but due to the presence of my custom /etc/X11/xorg.conf.d/20-device.conf, xserver-xorg-core never attempts to load 05-evdev.conf (or 10-vmmouse.conf for that matter). $ LANG=C ls -al /etc/X11/xorg.conf.d/ /usr/lib/X11/xorg.conf.d/ /etc/X11/xorg.conf.d/: total 12 drwxr-xr-x 2 root root 4096 Apr 14 12:30 . drwxr-xr-x 11 root root 4096 Apr 9 14:44 .. -rw-r--r-- 1 root root 354 Apr 9 14:48 20-device.conf /usr/lib/X11/xorg.conf.d/: total 20 drwxr-xr-x 2 root root 4096 Apr 14 12:01 . drwxr-xr-x 7 root root 4096 Apr 11 03:07 .. -rw-r--r-- 1 root root 946 Apr 13 18:02 05-evdev.conf -rw-r--r-- 1 root root 102 Apr 13 18:16 10-vmmouse.conf To temporarily unbreak my system, I've added a symlink for 05-evdev.conf in /etc/X11/xorg.conf.d/, but this would be very fragile in regards to future evdev updates and/ or other packages switching to distribution defaults stored in /usr/lib/X11/xorg.conf.d/ ln -s ../../../usr/lib/X11/xorg.conf.d/05-evdev.conf /etc/X11/xorg.conf.d/05-evdev.conf Regards Stefan Lippers-Hollmann Post scriptum: As an unrelated side note, I'd suggest adding /etc/X11/xorg.conf.d/*.conf and ls -al /usr/lib/X11/xorg.conf.d/ to the bug templates. -- Package-specific info: /var/lib/x11/X.roster does not exist. /var/lib/x11/X.md5sum does not exist. X server symlink status: lrwxrwxrwx 1 root root 13 Aug 28 2008 /etc/X11/X - /usr/bin/Xorg -rwxr-xr-x 1 root root 1876992 Apr 5 16:37 /usr/bin/Xorg /var/lib/x11/xorg.conf.roster does not exist. VGA-compatible devices on PCI bus: 01:00.0 VGA compatible controller: ATI Technologies Inc RV630 [Radeon HD 2600 Series] /etc/X11/xorg.conf does not exist. Xorg X server log files on system: -rw-r--r-- 1 root root 37806 Apr 14 12:31 /var/log/Xorg.0.log -- System Information: Debian Release: squeeze/sid APT prefers unstable APT policy: (500, 'unstable') Architecture: amd64 (x86_64) Kernel: Linux 2.6.33-2.slh.6-sidux-amd64 (SMP w/4 CPU cores; PREEMPT) Locale: LANG=de_DE.UTF-8, LC_CTYPE=de_DE.UTF-8 (charmap=UTF-8) Shell: /bin/sh linked to /bin/dash Versions of packages xserver-xorg-core depends on: ii keyboard-configuration 1.54system-wide keyboard preferences ii libaudit01.7.13-1+b1 Dynamic library for security audit ii libc62.10.2-6Embedded GNU C Library: Shared lib ii libdrm2 2.4.18-3Userspace interface to kernel DRM ii libgcrypt11 1.4.5-2 LGPL Crypto library - runtime libr ii libpciaccess00.11.0-2Generic PCI access library for X ii libpixman-1-00.16.4-1pixel-manipulation library for X a ii libselinux1 2.0.94-1SELinux runtime shared libraries ii libudev0 151-3 libudev shared library ii libxau6 1:1.0.5-2 X11 authorisation library ii libxdmcp61:1.0.3-2 X11 Display Manager Control Protoc ii libxfont11:1.4.1-2 X11 font rasterisation library ii udev 151-3 /dev/ and hotplug management daemo ii xserver-common 2:1.7.6-2 common files used by various X ser ii xserver-xorg 1:7.5+5 the X.Org X server Versions of packages xserver-xorg-core recommends: ii libgl1-mesa-dri 7.7.1-1A free implementation of the OpenG Versions of packages xserver-xorg-core suggests: ii xfonts-100dpi 1:1.0.1100 dpi fonts for X ii xfonts-75dpi 1:1.0.175 dpi fonts for X ii xfonts-scalable 1:1.0.1-1 scalable fonts for X -- no debconf information Section Monitor Identifier DVI-0 Option Primary true #Option PreferredMode 1600x1200 EndSection Section Monitor Identifier DVI-1 Option RightOf DVI-0 #Option PreferredMode 1280x1024 EndSection Section Device Identifier ATI Radeon HD 2600 Option Monitor-DVI-0 DVI-0 Option Monitor-DVI-1 DVI-1 EndSection [0.00] No AGP bridge found [0.00] No AGP bridge found [0.510614] Linux agpgart interface v0.103 [8.563403] [drm] Initialized drm 1.1.0
Bug#525039: xserver-xorg-input-vmmouse: vmmouse_detect doesn't detect kvm
Hi I can still confirm this regression in current Debian sid within kvm (85+dfsg-4.1) or qemu (0.10.6-1) and xserver-xorg-input-vmmouse 1:12.6.5-1. likewise reverting http://cgit.freedesktop.org/xorg/driver/xf86-input-vmmouse/commit/?id=bcdec3d0cd4434770cd841c33c030e0d7203881f reliably fixes the problem for me, so vmmouse actually works within kvm/ qemu and doesn't catch the mouse pointer. Is there any further information I could provide to get this regression from 1:12.5.1-4 fixed? Regards Stefan Lippers-Hollmann signature.asc Description: This is a digitally signed message part.
Bug#528538: [xserver-xorg-input-synaptics] VertScrolling stops working after update to version 1.1.0
Hi I can confirm that the new upstream version 1.1.3 of xf86-input-synaptics (aka xserver-xorg-input-synaptics) indeed fixes the vertical scrolling reliably on my Acer Aspire One 110L, alternatively the upstream backport of http://bugs.freedesktop.org/attachment.cgi?id=28026 (referred to from http://bugs.freedesktop.org/show_bug.cgi?id=21001) works just as well. Regards Stefan Lippers-Hollmann signature.asc Description: This is a digitally signed message part.
Bug#483989: xserver-xorg-video-savage: system freeze while starting X
Hi On Freitag, 5. September 2008, Brice Goglin wrote: Hello, I have prepared savage 2.2.1-2 to fix this. Could all of you please test the package available at http://newpeople.debian.org/~bgoglin/savage/ and report back whether it works? I want to be sure it doesn't break for anybody. Working reliably for me, thanks! Regards Stefan Lippers-Hollmann Post scriptum: I still intend to debug it even further, but I'm physically away from the notebook during the week. signature.asc Description: This is a digitally signed message part.
Bug#483989: xserver-xorg-video-savage: system freeze while starting X
Hi Sorry, I've been physically away from the notebook since early august till last weekend. On Dienstag, 26. August 2008, Brice Goglin wrote: On Sun, Jun 01, 2008 at 08:49:18PM +0200, Stefan Lippers-Hollmann wrote: Yes, it is completely dead, open ssh connections trying to gather last bits from tail -f /var/log/messages stall immediately (unfortunately the notebook has no serial connectors for a serial console), pings get no answer - a hard poweroff is the only recovery. Pinging again to make sure the bug didn't disappear by chance :) Unfortunately it hasn't gone away and is still present on today's sid and kernel 2.6.26.3. Otherwise, we need to decide between: 1) reverting to 2.1.3-5 which worked fine except bug #481739 (which looks strange to me) This version did/ does work fine for me. 2) reapplying 02_temporary_revert_pciaccess.diff and reverting 5 pciaccess commits (merging all of them in the 02_revert). Not sure how stable this one would be. I've been running this[1] reliably since I first encountered the problem, sorry I'm not too familiar with git and X.org's buildsystem generation, so the quilt series looks a bit messy, but was nevertheless quite helpful for me to pinpoint the problematic commits. Maybe we can start with (2) for now, and switch to (1) as the ultimate solution if needed before Lenny gets released? Now I notice Tormod's suggestions and will try them tonight, hopefully I get around to adding some ErrorF() breakpoints to the source tommorow, like you suggested. Regards Stefan Lippers-Hollmann [1] http://sidux.com/debian/pool/fix.main/x/xserver-xorg-video-savage/xserver-xorg-video-savage_2.2.1-1+c0.sidux.1.dsc signature.asc Description: This is a digitally signed message part.
Bug#483989: xserver-xorg-video-savage: system freeze while starting X
ioctl(10, DECODER_SET_PICTURE, 0xbfd7ca90) = 0
write(0, (II) [drm] loaded kernel module f..., 53) = 53
fsync(0)= 0
write(0, (II) [drm] DRM interface version ..., 37) = 37
fsync(0)= 0
ioctl(10, 0xc0186415, 0xbfd7ca88) = 0
mmap2(NULL, 8192, PROT_READ|PROT_WRITE, MAP_SHARED, 10, 0xcfdc1) = 0xb199d000
write(0, (II) [drm] DRM open master succee..., 38) = 38
fsync(0)= 0
write(0, (II) SAVAGE(0): [drm] Using the D..., 67) = 67
fsync(0)= 0
ioctl(10, 0xc0186415, 0xbfd7cb08) = 0
write(0, (II) SAVAGE(0): [drm] framebuffer..., 54) = 54
fsync(0)= 0
ioctl(10, 0xc0086426, 0xbfd7cb14) = 0
ioctl(10, 0xc0086426, 0xbfd7cb14) = 0
fstat64(10, {st_mode=S_IFCHR|0666, st_rdev=makedev(226, 0), ...}) = 0
fstat64(10, {st_mode=S_IFCHR|0666, st_rdev=makedev(226, 0), ...}) = 0
write(0, (II) SAVAGE(0): [drm] added 1 res..., 58) = 58
fsync(0)= 0
ioctl(10, 0xc0086420, 0xbfd7cafc) = 0
fstat64(10, {st_mode=S_IFCHR|0666, st_rdev=makedev(226, 0), ...}) = 0
ioctl(10, 0x40086422, 0xbfd7cadc) = 0
write(0, (II) SAVAGE(0): X context handle ..., 39) = 39
fsync(0)= 0
ioctl(10, 0x4008642a, 0xbfd7cae4) = 0
fstat64(10, {st_mode=S_IFCHR|0666, st_rdev=makedev(226, 0), ...}) = 0
fstat64(10, {st_mode=S_IFCHR|0666, st_rdev=makedev(226, 0), ...}) = 0
rt_sigprocmask(SIG_BLOCK, [IO], [], 8) = 0
fcntl64(10, F_GETFL)= 0x8002 (flags O_RDWR|O_LARGEFILE)
fcntl64(10, F_SETFL, O_RDWR|O_ASYNC|O_LARGEFILE) = 0
fcntl64(10, F_SETOWN, 2527) = 0
rt_sigaction(SIGIO, {0x80b3340, [IO], 0}, {SIG_DFL}, 8) = 0
rt_sigprocmask(SIG_UNBLOCK, [IO], NULL, 8) = 0
write(0, (II) SAVAGE(0): [drm] installed D..., 51) = 51
fsync(0)= 0
ioctl(10, DEVFSDIOC_GET_PROTO_REV, 0x89405a8) = 0
ioctl(10, DEVFSDIOC_GET_PROTO_REV, 0x89405a8) = 0
ioctl(10, 0x6430, 0)= 0
ioctl(10, 0x80206433, 0xbfd7cb54) = 0
ioctl(10, 0x80206433, 0xbfd7cb54) = 0
ioctl(10, 0x80206433, 0xbfd7cb54) = 0
write(0, (II) SAVAGE(0): [agp] Mode 0x1f00..., 78) = 78
fsync(0)= 0
ioctl(10, 0x40046432, 0xbfd7cb70) = 0
ioctl(10, 0xc0106434, 0xbfd7cb5c) = 0
write(0, (II) SAVAGE(0): [agp] 16384 kB al..., 64) = 64
fsync(0)= 0
ioctl(10, 0x40086436, 0xbfd7cb6c) = 0
ioctl(10, 0xc0186415, 0xbfd7cb58) = 0
write(0, (II) SAVAGE(0): [agp] command DMA..., 54) = 54
fsync(0)= 0
ioctl(10, 0xc0186415, 0xbfd7cb58) = 0
write(0, (II) SAVAGE(0): [agp] agpTextures..., 54) = 54
fsync(0)= 0
ioctl(10, 0xc0186415, 0xbfd7cb58) = 0
ioctl(10, 0xc0186415, 0xbfd7cb58) = 0
write(0, (II) SAVAGE(0): [drm] aperture ha..., 51) = 51
fsync(0)= 0
write(0, (II) SAVAGE(0): [drm] Enabling Sh..., 53) = 53
fsync(0)= 0
ioctl(10, 0xc0186415, 0xbfd7cb58) = 0
write(0, (II) SAVAGE(0): [drm] Status hand..., 49) = 49
fsync(0)= 0
mmap2(NULL, 4096, PROT_READ|PROT_WRITE, MAP_SHARED, 10, 0xd8bc) = 0xb199c000
write(0, (II) SAVAGE(0): [drm] Status page..., 55) = 55
fsync(0)= 0
write(0, (II) SAVAGE(0): [dri] visual conf..., 49) = 49
fsync(0)= 0
write(0, (**) SAVAGE(0): DRI is enabled\n..., 31) = 31
fsync(0)= 0
write(0, (--) SAVAGE(0): Chose mode 118 at..., 40) = 40
fsync(0)= 0
rt_sigprocmask(SIG_BLOCK, [IO], [], 8) = 0
rt_sigprocmask(SIG_UNBLOCK, [IO], NULL, 8) = 0
rt_sigprocmask(SIG_BLOCK, [IO], [], 8) = 0
rt_sigprocmask(SIG_UNBLOCK, [IO], NULL, 8) = 0
rt_sigprocmask(SIG_BLOCK, [IO], [], 8) = 0
...and resulting in the attached Xorg.0.log.
Section Device
Identifier Card0
Driver savage
VendorName All
BoardName All
BusID PCI:1:0:0
Option BusType PCI
Option DRI off
EndSection
has no visible effects, current xorg.conf attached.
Regards
Stefan Lippers-Hollmann
X.Org X Server 1.4.2
Release Date: 11 June 2008
X Protocol Version 11, Revision 0
Build Operating System: Linux Debian (xorg-server 2:1.4.2-5)
Current Operating System: Linux fsc-cy23 2.6.26-3.slh.1-sidux-686 #1 SMP PREEMPT Wed Aug 20 23:56:34 UTC 2008 i686
Build Date: 26 August 2008 07:32:05PM
Before reporting problems, check http://wiki.x.org
to make sure that you have the latest version.
Module Loader present
Markers: (--) probed, (**) from config file, (==) default setting,
(++) from command line, (!!) notice, (II) informational,
(WW) warning, (EE) error, (NI) not implemented, (??) unknown.
(==) Log file: /var/log/Xorg.0.log, Time: Wed Aug 27 21:21:06 2008
Bug#483989: xserver-xorg-video-savage: system freeze while starting X
Hi On Samstag, 26. Juli 2008, you wrote: On Sun, Jun 1, 2008 at 20:45:54 +0200, Stefan Lippers-Hollmann wrote: Hi On Sonntag, 1. Juni 2008, you wrote: [...] Is the machine completely dead with the plain 2.2.1 driver? Can you ping? ssh? catch the log? Yes, it is completely dead, open ssh connections trying to gather last bits from tail -f /var/log/messages stall immediately (unfortunately the notebook has no serial connectors for a serial console), pings get no answer - a hard poweroff is the only recovery. Hi, In the mean time I've been setting up netconsole, which (I can only start it just before invoking kdm, as the ethernet driver (tulip) doesn't really like netconsole) only shows the following: netconsole: network logging started [drm] Initialized drm 1.1.0 20060810 mtrr: no more MTRRs available [drm] Initialized savage 2.4.1 20050313 on minor 0 mtrr: no more MTRRs available mtrr: base(0xf200) is not aligned on a size(0x500) boundary agpgart: Found an AGP 2.0 compliant device at :00:00.0. agpgart: Putting AGP V2 device at :00:00.0 into 0x mode agpgart: Putting AGP V2 device at :01:00.0 into 0x mode Then, as soon as the X server tries to start, the system locks up immediately with a black screen and the fan humming at full speed. could you try to find out where the hang occurs? You can put some calls to ErrorF() at various points in the driver, and add Option Log sync in the ServerFlags section of xorg.conf. I'll try this today, thanks for your hints If we don't manage to track this down soon, I'd be tempted to revert to an earlier version of the savage driver for lenny. The current version with 02_temporary_revert_pciaccess.diff applied and the following commits reverted a01c9d12938f977a4310e0547866f01517059a3e 69eca3b8340966874ee3ffdc0d0a3f73de7a816a 908b155161ebb6cd506f43a3987e4d146ef5b330 88141fd21214c501cafed73b1bba084b8a2bb929 fd2a598e64a522c028a20444379fa200a5724e62 works reliably for me since early june, (the earlier version did as well, of course). Just now, I managed to start X with xserver-xorg-video-savage 1:2.2.1-1 (without any changes) once (Xorg.0.log_2.2.1-1-working.log.gz attached), it failed/ crashed for the following reboots though (attached as Xorg.0.log_2.2.1-1-crashed.log.gz). (II) SAVAGE(0): [agp] agpTextures handle = 0xec10 (II) SAVAGE(0): [drm] aperture handle = 0xf200 (II) SAVAGE(0): [drm] Enabling ShadowStatus for DRI. -(II) SAVAGE(0): [drm] Status handle = 0x09d62000 -(II) SAVAGE(0): [drm] Status page mapped at 0xb19c7000 +(II) SAVAGE(0): [drm] Status handle = 0x0e6ae000 +(II) SAVAGE(0): [drm] Status page mapped at 0xb1833000 (II) SAVAGE(0): [dri] visual configs initialized (**) SAVAGE(0): DRI is enabled (--) SAVAGE(0): Chose mode 118 at 60Hz. -(II) SAVAGE(0): virtualX:1024,virtualY:768 -[...] Cheers, Julien Regards Stefan Lippers-Hollmann Xorg.0.log_2.2.1-1-crashed.log.gz Description: GNU Zip compressed data Xorg.0.log_2.2.1-1-working.log.gz Description: GNU Zip compressed data xorg.conf.gz Description: GNU Zip compressed data signature.asc Description: This is a digitally signed message part.
Bug#483989: xserver-xorg-video-savage: system freeze while starting X
Hi On Montag, 2. Juni 2008, Pascal A. Dupuis wrote: On Sun, Jun 01, 2008 at 08:30:38PM +0200, Brice Goglin wrote: [...] After upgrading xserver-xorg-video-savage from 1:2.1.3-5 to current unstable (1:2.2.1-1), the system freezes immediately with a black screen (no flashing cursor) while trying to start X, without any recoverable error messages. Changing DefaultColorDepth from 24 to 16 bit shows no results. As disabling 02_temporary_revert_pciaccess.diff from 1:2.1.3-5 seems to result in the same system freeze, re- enabling it for 1:2.2.1-1 and dropping conflicting upstream commits: a01c9d12938f977a4310e0547866f01517059a3e 69eca3b8340966874ee3ffdc0d0a3f73de7a816a 908b155161ebb6cd506f43a3987e4d146ef5b330 88141fd21214c501cafed73b1bba084b8a2bb929 fd2a598e64a522c028a20444379fa200a5724e62 results in a working system again. [...] I am adding to CC 2 person that may experience the same problem since 2.1.3-4 was broken for them. Joseph and Pascal, can you report back whether savage 2.2.1 from unstable is broken for you as well? Hello, using 2.2.1 from unstable, without problems, on my laptop. I reported problems a long time ago, and the driver works fine since. A few hints: which version of gcc do you use to compile the kernel ? I remember having troubles with gcc-4.3, while gcc-4.2 is fine. [...] The kernel has been built with gcc-4.2.4 [1], but to rule out kernel related issues, I've just (re-) tested linux-image-2.6.25-2-686 2.6.25-4 [2] from current sid with the same results in combination with xserver-xorg-video-savage 1:2.2.1-1. As soon as X starts, the system locks up hard, while it works well with 1:2.1.3-5 or 1:2.2.1-1 and 02_temporary_revert_pciaccess.diff etc. applied. Regards Stefan Lippers-Hollmann [1] Linux version 2.6.25-4.slh.3-sidux-686 (Debian 2.6.25-19) ([EMAIL PROTECTED]) (gcc version 4.2.4 (Debian 4.2.4-1)) #1 SMP PREEMPT Fri May 23 21:58:49 UTC 2008 [2] Linux version 2.6.25-2-686 (Debian 2.6.25-4) ([EMAIL PROTECTED]) (gcc version 4.1.3 20080420 (prerelease) (Debian 4.1.2-22)) #1 SMP Tue May 27 15:38:35 UTC 2008 signature.asc Description: This is a digitally signed message part.
Bug#483989: xserver-xorg-video-savage: system freeze while starting X
Hi [sorry that you get this mail twice, I accidentally answered you privately and didn't address the bug ] On Sonntag, 1. Juni 2008, you wrote: [...] Is the machine completely dead with the plain 2.2.1 driver? Can you ping? ssh? catch the log? Yes, it is completely dead, open ssh connections trying to gather last bits from tail -f /var/log/messages stall immediately (unfortunately the notebook has no serial connectors for a serial console), pings get no answer - a hard poweroff is the only recovery. I was kind of expecting that upstream did not fix in 2.2.1 everything we disabled in 2.1.3-5. Let's bump the severity to prevent 2.2.1 from entering testing, it's better to keep 2.1.3-5 for now. Thanks, the other upstream changes from 2.2.1 seem to be fine so far. I am adding to CC 2 person that may experience the same problem since 2.1.3-4 was broken for them. Joseph and Pascal, can you report back whether savage 2.2.1 from unstable is broken for you as well? Brice Regards Stefan Lippers-Hollmann signature.asc Description: This is a digitally signed message part.
Bug#483989: xserver-xorg-video-savage: system freeze while starting X
Hi On Sonntag, 1. Juni 2008, you wrote: [...] Is the machine completely dead with the plain 2.2.1 driver? Can you ping? ssh? catch the log? Yes, it is completely dead, open ssh connections trying to gather last bits from tail -f /var/log/messages stall immediately (unfortunately the notebook has no serial connectors for a serial console), pings get no answer - a hard poweroff is the only recovery. I was kind of expecting that upstream did not fix in 2.2.1 everything we disabled in 2.1.3-5. Let's bump the severity to prevent 2.2.1 from entering testing, it's better to keep 2.1.3-5 for now. Thanks, the other upstream changes from 2.2.1 seem to be fine so far. I am adding to CC 2 person that may experience the same problem since 2.1.3-4 was broken for them. Joseph and Pascal, can you report back whether savage 2.2.1 from unstable is broken for you as well? Brice Regards Stefan Lippers-Hollmann signature.asc Description: This is a digitally signed message part.
Bug#437333: libgl1-mesa-dri: support for Intel 945GME, G33, Q33 and Q35
stability seems to be minimal, closer
inspections between mesa 7.0.1 and the affected commits don't suggest
further problems.
Most of the debugging has been conducted on mesa 6.5.2-7, but was confirmed
to be still present in mesa 7.0.1~rc2-1 and the final 7.0.1-1 from unstable,
further raw logs can be found here [6]. Adding the mentioned patches and
rebuilding mesa 7.0.1-1 fixes the mentioned issues and using OpenGL becomes
stable on i386 and x86_64.
Thanks a lot for your efforts
Stefan Lippers-Hollmann
[1] http://sidux.com/slh/mesa/Xorg.0.log
[2]
http://git.kernel.org/git/?p=linux/kernel/git/torvalds/linux-2.6.git;a=commit;h=dc7a93190c21edbf3ed23e678ad04f852b9cff28
[3] http://sidux.com/slh/mesa/strace_glxinfo.log
[4]
http://gitweb.freedesktop.org/?p=mesa/mesa.git;a=commit;h=a74eec5af5397b612d60dd4b0d81666027f19bb0
(i915tex: Add support for 945GME)
[5]
http://gitweb.freedesktop.org/?p=mesa/mesa.git;a=commit;h=8331d9d7aa7cde7126d38d4e1eb5fe8a168077f3
(Add PCI IDs for the G33, Q33, and Q35 chipsets)
[6] http://sidux.com/slh/mesa/
-- System Information:
Debian Release: lenny/sid
APT prefers unstable
APT policy: (500, 'unstable')
Architecture: amd64 (x86_64)
Kernel: Linux 2.6.22.2-slh64-smp-1 (SMP w/2 CPU cores; PREEMPT)
Locale: LANG=de_DE.UTF-8, LC_CTYPE=de_DE.UTF-8 (charmap=UTF-8)
Shell: /bin/sh linked to /bin/bash
Versions of packages libgl1-mesa-dri depends on:
ii libc6 2.6.1-1GNU C Library: Shared libraries
ii libdrm2 2.3.0-4Userspace interface to kernel DRM
ii libexpat1 1.95.8-4 XML parsing C library - runtime li
ii libgl1-mesa-glx 7.0.1-1A free implementation of the OpenG
libgl1-mesa-dri recommends no packages.
-- no debconf information
diff --git a/src/mesa/drivers/dri/i915/i915_texstate.c b/src/mesa/drivers/dri/i915/i915_texstate.c
index 9f0c949..a19d4b6 100644
--- a/src/mesa/drivers/dri/i915/i915_texstate.c
+++ b/src/mesa/drivers/dri/i915/i915_texstate.c
@@ -491,12 +491,19 @@ static void i915SetTexImages( i915ContextPtr i915,
abort();
}
-
- if (i915-intel.intelScreen-deviceID == PCI_CHIP_I945_G ||
- i915-intel.intelScreen-deviceID == PCI_CHIP_I945_GM)
- i945LayoutTextureImages( i915, tObj );
- else
- i915LayoutTextureImages( i915, tObj );
+ switch (i915-intel.intelScreen-deviceID) {
+ case PCI_CHIP_I945_G:
+ case PCI_CHIP_I945_GM:
+ case PCI_CHIP_I945_GME:
+ case PCI_CHIP_G33_G:
+ case PCI_CHIP_Q33_G:
+ case PCI_CHIP_Q35_G:
+ i945LayoutTextureImages( i915, tObj );
+ break;
+ default:
+ i915LayoutTextureImages( i915, tObj );
+ break;
+ }
t-Setup[I915_TEXREG_MS3] =
(((tObj-Image[0][t-intel.base.firstLevel]-Height - 1) MS3_HEIGHT_SHIFT) |
diff --git a/src/mesa/drivers/dri/i915/intel_context.c b/src/mesa/drivers/dri/i915/intel_context.c
index e747fc6..11c23f2 100644
--- a/src/mesa/drivers/dri/i915/intel_context.c
+++ b/src/mesa/drivers/dri/i915/intel_context.c
@@ -123,6 +123,14 @@ const GLubyte *intelGetString( GLcontext *ctx, GLenum name )
chipset = Intel(R) 945G; break;
case PCI_CHIP_I945_GM:
chipset = Intel(R) 945GM; break;
+ case PCI_CHIP_I945_GME:
+ chipset = Intel(R) 945GME; break;
+ case PCI_CHIP_G33_G:
+ chipset = Intel(R) G33; break;
+ case PCI_CHIP_Q35_G:
+ chipset = Intel(R) Q35; break;
+ case PCI_CHIP_Q33_G:
+ chipset = Intel(R) Q33; break;
default:
chipset = Unknown Intel Chipset; break;
}
diff --git a/src/mesa/drivers/dri/i915/intel_context.h b/src/mesa/drivers/dri/i915/intel_context.h
index c48b074..3b50107 100644
--- a/src/mesa/drivers/dri/i915/intel_context.h
+++ b/src/mesa/drivers/dri/i915/intel_context.h
@@ -454,6 +454,10 @@ extern int INTEL_DEBUG;
#define PCI_CHIP_I915_GM 0x2592
#define PCI_CHIP_I945_G 0x2772
#define PCI_CHIP_I945_GM 0x27A2
+#define PCI_CHIP_I945_GME 0x27AE
+#define PCI_CHIP_G33_G 0x29C2
+#define PCI_CHIP_Q35_G 0x29B2
+#define PCI_CHIP_Q33_G 0x29D2
/*
diff --git a/src/mesa/drivers/dri/i915/intel_screen.c b/src/mesa/drivers/dri/i915/intel_screen.c
index 67e176a..ca8610b 100644
--- a/src/mesa/drivers/dri/i915/intel_screen.c
+++ b/src/mesa/drivers/dri/i915/intel_screen.c
@@ -514,6 +514,10 @@ static GLboolean intelCreateContext( const __GLcontextModes *mesaVis,
case PCI_CHIP_I915_GM:
case PCI_CHIP_I945_G:
case PCI_CHIP_I945_GM:
+ case PCI_CHIP_I945_GME:
+ case PCI_CHIP_G33_G:
+ case PCI_CHIP_Q35_G:
+ case PCI_CHIP_Q33_G:
return i915CreateContext( mesaVis, driContextPriv,
sharedContextPrivate );
diff --git a/src/mesa/drivers/dri/i915/intel_tex.c b/src/mesa/drivers/dri/i915/intel_tex.c
index 98ddc79..5bd2806 100644
--- a/src/mesa/drivers/dri/i915/intel_tex.c
+++ b/src/mesa/drivers/dri/i915/intel_tex.c
@@ -677,7 +677,11 @@ static void
