)]}' { "log": [ { "commit": "ee005577aa3b89f5291fe73be2054d375d23f5eb", "tree": "50fc586c3a3b6bdc73d68d103e2554544060e8bf", "parents": [ "2e9e018ecd836d92cc4735b4d878d8b20c08b070", "d03330383c9255cdb184dd33594e89c3542f191b" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon Aug 23 18:28:03 2010 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon Aug 23 18:28:03 2010 -0700" }, "message": "Merge branch \u0027drm-core-next\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/airlied/drm-2.6\n\n* \u0027drm-core-next\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/airlied/drm-2.6: (33 commits)\n drm/radeon/kms: fix typo in radeon_compute_pll_gain\n drm/radeon/kms: try to detect tv vs monitor for underscan\n drm/radeon/kms: fix sideport detection on newer rs880 boards\n drm/radeon: fix passing wrong type to gem object create.\n drm/radeon/kms: set encoder type to DVI for HDMI on evergreen\n drm/radeon/kms: add back missing break in info ioctl\n drm/radeon/kms: don\u0027t enable MSIs on AGP boards\n drm/radeon/kms: fix agp mode setup on cards that use pcie bridges\n drm: move dereference below check\n drm: fix end of loop test\n drm/radeon/kms: rework radeon_dp_detect() logic\n drm/radeon/kms: add missing asic callback assignment for evergreen\n drm/radeon/kms/DCE3+: switch pads to ddc mode when going i2c\n drm/radeon/kms/pm: bail early if nothing\u0027s changing\n drm/radeon/kms/atom: clean up dig atom handling\n drm/radeon/kms: DCE3/4 transmitter fixes\n drm/radeon/kms: rework encoder handling\n drm/radeon/kms: DCE3/4 AdjustPixelPll updates\n drm/radeon: Fix stack data leak\n drm/radeon/kms: fix GTT/VRAM overlapping test\n ...\n" }, { "commit": "1b2f1489633888d4a06028315dc19d65768a1c05", "tree": "8d5d3bfec854d6c96c19a781bf9c873409b74210", "parents": [ "b9f0aee83335db1f3915f4e42a5e21b351740afd" ], "author": { "name": "Dave Airlie", "email": "airlied@redhat.com", "time": "Sat Aug 14 20:20:34 2010 +1000" }, "committer": { "name": "Dave Airlie", "email": "airlied@redhat.com", "time": "Tue Aug 17 14:52:25 2010 +1000" }, "message": "drm: block userspace under allocating buffer and having drivers overwrite it (v2)\n\nWith the current screwed but its ABI, ioctls for the drm, Linus pointed out that we could allow userspace to specify the allocation size, but we pass it to the driver which then uses it blindly to store a struct. Now if userspace specifies the allocation size as smaller than the driver needs, the driver can possibly overwrite memory.\n\nThis patch restructures the driver ioctls so we store the structure size we are expecting, and make sure we allocate at least that size. The copy from/to userspace are still restricted to the size the user specifies, this allows ioctl structs to grow on both sides of the equation.\n\nUp until now we didn\u0027t really use the DRM_IOCTL defines in the kernel, so this cleans them up and adds them for nouveau.\n\nv2:\nfix nouveau pushbuf arg (thanks to Ben for pointing it out)\n\nReported-by: Linus Torvalds \u003ctorvalds@linuxfoundation.org\u003e\nSigned-off-by: Dave Airlie \u003cairlied@redhat.com\u003e\n" }, { "commit": "60641aa1f379820e99ac7f45a38b43795670c741", "tree": "a4a68780ba75bbf8f2fc96dba880ea39da2c717b", "parents": [ "c29c08b59875fe053471cf9eb66f8cfef39bc509" ], "author": { "name": "Sam Ravnborg", "email": "sam@ravnborg.org", "time": "Sat Aug 14 10:15:12 2010 +0200" }, "committer": { "name": "Sam Ravnborg", "email": "sam@ravnborg.org", "time": "Sat Aug 14 22:26:51 2010 +0200" }, "message": "include: replace unifdef-y with header-y\n\nunifdef-y and header-y has same semantic.\nSo there is no need to have both.\n\nDrop the unifdef-y variant and sort all lines again\n\nSigned-off-by: Sam Ravnborg \u003csam@ravnborg.org\u003e\n" }, { "commit": "aa9f56b66d278aba2f278c75761b7e19fbaca97a", "tree": "f1a9a0e68b07a3a1a0643389cb5ff838366a2d32", "parents": [ "58d4ea65b98f154f3326b038eecda32f90b46ea8", "31ce4bfdfd10bf5db9bf85c92bbe0cf2edbdcad8" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Aug 12 09:21:39 2010 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Aug 12 09:21:39 2010 -0700" }, "message": "Merge branch \u0027drm-core-next\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/airlied/drm-2.6\n\n* \u0027drm-core-next\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/airlied/drm-2.6: (55 commits)\n io-mapping: move asm include inside the config option\n vgaarb: drop vga.h include\n drm/radeon: Add probing of clocks from device-tree\n drm/radeon: drop old and broken mesa warning\n drm/radeon: Fix pci_map_page() error checking\n drm: Remove count_lock for calling lastclose() after 58474713 (v2)\n drm/radeon/kms: allow FG_ALPHA_VALUE on r5xx\n drm/radeon/kms: another r6xx/r7xx CS checker fix\n DRM: Replace kmalloc/memset combos with kzalloc\n drm: expand gamma_set\n drm/edid: Split mode lists out to their own header for readability\n drm/edid: Rewrite mode parse to use the generic detailed block walk\n drm/edid: Add detailed block walk for VTB extensions\n drm/edid: Add detailed block walk for CEA extensions\n drm: Remove unused fields from drm_display_info\n drm: Use ENOENT consistently for the error return for an unmatched handle.\n drm/radeon/kms: mark 3D power states as performance\n drm: Only set DPMS once on the CRTC not after every encoder.\n drm/radeon/kms: add additional quirk for Acer rv620 laptop\n drm: Propagate error code from fb_create()\n ...\n\nFix up trivial conflicts in drivers/gpu/drm/drm_edid.c\n" }, { "commit": "7203425a943eb3e189ba6b512827e0deb5f23872", "tree": "e0fdc7ed583f6990bbffde67f4f45b1f11b5a39e", "parents": [ "38fcbb674d7cc37b38473a89e8045ee80364e4f9" ], "author": { "name": "James Simmons", "email": "jsimmons@infradead.org", "time": "Tue Aug 03 01:33:19 2010 +0100" }, "committer": { "name": "Dave Airlie", "email": "airlied@redhat.com", "time": "Tue Aug 10 10:47:00 2010 +1000" }, "message": "drm: expand gamma_set\n\nExpand the crtc_gamma_set function to accept a starting offset. The\nreason for this is to eventually use this function for setcolreg from\ndrm_fb_helper.c. The fbdev colormap function can start at any offset in\nthe color map.\n\nSigned-by: James Simmons \u003cjsimmons@infradead.org\u003e\nSigned-off-by: Dave Airlie \u003cairlied@redhat.com\u003e\n" }, { "commit": "4d76a22134d5a5ad259fd667f3d2b215b7e71d10", "tree": "683d8df7efc2a652cc78146022a31bbab1877950", "parents": [ "fb439640145df0d3af7eacb83a19d8eb0a24002a" ], "author": { "name": "Adam Jackson", "email": "ajax@redhat.com", "time": "Tue Aug 03 14:38:17 2010 -0400" }, "committer": { "name": "Dave Airlie", "email": "airlied@redhat.com", "time": "Tue Aug 10 10:46:57 2010 +1000" }, "message": "drm/edid: Add detailed block walk for CEA extensions\n\nSigned-off-by: Adam Jackson \u003cajax@redhat.com\u003e\nSigned-off-by: Dave Airlie \u003cairlied@redhat.com\u003e\n" }, { "commit": "fb439640145df0d3af7eacb83a19d8eb0a24002a", "tree": "99bac1a4955d6732e311f415223dff61b7759d3e", "parents": [ "bf79cb914dbfe848add8bb76cbb8ff89110d29ff" ], "author": { "name": "Adam Jackson", "email": "ajax@redhat.com", "time": "Tue Aug 03 14:38:16 2010 -0400" }, "committer": { "name": "Dave Airlie", "email": "airlied@redhat.com", "time": "Tue Aug 10 10:46:56 2010 +1000" }, "message": "drm: Remove unused fields from drm_display_info\n\nSigned-off-by: Adam Jackson \u003cajax@redhat.com\u003e\nSigned-off-by: Dave Airlie \u003cairlied@redhat.com\u003e\n" }, { "commit": "c17c2f892e23a3c70281a4e79bd7c2c226b1a561", "tree": "73e048ae853103479e3ba747809fc8c38f6b7de8", "parents": [ "c3b6ef8633e75bdcde8e845548e3b95e9a21cdf6" ], "author": { "name": "Benjamin Herrenschmidt", "email": "benh@kernel.crashing.org", "time": "Fri Aug 06 13:55:10 2010 +1000" }, "committer": { "name": "Dave Airlie", "email": "airlied@redhat.com", "time": "Tue Aug 10 08:20:20 2010 +1000" }, "message": "drm: Fix support for PCI domains\n\n(For some reason I thought that went in ages ago ...)\n\nThis fixes support for PCI domains in what should hopefully be a backward\ncompatible way along with a change to libdrm.\n\nWhen the interface version is set to 1.4, we assume userspace understands\ndomains and the world is at peace. We thus pass proper domain numbers\ninstead of 0 to userspace.\n\nThe newer libdrm will then try 1.4 first, and fallback to 1.1, along with\nignoring domains in the later case (well, except on alpha of course)\n\nSigned-off-by: Benjamin Herrenschmidt \u003cbenh@kernel.crashing.org\u003e\nSigned-off-by: Dave Airlie \u003cairlied@redhat.com\u003e\n" }, { "commit": "3b7433b8a8a83c87972065b1852b7dcae691e464", "tree": "93fa2c003f8baef5ab0733b53bac77961ed5240c", "parents": [ "4a386c3e177ca2fbc70c9283d0b46537844763a0", "6ee0578b4daaea01c96b172c6aacca43fd9807a6" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sat Aug 07 12:42:58 2010 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sat Aug 07 12:42:58 2010 -0700" }, "message": "Merge branch \u0027for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/tj/wq\n\n* \u0027for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/tj/wq: (55 commits)\n workqueue: mark init_workqueues() as early_initcall()\n workqueue: explain for_each_*cwq_cpu() iterators\n fscache: fix build on !CONFIG_SYSCTL\n slow-work: kill it\n gfs2: use workqueue instead of slow-work\n drm: use workqueue instead of slow-work\n cifs: use workqueue instead of slow-work\n fscache: drop references to slow-work\n fscache: convert operation to use workqueue instead of slow-work\n fscache: convert object to use workqueue instead of slow-work\n workqueue: fix how cpu number is stored in work-\u003edata\n workqueue: fix mayday_mask handling on UP\n workqueue: fix build problem on !CONFIG_SMP\n workqueue: fix locking in retry path of maybe_create_worker()\n async: use workqueue for worker pool\n workqueue: remove WQ_SINGLE_CPU and use WQ_UNBOUND instead\n workqueue: implement unbound workqueue\n workqueue: prepare for WQ_UNBOUND implementation\n libata: take advantage of cmwq and remove concurrency limitations\n workqueue: fix worker management invocation without pending works\n ...\n\nFixed up conflicts in fs/cifs/* as per Tejun. Other trivial conflicts in\ninclude/linux/workqueue.h, kernel/trace/Kconfig and kernel/workqueue.c\n" }, { "commit": "fc1caf6eafb30ea185720e29f7f5eccca61ecd60", "tree": "666dabc25a9b02e5c05f9eba32fa6b0d8027341a", "parents": [ "9779714c8af09d57527f18d9aa2207dcc27a8687", "96576a9e1a0cdb8a43d3af5846be0948f52b4460" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Aug 05 16:02:01 2010 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Aug 05 16:02:01 2010 -0700" }, "message": "Merge branch \u0027drm-core-next\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/airlied/drm-2.6\n\n* \u0027drm-core-next\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/airlied/drm-2.6: (204 commits)\n agp: intel-agp: do not use PCI resources before pci_enable_device()\n agp: efficeon-agp: do not use PCI resources before pci_enable_device()\n drm: kill BKL from common code\n drm/kms: Simplify setup of the initial I2C encoder config.\n drm,io-mapping: Specify slot to use for atomic mappings\n drm/radeon/kms: only expose underscan on avivo chips\n drm/radeon: add new pci ids\n drm: Cleanup after failing to create master-\u003eunique and dev-\u003ename\n drm/radeon: tone down overchatty acpi debug messages.\n drm/radeon/kms: enable underscan option for digital connectors\n drm/radeon/kms: fix calculation of h/v scaling factors\n drm/radeon/kms/igp: sideport is AMD only\n drm/radeon/kms: handle the case of no active displays properly in the bandwidth code\n drm: move ttm global code to core drm\n drm/i915: Clear the Ironlake dithering flags when the pipe doesn\u0027t want it.\n drm/radeon/kms: make sure HPD is set to NONE on analog-only connectors\n drm/radeon/kms: make sure rio_mem is valid before unmapping it\n drm/agp/i915: trim stolen space to 32M\n drm/i915: Unset cursor if out-of-bounds upon mode change (v4)\n drm/i915: Unreference object not handle on creation\n ...\n" }, { "commit": "9779714c8af09d57527f18d9aa2207dcc27a8687", "tree": "52182f2289d9b7a77fbe119f4cd5726ef6494e66", "parents": [ "89a6c8cb9e6e11b6e3671dce7e037789b8f7cf62", "65b5ac1479840a3e87f086d68e5ef91f3002e8e2" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Aug 05 16:00:44 2010 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Aug 05 16:00:44 2010 -0700" }, "message": "Merge branch \u0027kms-merge\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/jwessel/linux-2.6-kgdb\n\n* \u0027kms-merge\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/jwessel/linux-2.6-kgdb:\n kgdb,docs: Update the kgdb docs to include kms\n drm_fb_helper: Preserve capability to use atomic kms\n i915: when kgdb is active display compression should be off\n drm/i915: use new fb debug hooks\n drm: add KGDB/KDB support\n fb: add hooks to handle KDB enter/exit\n kgdboc: Add call backs to allow kernel mode switching\n vt,console,kdb: automatically set kdb LINES variable\n vt,console,kdb: implement atomic console enter/leave functions\n" }, { "commit": "1a7aba7f4e45014c5a4741164b1ecb4ffe616fb7", "tree": "f6884f1f17cf8715b6c3d21fc821847cebc3f7ad", "parents": [ "d219adc1228a3887486b58a430e736b0831f192c" ], "author": { "name": "Jesse Barnes", "email": "jbarnes@virtuousgeek.org", "time": "Thu Aug 05 09:22:31 2010 -0500" }, "committer": { "name": "Jason Wessel", "email": "jason.wessel@windriver.com", "time": "Thu Aug 05 09:22:31 2010 -0500" }, "message": "drm: add KGDB/KDB support\n\nImplement the callbacks for KDB entry/exit via the drm helpers.\n\nSigned-off-by: Jesse Barnes \u003cjbarnes@virtuousgeek.org\u003e\nSigned-off-by: Jason Wessel \u003cjason.wessel@windriver.com\u003e\n" }, { "commit": "58374713c9dfb4d231f8c56cac089f6fbdedc2ec", "tree": "9ba01c3990b5a8625437d13722595f5063f2d915", "parents": [ "a1e09b62592eb57e25f8d076ffa5b7bef18be812" ], "author": { "name": "Arnd Bergmann", "email": "arnd@arndb.de", "time": "Sat Jul 10 23:51:39 2010 +0200" }, "committer": { "name": "Dave Airlie", "email": "airlied@redhat.com", "time": "Thu Aug 05 11:54:40 2010 +1000" }, "message": "drm: kill BKL from common code\n\nThis restricts the use of the big kernel lock to the i830 and i810\ndevice drivers. The three remaining users in common code (open, ioctl\nand release) get converted to a new mutex, the drm_global_mutex,\nmaking the locking stricter than the big kernel lock.\n\nThis may have a performance impact, but only in those cases that\ncurrently don\u0027t use DRM_UNLOCKED flag in the ioctl list and would\nbenefit from that anyway.\n\nThe reason why i810 and i830 cannot use drm_global_mutex in their\nmmap functions is a lock-order inversion problem between the current\nuse of the BKL and mmap_sem in these drivers. Since the BKL has\nrelease-on-sleep semantics, it\u0027s harmless but it would cause trouble\nif we replace the BKL with a mutex.\n\nInstead, these drivers get their own ioctl wrappers that take the\nBKL around every ioctl call and then set their own handlers as\nDRM_UNLOCKED.\n\nSigned-off-by: Arnd Bergmann \u003carnd@arndb.de\u003e\nCc: David Airlie \u003cairlied@linux.ie\u003e\nCc: dri-devel@lists.freedesktop.org\nSigned-off-by: Dave Airlie \u003cairlied@redhat.com\u003e\n" }, { "commit": "1297c05a8dfb568c689f057d51a65eebe5ddc86f", "tree": "05d4416a33ef57f7f0b61309a5c686be427ae0b2", "parents": [ "3fb688fdc1890f9e8e97597f690c145ab888aec0" ], "author": { "name": "Alex Deucher", "email": "alexdeucher@gmail.com", "time": "Wed Aug 04 11:40:00 2010 -0400" }, "committer": { "name": "Dave Airlie", "email": "airlied@redhat.com", "time": "Thu Aug 05 08:47:00 2010 +1000" }, "message": "drm/radeon: add new pci ids\n\nNew evergreen and r7xx ids.\n\nSigned-off-by: Alex Deucher \u003calexdeucher@gmail.com\u003e\nCc: stable@kernel.org\nSigned-off-by: Dave Airlie \u003cairlied@redhat.com\u003e\n" }, { "commit": "ba4420c224c2808f2661cf8428f43ceef7a73a4a", "tree": "67b32498483c797c76e8f504a83746bdef35db7d", "parents": [ "2581afccadd347bf97c3a5620ba72c99aca8c355" ], "author": { "name": "Dave Airlie", "email": "airlied@redhat.com", "time": "Tue Mar 09 10:56:52 2010 +1000" }, "committer": { "name": "Dave Airlie", "email": "airlied@redhat.com", "time": "Wed Aug 04 09:46:06 2010 +1000" }, "message": "drm: move ttm global code to core drm\n\nI wrote this for the prime sharing work, but I also noticed other external\nnon-upstream drivers from a large company carrying a similiar patch, so I\nmay as well ship it in master.\n\nSigned-off-by: Dave Airlie \u003cairlied@redhat.com\u003e\n" }, { "commit": "aa7ffc01d254c91a36bf854d57a14049c6134c72", "tree": "589fb5fbaf42a41de2915818e589e7368df67778", "parents": [ "8cadd2831bf3abc94f4530e7fdbab7bb39b6b27d" ], "author": { "name": "Jesse Barnes", "email": "jbarnes@virtuousgeek.org", "time": "Fri May 14 15:41:14 2010 -0700" }, "committer": { "name": "Matthew Garrett", "email": "mjg@redhat.com", "time": "Tue Aug 03 09:48:45 2010 -0400" }, "message": "x86 platform driver: intelligent power sharing driver\n\nIntel Core i3/5 platforms with integrated graphics support both CPU and\nGPU turbo mode. CPU turbo mode is opportunistic: the CPU will use any\navailable power to increase core frequencies if thermal headroom is\navailable. The GPU side is more manual however; the graphics driver\nmust monitor GPU power and temperature and coordinate with a core\nthermal driver to take advantage of available thermal and power headroom\nin the package.\n\nThe intelligent power sharing (IPS) driver is intended to coordinate\nthis activity by monitoring MCP (multi-chip package) temperature and\npower, allowing the CPU and/or GPU to increase their power consumption,\nand thus performance, when possible. The goal is to maximize\nperformance within a given platform\u0027s TDP (thermal design point).\n\nSigned-off-by: Jesse Barnes \u003cjbarnes@virtuousgeek.org\u003e\nSigned-off-by: Matthew Garrett \u003cmjg@redhat.com\u003e\n" }, { "commit": "ab9e1f5966591dc3e811418e96ba04f284c52458", "tree": "d2021a631d17cb8d505b8bc8f8df39becf2cca49", "parents": [ "d9fdaafbe912a34ef06ed569c6606fe2811f325b" ], "author": { "name": "Dave Airlie", "email": "airlied@redhat.com", "time": "Tue Jul 13 11:11:11 2010 +1000" }, "committer": { "name": "Dave Airlie", "email": "airlied@redhat.com", "time": "Mon Aug 02 11:54:26 2010 +1000" }, "message": "drm/radeon: add basic zmask/hiz support (v4)\n\nThis interface allows userspace to request hyperz support, it probably\nneeds more locking, and really reporting that you can have hyperz is racy\nsince someone else might get it before you do.\n\nv2: modify so we pass 0 valued packets to let DDX/r300c keep working.\nalso fixed incorrect 0x4f1c reference.\n\nv3: fixup zb_bw_cntl so older drivers keep working\n\nv4: add locking, fixup SC_HYPERZ_EN - patch stream to disable hiz\n\nSigned-off-by: Dave Airlie \u003cairlied@redhat.com\u003e\n" }, { "commit": "7827627107aeb629f1a056cb56b17bd4fb789e03", "tree": "cbd83582abb9120c7ef724bf439916c8bf864e37", "parents": [ "e190bfe56841551b1ad5abb42ebd0c4798cc8c01", "219de62a1627247fca10789f28902f66cb0b408f" ], "author": { "name": "Dave Airlie", "email": "airlied@redhat.com", "time": "Mon Aug 02 10:24:46 2010 +1000" }, "committer": { "name": "Dave Airlie", "email": "airlied@redhat.com", "time": "Mon Aug 02 10:24:46 2010 +1000" }, "message": "Merge branch \u0027drm-radeon-next\u0027 of ../drm-radeon-next into drm-core-next\n\n* \u0027drm-radeon-next\u0027 of ../drm-radeon-next: (333 commits)\n drm/radeon/kms: trivial code style fixes for audio\n drm/radeon: remove viewport transform from r6xx/r7xx blit emit\n drm/radeon: group r6xx/r7xx newly sequential blit state\n drm/radeon: reorder r6xx/r7xx blit state emit to make more regs sequential\n drm/radeon: r6xx/r7xx move vport clipping to a single packet\n drm/radeon: group r6xx/r7xx sequential blit state\n drm/radeon: remove duplicate state emit in r6xx/r7xx blit\n drm/radeon: add comments to r6xx/r7xx blit state\n drm/radeon/kms/r7xx: add workaround for hw issue with HDP flush\n drm/radeon/kms: remove rs4xx gart limit\n drm: radeon: fix sign bug\n drm/radeon/kms: check/restore sanity before doing anything else with GPU.\n drm/radeon: fall back to GTT if bo creation/validation in VRAM fails.\n drm/radeon/kms: add ioport register access\n drm/radeon/kms: enable HDMI audio on RS600/RS690/RS740\n drm/radeon/kms: track audio engine state, do not use not setup timer\n drm/radeon/kms/r6xx+: add query for tile config (v2)\n drm/radeon/kms: fix CS alignment checking for tiling (v2)\n drm/radeon/kms: add tiling support to the cs checker for r6xx/r7xx\n drm/radeon/kms: Add crtc tiling setup support for evergreen\n ...\n" }, { "commit": "e190bfe56841551b1ad5abb42ebd0c4798cc8c01", "tree": "5a4759222056f95e0ffb085b267f8edb949579d4", "parents": [ "a7b98b6748efdddd832b39662801c9f828df1813" ], "author": { "name": "Francisco Jerez", "email": "currojerez@riseup.net", "time": "Thu Jul 22 17:06:18 2010 +0200" }, "committer": { "name": "Dave Airlie", "email": "airlied@redhat.com", "time": "Mon Aug 02 10:21:13 2010 +1000" }, "message": "drm: Import driver for the sil164 I2C TMDS transmitter.\n\nsil164 transmitters are used for DVI outputs on Intel/nvidia and ATI setups.\n\nSo far only nouveau can use this driver.\n\nSigned-off-by: Francisco Jerez \u003ccurrojerez@riseup.net\u003e\nTested-by: Patrice Mandin \u003cpatmandin@gmail.com\u003e\nSigned-off-by: Dave Airlie \u003cairlied@redhat.com\u003e\n" }, { "commit": "e7aeeba6a8fb86ac52bcffa0b72942f784f2b37f", "tree": "889d8196e31ec490beba8b801236d7734e8d36bb", "parents": [ "40e2a5c15d09e02a71711735564151c789f95032" ], "author": { "name": "Alex Deucher", "email": "alexdeucher@gmail.com", "time": "Fri Jun 04 13:10:12 2010 -0400" }, "committer": { "name": "Dave Airlie", "email": "airlied@redhat.com", "time": "Mon Aug 02 10:00:05 2010 +1000" }, "message": "drm/radeon/kms/r6xx+: add query for tile config (v2)\n\nUserspace needs this information to access tiled\nbuffers via the CPU.\n\nv2: rebased on evergreen accel changes\n\nSigned-off-by: Alex Deucher \u003calexdeucher@gmail.com\u003e\nSigned-off-by: Dave Airlie \u003cairlied@redhat.com\u003e\n" }, { "commit": "991ea75cb1df7188d209274b3d51c105b4f18ffe", "tree": "3798ac7d956cfdbb9f77497597d3a9c24cc6e6e5", "parents": [ "9b646972467fb5fdc677f9e4251875db20bdbb64" ], "author": { "name": "Tejun Heo", "email": "tj@kernel.org", "time": "Tue Jul 20 22:09:02 2010 +0200" }, "committer": { "name": "Tejun Heo", "email": "tj@kernel.org", "time": "Thu Jul 22 23:18:20 2010 +0200" }, "message": "drm: use workqueue instead of slow-work\n\nWorkqueue can now handle high concurrency. Convert drm_crtc_helper to\nuse system_nrt_wq instead of slow-work. The conversion is mostly\nstraight forward. One difference is that drm_helper_hpd_irq_event()\nno longer blocks and can be called from any context.\n\nSigned-off-by: Tejun Heo \u003ctj@kernel.org\u003e\nAcked-by: David Airlie \u003cairlied@linux.ie\u003e\nCc: dri-devel@lists.freedesktop.org\n" }, { "commit": "92897b5c669f5e819ff2596fe6228ca2e4904981", "tree": "7bd7f559624915873635d1255f473ff972860194", "parents": [ "9440106b460ddfb7c0ff98beb6a6741f1f67b92b" ], "author": { "name": "Ben Skeggs", "email": "bskeggs@redhat.com", "time": "Fri Jul 16 15:09:17 2010 +1000" }, "committer": { "name": "Dave Airlie", "email": "airlied@redhat.com", "time": "Wed Jul 21 11:19:45 2010 +1000" }, "message": "drm: add \"auto\" dithering method\n\nThere\u0027s no convenient/reliable way for drivers to both obey the dithering\nmode property, and to be able to attempt to provide a good default in all\ncases.\n\nThis commit adds an \"auto\" method to the property which drivers can default\nto if they wish, whilst still allowing the user to override the choice as\nthey do now.\n\nSigned-off-by: Ben Skeggs \u003cbskeggs@redhat.com\u003e\nSigned-off-by: Dave Airlie \u003cairlied@redhat.com\u003e\n" }, { "commit": "102e73463e1bb921b3a829a1392a29dba16bbabd", "tree": "8c569c1a6a7fd3ffc21cf1780bd8fa62be5b23b2", "parents": [ "5c8d7171cc4984351af802a525675d50ae555a7b", "e5510fac98a706c424034950f55bb5e819c46f51" ], "author": { "name": "Dave Airlie", "email": "airlied@redhat.com", "time": "Wed Jul 07 18:38:44 2010 +1000" }, "committer": { "name": "Dave Airlie", "email": "airlied@redhat.com", "time": "Wed Jul 07 18:38:44 2010 +1000" }, "message": "Merge branch \u0027drm-tracepoints\u0027 into drm-testing\n" }, { "commit": "5c8d7171cc4984351af802a525675d50ae555a7b", "tree": "ed6337bff7e94fb3d2ef5fe96bd70e8882d6991e", "parents": [ "a907a2e7d287f2b89fd81bc8edf164c0008c624f" ], "author": { "name": "Alex Deucher", "email": "alexdeucher@gmail.com", "time": "Fri Jun 11 17:04:35 2010 -0400" }, "committer": { "name": "Dave Airlie", "email": "airlied@redhat.com", "time": "Wed Jul 07 18:38:32 2010 +1000" }, "message": "drm/kms: add crtc disable function\n\nMore explicit than dpms. Same as the encoder disable function.\n\nNeed this to explicity disconnect plls from crtcs for reuse when you\nplls:crtcs ratio isn\u0027t 1:1.\n\nSigned-off-by: Alex Deucher \u003calexdeucher@gmail.com\u003e\nSigned-off-by: Dave Airlie \u003cairlied@redhat.com\u003e\n" }, { "commit": "a907a2e7d287f2b89fd81bc8edf164c0008c624f", "tree": "d93fecbe492cb9f65e6253d10a2f55333b8800de", "parents": [ "db8cc27b804f89e8fd5f9d5385161956a777c471", "709ea97145c125b3811ff70429e90ebdb0e832e5" ], "author": { "name": "Dave Airlie", "email": "airlied@redhat.com", "time": "Wed Jul 07 18:37:37 2010 +1000" }, "committer": { "name": "Dave Airlie", "email": "airlied@redhat.com", "time": "Wed Jul 07 18:37:37 2010 +1000" }, "message": "Merge branch \u0027drm-intel-lru\u0027 into drm-testing\n\n* drm-intel-lru:\n drm: implement helper functions for scanning lru list\n drm_mm: extract check_free_mm_node\n drm: sane naming for drm_mm.c\n drm: kill dead code in drm_mm.c\n drm: kill drm_mm_node-\u003eprivate\n drm: use list_for_each_entry in drm_mm.c\n" }, { "commit": "db8cc27b804f89e8fd5f9d5385161956a777c471", "tree": "4d84e12dbf9b4bd75fa6150f4aedf54a41d722db", "parents": [ "6dbe7465713f0e45f0e867105ca944978d57346e", "05269a3a5a78bb074413de495105d7a2686c4529" ], "author": { "name": "Dave Airlie", "email": "airlied@redhat.com", "time": "Wed Jul 07 18:37:35 2010 +1000" }, "committer": { "name": "Dave Airlie", "email": "airlied@redhat.com", "time": "Wed Jul 07 18:37:35 2010 +1000" }, "message": "Merge branch \u0027drm-platform\u0027 into drm-testing\n\n* drm-platform:\n drm: Make sure the DRM offset matches the CPU\n drm: Add __arm defines to DRM\n drm: Add support for platform devices to register as DRM devices\n drm: Remove drm_resource wrappers\n" }, { "commit": "709ea97145c125b3811ff70429e90ebdb0e832e5", "tree": "222c5cafcae50f06e0e2c2591ab09f3bd1e89827", "parents": [ "7a6b2896f261894dde287d3faefa4b432cddca53" ], "author": { "name": "Daniel Vetter", "email": "daniel.vetter@ffwll.ch", "time": "Fri Jul 02 15:02:16 2010 +0100" }, "committer": { "name": "Dave Airlie", "email": "airlied@redhat.com", "time": "Wed Jul 07 12:29:51 2010 +1000" }, "message": "drm: implement helper functions for scanning lru list\n\nThese helper functions can be used to efficiently scan lru list\nfor eviction. Eviction becomes a three stage process:\n1. Scanning through the lru list until a suitable hole has been found.\n2. Scan backwards to restore drm_mm consistency and find out which\n objects fall into the hole.\n3. Evict the objects that fall into the hole.\n\nThese helper functions don\u0027t allocate any memory (at the price of\nnot allowing any other concurrent operations). Hence this can also be\nused for ttm (which does lru scanning under a spinlock).\n\nEvicting objects in this fashion should be more fair than the current\napproach by i915 (scan the lru for a object large enough to contain\nthe new object). It\u0027s also more efficient than the current approach used\nby ttm (uncoditionally evict objects from the lru until there\u0027s enough\nfree space).\n\nSigned-Off-by: Daniel Vetter \u003cdaniel.vetter@ffwll.ch\u003e\nAcked-by: Thomas Hellstrom \u003cthellstrom@vmwgfx.com\u003e\nSigned-off-by: Chris Wilson \u003cchris@chris-wilson.co.uk\u003e\nSigned-off-by: Dave Airlie \u003cairlied@redhat.com\u003e\n" }, { "commit": "d1024ce91ff4c2c4ccbf692d204c71cbf215157a", "tree": "70bef4a1ad212c81020d2deadeb5aaca02df4aa1", "parents": [ "ca31efa89ae16c66966b8d5a5df3ae5cbffa61de" ], "author": { "name": "Daniel Vetter", "email": "daniel.vetter@ffwll.ch", "time": "Fri Jul 02 15:02:14 2010 +0100" }, "committer": { "name": "Dave Airlie", "email": "airlied@redhat.com", "time": "Wed Jul 07 12:27:53 2010 +1000" }, "message": "drm: sane naming for drm_mm.c\n\nYeah, I\u0027ve kinda noticed that fl_entry is the free stack. Still\ngive it (and the memory node list ml_entry) decent names.\n\nSigned-off-by: Daniel Vetter \u003cdaniel.vetter@ffwll.ch\u003e\nAcked-by: Thomas Hellstrom \u003cthellstrom@vmwgfx.com\u003e\nSigned-off-by: Chris Wilson \u003cchris@chris-wilson.co.uk\u003e\nSigned-off-by: Dave Airlie \u003cairlied@redhat.com\u003e\n" }, { "commit": "db3307a9f7b8078c654021e3b35354a2b09a8e67", "tree": "95c0a9382dcd95f75977f6dff07e2f7a557967d0", "parents": [ "26f3751eb47c757c656333e74bdceccd8d286d76" ], "author": { "name": "Daniel Vetter", "email": "daniel.vetter@ffwll.ch", "time": "Fri Jul 02 15:02:12 2010 +0100" }, "committer": { "name": "Dave Airlie", "email": "airlied@redhat.com", "time": "Wed Jul 07 12:26:44 2010 +1000" }, "message": "drm: kill drm_mm_node-\u003eprivate\n\nOnly ever assigned, never used.\n\nSigned-off-by: Daniel Vetter \u003cdaniel.vetter@ffwll.ch\u003e\n[glisse: I will re-add if needed for range-restricted allocations]\nSigned-off-by: Chris Wilson \u003cchris@chris-wilson.co.uk\u003e\nSigned-off-by: Dave Airlie \u003cairlied@redhat.com\u003e\n" }, { "commit": "5870a4d97da136908ca477e3a21bc9f4c2705161", "tree": "3030a0ee387f3187a5a30f8f4cc745788c7d69e7", "parents": [ "123f94f22e3d283dfe68742b269c245b0501ad82" ], "author": { "name": "Francisco Jerez", "email": "currojerez@riseup.net", "time": "Sun Jul 04 04:03:07 2010 +0200" }, "committer": { "name": "Dave Airlie", "email": "airlied@redhat.com", "time": "Wed Jul 07 12:14:11 2010 +1000" }, "message": "drm/ttm: Allocate the page pool manager in the heap.\n\nRepeated ttm_page_alloc_init/fini fails noisily because the pool\nmanager kobj isn\u0027t zeroed out between uses (we could do just that but\nstatically allocated kobjects are generally considered a bad thing).\nMove it to kzalloc\u0027ed memory.\n\nNote that this patch drops the refcounting behavior of the pool\nallocator init/fini functions: it would have led to a race condition\nin its current form, and anyway it was never exploited.\n\nThis fixes a regression with reloading kms modules at runtime, since\npage allocator was introduced.\n\nSigned-off-by: Francisco Jerez \u003ccurrojerez@riseup.net\u003e\nSigned-off-by: Dave Airlie \u003cairlied@redhat.com\u003e\n" }, { "commit": "b9c2c9ae882f058084e13e339925dbf8d2d20271", "tree": "2c3baccc55ef03477a4fc3e08473ea35931e56ec", "parents": [ "ac2874b980e05ed7a4ea8fed7b0a92428b51ce58" ], "author": { "name": "Jesse Barnes", "email": "jbarnes@virtuousgeek.org", "time": "Thu Jul 01 16:48:09 2010 -0700" }, "committer": { "name": "Dave Airlie", "email": "airlied@redhat.com", "time": "Fri Jul 02 14:03:24 2010 +1000" }, "message": "drm: add per-event vblank event trace points\n\nAllows us to track each process that requests and completes events.\n\nSigned-off-by: Jesse Barnes \u003cjbarnes@virtuousgeek.org\u003e\nSigned-off-by: Dave Airlie \u003cairlied@redhat.com\u003e\n" }, { "commit": "148a03bc0b0e3ef153d0cade7bc88e9b14edfb7a", "tree": "ec5cf10676d6f69848952f6a89b475eb664333e2", "parents": [ "9b8eb4d14767209c83087063352cd04266ecdfd1" ], "author": { "name": "Alex Deucher", "email": "alexdeucher@gmail.com", "time": "Thu Jun 03 19:00:03 2010 -0400" }, "committer": { "name": "Dave Airlie", "email": "airlied@redhat.com", "time": "Tue Jun 08 09:34:42 2010 +1000" }, "message": "drm/radeon/kms/evergreen: set accel_enabled\n\nThis is needed to enable accel in the ddx. However,\ndue to a bug in older versions of the ddx, it relies\non accel being disabled in order to load properly on\nevergreen chips. To maintain compatility, we add a new\nget accel param and call that from the ddx. The old one\nalways returns false for evergreen cards.\n\n[this fixes a regression with older userspaces on newer kernels].\n\nSigned-off-by: Alex Deucher \u003calexdeucher@gmail.com\u003e\nSigned-off-by: Dave Airlie \u003cairlied@redhat.com\u003e\n" }, { "commit": "1067b6c2bea7fd2cc9da290d865ab3f3b91c8130", "tree": "5b20d5fbe9f9a2b3cfbb794018d74606f5031a88", "parents": [ "a652883a244901742d6c9733a9eebdf72e3114ea", "d8dcaa1dc50f5aecd38d34180cd99d6af8566c88" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Jun 03 07:19:45 2010 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Jun 03 07:19:45 2010 -0700" }, "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: (41 commits)\n drm/radeon/kms: make sure display hw is disabled when suspending\n drm/vmwgfx: Allow userspace to change default layout. Bump minor.\n drm/vmwgfx: Fix framebuffer modesetting\n drm/vmwgfx: Fix vga save / restore with display topology.\n vgaarb: use MIT license\n vgaarb: convert pr_devel() to pr_debug()\n drm: fix typos in Linux DRM Developer\u0027s Guide\n drm/radeon/kms/pm: voltage fixes\n drm/radeon/kms/pm: radeon_set_power_state fixes\n drm/radeon/kms/pm: patch default power state with default clocks/voltages on r6xx+\n drm/radeon/kms/pm: enable SetVoltage on r7xx/evergreen\n drm/radeon/kms/pm: add support for SetVoltage cmd table (V2)\n drm/radeon/kms/evergreen: add initial CS parser\n drm/kms: disable/enable poll around switcheroo on/off\n drm/nouveau: fixup confusion over which handle the DSM is hanging off.\n drm/nouveau: attempt to get bios from ACPI v3\n drm/nv50: cast IGP memory location to u64 before shifting\n drm/ttm: Fix ttm_page_alloc.c\n drm/ttm: Fix cached TTM page allocation.\n drm/vmwgfx: Remove some leftover debug messages.\n ...\n" }, { "commit": "d8bd19d2aff95e52c7f356cc2fc722584a656065", "tree": "e9312e761aede46a030030288a4a51a576019396", "parents": [ "991b7b44f8cfa1b9beff8c4c2f2ec888b925c2a7" ], "author": { "name": "Jakob Bornecrantz", "email": "jakob@vmware.com", "time": "Tue Jun 01 11:54:20 2010 +0200" }, "committer": { "name": "Dave Airlie", "email": "airlied@redhat.com", "time": "Thu Jun 03 13:13:36 2010 +1000" }, "message": "drm/vmwgfx: Allow userspace to change default layout. Bump minor.\n\nThe host may change the layout and, since the change is\ncommunicated to the master, the master needs a way to\ncommunicate the change to the kernel driver.\n\nThe minor version number is bumped to advertize the\navailability of this feature.\n\nSigned-off-by: Jakob Bornecrantz \u003cjakob@vmware.com\u003e\nSigned-off-by: Thomas Hellstrom \u003cthellstrom@vmware.com\u003e\nSigned-off-by: Dave Airlie \u003cairlied@redhat.com\u003e\n" }, { "commit": "e3a815fcd38043b8f1bb526123d8ab6ae01deb77", "tree": "903c75fcd0e5cc7ef20885562c7807de23323968", "parents": [ "9bc354998f8aa8a83b0cd430e8fcf2cbc3be7367" ], "author": { "name": "Zou Nan hai", "email": "nanhai.zou@intel.com", "time": "Mon May 31 13:58:47 2010 +0800" }, "committer": { "name": "Eric Anholt", "email": "eric@anholt.net", "time": "Tue Jun 01 11:21:09 2010 -0700" }, "message": "drm/i915: add HAS_BSD check to i915_getparam\n\nThis will let userland only try to use the new media decode\nfunctionality when the appropriate kernel is present.\n\nSigned-off-by: Zou Nan hai \u003cnanhai.zou@intel.com\u003e\nSigned-off-by: Eric Anholt \u003ceric@anholt.net\u003e\n" }, { "commit": "36d1701c502d4f46386e1000ad58d9497a11688d", "tree": "474f0d29edc8405a14e23383e2b0afc0f325a1ee", "parents": [ "afa3b60c905f606e8245115474d77787035e02eb", "8b281db596744a15b2abbfdbf655796c64e172ca" ], "author": { "name": "Dave Airlie", "email": "airlied@redhat.com", "time": "Tue Jun 01 11:32:29 2010 +1000" }, "committer": { "name": "Dave Airlie", "email": "airlied@redhat.com", "time": "Tue Jun 01 11:32:29 2010 +1000" }, "message": "Merge remote branch \u0027nouveau/for-airlied\u0027 of ../drm-nouveau-next into drm-testing\n\n* \u0027nouveau/for-airlied\u0027 of ../drm-nouveau-next:\n drm/nv50: cast IGP memory location to u64 before shifting\n drm/nv50: use alternate source of SOR_MODE_CTRL for DP hack\n drm/nouveau: fix dual-link displays when plugged into single-link outputs\n drm/nv50: obey dcb-\u003eduallink_possible\n drm/nv50: fix duallink_possible calculation for DCB 4.0 cards\n drm/nouveau: don\u0027t execute INIT_GPIO unless we\u0027re really running the table\n drm/nv40: allow cold-booting of nv4x chipsets\n drm/nouveau: fix POST detection for certain chipsets\n drm/nouveau: Add getparam for current PTIMER time.\n drm/nouveau: allow cursor image and position to survive suspend\n" }, { "commit": "fbf81762e385d3d45acad057b654d56972acf58c", "tree": "bc1b9e31e92ca702ea808650fda45443145f6776", "parents": [ "fc5ea29d72bde1bec230538becf396caad8621b8" ], "author": { "name": "Dave Airlie", "email": "airlied@redhat.com", "time": "Tue Jun 01 09:09:06 2010 +1000" }, "committer": { "name": "Dave Airlie", "email": "airlied@redhat.com", "time": "Tue Jun 01 10:36:02 2010 +1000" }, "message": "drm/kms: disable/enable poll around switcheroo on/off\n\nBecause we aren\u0027t in a suspend state the poll will still run when we have switcherooed a card off.\n\nSigned-off-by: Dave Airlie \u003cairlied@redhat.com\u003e\n" }, { "commit": "dcdb167402cbdca1d021bdfa5f63995ee0a79317", "tree": "3cd0ab1189d972b59daaaf863f518d7b94d2de7a", "parents": [ "01d73a6967f12fe6c4bbde1834a9fe662264a2eb" ], "author": { "name": "Jordan Crouse", "email": "jcrouse@codeaurora.org", "time": "Thu May 27 13:40:25 2010 -0600" }, "committer": { "name": "Dave Airlie", "email": "airlied@redhat.com", "time": "Tue Jun 01 10:07:39 2010 +1000" }, "message": "drm: Add support for platform devices to register as DRM devices\n\nAllow platform devices without PCI resources to be DRM devices.\n\n[airlied: fixup warnings with dev pointers]\n\nSigned-off-by: Jordan Crouse \u003cjcrouse@codeaurora.org\u003e\nSigned-off-by: Dave Airlie \u003cairlied@redhat.com\u003e\n" }, { "commit": "01d73a6967f12fe6c4bbde1834a9fe662264a2eb", "tree": "32e4a3171cd371dfc037af52e181e6c8454a961b", "parents": [ "cf22f20ade30f8c03955324aaf27b1049e182600" ], "author": { "name": "Jordan Crouse", "email": "jcrouse@codeaurora.org", "time": "Thu May 27 13:40:24 2010 -0600" }, "committer": { "name": "Dave Airlie", "email": "airlied@redhat.com", "time": "Tue Jun 01 10:07:24 2010 +1000" }, "message": "drm: Remove drm_resource wrappers\n\nRemove the drm_resource wrappers and directly use the\nactual PCI and/or platform functions in their place.\n\n[airlied: fixup nouveau properly to build]\n\nSigned-off-by: Jordan Crouse \u003cjcrouse@codeaurora.org\u003e\nReviewed-by: Matt Turner \u003cmattst88@gmail.com\u003e\nSigned-off-by: Dave Airlie \u003cairlied@redhat.com\u003e\n" }, { "commit": "7fc74f17e6c9b4d86371c3a947afc32bd6bc9691", "tree": "3658c270bd5c45a408779040e2db181e5fca855b", "parents": [ "b334f2b3b68c35fd86a0cbc90ecee40e63ba2f37" ], "author": { "name": "Marcin Kościelnicki", "email": "koriakin@0x04.net", "time": "Sun May 23 11:36:04 2010 +0000" }, "committer": { "name": "Ben Skeggs", "email": "bskeggs@redhat.com", "time": "Fri May 28 16:06:21 2010 +1000" }, "message": "drm/nouveau: Add getparam for current PTIMER time.\n\nThis will be useful for computing GPU-CPU latency, including\nGL_ARB_timer_query extension.\n\nSigned-off-by: Marcin Kościelnicki \u003ckoriakin@0x04.net\u003e\nSigned-off-by: Ben Skeggs \u003cbskeggs@redhat.com\u003e\n" }, { "commit": "8187a2b70e34c727a06617441f74f202b6fefaf9", "tree": "48622c6f95282dc0a0fa668110aac4efa6e89066", "parents": [ "d3301d86b4bf2bcf649982ae464211d8bcf9575a" ], "author": { "name": "Zou Nan hai", "email": "nanhai.zou@intel.com", "time": "Fri May 21 09:08:55 2010 +0800" }, "committer": { "name": "Eric Anholt", "email": "eric@anholt.net", "time": "Wed May 26 13:24:49 2010 -0700" }, "message": "drm/i915: introduce intel_ring_buffer structure (V2)\n\nIntroduces a more complete intel_ring_buffer structure with callbacks\nfor setup and management of a particular ringbuffer, and converts the\nrender ring buffer consumers to use it.\n\nSigned-off-by: Zou Nan hai \u003cnanhai.zou@intel.com\u003e\nSigned-off-by: Xiang Hai hao \u003chaihao.xiang@intel.com\u003e\n[anholt: Fixed up whitespace fail and rebased against prep patches]\nSigned-off-by: Eric Anholt \u003ceric@anholt.net\u003e\n" }, { "commit": "59534f7298c5e28aaa64e6ed550e247f64ee72ae", "tree": "b9fef7756abf897d9e1b10950cdf10bf6dfe5cb7", "parents": [ "ac3ee84c604502240122c47b52f0542ec8774f15", "b486787ee4797d6e42a9bd3a6f079385ad0f4472" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri May 21 11:14:52 2010 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri May 21 11:14:52 2010 -0700" }, "message": "Merge branch \u0027drm-for-2.6.35\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/airlied/drm-2.6\n\n* \u0027drm-for-2.6.35\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/airlied/drm-2.6: (207 commits)\n drm/radeon/kms/pm/r600: select the mid clock mode for single head low profile\n drm/radeon: fix power supply kconfig interaction.\n drm/radeon/kms: record object that have been list reserved\n drm/radeon: AGP memory is only I/O if the aperture can be mapped by the CPU.\n drm/radeon/kms: don\u0027t default display priority to high on rs4xx\n drm/edid: fix typo in 1600x1200@75 mode\n drm/nouveau: fix i2c-related init table handlers\n drm/nouveau: support init table i2c device identifier 0x81\n drm/nouveau: ensure we\u0027ve parsed i2c table entry for INIT_*I2C* handlers\n drm/nouveau: display error message for any failed init table opcode\n drm/nouveau: fix init table handlers to return proper error codes\n drm/nv50: support fractional feedback divider on newer chips\n drm/nv50: fix monitor detection on certain chipsets\n drm/nv50: store full dcb i2c entry from vbios\n drm/nv50: fix suspend/resume with DP outputs\n drm/nv50: output calculated crtc pll when debugging on\n drm/nouveau: dump pll limits entries when debugging is on\n drm/nouveau: bios parser fixes for eDP boards\n drm/nouveau: fix a nouveau_bo dereference after it\u0027s been destroyed\n drm/nv40: remove some completed ctxprog TODOs\n ...\n" }, { "commit": "68adac5e49436992e9c999fbae879d9ac5b72d4e", "tree": "6593c74a8baf4a0424bbc5b2a06264c0a6a9338d", "parents": [ "15a7df8db84e7a9d9915d879199ac4a870836c54" ], "author": { "name": "Ben Skeggs", "email": "bskeggs@redhat.com", "time": "Wed Apr 28 11:46:42 2010 +1000" }, "committer": { "name": "Dave Airlie", "email": "airlied@redhat.com", "time": "Tue May 18 18:21:33 2010 +1000" }, "message": "drm: move radeon_fixed.h to shared drm_fixed.h header\n\nWill be used by nouveau driver also in the near future.\n\nSigned-off-by: Ben Skeggs \u003cbskeggs@redhat.com\u003e\nSigned-off-by: Dave Airlie \u003cairlied@redhat.com\u003e\n" }, { "commit": "7c5ee5366f79f53de2a11e73953daee6d58df124", "tree": "b687002e761917b91e17fed3f327015939b115c8", "parents": [ "8f5b5e632cd55d9acf10ba498b858fd996bd1a39" ], "author": { "name": "Matthew Garrett", "email": "mjg@redhat.com", "time": "Mon Apr 26 16:00:09 2010 -0400" }, "committer": { "name": "Dave Airlie", "email": "airlied@redhat.com", "time": "Tue May 18 18:21:20 2010 +1000" }, "message": "ttm: Provide an API for starting and stopping the delayed workqueue\n\nWe want to be able to prevent the delayed workqueue from changing state\nwhile we\u0027re reclocking, so add an API to block and unblock it.\n\nSigned-off-by: Matthew Garrett \u003cmjg@redhat.com\u003e\nSigned-off-by: Dave Airlie \u003cairlied@redhat.com\u003e\n" }, { "commit": "1d42bbc8f7f9ce4d852692ef7aa336b133b0830a", "tree": "a0ea2d17508104ab681c829f0552e7f13512c8e2", "parents": [ "eb1f8e4f3be898df808e2dfc131099f5831d491d" ], "author": { "name": "Dave Airlie", "email": "airlied@redhat.com", "time": "Fri May 07 05:02:30 2010 +0000" }, "committer": { "name": "Dave Airlie", "email": "airlied@redhat.com", "time": "Tue May 18 17:40:22 2010 +1000" }, "message": "drm/fbdev: fix cloning on fbcon\n\nSimple cloning rules compared to server:\n(a) single crtc\n(b) \u003e 1 connector active\n(c) check command line mode\n(d) try and find 1024x768 DMT mode if no command line.\n(e) fail to clone\n\nSigned-off-by: Dave Airlie \u003cairlied@redhat.com\u003e\n" }, { "commit": "eb1f8e4f3be898df808e2dfc131099f5831d491d", "tree": "9e5807824c60601f23016f3a2e82f8de10f7435a", "parents": [ "0ddfa7d574e0f3a7510b0be6c8ed807af017223f" ], "author": { "name": "Dave Airlie", "email": "airlied@redhat.com", "time": "Fri May 07 06:42:51 2010 +0000" }, "committer": { "name": "Dave Airlie", "email": "airlied@redhat.com", "time": "Tue May 18 17:40:11 2010 +1000" }, "message": "drm/fbdev: rework output polling to be back in the core. (v4)\n\nAfter thinking it over a lot it made more sense for the core to deal with\nthe output polling especially so it can notify X.\n\nv2: drop plans for fake connector - per Michel\u0027s comments - fix X patch sent to xorg-devel, add intel polled/hpd setting, add initial nouveau polled/hpd settings.\n\nv3: add config lock take inside polling, add intel/nouveau poll init/fini calls\n\nv4: config lock was a bit agressive, only needed around connector list reading.\notherwise it could re-enter.\n\nglisse: discard drm_helper_hpd_irq_event\n\nv3: Reviewed-by: Michel Dänzer \u003cmichel@daenzer.net\u003e\nSigned-off-by: Dave Airlie \u003cairlied@redhat.com\u003e\n" }, { "commit": "bc35afdb182d4c48c889fe27ba7a5d7ea0c8194d", "tree": "0e8f87e31a8a979a9c1a3090f9bf9d906981afa6", "parents": [ "61dd98fad58f945ed720ba132681acb58fcee015" ], "author": { "name": "Jerome Glisse", "email": "jglisse@redhat.com", "time": "Wed May 12 18:01:13 2010 +0200" }, "committer": { "name": "Dave Airlie", "email": "airlied@redhat.com", "time": "Tue May 18 15:59:08 2010 +1000" }, "message": "drm/radeon/kms: add query for crtc hw id from crtc id to get info V2\n\nUserspace need to know the hw crtc id (0, 1, 2, ...) from the drm\ncrtc id. Bump the minor version so userspace can enable conditionaly\nfeatures depend on this.\n\nV2 use num_crtc and avoid DRM_ERROR\n\nSigned-off-by: Jerome Glisse \u003cjglisse@redhat.com\u003e\nSigned-off-by: Dave Airlie \u003cairlied@redhat.com\u003e\n" }, { "commit": "96525a2f7448c427bb8d99240907a6bd2d9e818c", "tree": "2794c2f359003f432d40cba0e007531f8fadeb02", "parents": [ "f405a1ab2bf316b1969fc5355891e5dff4e1a54c" ], "author": { "name": "Dan Carpenter", "email": "error27@gmail.com", "time": "Fri May 14 13:06:19 2010 +0200" }, "committer": { "name": "Dave Airlie", "email": "airlied@redhat.com", "time": "Tue May 18 15:56:14 2010 +1000" }, "message": "drm_edid: There should be 6 Standard Timings\n\nSmatch complained that we initialize 6 elements in add_detailed_modes()\nbut the timings[] array is declared with 5 elements. Adam Jackson\nverified that 6 is the correct number of timings.\n\nOn Mon, May 10, 2010 at 12:08:24PM -0400, Adam Jackson wrote:\n\u003e \u003e \u003e struct std_timing timings[5];\n\u003e \u003e \u003e ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^\n\u003e\n\u003e This decl is wrong, should be 6. From the 1.4 spec:\n\u003e\n\u003e \"Six additional Standard Timings may be listed as a display descriptor\n\u003e (tag #FAh).\"\n\u003e\n\u003e The 1.3 spec is a little less explicit about it, but does show 6\n\u003e standard timing codes in the 0xFA detailed subblock, terminated by 0x0A\n\u003e in the 18th byte. I don\u0027t have the docs for 1.2 or earlier, but we\u0027re\n\u003e paranoid enough about not adding broken timings that we should be fine.\n\nThis patch is basically a clean up, because timings[] is declared inside\na union and increasing the number of elements here doesn\u0027t change the\noverall size of the union.\n\nSigned-off-by: Dan Carpenter \u003cerror27@gmail.com\u003e\nSigned-off-by: Dave Airlie \u003cairlied@redhat.com\u003e\n" }, { "commit": "e33b3e7567f8636c61e79ff1da5ff9a6cf6562c7", "tree": "72f361fec4a8c81d5003b93344bf3eab3eb21775", "parents": [ "e2dbe06c271f3bb2a495627980aad3d1d8ccef2a", "8cfe92d683a0041ac8e016a0b0a487c99a78f6c1" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri May 07 14:02:01 2010 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri May 07 14:02:01 2010 -0700" }, "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:\n drm/ttm: Remove the ttm_bo_block_reservation() function.\n drm/ttm: Remove some leftover debug messages.\n drm/radeon: async event synchronization for drmWaitVblank\n" }, { "commit": "8cfe92d683a0041ac8e016a0b0a487c99a78f6c1", "tree": "5949c336ea881c9fb51aee811432125451fef45d", "parents": [ "5be6eff965aee22181d7f6210c2c463420e94e03" ], "author": { "name": "Thomas Hellstrom", "email": "thellstrom@vmware.com", "time": "Wed Apr 28 11:33:25 2010 +0200" }, "committer": { "name": "Dave Airlie", "email": "airlied@redhat.com", "time": "Fri May 07 09:21:28 2010 +1000" }, "message": "drm/ttm: Remove the ttm_bo_block_reservation() function.\n\nIt\u0027s unused and buggy in its current form, since it can place a bo\nin the reserved state without removing it from lru lists.\n\nSigned-off-by: Thomas Hellstrom \u003cthellstrom@vmware.com\u003e\nSigned-off-by: Dave Airlie \u003cairlied@redhat.com\u003e\n" }, { "commit": "7547a917fa5f3b2406f52c7dcf7ec9ad3c8532eb", "tree": "59b0d0e9b6c251c4df5799b93395454592004d57", "parents": [ "a8089e849a32c5b6bfd6c88dbd09c0ea4a779b71", "6b8b1786a8c29ce6e32298b93ac8d4a18a2b11c4" ], "author": { "name": "Dave Airlie", "email": "airlied@redhat.com", "time": "Tue Apr 20 14:15:09 2010 +1000" }, "committer": { "name": "Dave Airlie", "email": "airlied@redhat.com", "time": "Tue Apr 20 14:15:09 2010 +1000" }, "message": "Merge branch \u0027drm-ttm-unmappable\u0027 into drm-core-next\n\n* drm-ttm-unmappable:\n drm/radeon/kms: enable use of unmappable VRAM V2\n drm/ttm: remove io_ field from TTM V6\n drm/vmwgfx: add support for new TTM fault callback V5\n drm/nouveau/kms: add support for new TTM fault callback V5\n drm/radeon/kms: add support for new fault callback V7\n drm/ttm: ttm_fault callback to allow driver to handle bo placement V6\n drm/ttm: split no_wait argument in 2 GPU or reserve wait\n\nConflicts:\n\tdrivers/gpu/drm/nouveau/nouveau_bo.c\n" }, { "commit": "0c321c79627189204d7d0bf65ab19f5ac419abed", "tree": "9df52ae46164bdca3dab6a36d5ec17360c60b9e4", "parents": [ "96bf8b8778976a6e6a4fe4e6e0421d8ed7892798" ], "author": { "name": "Jerome Glisse", "email": "jglisse@redhat.com", "time": "Wed Apr 07 10:21:27 2010 +0000" }, "committer": { "name": "Dave Airlie", "email": "airlied@redhat.com", "time": "Tue Apr 20 14:13:09 2010 +1000" }, "message": "drm/ttm: remove io_ field from TTM V6\n\nAll TTM driver have been converted to new io_mem_reserve/free\ninterface which allow driver to choose and return proper io\nbase, offset to core TTM for ioremapping if necessary. This\npatch remove what is now deadcode.\n\nV2 adapt to match with change in first patch of the patchset\nV3 update after io_mem_reserve/io_mem_free callback balancing\nV4 adjust to minor cleanup\nV5 remove the needs ioremap flag\nV6 keep the ioremapping facility in TTM\n\n[airlied- squashed driver removals in here also]\n\nSigned-off-by: Jerome Glisse \u003cjglisse@redhat.com\u003e\nReviewed-by: Thomas Hellstrom \u003cthellstrom@vmware.com\u003e\nSigned-off-by: Dave Airlie \u003cairlied@redhat.com\u003e\n" }, { "commit": "82c5da6bf8b55a931b042fb531083863d26c8020", "tree": "88168d32d7060598ac730c30967b2e62dc5da28d", "parents": [ "9d87fa2138d06ff400551800d67d522625033e35" ], "author": { "name": "Jerome Glisse", "email": "jglisse@redhat.com", "time": "Fri Apr 09 14:39:23 2010 +0200" }, "committer": { "name": "Dave Airlie", "email": "airlied@redhat.com", "time": "Tue Apr 20 14:12:05 2010 +1000" }, "message": "drm/ttm: ttm_fault callback to allow driver to handle bo placement V6\n\nOn fault the driver is given the opportunity to perform any operation\nit sees fit in order to place the buffer into a CPU visible area of\nmemory. This patch doesn\u0027t break TTM users, nouveau, vmwgfx and radeon\nshould keep working properly. Future patch will take advantage of this\ninfrastructure and remove the old path from TTM once driver are\nconverted.\n\nV2 return VM_FAULT_NOPAGE if callback return -EBUSY or -ERESTARTSYS\nV3 balance io_mem_reserve and io_mem_free call, fault_reserve_notify\n is responsible to perform any necessary task for mapping to succeed\nV4 minor cleanup, atomic_t -\u003e bool as member is protected by reserve\n mecanism from concurent access\nV5 the callback is now responsible for iomapping the bo and providing\n a virtual address this simplify TTM and will allow to get rid of\n TTM_MEMTYPE_FLAG_NEEDS_IOREMAP\nV6 use the bus addr data to decide to ioremap or this isn\u0027t needed\n but we don\u0027t necesarily need to ioremap in the callback but still\n allow driver to use static mapping\n\nSigned-off-by: Jerome Glisse \u003cjglisse@redhat.com\u003e\nReviewed-by: Thomas Hellstrom \u003cthellstrom@vmware.com\u003e\nSigned-off-by: Dave Airlie \u003cairlied@redhat.com\u003e\n" }, { "commit": "fd632aa34c8592fb1d37fc83cbffa827bc7dd42c", "tree": "5c6a0fc186e297590aee2c050b837a721db337b2", "parents": [ "1d397043bcc2c8cdccb584a8ef73131f28f18e4c" ], "author": { "name": "Daniel Vetter", "email": "daniel.vetter@ffwll.ch", "time": "Fri Apr 09 19:05:05 2010 +0000" }, "committer": { "name": "Dave Airlie", "email": "airlied@redhat.com", "time": "Tue Apr 20 13:19:33 2010 +1000" }, "message": "drm: free core gem object from driver callbacks\n\nWhen drivers embed the core gem object into their own structures,\nthey\u0027ll have to do this. Temporarily this results in an ugly\n\nkfree(gem_obj);\n\nin every gem driver.\n\nSigned-off-by: Daniel Vetter \u003cdaniel.vetter@ffwll.ch\u003e\nAcked-by: Eric Anholt \u003ceric@anholt.net\u003e\nSigned-off-by: Dave Airlie \u003cairlied@redhat.com\u003e\n" }, { "commit": "1d397043bcc2c8cdccb584a8ef73131f28f18e4c", "tree": "564c09e78bffef21ff65988ea76380db132cc02a", "parents": [ "153549b8b63d71a9c5d8cbde887097b995c32bd6" ], "author": { "name": "Daniel Vetter", "email": "daniel.vetter@ffwll.ch", "time": "Fri Apr 09 19:05:04 2010 +0000" }, "committer": { "name": "Dave Airlie", "email": "airlied@redhat.com", "time": "Tue Apr 20 13:19:25 2010 +1000" }, "message": "drm: extract drm_gem_object_init\n\nThis function can be used by drivers who allocate the drm gem object\non their own. No functional change in here, just preparation.\n\nSigned-off-by: Daniel Vetter \u003cdaniel.vetter@ffwll.ch\u003e\nAcked-by: Eric Anholt \u003ceric@anholt.net\u003e\nSigned-off-by: Dave Airlie \u003cairlied@redhat.com\u003e\n" }, { "commit": "7fff400be6fbf64f10abca9939718aaf1d61c255", "tree": "384118628f5c5aa2d74303cddd120de75308beea", "parents": [ "0bcb1d844ac638a4c4280f697d5bfac9791e9a70", "b1f201980eb4a7a59277a13cf18acdbb46167ad5" ], "author": { "name": "Dave Airlie", "email": "airlied@redhat.com", "time": "Tue Apr 20 13:16:04 2010 +1000" }, "committer": { "name": "Dave Airlie", "email": "airlied@redhat.com", "time": "Tue Apr 20 13:16:04 2010 +1000" }, "message": "Merge branch \u0027drm-fbdev-cleanup\u0027 into drm-core-next\n\n* drm-fbdev-cleanup:\n drm/fb: remove drm_fb_helper_setcolreg\n drm/kms/fb: use slow work mechanism for normal hotplug also.\n drm/kms/fb: add polling support for when nothing is connected.\n drm/kms/fb: provide a 1024x768 fbcon if no outputs found.\n drm/kms/fb: separate fbdev connector list from core drm connectors\n drm/kms/fb: move to using fb helper crtc grouping instead of core crtc list\n drm/fb: fix fbdev object model + cleanup properly.\n\nConflicts:\n\tdrivers/gpu/drm/i915/i915_drv.h\n\tdrivers/gpu/drm/nouveau/nouveau_drv.h\n" }, { "commit": "c9c2625ff4fc4ce652e686f895059d2902c01ca0", "tree": "243c07b0380d60d15566064843acb2213b0cacdf", "parents": [ "c2b41276da65481d36311a13d69020d150861c43", "522032da7ed3068cf79f733fb836118d908b7719" ], "author": { "name": "Dave Airlie", "email": "airlied@redhat.com", "time": "Tue Apr 20 13:14:38 2010 +1000" }, "committer": { "name": "Dave Airlie", "email": "airlied@redhat.com", "time": "Tue Apr 20 13:14:38 2010 +1000" }, "message": "Merge branch \u0027drm-edid-fixes\u0027 into drm-core-next\n\n* drm-edid-fixes:\n drm/edid: When checking duplicate standard modes, walked the probed list\n drm/edid: Fix sync polarity for secondary GTF curve\n drm/modes: Fix interlaced mode names\n drm/edid: Add secondary GTF curve support\n drm/edid: Strengthen the algorithm for standard mode codes\n drm/edid: Fix the HDTV hack.\n drm/edid: Extend range-based mode addition for EDID 1.4\n drm/edid: Add test for monitor reduced blanking support.\n drm/edid: Fix preferred mode parse for EDID 1.4\n drm/edid: Remove some silly comments\n drm/edid: Remove arbitrary EDID extension limit\n drm/edid: Add modes for Established Timings III section\n drm/edid: Reshuffle mode list construction to closer match the spec\n drm/edid: Remove a redundant check\n drm/edid: Remove some misleading comments\n drm/edid: Fix secondary block fetch.\n" }, { "commit": "c2b41276da65481d36311a13d69020d150861c43", "tree": "5a67f674b77cfdc47bd386f114fbf5a6bff740c6", "parents": [ "97921a5b03d40681b3aed620a5e719710336c6df", "2125b8a44d771351fc44719ed291be70b73672ad" ], "author": { "name": "Dave Airlie", "email": "airlied@redhat.com", "time": "Tue Apr 20 13:12:28 2010 +1000" }, "committer": { "name": "Dave Airlie", "email": "airlied@redhat.com", "time": "Tue Apr 20 13:12:28 2010 +1000" }, "message": "Merge branch \u0027drm-ttm-pool\u0027 into drm-core-next\n\n* drm-ttm-pool:\n drm/ttm: using kmalloc/kfree requires including slab.h\n drm/ttm: include linux/seq_file.h for seq_printf\n drm/ttm: Add sysfs interface to control pool allocator.\n drm/ttm: Use set_pages_array_wc instead of set_memory_wc.\n arch/x86: Add array variants for setting memory to wc caching.\n drm/nouveau: Add ttm page pool debugfs file.\n drm/radeon/kms: Add ttm page pool debugfs file.\n drm/ttm: Add debugfs output entry to pool allocator.\n drm/ttm: add pool wc/uc page allocator V3\n" }, { "commit": "73c6c7fbb74d07a80fee41ce4ca3976547519e42", "tree": "2c2e2e5c7420054900a491bed70a2c766bd558c9", "parents": [ "eb3e5cce2b39a266a1a167fa4290939db20ef5d6", "79b9517a33a283c5d9db875c263670ed1e055f7e" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon Apr 19 07:27:06 2010 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon Apr 19 07:27:06 2010 -0700" }, "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:\n drm/radeon/kms: add FireMV 2400 PCI ID.\n drm/radeon/kms: allow R500 regs VAP_ALT_NUM_VERTICES and VAP_INDEX_OFFSET\n drivers/gpu/radeon: Add MSPOS regs to safe list.\n drm/radeon/kms: disable the tv encoder when tv/cv is not in use\n drm/radeon/kms: adjust pll settings for tv\n drm/radeon/kms: fix tv dac conflict resolver\n drm/radeon/kms/evergreen: don\u0027t enable hdmi audio stuff\n drm/radeon/kms/atom: fix dual-link DVI on DCE3.2/4.0\n drm/radeon/kms: fix rs600 tlb flush\n drm/radeon/kms: print GPU family and device id when loading\n drm/radeon/kms: fix calculation of mipmapped 3D texture sizes\n drm/radeon/kms: only change mode when coherent value changes.\n drm/radeon/kms: more atom parser fixes (v2)\n" }, { "commit": "79b9517a33a283c5d9db875c263670ed1e055f7e", "tree": "0a6c0fb95415864c0a1e1356a4dd26cb3f390ba0", "parents": [ "cae94b0ad9d147152af77b971a7234faf20027a9" ], "author": { "name": "Dave Airlie", "email": "airlied@redhat.com", "time": "Mon Apr 19 17:54:31 2010 +1000" }, "committer": { "name": "Dave Airlie", "email": "airlied@redhat.com", "time": "Mon Apr 19 18:53:10 2010 +1000" }, "message": "drm/radeon/kms: add FireMV 2400 PCI ID.\n\nThis is an M24/X600 chip.\n\nFrom RH# 581927\n\ncc: stable@kernel.org\nSigned-off-by: Dave Airlie \u003cairlied@redhat.com\u003e\n" }, { "commit": "9d87fa2138d06ff400551800d67d522625033e35", "tree": "284cd0f73ccb2f2fad1c71f974d4e9e4d0035e81", "parents": [ "3a89b4a9ca7ce11e3b7d5119aea917b9fc29a302" ], "author": { "name": "Jerome Glisse", "email": "jglisse@redhat.com", "time": "Wed Apr 07 10:21:19 2010 +0000" }, "committer": { "name": "Dave Airlie", "email": "airlied@redhat.com", "time": "Thu Apr 08 10:21:19 2010 +1000" }, "message": "drm/ttm: split no_wait argument in 2 GPU or reserve wait\n\nThere is case where we want to be able to wait only for the\nGPU while not waiting for other buffer to be unreserved. This\npatch split the no_wait argument all the way down in the whole\nttm path so that upper level can decide on what to wait on or\nnot.\n\n[airlied: squashed these 4 for bisectability reasons.]\ndrm/radeon/kms: update to TTM no_wait splitted argument\ndrm/nouveau: update to TTM no_wait splitted argument\ndrm/vmwgfx: update to TTM no_wait splitted argument\n[vmwgfx patch: Reviewed-by: Thomas Hellstrom \u003cthellstrom@vmware.com\u003e]\n\nSigned-off-by: Jerome Glisse \u003cjglisse@redhat.com\u003e\nAcked-by: Thomas Hellstrom \u003cthellstrom@vmware.com\u003e\nSigned-off-by: Dave Airlie \u003cairlied@redhat.com\u003e\n" }, { "commit": "4abe35204af82a018ca3ce6db4102aa09719698e", "tree": "fcc91e2e109fe311a673d5b99dc758aba3bb4a79", "parents": [ "5c4426a782bc9509573fc7958a786ebd14fafdf3" ], "author": { "name": "Dave Airlie", "email": "airlied@redhat.com", "time": "Tue Mar 30 05:34:18 2010 +0000" }, "committer": { "name": "Dave Airlie", "email": "airlied@redhat.com", "time": "Wed Apr 07 10:30:38 2010 +1000" }, "message": "drm/kms/fb: use slow work mechanism for normal hotplug also.\n\na) slow work is always used now for any fbcon hotplug, as its not\n a fast task and is more suited to being ran under slow work.\n\nb) attempt to not do any fbdev changes when X is running as we\u0027ll\n just mess it up. This hooks set_par to hopefully do the changes\n once X hands control to fbdev.\n\nThis also adds the nouveau/intel hotplug support.\n\nSigned-off-by: Dave Airlie \u003cairlied@redhat.com\u003e\n" }, { "commit": "5c4426a782bc9509573fc7958a786ebd14fafdf3", "tree": "ce701b338b6cd84e07a6259b56dca9df9875aedb", "parents": [ "19b4b44503ccdf834062d68e022dc1e2721695a5" ], "author": { "name": "Dave Airlie", "email": "airlied@redhat.com", "time": "Tue Mar 30 05:34:17 2010 +0000" }, "committer": { "name": "Dave Airlie", "email": "airlied@redhat.com", "time": "Wed Apr 07 10:29:52 2010 +1000" }, "message": "drm/kms/fb: add polling support for when nothing is connected.\n\nWhen we are running in a headless environment we have no idea what\noutput the user might plug in later, we only have hotplug detect\nfrom the digital outputs. So if we detect no connected outputs at\ninitialisation, start a slow work operation to poll every 5 seconds\nfor an output.\n\nthis is only hooked up for radeon so far, on hw where we have full\nhotplug detection there is no need for this.\n\nSigned-off-by: Dave Airlie \u003cairlied@redhat.com\u003e\n" }, { "commit": "0b4c0f3f0eceacb691e2b5570d9b16d751ce1b48", "tree": "708eecc3e3b86f4328df588400e2b7a3f6f2b32d", "parents": [ "8be48d924c307e72e3797ab5bde81b07a1ccc52d" ], "author": { "name": "Dave Airlie", "email": "airlied@redhat.com", "time": "Tue Mar 30 05:34:15 2010 +0000" }, "committer": { "name": "Dave Airlie", "email": "airlied@redhat.com", "time": "Wed Apr 07 10:28:01 2010 +1000" }, "message": "drm/kms/fb: separate fbdev connector list from core drm connectors\n\nThis breaks the connection between the core drm connector list\nand the fbdev connector usage, and allows them to become disjoint\nin the future. It also removes the untype void* that was in the\nconnector struct to support this.\n\nAll connectors are added to the fbdev now but this could be\nchanged in the future.\n\nSigned-off-by: Dave Airlie \u003cairlied@redhat.com\u003e\n" }, { "commit": "8be48d924c307e72e3797ab5bde81b07a1ccc52d", "tree": "7d2fec8d40b0a6e9f7bd8a5aef5bb100783ecd44", "parents": [ "386516744ba45d50f42c6999151cc210cb4f96e4" ], "author": { "name": "Dave Airlie", "email": "airlied@redhat.com", "time": "Tue Mar 30 05:34:14 2010 +0000" }, "committer": { "name": "Dave Airlie", "email": "airlied@redhat.com", "time": "Wed Apr 07 10:24:56 2010 +1000" }, "message": "drm/kms/fb: move to using fb helper crtc grouping instead of core crtc list\n\nThis move to using the list of crtcs in the fb helper and cleans up the\nwhole picking code, now we store the crtc/connectors we want directly\ninto the modeset and we use the modeset directly to set the mode.\n\nFixes from James Simmons and Ben Skeggs.\n\nSigned-off-by: Dave Airlie \u003cairlied@redhat.com\u003e\n" }, { "commit": "386516744ba45d50f42c6999151cc210cb4f96e4", "tree": "88e3b6aeb83040a8bd512eb7aad087e6c0fcd556", "parents": [ "643acacf02679befd0f98ac3c5fecb805f1c9548" ], "author": { "name": "Dave Airlie", "email": "airlied@redhat.com", "time": "Tue Mar 30 05:34:13 2010 +0000" }, "committer": { "name": "Dave Airlie", "email": "airlied@redhat.com", "time": "Wed Apr 07 10:21:03 2010 +1000" }, "message": "drm/fb: fix fbdev object model + cleanup properly.\n\nThe fbdev layer in the kms code should act like a consumer of the kms services and avoid having relying on information being store in the kms core structures in order for it to work.\n\nThis patch\n\na) removes the info pointer/psuedo palette from the core drm_framebuffer structure and moves it to the fbdev helper layer, it also removes the core drm keeping a list of kernel kms fbdevs.\nb) migrated all the fb helper functions out of the crtc helper file into the fb helper file.\nc) pushed the fb probing/hotplug control into the driver\nd) makes the surface sizes into a structure for ease of passing\nThis changes the intel/radeon/nouveau drivers to use the new helper.\n\nSigned-off-by: Dave Airlie \u003cairlied@redhat.com\u003e\n" }, { "commit": "c96af79e3463d5d3f865625baa8bb8aa4c0944a0", "tree": "d3ed3dd9a4a9e8beda500f51213bd0c7e5c28884", "parents": [ "975efdb1bf925ad48d4e3fe5339a85f12601e10d" ], "author": { "name": "Pauli Nieminen", "email": "suokkos@gmail.com", "time": "Thu Apr 01 12:45:03 2010 +0000" }, "committer": { "name": "Dave Airlie", "email": "airlied@redhat.com", "time": "Tue Apr 06 11:36:18 2010 +1000" }, "message": "drm/ttm: Add sysfs interface to control pool allocator.\n\nSysfs interface allows user to configure pool allocator functionality and\nchange limits for the size of pool.\n\nSigned-off-by: Pauli Nieminen \u003csuokkos@gmail.com\u003e\nSigned-off-by: Dave Airlie \u003cairlied@redhat.com\u003e\n" }, { "commit": "0745866165598b067442c472911280527b08be3e", "tree": "454900be36c969fe45554a47e733807d63be8b6f", "parents": [ "1403b1a38e8b19a4cc17e2c158e278628943a436" ], "author": { "name": "Pauli Nieminen", "email": "suokkos@gmail.com", "time": "Thu Apr 01 12:44:58 2010 +0000" }, "committer": { "name": "Dave Airlie", "email": "airlied@redhat.com", "time": "Tue Apr 06 11:35:45 2010 +1000" }, "message": "drm/ttm: Add debugfs output entry to pool allocator.\n\nttm_page_alloc_debugfs can be registered to output the state\nof pools.\n\nDebugfs file will output number of pages freed from the pool,\nnumber of pages in pool now and the lowes number of pages in\npool since previous shrink.\n\nSigned-off-by: Pauli Nieminen \u003csuokkos@gmail.com\u003e\nSigned-off-by: Dave Airlie \u003cairlied@redhat.com\u003e\n" }, { "commit": "1403b1a38e8b19a4cc17e2c158e278628943a436", "tree": "309781b3948092d97e47e64eab9f14db85c357cd", "parents": [ "95beb690170e6ce918fe53c73a0fcc7cf64d704a" ], "author": { "name": "Pauli Nieminen", "email": "suokkos@gmail.com", "time": "Thu Apr 01 12:44:57 2010 +0000" }, "committer": { "name": "Dave Airlie", "email": "airlied@redhat.com", "time": "Tue Apr 06 11:35:26 2010 +1000" }, "message": "drm/ttm: add pool wc/uc page allocator V3\n\nOn AGP system we might allocate/free routinely uncached or wc memory,\nchanging page from cached (wb) to uc or wc is very expensive and involves\na lot of flushing. To improve performance this allocator use a pool\nof uc,wc pages.\n\nPools are protected with spinlocks to allow multiple threads to allocate pages\nsimultanously. Expensive operations are done outside of spinlock to maximize\nconcurrency.\n\nPools are linked lists of pages that were recently freed. mm shrink callback\nallows kernel to claim back pages when they are required for something else.\n\nFixes:\n* set_pages_array_wb handles highmem pages so we don\u0027t have to remove them\n from pool.\n* Add count parameter to ttm_put_pages to avoid looping in free code.\n* Change looping from _safe to normal in pool fill error path.\n* Initialize sum variable and make the loop prettier in get_num_unused_pages.\n\n* Moved pages_freed reseting inside the loop in ttm_page_pool_free.\n* Add warning comment about spinlock context in ttm_page_pool_free.\n\nBased on Jerome Glisse\u0027s and Dave Airlie\u0027s pool allocator.\n\nSigned-off-by: Jerome Glisse \u003cjglisse@redhat.com\u003e\nSigned-off-by: Dave Airlie \u003cairlied@redhat.com\u003e\nSigned-off-by: Pauli Nieminen \u003csuokkos@gmail.com\u003e\nReviewed-by: Jerome Glisse \u003cjglisse@redhat.com\u003e\nSigned-off-by: Dave Airlie \u003cairlied@redhat.com\u003e\n" }, { "commit": "7a37435008b0ffea2442eb1134ddd4adeea81e19", "tree": "cb0f68ab38d1a6572a913857c67e782ca34ad99c", "parents": [ "7ca6adb37918db21d076a489c6c39490fb34264e" ], "author": { "name": "Adam Jackson", "email": "ajax@redhat.com", "time": "Mon Mar 29 21:43:30 2010 +0000" }, "committer": { "name": "Dave Airlie", "email": "airlied@redhat.com", "time": "Tue Apr 06 10:40:25 2010 +1000" }, "message": "drm/edid: Add secondary GTF curve support\n\nBefore CVT-R, some monitors would advertise support for an alternative\nGTF formula with lower blanking intervals. Correctly identify such\nmonitors, and use the alternative formula when generating modes for\nthem.\n\nNote that we only do this for \"standard\" timing descriptors (tuples of\nhsize in characters / aspect ratio / vertical refresh). Range-based\nmode lists still only refer to the primary GTF curve. It would be\npossible to do better for the latter case, but monitors are required to\nsupport the primary curve over the entire advertised range, so all it\nwould win you is a lower pixel clock and therefore possibly better image\nquality on analog links.\n\nSigned-off-by: Adam Jackson \u003cajax@redhat.com\u003e\nSigned-off-by: Dave Airlie \u003cairlied@redhat.com\u003e\n" }, { "commit": "7466f4cc508878a8328dff1c328a2b4108888d2e", "tree": "a46b13cd8b1baa22f241d1e8c90809a73c333561", "parents": [ "2255be14cb82370a6af4054edb3b4cd170d80752" ], "author": { "name": "Adam Jackson", "email": "ajax@redhat.com", "time": "Mon Mar 29 21:43:23 2010 +0000" }, "committer": { "name": "Dave Airlie", "email": "airlied@redhat.com", "time": "Tue Apr 06 10:40:20 2010 +1000" }, "message": "drm/edid: Remove arbitrary EDID extension limit\n\nSigned-off-by: Adam Jackson \u003cajax@redhat.com\u003e\nSigned-off-by: Dave Airlie \u003cairlied@redhat.com\u003e\n" }, { "commit": "61e57a8d72f2336faf39b5d940215cf085e01e6e", "tree": "8c9c6713b4f1ff4c610771860c6cca411cb28cfc", "parents": [ "95beb690170e6ce918fe53c73a0fcc7cf64d704a" ], "author": { "name": "Adam Jackson", "email": "ajax@redhat.com", "time": "Mon Mar 29 21:43:18 2010 +0000" }, "committer": { "name": "Dave Airlie", "email": "airlied@redhat.com", "time": "Tue Apr 06 10:40:16 2010 +1000" }, "message": "drm/edid: Fix secondary block fetch.\n\nThis makes fetching the second EDID block on HDMI monitors actually\nwork. DDC can\u0027t transfer more than 128 bytes at a time. Also,\nrearrange the code so the pure DDC bits are separate from block parse.\n\nSigned-off-by: Adam Jackson \u003cajax@redhat.com\u003e\nSigned-off-by: Dave Airlie \u003cairlied@redhat.com\u003e\n" }, { "commit": "336f5899d287f06d8329e208fc14ce50f7ec9698", "tree": "9b762d450d5eb248a6ff8317badb7e223d93ed58", "parents": [ "a4ab2773205e8b94c18625455f85e3b6bb9d7ad6", "db217dece3003df0841bacf9556b5c06aa097dae" ], "author": { "name": "Tejun Heo", "email": "tj@kernel.org", "time": "Mon Apr 05 11:37:28 2010 +0900" }, "committer": { "name": "Tejun Heo", "email": "tj@kernel.org", "time": "Mon Apr 05 11:37:28 2010 +0900" }, "message": "Merge branch \u0027master\u0027 into export-slabh\n" }, { "commit": "5a0e3ad6af8660be21ca98a971cd00f331318c05", "tree": "5bfb7be11a03176a87296a43ac6647975c00a1d1", "parents": [ "ed391f4ebf8f701d3566423ce8f17e614cde9806" ], "author": { "name": "Tejun Heo", "email": "tj@kernel.org", "time": "Wed Mar 24 17:04:11 2010 +0900" }, "committer": { "name": "Tejun Heo", "email": "tj@kernel.org", "time": "Tue Mar 30 22:02:32 2010 +0900" }, "message": "include cleanup: Update gfp.h and slab.h includes to prepare for breaking implicit slab.h inclusion from percpu.h\n\npercpu.h is included by sched.h and module.h and thus ends up being\nincluded when building most .c files. percpu.h includes slab.h which\nin turn includes gfp.h making everything defined by the two files\nuniversally available and complicating inclusion dependencies.\n\npercpu.h -\u003e slab.h dependency is about to be removed. Prepare for\nthis change by updating users of gfp and slab facilities include those\nheaders directly instead of assuming availability. As this conversion\nneeds to touch large number of source files, the following script is\nused as the basis of conversion.\n\n http://userweb.kernel.org/~tj/misc/slabh-sweep.py\n\nThe script does the followings.\n\n* Scan files for gfp and slab usages and update includes such that\n only the necessary includes are there. ie. if only gfp is used,\n gfp.h, if slab is used, slab.h.\n\n* When the script inserts a new include, it looks at the include\n blocks and try to put the new include such that its order conforms\n to its surrounding. It\u0027s put in the include block which contains\n core kernel includes, in the same order that the rest are ordered -\n alphabetical, Christmas tree, rev-Xmas-tree or at the end if there\n doesn\u0027t seem to be any matching order.\n\n* If the script can\u0027t find a place to put a new include (mostly\n because the file doesn\u0027t have fitting include block), it prints out\n an error message indicating which .h file needs to be added to the\n file.\n\nThe conversion was done in the following steps.\n\n1. The initial automatic conversion of all .c files updated slightly\n over 4000 files, deleting around 700 includes and adding ~480 gfp.h\n and ~3000 slab.h inclusions. The script emitted errors for ~400\n files.\n\n2. Each error was manually checked. Some didn\u0027t need the inclusion,\n some needed manual addition while adding it to implementation .h or\n embedding .c file was more appropriate for others. This step added\n inclusions to around 150 files.\n\n3. The script was run again and the output was compared to the edits\n from #2 to make sure no file was left behind.\n\n4. Several build tests were done and a couple of problems were fixed.\n e.g. lib/decompress_*.c used malloc/free() wrappers around slab\n APIs requiring slab.h to be added manually.\n\n5. The script was run on all .h files but without automatically\n editing them as sprinkling gfp.h and slab.h inclusions around .h\n files could easily lead to inclusion dependency hell. Most gfp.h\n inclusion directives were ignored as stuff from gfp.h was usually\n wildly available and often used in preprocessor macros. Each\n slab.h inclusion directive was examined and added manually as\n necessary.\n\n6. percpu.h was updated not to include slab.h.\n\n7. Build test were done on the following configurations and failures\n were fixed. CONFIG_GCOV_KERNEL was turned off for all tests (as my\n distributed build env didn\u0027t work with gcov compiles) and a few\n more options had to be turned off depending on archs to make things\n build (like ipr on powerpc/64 which failed due to missing writeq).\n\n * x86 and x86_64 UP and SMP allmodconfig and a custom test config.\n * powerpc and powerpc64 SMP allmodconfig\n * sparc and sparc64 SMP allmodconfig\n * ia64 SMP allmodconfig\n * s390 SMP allmodconfig\n * alpha SMP allmodconfig\n * um on x86_64 SMP allmodconfig\n\n8. percpu.h modifications were reverted so that it could be applied as\n a separate patch and serve as bisection point.\n\nGiven the fact that I had only a couple of failures from tests on step\n6, I\u0027m fairly confident about the coverage of this conversion patch.\nIf there is a breakage, it\u0027s likely to be something in one of the arch\nheaders which should be easily discoverable easily on most builds of\nthe specific arch.\n\nSigned-off-by: Tejun Heo \u003ctj@kernel.org\u003e\nGuess-its-ok-by: Christoph Lameter \u003ccl@linux-foundation.org\u003e\nCc: Ingo Molnar \u003cmingo@redhat.com\u003e\nCc: Lee Schermerhorn \u003cLee.Schermerhorn@hp.com\u003e\n" }, { "commit": "1fc59eda33e55f8787901e3501d695bf5ecec48b", "tree": "9a86d6e5728f67670de441dd892cd9a09f67423b", "parents": [ "d5e5deddf67389eabc3d9b13004c108120d397e1", "d0d6cb81e7eb34d83461070ca3e919fba1db437c" ], "author": { "name": "Dave Airlie", "email": "airlied@redhat.com", "time": "Mon Mar 15 11:08:56 2010 +1000" }, "committer": { "name": "Dave Airlie", "email": "airlied@redhat.com", "time": "Mon Mar 15 11:08:59 2010 +1000" }, "message": "Merge branch \u0027radeon-for-airlied\u0027 of ../linux-2.6 into drm-linus\n\n* \u0027radeon-for-airlied\u0027 of ../linux-2.6:\n drm/radeon/kms: prepare for more reclocking operations\n drm/radeon/kms: switch to condition waiting for reclocking\n drm/radeon/r600: add missing license and comments to r600_blit_shaders.c\n drm/radeon/kms: improve coding style a little\n drm/radeon/kms: remove dead audio/HDMI code\n drm/radeon/kms: enable audio engine on DCE32\n drm/radeon/kms: add HDMI code for pre-DCE3 R6xx GPUs\n drm/radeon/kms: clean assigning HDMI blocks to encoders\n drm/radeon/kms: clean HDMI definitions\n drm/radeon/kms/rs4xx: make sure crtcs are enabled when setting timing\n drm/radeon/kms/r1xx: enable hw i2c\n drm/radeon/kms: fix i2c prescale calc on older radeons\n drm/radeon/kms: fix for hw i2c\n drm/radeon/kms: fix pal tv-out support on legacy IGP chips\n drm/radeon/kms: further spread spectrum fixes\n drm/radeon/kms: use lcd pll limits when available\n drm/radeon/kms/atom: spread spectrum fix\n drm/radeon/kms: catch atombios infinite loop and break out of it\n drm/radeon: add new RS880 pci id\n" }, { "commit": "72e942dd846f98e2d35aad5436d77a878ef05c5e", "tree": "bed31b516da9fd80058800caa6161b6e0f880595", "parents": [ "d424b925f7092b9d95e0a8556872349abe79d9b6" ], "author": { "name": "Dave Airlie", "email": "airlied@redhat.com", "time": "Tue Mar 09 06:33:26 2010 +0000" }, "committer": { "name": "Dave Airlie", "email": "airlied@redhat.com", "time": "Mon Mar 15 10:31:43 2010 +1000" }, "message": "drm/ttm: use drm calloc large and free large\n\nNow that the drm core can do this, lets just use it, split the code out\nso TTM doesn\u0027t have to drag all of drmP.h in.\n\nSigned-off-by: Dave Airlie \u003cairlied@redhat.com\u003e\n" }, { "commit": "338e2b1d571e4873908b199c90d6a31f65137fe3", "tree": "2dd6417d9217e1ad888a88fbf110ad7b00d49bfc", "parents": [ "d424b925f7092b9d95e0a8556872349abe79d9b6" ], "author": { "name": "Alex Deucher", "email": "alexdeucher@gmail.com", "time": "Wed Mar 03 13:39:13 2010 -0500" }, "committer": { "name": "Dave Airlie", "email": "airlied@redhat.com", "time": "Mon Mar 15 09:22:12 2010 +1000" }, "message": "drm/radeon: add new RS880 pci id\n\nThis should go to 2.6.33 stable as well.\n\nSigned-off-by: Alex Deucher \u003calexdeucher@gmail.com\u003e\nCc: stable@kernel.org\nSigned-off-by: Dave Airlie \u003cairlied@redhat.com\u003e\n" }, { "commit": "68de7745822f0dc2eea940e3c1fc65896d7afc88", "tree": "8ee06f4ee466b58fc224a7d447dd90a1168896e0", "parents": [ "cf7934a2a0ec55759fcf6861a868baadfd522300", "566d84d172161cb6c0c4dd834c34abbac6bf7b38" ], "author": { "name": "Dave Airlie", "email": "airlied@redhat.com", "time": "Mon Mar 01 16:08:57 2010 +1000" }, "committer": { "name": "Dave Airlie", "email": "airlied@redhat.com", "time": "Mon Mar 01 16:08:57 2010 +1000" }, "message": "Merge branch \u0027drm-radeon-testing\u0027 of /ssd/git/drm-radeon-next into drm-next-stage\n\n* \u0027drm-radeon-testing\u0027 of /ssd/git/drm-radeon-next:\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" }, { "commit": "a55e8d452ed2f6bbecda1a3039e82cd05244be3d", "tree": "4865b9575e3d6c22b68b2df70eaec27c37f73b36", "parents": [ "d964fc54ed06cea45dfd10832ed3d34f3ddb661b" ], "author": { "name": "Randy Dunlap", "email": "randy.dunlap@oracle.com", "time": "Wed Feb 24 14:29:14 2010 -0800" }, "committer": { "name": "Dave Airlie", "email": "airlied@redhat.com", "time": "Mon Mar 01 16:03:26 2010 +1000" }, "message": "drm/ttm: fix function prototype to match implementation\n\nFix function prototype to match its actual usage and implementation.\n\ndrivers/gpu/drm/ttm/ttm_bo_util.c:341:10: error: symbol \u0027ttm_io_prot\u0027 redeclared with different type (originally declared at include/drm/ttm/ttm_bo_driver.h:911) - incompatible argument 1 (different signedness)\n\nSigned-off-by: Randy Dunlap \u003crandy.dunlap@oracle.com\u003e\nCc:\tDavid Airlie \u003cairlied@linux.ie\u003e\nSigned-off-by: Dave Airlie \u003cairlied@redhat.com\u003e\n" }, { "commit": "cf7934a2a0ec55759fcf6861a868baadfd522300", "tree": "97fb4aac01d1b4e112126b2bd3852e3646d4b408", "parents": [ "aa71fa3cd5b7b4f669cd74c5a16de57d2938cd85", "6070a4a928f8c92b9fae7d6717ebbb05f425d6b2" ], "author": { "name": "Dave Airlie", "email": "airlied@redhat.com", "time": "Mon Mar 01 15:41:26 2010 +1000" }, "committer": { "name": "Dave Airlie", "email": "airlied@redhat.com", "time": "Mon Mar 01 15:41:26 2010 +1000" }, "message": "Merge remote branch \u0027anholt/drm-intel-next\u0027 into drm-next-stage\n\n* anholt/drm-intel-next: (103 commits)\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 drm/i915: extract fence stealing code\n drm/i915: fixup active list locking in object_unbind\n drm/i915: reuse i915_gem_object_put_fence_reg for fence stealing code\n drm/i915: Add dependency on the intel agp module\n drm/i915: More s/IS_IRONLAKE/HAS_PCH_SPLIT for Sandybridge.\n drm/i915: Correct the Sandybridge chipset info structs.\n drm/i915: Disable the hangcheck reset on Sandybridge until we add support.\n drm/i915: Add a new mobile Sandybridge PCI ID.\n agp/intel: Add a new Sandybridge HB/IG PCI ID combo.\n drm/i915, agp/intel: Fix stolen memory size on Sandybridge\n drm/i915: Correct locking in the modesetting failure path, fixing a BUG_ON.\n drm/i915: Disable the surface tile swizzling on Sandybridge.\n agp/intel: Use a non-reserved value for the cache field of the PTEs.\n drm/i915: Fix sandybridge status page setup.\n ...\n" }, { "commit": "aa71fa3cd5b7b4f669cd74c5a16de57d2938cd85", "tree": "d6dac4b9a73b7c3fc4a62bddfd8622e067cbdcdf", "parents": [ "79fa9eb7396238233c327668185d28bb47fb0796", "3bfc7d22d0400e85a93e835d4398dcbe0af68b0b" ], "author": { "name": "Dave Airlie", "email": "airlied@redhat.com", "time": "Mon Mar 01 15:41:15 2010 +1000" }, "committer": { "name": "Dave Airlie", "email": "airlied@redhat.com", "time": "Mon Mar 01 15:41:15 2010 +1000" }, "message": "Merge remote branch \u0027nouveau/for-airlied\u0027 into drm-next-stage\n\n* nouveau/for-airlied: (25 commits)\n drm/nouveau: use ALIGN instead of open coding it\n drm/nouveau: report unknown connector state if lid closed\n drm/nouveau: support version 0x20 displayport tables\n drm/nouveau: Fix noaccel/nofbaccel option descriptions.\n drm/nv50: Implement ctxprog/state generation.\n drm/nouveau: use dcb connector types throughout the driver\n drm/nv50: enable hpd on any connector we know the gpio line for\n drm/nouveau: use dcb connector table for creating drm connectors\n drm/nouveau: construct a connector table for cards that lack a real one\n drm/nouveau: check for known dcb connector types\n drm/nouveau: parse dcb gpio/connector tables after encoders\n drm/nouveau: reorganise bios header, add dcb connector type enums\n drm/nouveau: merge nvbios and nouveau_bios_info\n drm/nouveau: merge parsed_dcb and bios_parsed_dcb into dcb_table\n drm/nouveau: rename parsed_dcb_gpio to dcb_gpio_table\n drm/nouveau: allow retrieval of vbios image from debugfs\n drm/nouveau: fix missing spin_unlock in failure path\n drm/nouveau: fix i2ctable bounds checking\n drm/nouveau: fix nouveau_i2c_find bounds checking\n drm/nouveau: fix pramdac_table range checking\n ...\n\nConflicts:\n\tdrivers/gpu/drm/nouveau/nouveau_gem.c\n" }, { "commit": "bad720ff3e8e47a04bd88d9bbc8317e7d7e049d3", "tree": "f799c660fbe0530398366f46da0fb25381b78978", "parents": [ "1089e3009572e07a1fe12c3408828f27c96453be" ], "author": { "name": "Eric Anholt", "email": "eric@anholt.net", "time": "Thu Oct 22 16:11:14 2009 -0700" }, "committer": { "name": "Eric Anholt", "email": "eric@anholt.net", "time": "Fri Feb 26 13:23:17 2010 -0800" }, "message": "drm/i915: Add initial bits for VGA modesetting bringup on Sandybridge.\n\nSigned-off-by: Eric Anholt \u003ceric@anholt.net\u003e\n" }, { "commit": "eb6b6d7cdd5548fa03a919d14615195600013be2", "tree": "c499472ef28a903f94b09da9a24f66b021412813", "parents": [ "30d6c72c4a760cfc9069ee100786e4d6cf6de59d", "383be5d1789d9a7a2e77dca1cb0aca89507d069e" ], "author": { "name": "Dave Airlie", "email": "airlied@redhat.com", "time": "Thu Feb 25 13:44:04 2010 +1000" }, "committer": { "name": "Dave Airlie", "email": "airlied@redhat.com", "time": "Fri Feb 26 16:23:23 2010 +1000" }, "message": "Merge remote branch \u0027korg/drm-radeon-testing\u0027 into drm-next-stage\n\n* korg/drm-radeon-testing: (62 commits)\n drm/radeon/kms: update new pll algo\n drm/radeon/kms: add support for square microtiles on r3xx-r5xx\n drm/radeon/kms: force pinning buffer into visible VRAM\n drm/radeon/kms/evergreen: fix typo in cursor code\n drm/radeon/kms: implement reading active PCIE lanes on R600+\n drm/radeon/kms: for downclocking non-mobility check PERFORMANCE state\n drm/radeon/kms: simplify storing current and requested PM mode\n drm/radeon: fixes for r6xx/r7xx gfx init\n drm/radeon/rv740: fix backend setup\n drm/radeon/kms: fix R3XX/R4XX memory controller initialization\n [rfc] drm/radeon/kms: pm debugging check for vbl.\n drm/radeon: Fix memory allocation failures in the preKMS command stream checking.\n drm: Add generic multipart buffer.\n drm/radeon/kms: simplify memory controller setup V2\n drm/radeon: Add asic hook for dma copy to r200 cards.\n drm/radeon/kms: Create asic structure for r300 pcie cards.\n drm/radeon/kms: remove unused r600_gart_clear_page\n drm/radeon/kms: remove HDP flushes from fence emit (v2)\n drm/radeon/kms: add LVDS pll quirk for Dell Studio 15\n drm/radeon/kms: simplify picking power state\n ...\n\nConflicts:\n\tdrivers/gpu/drm/radeon/atom.c\n\tdrivers/gpu/drm/radeon/atombios.h\n\tdrivers/gpu/drm/radeon/atombios_dp.c\n\tdrivers/gpu/drm/radeon/r600.c\n\tdrivers/gpu/drm/radeon/r600_audio.c\n\tdrivers/gpu/drm/radeon/r600_cp.c\n\tdrivers/gpu/drm/radeon/radeon.h\n\tdrivers/gpu/drm/radeon/radeon_connectors.c\n\tdrivers/gpu/drm/radeon/radeon_ring.c\n\tdrivers/gpu/drm/radeon/rv770.c\n" }, { "commit": "a1606a9596e54da90ad6209071b357a4c1b0fa82", "tree": "1f01726a80ea1e374d87fb6c6ebe3bbc6015b36a", "parents": [ "d87897d4c853a5c136f60efa858d0d4cb3740f57" ], "author": { "name": "Ben Skeggs", "email": "bskeggs@redhat.com", "time": "Fri Feb 12 10:27:35 2010 +1000" }, "committer": { "name": "Ben Skeggs", "email": "bskeggs@redhat.com", "time": "Thu Feb 25 15:08:44 2010 +1000" }, "message": "drm/nouveau: new gem pushbuf interface, bump to 0.0.16\n\nThis commit breaks the userspace interface, and requires a new libdrm for\nnouveau to operate again.\n\nThe multiple GEM_PUSHBUF ioctls that were present in 0.0.15 for\ncompatibility purposes are now gone, and replaced with the new ioctl which\nallows for multiple push buffers to be submitted (necessary for hw index\nbuffers in the nv50 3d driver) and relocations to be applied on any buffer.\n\nA number of other ioctls (CARD_INIT, GEM_PIN, GEM_UNPIN) that were needed\nfor userspace modesetting have also been removed.\n\nSigned-off-by: Ben Skeggs \u003cbskeggs@redhat.com\u003e\nSigned-off-by: Francisco Jerez \u003ccurrojerez@riseup.net\u003e\n" }, { "commit": "939461d59d6ac4e5142f767d24810c9b4b5caa38", "tree": "f3b22ad375ebec24457b29e78d73b054774d2e80", "parents": [ "51e5fcd353a55364984bda3dd1391742e4dec53c" ], "author": { "name": "Marek Olšák", "email": "maraeo@gmail.com", "time": "Sun Feb 14 07:10:10 2010 +0100" }, "committer": { "name": "Dave Airlie", "email": "airlied@redhat.com", "time": "Thu Feb 25 11:36:12 2010 +1000" }, "message": "drm/radeon/kms: add support for square microtiles on r3xx-r5xx\n\nSigned-off-by: Marek Olšák \u003cmaraeo@gmail.com\u003e\nSigned-off-by: Dave Airlie \u003cairlied@redhat.com\u003e\n" }, { "commit": "7a9f0dd9c49425e2b0e39ada4757bc7a38c84873", "tree": "67620d1185e173ac84d27a686bab381cb916b754", "parents": [ "d594e46ace22afa1621254f6f669e65430048153" ], "author": { "name": "Pauli Nieminen", "email": "suokkos@gmail.com", "time": "Mon Feb 01 19:11:15 2010 +0200" }, "committer": { "name": "Dave Airlie", "email": "airlied@redhat.com", "time": "Tue Feb 23 09:46:20 2010 +1000" }, "message": "drm: Add generic multipart buffer.\n\nAllocating multiple pages of memory for data that is coming\nfrom user space may fail. To fix memory allocation failures\nthe buffer object should be split to multiple independ pages.\n\ndrm buffer provides generic interface to copy and process\nlarge data arrays from user space.\n\nInterface includes allocation and free functions to allocate\nthe buffer object and data storage pages.\n\nAll access operations are performed relative to a internal\npointer which is advanced with drm_buffer_advance function.\n\nThe buffer can be accessed using drm_buffer_pointer_to_XXX\nfunctions if it is known that requested object doesn\u0027t split\nover a page boundary. These functions don\u0027t do any error\nchecking to maximize performance.\n\nIf there is large object which could be split there is special\ndrm_buffer_read_object function. drm_buffer_read_object takes\na pointer as argument which is used as temporary store for\ndata if it is split over boundary in the buffer.\n\nSigned-off-by: Pauli Nieminen \u003csuokkos@gmail.com\u003e\nSigned-off-by: Dave Airlie \u003cairlied@redhat.com\u003e\n" }, { "commit": "c3ae90c099bb62387507e86da7cf799850444b08", "tree": "4f546a65e35fddea09a97fbfd28ce724ea86f7c2", "parents": [ "77c1ff3982c6b36961725dd19e872a1c07df7f3b" ], "author": { "name": "Luca Barbieri", "email": "luca@luca-barbieri.com", "time": "Tue Feb 09 05:49:11 2010 +0000" }, "committer": { "name": "Dave Airlie", "email": "airlied@redhat.com", "time": "Thu Feb 11 14:21:24 2010 +1000" }, "message": "drm: introduce drm_gem_object_[handle_]unreference_unlocked\n\nThis patch introduces the drm_gem_object_unreference_unlocked\nand drm_gem_object_handle_unreference_unlocked functions that\ndo not require holding struct_mutex.\n\ndrm_gem_object_unreference_unlocked calls the new\n-\u003egem_free_object_unlocked entry point if available, and\notherwise just takes struct_mutex and just calls -\u003egem_free_object\n\nSigned-off-by: Luca Barbieri \u003cluca@luca-barbieri.com\u003e\nSigned-off-by: Dave Airlie \u003cairlied@redhat.com\u003e\n" }, { "commit": "e8a47c10b20ee446e7badd0ec5625d0bdc4216b1", "tree": "117d4ac7107faa1d04b30bd5c114598057ad3e78", "parents": [ "85b9e4878f3b16993fba871c0c68d0948ec9c7c6", "13876c6e5fec94e9ea51b73ac025583dd7655345" ], "author": { "name": "Dave Airlie", "email": "airlied@redhat.com", "time": "Thu Feb 11 12:10:48 2010 +1000" }, "committer": { "name": "Dave Airlie", "email": "airlied@redhat.com", "time": "Thu Feb 11 12:10:52 2010 +1000" }, "message": "Merge remote branch \u0027nouveau/for-airlied\u0027 of nouveau-2.6\n\n* \u0027nouveau/for-airlied\u0027 of /home/airlied/kernel/drm-next:\n nouveau: fix state detection with switchable graphics\n drm/nouveau: move dereferences after null checks\n drm/nv50: make the pgraph irq handler loop like the pre-nv50 version\n drm/nv50: delete ramfc object after disabling fifo, not before\n drm/nv50: avoid unloading pgraph context when ctxprog is running\n drm/nv50: align size of buffer object to the right boundaries.\n drm/nv50: disregard dac outputs in nv50_sor_dpms()\n drm/nv50: prevent multiple init tables being parsed at the same time\n drm/nouveau: make dp auxch xfer len check for reads only\n drm/nv40: make INIT_COMPUTE_MEM a NOP, just like nv50\n drm/nouveau: Add proper vgaarb support.\n drm/nouveau: Fix fbcon on mixed pre-NV50 + NV50 multicard.\n drivers/gpu/drm/nouveau/nouveau_grctx.c: correct NULL test\n drm/nouveau: call ttm_bo_wait with the bo lock held to prevent hang\n drm/nouveau: Fixup semaphores on pre-nv50 cards.\n drm/nouveau: Add getparam to get available PGRAPH units.\n drm/nouveau: Add module options to disable acceleration.\n drm/nouveau: fix non-vram notifier blocks\n" }, { "commit": "a87897edbae2d60db7bcb6bb0a75e82013d68305", "tree": "b0d1891b5bf73cd9dbad8ec22ab87813ad029522", "parents": [ "3bef35721018d2bac08d0d03979606b65347211e" ], "author": { "name": "Jakob Bornecrantz", "email": "jakob@vmware.com", "time": "Tue Feb 09 21:29:47 2010 +0000" }, "committer": { "name": "Dave Airlie", "email": "airlied@redhat.com", "time": "Thu Feb 11 12:03:26 2010 +1000" }, "message": "drm/vmwgfx: Drop scanout flag compat and add execbuf ioctl parameter members. Bumps major.\n\nEven if this bumps the version to 1 it does not mean the driver is\nout of staging. From what we know this is the last backwards\nincompatible change to the driver.\n\nSigned-off-by: Jakob Bornecrantz \u003cjakob@vmware.com\u003e\nSigned-off-by: Thomas Hellstrom \u003cthellstrom@vmware.com\u003e\nSigned-off-by: Dave Airlie \u003cairlied@redhat.com\u003e\n" }, { "commit": "f77cef3db357aeea22d82a2aa4f0ef8fbae41d47", "tree": "55e05387f639cfeb9f2c610f13ec2b77453ed9a6", "parents": [ "e28cab42f384745c8a947a9ccd51e4aae52f5d51" ], "author": { "name": "Thomas Hellstrom", "email": "thellstrom@vmware.com", "time": "Tue Feb 09 19:41:55 2010 +0000" }, "committer": { "name": "Dave Airlie", "email": "airlied@redhat.com", "time": "Thu Feb 11 11:58:09 2010 +1000" }, "message": "drm/vmwgfx: Update the user-space interface.\n\nWhen time-based throttling is implemented, we need to bump minor.\nWhen the old way of detecting scanout is removed, we need to bump major.\nIn the meantime, this change should not break existing user-space.\n\nSigned-off-by: Thomas Hellstrom \u003cthellstrom@vmware.com\u003e\nSigned-off-by: Jakob Bornecrantz \u003cjakob@vmware.com\u003e\nSigned-off-by: Dave Airlie \u003cairlied@redhat.com\u003e\n" }, { "commit": "69c9700b544e496dc3ccf472a4f3a76dcf4abaf7", "tree": "2d80752bfabdf77a42f7d432dfafed5be85f02f5", "parents": [ "a32ed69d7bb3cd259d813d71281d62993b9a70fd" ], "author": { "name": "Marcin Kościelnicki", "email": "koriakin@0x04.net", "time": "Tue Jan 26 18:39:20 2010 +0000" }, "committer": { "name": "Ben Skeggs", "email": "bskeggs@redhat.com", "time": "Tue Feb 09 12:48:08 2010 +1000" }, "message": "drm/nouveau: Add getparam to get available PGRAPH units.\n\nOn nv50, this will be needed by applications using CUDA to know\nhow much stack/local memory to allocate.\n\nSigned-off-by: Marcin Kościelnicki \u003ckoriakin@0x04.net\u003e\nSigned-off-by: Ben Skeggs \u003cbskeggs@redhat.com\u003e\n" }, { "commit": "bcc1c2a1d22974215e39dc87ce746ba9a39223e5", "tree": "62ae9dfab266202240307fc3998806c1d4655552", "parents": [ "e97bd974448ce90f8e4720499d84580bcd6a2f7a" ], "author": { "name": "Alex Deucher", "email": "alexdeucher@gmail.com", "time": "Tue Jan 12 17:54:34 2010 -0500" }, "committer": { "name": "Dave Airlie", "email": "airlied@redhat.com", "time": "Tue Feb 09 09:44:02 2010 +1000" }, "message": "drm/radeon/kms: add initial Evergreen support (Radeon HD 5xxx)\n\nThis adds initial Evergreen KMS support, it doesn\u0027t include\nany acceleration features or interrupt handling yet.\n\nMajor changes are DCE4 handling for PLLs for the \u003e 2 crtcs.\n\nSigned-off-by: Alex Deucher \u003calexdeucher@gmail.com\u003e\nSigned-off-by: Dave Airlie \u003cairlied@redhat.com\u003e\n" }, { "commit": "3c537889e17232e9073f75ae8710ea0f008c5a29", "tree": "9d3c25825b466b8ddc3fdc8224d4484c99173b08", "parents": [ "2739d49cd7f1f44876cad614b072da698967b370" ], "author": { "name": "Alex Deucher", "email": "alexdeucher@gmail.com", "time": "Fri Feb 05 04:21:19 2010 -0500" }, "committer": { "name": "Dave Airlie", "email": "airlied@redhat.com", "time": "Tue Feb 09 09:31:20 2010 +1000" }, "message": "drm/radeon/kms: add support for hardcoded edids in rom (v2)\n\nSome servers hardcode an edid in rom so that they will\nwork properly with KVMs. This is a port of the relevant\ncode from the ddx.\n\n[airlied: reworked to validate edid at boot stage - and\nremove special quirk, if there is a valid EDID in the BIOS rom\nwe\u0027ll just try and use it.]\n\nSigned-off-by: Alex Deucher \u003calexdeucher@gmail.com\u003e\nSigned-off-by: Dave Airlie \u003cairlied@redhat.com\u003e\n" }, { "commit": "9ce929078af868ce5f5b0b3537184dad642fba43", "tree": "8d61d65f46ba894bbc346f5e0cfde72e7b2308de", "parents": [ "13af75740f345a5ddb5f7020a688c0f96b0d9f1f", "17aafccab4352b422aa01fa6ebf82daff693a5b3" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon Feb 01 10:46:49 2010 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon Feb 01 10:46:49 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:\n drm/radeon/kms: Fix oops after radeon_cs_parser_init() failure.\n drm/radeon/kms: move radeon KMS on/off switch out of staging.\n drm/radeon/kms: Bailout of blit if error happen \u0026 protect with mutex V3\n drm/vmwgfx: Don\u0027t send bad flags to the host\n drm/vmwgfx: Request SVGA version 2 and bail if not found\n drm/vmwgfx: Correctly detect 3D\n drm/ttm: remove unnecessary save_flags and ttm_flag_masked in ttm_bo_util.c\n drm/kms: Remove incorrect comment in struct drm_mode_modeinfo\n drm/ttm: remove padding from ttm_ref_object on 64bit builds\n drm/radeon/kms: release agp on error.\n drm/kms/radeon/agp: Move the check of the aper_size after drm_acp_acquire and drm_agp_info\n drm/kms/radeon/agp: Fix warning, format ‘%d’ expects type ‘int’, but argument 4 has type ‘size_t’\n drm/ttm: Avoid conflicting reserve_memtype during ttm_tt_set_page_caching.\n drm/kms/radeon: pick digitial encoders smarter. (v3)\n drm/radeon/kms: use active device to pick connector for encoder\n drm/radeon/kms: fix incorrect logic in DP vs eDP connector checking.\n" }, { "commit": "fa5829b36539067f3c675f5d437531dedcfc4ad8", "tree": "cd2ec2bf02d88393e798cc7f6e1d00a39e0f522d", "parents": [ "dd5fde6041d7ea30fcfedcc159a4cec8b01f73b2" ], "author": { "name": "Marcin Kościelnicki", "email": "koriakin@0x04.net", "time": "Sat Jan 23 10:25:28 2010 +1000" }, "committer": { "name": "Dave Airlie", "email": "airlied@redhat.com", "time": "Mon Feb 01 11:26:39 2010 +1000" }, "message": "drm/kms: Remove incorrect comment in struct drm_mode_modeinfo\n\nSigned-off-by: Dave Airlie \u003cairlied@redhat.com\u003e\n" }, { "commit": "abefedd538f57f63199d821ade33f282e7fe0921", "tree": "d5b442c1d504ac0ed12c2801b98b6418a7f79764", "parents": [ "840f51ffe126123e748df0f36c411a90db1efd93", "7087e16286913b41ba9a5186360645b57b8508dd" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon Jan 25 18:59:47 2010 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon Jan 25 18:59:47 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: (95 commits)\n drm/radeon/kms: preface warning printk with driver name\n drm/radeon/kms: drop unnecessary printks.\n drm: fix regression in fb blank handling\n drm/radeon/kms: make hibernate work on IGPs\n drm/vmwgfx: Optimize memory footprint for DMA buffers.\n drm/ttm: Allow system memory as a busy placement.\n drm/ttm: Fix race condition in ttm_bo_delayed_delete (v3, final)\n drm/nv50: prevent switching off SOR when in use for DVI-over-DP\n drm/nv50: fail auxch transaction if reply count not what we expect\n drm/nouveau: fix failure path if userspace specifies no valid memtypes\n drm/nouveau: report LVDS as disconnected if lid closed\n drm/radeon/kms: fix legacy get_engine/memory clock\n drm/radeon/kms/atom: atom parser fixes\n drm/radeon/kms: clean up atombios pll code\n drm/radeon/kms: clean up pll struct\n drm/radeon/kms/atom: fix crtc lock ordering\n drm/radeon: r6xx/r7xx possible security issue, system ram access\n drm/radeon/kms: r600/r700 don\u0027t test ib if ib initialization fails\n drm/radeon/kms: Forbid creation of framebuffer with no valid GEM object\n drm/radeon/kms: r600 handle irq vector ring overflow\n ...\n" }, { "commit": "3f09ea4ecdcbcea05541f83e557d6ce2e56626d8", "tree": "445e4519b2e8a39136f611f07db670d1e10ace6e", "parents": [ "effe1105bef07f42366c20eac41b80ff9fcf675e" ], "author": { "name": "Thomas Hellstrom", "email": "thellstrom@vmware.com", "time": "Wed Jan 13 22:28:40 2010 +0100" }, "committer": { "name": "Dave Airlie", "email": "airlied@redhat.com", "time": "Thu Jan 14 12:18:54 2010 +1000" }, "message": "drm/ttm: Add a swap_notify callback.\n\nThis is needed for a bugfix in the vmwgfx driver.\nDrivers may have GPU bindings on buffers that core TTM is not aware of,\nand TTM may view those buffers as ordinary system memory buffers.\nAdd a notifier to such drivers when TTM is about to move the buffer\ncontents out to swappable memory. The driver must then release any\nprivate GPU bindings on those buffers.\n\nSigned-off-by: Thomas Hellstrom \u003cthellstrom@vmware.com\u003e\nSigned-off-by: Dave Airlie \u003cairlied@redhat.com\u003e\n" }, { "commit": "c07d7237a639d57dc91ea7efdbc1b3f85c7a095d", "tree": "484e68396c9ab06793d8f7b3d0e498ce2183bf07", "parents": [ "6102c315d896fb020550fb2481613485872978f6", "f22d6ddaeb8126623d62c828a4d4a96dfc4cbc5c" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon Jan 11 09:46:20 2010 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon Jan 11 09:46:20 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: (45 commits)\n drm/nv04: Fix set_operation software method.\n drm/nouveau: initialise DMA tracking parameters earlier\n drm/nouveau: use dma.max rather than pushbuf size for checking GET validity\n drm/nv04: differentiate between nv04/nv05\n drm/nouveau: Fix null deref in nouveau_fence_emit due to deleted fence\n drm/nv50: prevent a possible ctxprog hang\n drm/nouveau: have ttm\u0027s fault handler called directly\n drm/nv50: restore correct cache1 get/put address on fifoctx load\n drm/nouveau: create function for \"dealing\" with gpu lockup\n drm/nouveau: remove unused nouveau_channel_idle() function\n drm/nouveau: fix handling of fbcon colours in 8bpp\n drm/nv04: Context switching fixes.\n drm/nouveau: Use the software object for fencing.\n drm/nouveau: Allocate a per-channel instance of NV_SW.\n drm/nv50: make the blocksize depend on vram size\n drm/nouveau: better alignment of bo sizes and use roundup instead of ALIGN\n drm/nouveau: Don\u0027t skip card take down on nv0x.\n drm/nouveau: Implement nv42-nv43 TV load detection.\n drm/nouveau: Clean up the nv17-nv4x load detection code a bit.\n drm/nv50: fix fillrect color\n ...\n" }, { "commit": "0c9d2c418aa4a45534943c4c9a1c8dda82d3b481", "tree": "7844c421b7bd20b9b4e9c17b425ee050653eb407", "parents": [ "94fd163d86b049842856864cdeac318131ec576d", "804c7559e9376c3ba78ae15a30337b1e24f8ae80" ], "author": { "name": "Dave Airlie", "email": "airlied@redhat.com", "time": "Mon Jan 11 14:42:58 2010 +1000" }, "committer": { "name": "Dave Airlie", "email": "airlied@redhat.com", "time": "Mon Jan 11 14:42:58 2010 +1000" }, "message": "Merge remote branch \u0027korg/drm-radeon-next\u0027 into drm-linus\n\n* korg/drm-radeon-next:\n drm/radeon/kms: add additional safe regs for r4xx/rs6xx and r5xx\n drm/radeon/kms: Don\u0027t try to enable IRQ if we have no handler installed\n drm: Avoid calling vblank function is vblank wasn\u0027t initialized\n drm/radeon: mkregtable.c: close a file before exit\n drm/radeon/kms: Make sure we release AGP device if we acquired it\n drm/radeon/kms: Schedule host path read cache flush through the ring V2\n drm/radeon/kms: Workaround RV410/R420 CP errata (V3)\n drm/radeon/kms: detect sideport memory on IGP chips\n drm/radeon: fix a couple of array index errors\n drm/radeon/kms: add support for eDP (embedded DisplayPort)\n drm: Add eDP connector type\n drm/radeon/kms: pull in the latest upstream ObjectID.h changes\n drm/radeon/kms: whitespace changes to ObjectID.h\n drm/radeon/kms: fix typo in atom connector type handling\n" }, { "commit": "e8d6d61586b84acfd66ec20142c9a850d2d11544", "tree": "14d30092322a36772337bafa76c84b5ddb2d8c98", "parents": [ "a3a06cb6c207a5612fa9753e2453bbcb3f5a256d", "003e69f9862bcda89a75c27750efdbc17ac02945" ], "author": { "name": "Dave Airlie", "email": "airlied@redhat.com", "time": "Fri Jan 08 13:29:53 2010 +1000" }, "committer": { "name": "Dave Airlie", "email": "airlied@redhat.com", "time": "Fri Jan 08 13:29:53 2010 +1000" }, "message": "Merge remote branch \u0027korg/drm-radeon-testing\u0027 into drm-testing\n" } ], "next": "7970e677accb676f15e11468c60cb93ae477a513" }