)]}' { "log": [ { "commit": "03a2c4d76c9e99b80d74ab8a4f344e135a5ae44b", "tree": "7fd7940a4f87dc1ace1c1bdeb1fb0d90ac3beb13", "parents": [ "a27341cd5fcb7cf2d2d4726e9f324009f7162c00", "d424b925f7092b9d95e0a8556872349abe79d9b6" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Mar 04 07:49:37 2010 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Mar 04 07:49:37 2010 -0800" }, "message": "Merge branch \u0027drm-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/airlied/drm-2.6\n\n* \u0027drm-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/airlied/drm-2.6: (151 commits)\n vga_switcheroo: disable default y by new rules.\n drm/nouveau: fix *staging* driver build with switcheroo off.\n drm/radeon: fix typo in Makefile\n vga_switcheroo: fix build on platforms with no ACPI\n drm/radeon: Fix printf type warning in 64bit system.\n drm/radeon/kms: bump the KMS version number for square tiling support.\n vga_switcheroo: initial implementation (v15)\n drm/radeon/kms: do not disable audio engine twice\n Revert \"drm/radeon/kms: disable HDMI audio for now on rv710/rv730\"\n drm/radeon/kms: do not preset audio stuff and start timer when not using audio\n drm/radeon: r100/r200 ums: block ability for userspace app to trash 0 page and beyond\n drm/ttm: fix function prototype to match implementation\n drm/radeon: use ALIGN instead of open coding it\n drm/radeon/kms: initialize set_surface_reg reg for rs600 asic\n drm/i915: Use a dmi quirk to skip a broken SDVO TV output.\n drm/i915: enable/disable LVDS port at DPMS time\n drm/i915: check for multiple write domains in pin_and_relocate\n drm/i915: clean-up i915_gem_flush_gpu_write_domain\n drm/i915: reuse i915_gpu_idle helper\n drm/i915: ensure lru ordering of fence_list\n ...\n\nFixed trivial conflicts in drivers/gpu/vga/Kconfig\n" }, { "commit": "d424b925f7092b9d95e0a8556872349abe79d9b6", "tree": "a83742bb135b543389342daaddff8252211995ce", "parents": [ "2f41a7f11c4bb93c41715008a693cadaee5efd82" ], "author": { "name": "Dave Airlie", "email": "airlied@redhat.com", "time": "Wed Mar 03 09:26:35 2010 +1000" }, "committer": { "name": "Dave Airlie", "email": "airlied@redhat.com", "time": "Wed Mar 03 09:26:35 2010 +1000" }, "message": "vga_switcheroo: disable default y by new rules.\n\nAnother undocumented rule of kernel folklore, no default y\nconfig options anymore, apparantly hinting to distros they might\nwant something isn\u0027t preferred anymore.\n\nSigned-off-by: Dave Airlie \u003cairlied@redhat.com\u003e\n" }, { "commit": "8edb381d6705811b278527907a5ae2a9c4db8074", "tree": "3e9c0c6474eba65cfafc2652c49be002ae76a493", "parents": [ "55a5cb5d594c18b3147a2288b00ea359c1a38cf8" ], "author": { "name": "Dave Airlie", "email": "airlied@redhat.com", "time": "Mon Mar 01 21:50:01 2010 +1100" }, "committer": { "name": "Dave Airlie", "email": "airlied@ppcg5.localdomain", "time": "Mon Mar 01 22:21:58 2010 +1100" }, "message": "vga_switcheroo: fix build on platforms with no ACPI\n\nradeon was always including the atpx code unnecessarily, also core\nswitcheroo was including acpi headers.\n\nSigned-off-by: Dave Airlie \u003cairlied@redhat.com\u003e\n" }, { "commit": "6a9ee8af344e3bd7dbd61e67037096cdf7f83289", "tree": "07cdb493a790cf45bc473f2fc2ea1b9a166d5191", "parents": [ "9fd1de52945e06ed88a440c99ca92dab74b9b33c" ], "author": { "name": "Dave Airlie", "email": "airlied@linux.ie", "time": "Mon Feb 01 15:38:10 2010 +1000" }, "committer": { "name": "Dave Airlie", "email": "airlied@redhat.com", "time": "Mon Mar 01 16:20:37 2010 +1000" }, "message": "vga_switcheroo: initial implementation (v15)\n\nMany new laptops now come with 2 gpus, one to be used for low power\nmodes and one for gaming/on-ac applications. These GPUs are typically\nwired to the laptop panel and VGA ports via a multiplexer unit which\nis controlled via ACPI methods.\n\n4 combinations of systems typically exist - with 2 ACPI methods.\nIntel/ATI - Lenovo W500/T500 - use ATPX ACPI method\nATI/ATI - some ASUS - use ATPX ACPI Method\nIntel/Nvidia - - use _DSM ACPI method\nNvidia/Nvidia - - use _DSM ACPI method.\n\nTODO:\nThis patch adds support for the ATPX method and initial bits\nfor the _DSM methods that need to written by someone with\naccess to the hardware.\nAdd a proper non-debugfs interface - need to get some proper\ntesting first.\n\nv2: add power up/down support for both devices\non W500 puts i915/radeon into D3 and cuts power to radeon.\n\nv3: redo probing methods, no DMI list, drm devices call to\nregister with switcheroo, it tries to find an ATPX method on\nany device and once there is two devices + ATPX it inits the\nswitcher.\n\nv4: ATPX msg handling using buffers - should work on more machines\n\nv5: rearchitect after more mjg59 discussion - move ATPX handling to\n radeon driver.\n\nv6: add file headers + initial nouveau bits (to be filled out).\n\nv7: merge delayed switcher code.\n\nv8: avoid suspend/resume of gpu that is off\n\nv9: rearchitect - mjg59 is always right. - move all ATPX code to\nradeon, should allow simpler DSM also proper ATRM handling\n\nv10: add ATRM support for radeon BIOS, add mutex to lock vgasr_priv\n\nv11: fix bug in resuming Intel for 2nd time.\n\nv12: start fixing up nvidia code blindly.\n\nv13: blindly guess at finishing nvidia code\n\nv14: remove radeon audio hacks - fix up intel resume more like upstream\n\nv15: clean up printks + remove unnecessary igd/dis pointers\n\nmount debugfs\n\n/sys/kernel/debug/vgaswitcheroo/switch - should exist if ATPX detected\n + 2 cards.\n\nDIS - immediate change to discrete\nIGD - immediate change to IGD\nDDIS - delayed change to discrete\nDIGD - delayed change to IGD\nON - turn on not in use\nOFF - turn off not in use\n\nTested on W500 (Intel/ATI) and T500 (Intel/ATI)\n\nSigned-off-by: Dave Airlie \u003cairlied@redhat.com\u003e\n" }, { "commit": "c7e15899d07c9813c1aa96b21699d2d9c8314c4b", "tree": "16e9b4dceddf1b4d1dad05588d700c70cf8fcb88", "parents": [ "f6a0b5cd34d6e922cc7258c5429fb0f17508ceb6", "78c06176466cbd1b3f0f67709d3023c40dbebcbd" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sun Feb 28 10:59:18 2010 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sun Feb 28 10:59:18 2010 -0800" }, "message": "Merge branch \u0027x86-pci-for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip\n\n* \u0027x86-pci-for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:\n x86: Enable NMI on all cpus on UV\n vgaarb: Add user selectability of the number of GPUS in a system\n vgaarb: Fix VGA arbiter to accept PCI domains other than 0\n x86, uv: Update UV arch to target Legacy VGA I/O correctly.\n pci: Update pci_set_vga_state() to call arch functions\n" }, { "commit": "2cc9116c2b37c525965d76a3e6def38913259427", "tree": "16d5540bae7da373a52efd179c094f5cfc80c472", "parents": [ "6b15835282f9c6a023e2625455bfdb822bb9cc64" ], "author": { "name": "Kyle McMartin", "email": "kyle@redhat.com", "time": "Tue Feb 16 16:18:37 2010 -0500" }, "committer": { "name": "Dave Airlie", "email": "airlied@redhat.com", "time": "Sat Feb 20 07:28:04 2010 +1000" }, "message": "vgaarb: fix \"target\u003ddefault\" passing\n\nCommit 77c1ff3982c6b36961725dd19e872a1c07df7f3b fixed the userspace\npointer dereference, but introduced another bug pointed out by Eugene Teo\nin RH bug #564264. Instead of comparing the point we were at in the string,\nwe instead compared the beginning of the string to \"default\".\n\nSigned-off-by: Kyle McMartin \u003ckyle@redhat.com\u003e\nReported-by: Eugene Teo \u003ceteo@redhat.com\u003e\nSigned-off-by: Dave Airlie \u003cairlied@redhat.com\u003e\n" }, { "commit": "77c1ff3982c6b36961725dd19e872a1c07df7f3b", "tree": "679ddde451763655c6594ae18afa58fcfc7339b1", "parents": [ "0a4583eb98af3fad7a8ab7d4915bd3ae179618c3" ], "author": { "name": "Andy Getzendanner", "email": "james.getzendanner@students.olin.edu", "time": "Thu Feb 11 14:04:48 2010 +1000" }, "committer": { "name": "Dave Airlie", "email": "airlied@redhat.com", "time": "Thu Feb 11 14:04:48 2010 +1000" }, "message": "vgaarb: fix incorrect dereference of userspace pointer.\n\nThis patch corrects a userspace pointer dereference in the VGA arbiter\nin 2.6.32.1.\n\ncopy_from_user() is used at line 822 to copy the contents of buf into\nkbuf, but a call to strncmp() on line 964 uses buf rather than kbuf. This\nproblem led to a GPF in strncmp() when X was started on my x86_32 systems.\n X triggered the behavior with a write of \"target PCI:0000:01:00.0\" to\n/dev/vga_arbiter.\n\nThe patch has been tested against 2.6.32.1 and observed to correct the GPF\nobserved when starting X or manually writing the string \"target\nPCI:0000:01:00.0\" to /dev/vga_arbiter.\n\nSigned-off-by: Andy Getzendanner \u003cjames.getzendanner@students.olin.edu\u003e\nCc: Jesse Barnes \u003cjbarnes@virtuousgeek.org\u003e\nCc: \u003cstable@kernel.org\u003e\nSigned-off-by: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nSigned-off-by: Dave Airlie \u003cairlied@redhat.com\u003e\n" }, { "commit": "36028f3383872eefb558a4aae4c12ec2b5fa640f", "tree": "c6716b619537d54991d17bd4296f9e3bd194086e", "parents": [ "773a38dbdad03474c5ee235f7d9bf9f51c9e3c2b" ], "author": { "name": "Mike Travis", "email": "travis@sgi.com", "time": "Tue Feb 02 17:45:01 2010 -0800" }, "committer": { "name": "H. Peter Anvin", "email": "hpa@zytor.com", "time": "Fri Feb 05 15:02:47 2010 -0800" }, "message": "vgaarb: Add user selectability of the number of GPUS in a system\n\nUpdate the VGA Arbiter to allow the user to select the number\nof GPU\u0027s supported in a system.\n\nv2: simplify setting of MAX_USER_CARDS, revert back to original default of 16\n\nSigned-off-by: Mike Travis \u003ctravis@sgi.com\u003e\nLKML-Reference: \u003c4B68D51D.6090401@sgi.com\u003e\nCc: Thomas Gleixner \u003ctglx@linutronix.de\u003e\nCc: Robin Holt \u003cholt@sgi.com\u003e\nCc: Jack Steiner \u003csteiner@sgi.com\u003e\nCc: Ingo Molnar \u003cmingo@elte.hu\u003e\nCc: Jesse Barnes \u003cjbarnes@virtuousgeek.org\u003e\nCc: David Airlie \u003cairlied@linux.ie\u003e\nSigned-off-by: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nSigned-off-by: H. Peter Anvin \u003chpa@zytor.com\u003e\n" }, { "commit": "773a38dbdad03474c5ee235f7d9bf9f51c9e3c2b", "tree": "0ae8953a3ad092f9294f51de0f6b3f2c48d1a0ef", "parents": [ "841582ea9e29a8f757c30c5377ce649586ba793a" ], "author": { "name": "Mike Travis", "email": "travis@sgi.com", "time": "Tue Feb 02 14:38:15 2010 -0800" }, "committer": { "name": "H. Peter Anvin", "email": "hpa@zytor.com", "time": "Fri Feb 05 14:05:41 2010 -0800" }, "message": "vgaarb: Fix VGA arbiter to accept PCI domains other than 0\n\nUpdate the VGA Arbiter to accept PCI Domains other than 0.\n\nSigned-off-by: Mike Travis \u003ctravis@sgi.com\u003e\nLKML-Reference: \u003c201002022238.o12McFe8018730@imap1.linux-foundation.org\u003e\nCc: Thomas Gleixner \u003ctglx@linutronix.de\u003e\nCc: Robin Holt \u003cholt@sgi.com\u003e\nCc: Jack Steiner \u003csteiner@sgi.com\u003e\nCc: Ingo Molnar \u003cmingo@elte.hu\u003e\nCc: Jesse Barnes \u003cjbarnes@virtuousgeek.org\u003e\nCc: David Airlie \u003cairlied@linux.ie\u003e\nSigned-off-by: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nSigned-off-by: H. Peter Anvin \u003chpa@zytor.com\u003e\n" }, { "commit": "6ac3bd527007eeecb148b67ca47b21731fd8a503", "tree": "bce4a885075a26bf0980956017f9ff2c79c2703b", "parents": [ "6e19314cc98ab9ccc22c30d1c414984ac6de5ce2" ], "author": { "name": "Dave Airlie", "email": "airlied@linux.ie", "time": "Wed Aug 19 15:21:57 2009 +1000" }, "committer": { "name": "Jesse Barnes", "email": "jbarnes@virtuousgeek.org", "time": "Wed Sep 09 13:29:41 2009 -0700" }, "message": "PCI/vgaarb: cleanup some warnings + cleanup some comments.\n\nFix some warnings reported in linux-next + also cleanup some\ncomment errors noticed by Pekka Paalanen.\n\nSigned-off-by: Dave Airlie \u003cairlied@redhat.com\u003e\nSigned-off-by: Jesse Barnes \u003cjbarnes@virtuousgeek.org\u003e\n" }, { "commit": "deb2d2ecd43dfc51efe71eed7128fda514da96c6", "tree": "ba05339620bc285265f88d2c7c43df5fc25b732c", "parents": [ "500559a92dd36af7cee95ed2f5b7722fb95a82e7" ], "author": { "name": "Benjamin Herrenschmidt", "email": "benh@kernel.crashing.org", "time": "Tue Aug 11 15:52:06 2009 +1000" }, "committer": { "name": "Jesse Barnes", "email": "jbarnes@virtuousgeek.org", "time": "Wed Sep 09 13:29:36 2009 -0700" }, "message": "PCI/GPU: implement VGA arbitration on Linux\n\nBackground:\nGraphic devices are accessed through ranges in I/O or memory space. While most\nmodern devices allow relocation of such ranges, some \"Legacy\" VGA devices\nimplemented on PCI will typically have the same \"hard-decoded\" addresses as\nthey did on ISA. For more details see \"PCI Bus Binding to IEEE Std 1275-1994\nStandard for Boot (Initialization Configuration) Firmware Revision 2.1\"\nSection 7, Legacy Devices.\n\nThe Resource Access Control (RAC) module inside the X server currently does\nthe task of arbitration when more than one legacy device co-exists on the same\nmachine. But the problem happens when these devices are trying to be accessed\nby different userspace clients (e.g. two server in parallel). Their address\nassignments conflict. Therefore an arbitration scheme _outside_ of the X\nserver is needed to control the sharing of these resources. This document\nintroduces the operation of the VGA arbiter implemented for Linux kernel.\n\nSigned-off-by: Benjamin Herrenschmidt \u003cbenh@kernel.crashing.org\u003e\nSigned-off-by: Tiago Vignatti \u003ctiago.vignatti@nokia.com\u003e\nSigned-off-by: Dave Airlie \u003cairlied@redhat.com\u003e\nSigned-off-by: Jesse Barnes \u003cjbarnes@virtuousgeek.org\u003e\n" } ] }