New branch 'ubuntu' available with the following commits: commit 576f82efbf54c800501f7fc742acb1f6920eb4ec Author: Christopher James Halse Rogers <r...@ubuntu.com> Date: Wed Aug 26 19:41:58 2009 +1000
Update changelog commit 210b13cf5c84af8c5ea7f39d04fd6c2a28922571 Author: Christopher James Halse Rogers <r...@ubuntu.com> Date: Wed Aug 26 19:40:34 2009 +1000 Update debian/xsfbs from pkg-xorg git. No longer uses deprecated --print-installation-architecture. Fixes bug #403316 commit 3a64a645f8a396392241189fe42fe8ad2eab5140 Author: Christopher James Halse Rogers <r...@ubuntu.com> Date: Sun Aug 23 19:36:52 2009 +1000 * Merge package from Debian experimental. Remaining Ubuntu changes: + debian/control: - Remove mention of using module-assistant; we have a DKMS source package - Add dependency on quilt for our snapshot-date patch + debian/rules: - Call patch target - Generate snapshot-date in get-orig-source + debian/patches/01_include_snapshot_date - Use snapshot-date included by get-orig-source to define NV_DRIVER_DATE in configure. Helps upstream identify obsolete drivers with Xorg.log * New upstream snapshot. commit e3c008067956163d91b5cd9a2a8920794b60180f Merge: 58ed4d84de9a2718327d7864d227d418b84ebabf dce88a3d787398667baf015182fd5aaf245baed9 Author: Christopher James Halse Rogers <r...@ubuntu.com> Date: Sun Aug 23 19:23:57 2009 +1000 Merge with debian-experimental * Merge changelog entries * Maintain build-depend on quilt; we still patch in a snapshot-date commit 58ed4d84de9a2718327d7864d227d418b84ebabf Merge: 9cd7ccfe087107b8332232e5a7a4512d886c3918 92f271020a1b9486bd5890a00649aed3678ead62 Author: Christopher James Halse Rogers <r...@ubuntu.com> Date: Sun Aug 23 19:13:14 2009 +1000 Merge branch 'upstream-ubuntu' into ubuntu * upstream-ubuntu: (84 commits) nv50/xv: provide SYNC_TO_VBLANK attribute xv: disable overlay with kms for the moment dri2: call exaMoveInPixmap() before accessing driver pixmap private xv: call exaMoveInPixmap() for driver pixmaps nv50/exa: fix pointer increment in UploadSIFC wfb: don't default to linear when encountering a pixmap without bo Revert "nv50: enforce certain allignments on a tiled frontbuffer, as well as overallocate it a bit" nv50: enforce certain allignments on a tiled frontbuffer, as well as overallocate it a bit exa: default to enabling driver pixmaps if everything else is new enough exa: turn on new exa migration mode for driver pixmaps nv04-nv40/exa: set cliprect to drawing area for IFC dri: close before dropping master Set/Drop master in Enter/LeaveVT dri: close before taking down accel nv04-nv40: deal with framebuffer resize in !kms_enable mode nv50: deal with framebuffer resize for !kms_enable No wfb without KMS dri2: fix CopyRegion() dri2: merge DRI2BufferRec and nouveau_dri2_buffer into a single struct dri2: remove support for < version 3 ... commit 92f271020a1b9486bd5890a00649aed3678ead62 Author: Ben Skeggs <bske...@redhat.com> Date: Thu Aug 13 15:40:52 2009 +1000 nv50/xv: provide SYNC_TO_VBLANK attribute commit ada1d36d7097c389c8e21707d36b3cdd6378db94 Author: Ben Skeggs <bske...@redhat.com> Date: Thu Aug 13 15:38:14 2009 +1000 xv: disable overlay with kms for the moment commit 85b1c86983a39cb921bd68a8601785975c948e2d Author: Ben Skeggs <bske...@redhat.com> Date: Mon Aug 10 11:42:15 2009 +1000 dri2: call exaMoveInPixmap() before accessing driver pixmap private commit 292f46a0a0e031fc8a4256aa1eed91e3b2167acd Author: Ben Skeggs <bske...@redhat.com> Date: Mon Aug 10 11:36:56 2009 +1000 xv: call exaMoveInPixmap() for driver pixmaps commit 0210fbf01d61fb0541770d541b71396537bcb728 Author: Christoph Bumiller <e0425...@student.tuwien.ac.at> Date: Sun Aug 9 14:53:28 2009 +0200 nv50/exa: fix pointer increment in UploadSIFC We always output 'size' dwords to the ring buffer, so the pointer should be advanced accordingly, independent of cpp. commit 1ac7d83c1e46a164c4a3a3688de1bcde9e5a58e0 Author: Maarten Maathuis <madman2...@gmail.com> Date: Sat Aug 8 19:41:02 2009 +0200 wfb: don't default to linear when encountering a pixmap without bo - With exa "mixed" there are actually very valid cases where this happens. - This fixes certain types of corruptions, like the yellow and black in a gimp window. commit 64790e950e7f46e6f4f5b8486f8d0bd929cb5504 Author: Maarten Maathuis <madman2...@gmail.com> Date: Fri Aug 7 16:12:41 2009 +0200 Revert "nv50: enforce certain allignments on a tiled frontbuffer, as well as overallocate it a bit" This reverts commit dd72640c8133ee78304f875023134f214d94a630. Moved to the kernel. commit dd72640c8133ee78304f875023134f214d94a630 Author: Maarten Maathuis <madman2...@gmail.com> Date: Fri Aug 7 11:56:29 2009 +0200 nv50: enforce certain allignments on a tiled frontbuffer, as well as overallocate it a bit - There is reason to believe that with driver modifications (part of) this won't be needed. - Until then this should fix "tiles" appearing at the upper left or lower right corner. commit bfbe4d33679cc25939db0da729d89ba2a4295764 Author: Ben Skeggs <bske...@redhat.com> Date: Fri Aug 7 16:02:27 2009 +1000 exa: default to enabling driver pixmaps if everything else is new enough commit 30ddd08bb2739514edf6d6e137f533b34a4369d2 Author: Ben Skeggs <bske...@redhat.com> Date: Fri Aug 7 16:01:27 2009 +1000 exa: turn on new exa migration mode for driver pixmaps commit 712064e6188d65e2c7d85078b95a0292edcad0e7 Author: Ben Skeggs <bske...@redhat.com> Date: Wed Aug 5 14:00:51 2009 +1000 nv04-nv40/exa: set cliprect to drawing area for IFC commit 7f63da83d8622176114ecd55048736fecd703322 Author: Ben Skeggs <bske...@redhat.com> Date: Wed Aug 5 12:04:46 2009 +1000 dri: close before dropping master commit 0cc44b713ec07dfb56a4b4a6d7ae1c1a75c74971 Author: Ben Skeggs <bske...@redhat.com> Date: Wed Aug 5 11:57:01 2009 +1000 Set/Drop master in Enter/LeaveVT commit 087e9f61b81ea90a1591d8b43e29bda091156405 Author: Ben Skeggs <bske...@redhat.com> Date: Wed Aug 5 11:51:54 2009 +1000 dri: close before taking down accel Fixes "failed to destroy server context" errors on exit. commit 96ac8c5a9473d81b737afa116f4fd388e3152f50 Author: Ben Skeggs <bske...@redhat.com> Date: Wed Aug 5 11:36:39 2009 +1000 nv04-nv40: deal with framebuffer resize in !kms_enable mode commit b8ea3b41b0540635585bc68334691414f7cff53d Author: Ben Skeggs <bske...@redhat.com> Date: Wed Aug 5 11:30:51 2009 +1000 nv50: deal with framebuffer resize for !kms_enable commit d0dcc89825acb4b480f3849d8896b17a80df02f4 Author: Ben Skeggs <bske...@redhat.com> Date: Wed Aug 5 11:28:45 2009 +1000 No wfb without KMS commit 2c7502680e1ab3a4ea4869a78d0317746084dd92 Author: Ben Skeggs <bske...@redhat.com> Date: Wed Aug 5 08:55:09 2009 +1000 dri2: fix CopyRegion() commit 2a4c93a064353cf61c30dd1e96f93203895beb15 Author: Ben Skeggs <bske...@redhat.com> Date: Wed Aug 5 08:36:26 2009 +1000 dri2: merge DRI2BufferRec and nouveau_dri2_buffer into a single struct commit 4f386f983fde197e9136ffe6fbf941a343996897 Author: Ben Skeggs <bske...@redhat.com> Date: Wed Aug 5 08:20:46 2009 +1000 dri2: remove support for < version 3 commit 0f691257e6d2c3662f9c76adc3287f5320a8822d Author: Ben Skeggs <bske...@redhat.com> Date: Mon Aug 3 11:30:46 2009 +1000 zfill scanout buffer, not offscreen commit d893600356b3480d3df536a04e9860bfada5a159 Author: Maarten Maathuis <madman2...@gmail.com> Date: Sun Aug 2 19:43:58 2009 +0200 kms: remove fb in NVCloseScreen otherwise server regeneration fails - The bo was deleted, but fb_id remained non-zero, so it never picked up the new one. commit ac2a644773e5b160b6794a252b85c0bf8acc5169 Author: Ben Skeggs <bske...@redhat.com> Date: Sun Aug 2 20:10:35 2009 +1000 xv: really fix offscreen pixmap calculation sleep.. good.. commit 60635e5073e69c6f690dc3c876772b5478013783 Author: Ben Skeggs <bske...@redhat.com> Date: Sun Aug 2 19:42:17 2009 +1000 xv: fix check for offscreen pixmaps commit 1ecd4358c851b3d7bebfb00f5f7ac3c7c151bc20 Author: Ben Skeggs <bske...@redhat.com> Date: Fri Jul 31 15:30:08 2009 +1000 Recalculate displayWidth if we do a late NoAccel fallback Fixes G80, where we'd have calculated the pitch for tiled scanout. commit 08ef8aaf2bd7b9565cc36679412b721499f9a367 Author: Ben Skeggs <bske...@redhat.com> Date: Fri Jul 31 15:23:49 2009 +1000 Don't allocate offscreen memory or GART when using NoAccel commit 64a1515fab9764d0ada304426e7f0d7ec995b84e Author: Ben Skeggs <bske...@redhat.com> Date: Fri Jul 31 13:49:49 2009 +1000 Fix NoAccel/ShadowFB with fb resize commit e9034a2e8d8285cf45cd1410b9e8933991f82a2b Author: Ben Skeggs <bske...@redhat.com> Date: Fri Jul 31 13:29:11 2009 +1000 NoAccel + wfb == bad idea commit 69a40131b700a4fbc4de9432110045870de0806e Author: Ben Skeggs <bske...@redhat.com> Date: Fri Jul 31 13:28:02 2009 +1000 Fix up screen pixmap's devPrivate.ptr after resize commit 4ea65c594a1f10f586da2ca32e499de2ea0a2605 Author: Ben Skeggs <bske...@redhat.com> Date: Fri Jul 31 13:25:45 2009 +1000 Point fb at the correct buffer.. commit c6b98608daec4162a7d23ce8c1d50a4a9c3ca3dc Author: Ben Skeggs <bske...@redhat.com> Date: Fri Jul 31 13:09:56 2009 +1000 Switch on can_resize for non-kms commit 4bb007ebb8e60c87c815f9c4ce63b8d1d46e8b75 Author: Ben Skeggs <bske...@redhat.com> Date: Fri Jul 31 13:03:45 2009 +1000 Fall back to NoAccel if channel/object creation fails commit 641fdacbd1aeb9882caa30da6d568ff9a0bd78f5 Author: Ben Skeggs <bske...@redhat.com> Date: Fri Jul 31 11:46:47 2009 +1000 nv50/exa: use scissored triangle for composite too commit c6c0ef1b5a837838a0fc2e8d1659b1b4d76d26b0 Author: Ben Skeggs <bske...@redhat.com> Date: Fri Jul 31 11:23:04 2009 +1000 nv50/xv: enable sync-to-vblank commit b3d6861fa482a92807aadd9222ca2c8c605beaeb Author: Maarten Maathuis <madman2...@gmail.com> Date: Thu Jul 30 17:23:25 2009 +0200 nv50_xv: switch to a scissored triangle to avoid strange artifacts when vsync is enabled commit 9b37bc96d86882b7f9c355e92cbeff517090a98d Author: Ben Skeggs <bske...@redhat.com> Date: Thu Jul 30 19:24:19 2009 +1000 more cleanup commit d8c10eb14f8d6b5cad88a39a5da7104a403060cd Author: Ben Skeggs <bske...@redhat.com> Date: Thu Jul 30 10:17:38 2009 +1000 non-kms fb resize commit 3b1a861aa56f823e8d26f33b7139e290bf44b79d Author: Ben Skeggs <bske...@redhat.com> Date: Thu Jul 30 07:14:17 2009 +1000 free scanout buffer in NVUnmapMem() commit 4d20547df30d630b94b0cfc28dcf7ead564f7369 Author: Ben Skeggs <bske...@redhat.com> Date: Tue Jul 28 18:14:03 2009 +1000 nv50: tile scanout buffer for "classic" exa if xserver new enough commit 03bc3a604e5c12829f81f2582374d37012da7f36 Author: Ben Skeggs <bske...@redhat.com> Date: Tue Jul 28 11:45:51 2009 +1000 kms: only use rounded height for allocation Fixes minor cursor corruption in some circumstances with driver pixmaps. commit e4fb3e7064df14b21a6ea34b919ccf2bf9fa0ca2 Author: Ben Skeggs <bske...@redhat.com> Date: Tue Jul 28 11:27:09 2009 +1000 More fixing of pitches + use 0x7000 tile_flags for tiled 16bpp on nv50 commit 97cca7630441876414da5dfabb9ad9f2b208e29d Author: Ben Skeggs <skeg...@beleth.keine.ath.cx> Date: Tue Jul 28 10:21:11 2009 +1000 kms: implement rotation support without driver pixmaps commit 786ff2994aa4f614b7cc9d466455eef183697d42 Author: Ben Skeggs <skeg...@beleth.keine.ath.cx> Date: Tue Jul 28 09:43:00 2009 +1000 kms: simplify drmmode_is_rotate_pixmaps args commit ff62da668a468796e4001523958e73eb2060b7f2 Author: Ben Skeggs <bske...@redhat.com> Date: Mon Jul 27 22:07:38 2009 +1000 dri1: dodgyness to "survive" a framebuffer resize (or rather, move) This can never work well without a lot of work, which I'm not willing to put in for DRI1. This will at least let it keep sort-of working, any DRI1 apps running when a resize event occurs will continue rendering into the old framebuffer. commit b77d580ebcc9b371153774010d29038645effffb Author: Ben Skeggs <bske...@redhat.com> Date: Mon Jul 27 21:43:25 2009 +1000 We already map offscreen and store the virtual, no need to keep doing it commit bdf2c9aee02a100b44c083347a2415c100bd2546 Author: Ben Skeggs <bske...@redhat.com> Date: Mon Jul 27 21:35:19 2009 +1000 kms: implement framebuffer resize without driver pixmaps commit 595b1c74e52f16ef482be6f14e4a33b4649b8bfd Author: Ben Skeggs <bske...@redhat.com> Date: Mon Jul 27 07:44:41 2009 +1000 Fix build with 0.0.15 commit 9b879b9b38809e7d206c9e78610836bdd9c2d09b Author: Ben Skeggs <bske...@redhat.com> Date: Mon Jul 27 21:09:42 2009 +1000 Cleanup commit 0336eb15ebc351ab6900b48972e12f5cc6abf1bb Author: Ben Skeggs <bske...@redhat.com> Date: Mon Jul 27 17:52:15 2009 +1000 Switch to using scanout buffer detached from EXA offscreen memory area commit 0403cf3698ecb9a290bb4b7e24d0deedc957ad2a Author: Ben Skeggs <bske...@redhat.com> Date: Mon Jul 27 17:45:29 2009 +1000 Allocate scanout buffer independently of EXA offscreen area This is just wasted memory for the moment... commit f8ac9e35bd20391f923c5c5ccc509251ea23a4c5 Author: Ben Skeggs <bske...@redhat.com> Date: Mon Jul 27 17:30:54 2009 +1000 Remove NoDRM mode commit e259925bbdcebe4c3d136f476fc54f426eea9261 Author: Ben Skeggs <bske...@redhat.com> Date: Mon Jul 27 17:14:00 2009 +1000 xv: fix some badness in nv3x/nv4x textured video adaptors commit 3a10daca16752b52ec3187deb8b1c25d6c6fd641 Author: Ben Skeggs <bske...@redhat.com> Date: Mon Jul 27 16:05:03 2009 +1000 rename pNv->FB to pNv->offscreen Not strictly true right now, but it's about to be. commit 91bfda81982a77a79c2baee39929711b38b1ae6a Author: Ben Skeggs <bske...@redhat.com> Date: Mon Jul 27 11:46:51 2009 +1000 exa: allow acceleration to rotation bo commit d59aaa81590b52b6227b69028f08d8ab62505525 Author: Ben Skeggs <bske...@redhat.com> Date: Mon Jul 27 11:02:44 2009 +1000 exa: use PixmapIsOffscreen hook for non-driver pixmaps path too commit c442376d4e9a8296760c1171fee5ca155534d011 Author: Ben Skeggs <bske...@redhat.com> Date: Mon Jul 27 07:44:14 2009 +1000 Fix typo exposed by removal of NV_* card type defines from DRM header commit 15bfc676094d19e57711bbdff40edd5c8e8592d6 Author: Ben Skeggs <bske...@redhat.com> Date: Mon Jul 27 07:40:20 2009 +1000 Warning fixes commit 6eb790b6113a999727895694d01910b83348647a Author: Ben Skeggs <bske...@redhat.com> Date: Fri Jul 24 13:54:49 2009 +1000 kms: keep rotate buffer pitch in crtc struct, rather than recalculating commit 25f29426293fcac2e7a17b986673b2874e7a7264 Author: Ben Skeggs <bske...@redhat.com> Date: Fri Jul 24 13:18:22 2009 +1000 Wrap CreateScreenResources and set screen pixmap's BO there Avoids reallocating pNv->FB yet again when we hit the resize hook. commit d1628dc9159343400f09f696b9c4ef9d0fe1acbf Author: Maarten Maathuis <madman2...@gmail.com> Date: Tue Jul 28 10:08:40 2009 +0200 nouveau: remove some more RAC bits - The assumption is that RAC is dead anyway on post-libpciaccess xservers. commit 75fba5dfd2a00f3b8212d0e8af544273c14ee0c5 Author: Dave Airlie <airl...@redhat.com> Date: Tue Jul 28 13:53:06 2009 +1000 nouveau: rip out resources code whats left at least commit 094e4e075f8e48ace534a6f011f95b6ebf1abc3b Author: Ben Skeggs <skeg...@beleth.keine.ath.cx> Date: Thu Jul 23 11:25:22 2009 +1000 kms: don't skip resize call if we don't have a backing bo for screen pixmap commit bff801941e23dfe3fb7449af5780ee477b10d092 Author: Ben Skeggs <skeg...@beleth.keine.ath.cx> Date: Thu Jul 23 11:23:15 2009 +1000 Fix a DRM vs DDX confusion typo commit e9ebddae840789535acf56ac2281b3fde3cfee96 Author: Maarten Maathuis <madman2...@gmail.com> Date: Wed Jul 22 12:51:08 2009 +0200 Fix build without AM_SILENT_RULES. commit f70287cf7cacc03d8390376519165d50a325cec5 Author: Peter Henriksson <peter.henriks...@gmail.com> Date: Mon Jul 20 23:56:13 2009 +0200 Add support for AM_SILENT_RULES Make use of the AM_SILENT_RULES functionality in automake 1.11 Defaults to quiet output. Verbose output can be enabled with "./configure --disable-silent-rules" or "make V=1" Signed-off-by: Ben Skeggs <bske...@redhat.com> commit 69ba1095a9aef29ce8fdb71ecf48f15cb13202c2 Author: Ben Skeggs <bske...@redhat.com> Date: Tue Jul 21 16:29:13 2009 +1000 nv50/xv: attempt sync-to-vblank if driver pixmaps are being used commit 994c37927289de7a0ab6e951892f0d66880a6210 Author: Ben Skeggs <bske...@redhat.com> Date: Tue Jul 21 14:05:59 2009 +1000 nv50: fix a number of tiled buffer sizing issues in kms paths commit 9c1eefd221366b9f5efbd30e4a28fba244347d4f Author: Ben Skeggs <bske...@redhat.com> Date: Tue Jul 21 13:43:14 2009 +1000 Don't set driver pixmaps enabled with NoAccel commit 52882e82708f79ef198dde51f9bbebee752154be Author: Ben Skeggs <bske...@redhat.com> Date: Tue Jul 21 13:19:07 2009 +1000 exa: fix nouveau_exa_pixmap_is_onscreen() for driver pixmaps commit 9fb28d107ad9fcd6a4bbb0a35c1fc0f719d531ae Author: Ben Skeggs <bske...@redhat.com> Date: Tue Jul 21 12:52:35 2009 +1000 exa: remove ModifyPixmapHeader hook, it's not required commit 574fa36c73a1b04b67289762a10b5bbda7be083f Author: Ben Skeggs <bske...@redhat.com> Date: Tue Jul 21 12:51:26 2009 +1000 exa: only support driver pixmaps on servers with CreatePixmap2 commit 365ab69499f466aeebac1437578609a7790f5dc4 Author: Ben Skeggs <bske...@redhat.com> Date: Fri Jul 17 13:41:07 2009 +1000 remove explicit pin of pNv->FB on creation commit a757db1aadfd7a7d206dfc7968da8647dd91e65f Author: Ben Skeggs <bske...@redhat.com> Date: Fri Jul 17 13:38:52 2009 +1000 no need to pin GART bo commit 474ebdeea1266959fddeabf04b24e04aaab8449e Author: Ben Skeggs <bske...@redhat.com> Date: Fri Jul 17 13:37:29 2009 +1000 remove pinned creation from nodrm path commit b9333d5d34386d88b58d2267b388bbcc89b73f47 Author: Ben Skeggs <bske...@redhat.com> Date: Fri Jul 17 13:35:20 2009 +1000 nv04-nv40: explicitly pin scanout buffer when required commit 53b5b68cd168b15c377f83e5e068cee92361f51d Author: Ben Skeggs <bske...@redhat.com> Date: Fri Jul 17 13:31:13 2009 +1000 nv50: no need to pin rotate scanout buffers on creation now commit a57a9bb825e04bbe4aa94d9ac1149e2fca6525a4 Author: Ben Skeggs <bske...@redhat.com> Date: Fri Jul 17 13:28:36 2009 +1000 exa: only allow driver pixmaps when KMS enabled The pre-KMS code can't deal with driver pixmaps in some circumstances, and rather than leave it there for people to accidently trip on, remove support. The other option would have been to fix the UMS code, but, who really cares? commit 5d7a0b954c0da879f81a6fa1a9dc8070c58a0fe6 Author: Ben Skeggs <bske...@redhat.com> Date: Fri Jul 17 13:25:31 2009 +1000 remove remains of prehistoric NOUVEAU_EXA_PIXMAPS stuff commit 784a0337c3165c8d8fb696e4fa30bbdc8cf01b98 Author: Ben Skeggs <bske...@redhat.com> Date: Fri Jul 17 13:18:06 2009 +1000 nv50: explicitly pin scanout buffer in non-kms path commit 09db6180e4205ef55516c24ac5dfc3bd861d9fd6 Author: Ben Skeggs <bske...@redhat.com> Date: Fri Jul 17 13:12:25 2009 +1000 nv30: don't pin shader memory commit 7da55d99e3c93cadda50dcad06b09c52daa0cc5b Author: Ben Skeggs <bske...@redhat.com> Date: Fri Jul 17 13:10:16 2009 +1000 xv: don't pin buffer unless using the overlay commit e8b9f689b778909e710fc5bd5616e6497b922a09 Author: Ben Skeggs <bske...@redhat.com> Date: Fri Jul 17 13:07:04 2009 +1000 kms: don't pin scanout buffer, no need, kernel will do it commit b1b233099853b56cfdcff9c4c31d3550b76b949e Author: Ben Skeggs <bske...@redhat.com> Date: Fri Jul 17 08:22:02 2009 +1000 Fix build with xextproto 7.1 commit c089a71a94e7887c405af7141e188302a5e2d393 Author: Ben Skeggs <bske...@redhat.com> Date: Thu Jul 16 09:32:59 2009 +1000 dri2: fix for xserver abi change commit 9cd7ccfe087107b8332232e5a7a4512d886c3918 Author: Christopher James Halse Rogers <r...@ubuntu.com> Date: Wed Jul 15 15:25:36 2009 +1000 Expand on changelog entry commit 9c219ca508fe4027b1c69650831fd2222101c282 Author: Christopher James Halse Rogers <ch...@ed.bebop.cooperteam.net> Date: Wed Jul 8 08:38:09 2009 +1000 Add changelog entry for new upstream snapshot commit 356bd3ddcbf80d3190a3ce00ec996888b941b5d2 Merge: d748435ea4ea77b9e86e671041fc1da981249fa5 ef3a386a6df4569343e63332eb798c1d722fe164 Author: Christopher James Halse Rogers <ch...@ed.bebop.cooperteam.net> Date: Wed Jul 8 08:34:22 2009 +1000 Merge branch 'upstream-ubuntu' into ubuntu * upstream-ubuntu: (95 commits) Update manpage + finish removing useless options No need for pci access wrappers now.. Remove non-XSERVER_LIBPCIACCESS paths, we depend on a new xserver anyway Some more bits of NVRec to go... Rip out vgaHW + more unused vars from NVRec Nuke nv_hw.c, and a heap of unused vars from NVRec Remove nv_dac.c Cull everything in !pNv->randr12_enabled blocks kms: fix CRTC offset when rotation enabled nv50: initial support for depth 30 kms: don't try transition when we don't have src+dst buffer ids wfb: fix stupid thinko + more safety bios: oops bios: use image from PRAMIN in preference to PROM on NV50 wrap BlockHandler a little earlier kms: safer fb resize func wfb: use straight memcpy hook if no tiled wraps present wfb: be more cautious in a few places kms: small cleanup kms: fix rotation buffer pitch ... commit ef3a386a6df4569343e63332eb798c1d722fe164 Author: Ben Skeggs <bske...@redhat.com> Date: Mon Jul 6 20:33:49 2009 +1000 Update manpage + finish removing useless options commit 4b6e0b96188e32cb2a13f8d2bd5973f0287c827b Author: Ben Skeggs <bske...@redhat.com> Date: Mon Jul 6 20:25:23 2009 +1000 No need for pci access wrappers now.. commit 1e22673f43acd0f02ba36e189b39e28b635cd50c Author: Ben Skeggs <bske...@redhat.com> Date: Mon Jul 6 20:16:02 2009 +1000 Remove non-XSERVER_LIBPCIACCESS paths, we depend on a new xserver anyway commit aafb62f86adebb3418876649e8bd189c1523e961 Author: Ben Skeggs <bske...@redhat.com> Date: Mon Jul 6 20:08:03 2009 +1000 Some more bits of NVRec to go... commit 0ba588cb75af67a644f51add35778925d4088cf9 Author: Ben Skeggs <bske...@redhat.com> Date: Mon Jul 6 19:58:15 2009 +1000 Rip out vgaHW + more unused vars from NVRec commit 3e22547b6826ae741b168c4b3391b6ade56b4829 Author: Ben Skeggs <bske...@redhat.com> Date: Mon Jul 6 19:46:26 2009 +1000 Nuke nv_hw.c, and a heap of unused vars from NVRec commit eea5259d951a5919fa7800877570347c14411a32 Author: Ben Skeggs <bske...@redhat.com> Date: Mon Jul 6 19:13:44 2009 +1000 Remove nv_dac.c commit a38b91a7a5c3337d405aa217830857832c5399e0 Author: Ben Skeggs <bske...@redhat.com> Date: Mon Jul 6 19:09:09 2009 +1000 Cull everything in !pNv->randr12_enabled blocks commit 4815d312911cb4cfad4b4a5b194fce41d82f4869 Author: Ben Skeggs <bske...@redhat.com> Date: Mon Jul 6 11:44:26 2009 +1000 kms: fix CRTC offset when rotation enabled commit 6d143272f497a61c5578752f58261befbfaf911a Author: Ben Skeggs <bske...@redhat.com> Date: Wed Jul 1 14:03:06 2009 +1000 nv50: initial support for depth 30 commit 9b0919c3f3269b88fb338c043bbad34f20c22f41 Author: Ben Skeggs <bske...@redhat.com> Date: Tue Jun 30 13:20:15 2009 +1000 kms: don't try transition when we don't have src+dst buffer ids -- To UNSUBSCRIBE, email to debian-x-requ...@lists.debian.org with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org