)]}' { "log": [ { "commit": "752d2635ebb12b6122ba05775f7d1ccfef14b275", "tree": "787f76b453e15a03e7db938eaace598dc36273eb", "parents": [ "8eea1be174a1ea4b86323167bbadc8a6abdca613" ], "author": { "name": "Chris Wilson", "email": "chris@chris-wilson.co.uk", "time": "Fri Apr 22 11:03:57 2011 +0100" }, "committer": { "name": "Dave Airlie", "email": "airlied@redhat.com", "time": "Mon May 16 12:01:43 2011 +1000" }, "message": "drm: Take lock around probes for drm_fb_helper_hotplug_event\n\nWe need to hold the dev-\u003emode_config.mutex whilst detecting the output\nstatus. But we also need to drop it for the call into\ndrm_fb_helper_single_fb_probe(), which indirectly acquires the lock when\nattaching the fbcon.\n\nFailure to do so exposes a race with normal output probing. Detected by\nadding some warnings that the mutex is held to the backend detect routines:\n\n[ 17.772456] WARNING: at drivers/gpu/drm/i915/intel_crt.c:471 intel_crt_detect+0x3e/0x373 [i915]()\n[ 17.772458] Hardware name: Latitude E6400\n[ 17.772460] Modules linked in: ....\n[ 17.772582] Pid: 11, comm: kworker/0:1 Tainted: G W 2.6.38.4-custom.2 #8\n[ 17.772584] Call Trace:\n[ 17.772591] [\u003cffffffff81046af5\u003e] ? warn_slowpath_common+0x78/0x8c\n[ 17.772603] [\u003cffffffffa03f3e5c\u003e] ? intel_crt_detect+0x3e/0x373 [i915]\n[ 17.772612] [\u003cffffffffa0355d49\u003e] ? drm_helper_probe_single_connector_modes+0xbf/0x2af [drm_kms_helper]\n[ 17.772619] [\u003cffffffffa03534d5\u003e] ? drm_fb_helper_probe_connector_modes+0x39/0x4d [drm_kms_helper]\n[ 17.772625] [\u003cffffffffa0354760\u003e] ? drm_fb_helper_hotplug_event+0xa5/0xc3 [drm_kms_helper]\n[ 17.772633] [\u003cffffffffa035577f\u003e] ? output_poll_execute+0x146/0x17c [drm_kms_helper]\n[ 17.772638] [\u003cffffffff81193c01\u003e] ? cfq_init_queue+0x247/0x345\n[ 17.772644] [\u003cffffffffa0355639\u003e] ? output_poll_execute+0x0/0x17c [drm_kms_helper]\n[ 17.772648] [\u003cffffffff8105b540\u003e] ? process_one_work+0x193/0x28e\n[ 17.772652] [\u003cffffffff8105c6bc\u003e] ? worker_thread+0xef/0x172\n[ 17.772655] [\u003cffffffff8105c5cd\u003e] ? worker_thread+0x0/0x172\n[ 17.772658] [\u003cffffffff8105c5cd\u003e] ? worker_thread+0x0/0x172\n[ 17.772663] [\u003cffffffff8105f767\u003e] ? kthread+0x7a/0x82\n[ 17.772668] [\u003cffffffff8100a724\u003e] ? kernel_thread_helper+0x4/0x10\n[ 17.772671] [\u003cffffffff8105f6ed\u003e] ? kthread+0x0/0x82\n[ 17.772674] [\u003cffffffff8100a720\u003e] ? kernel_thread_helper+0x0/0x10\n\nReported-by: Frederik Himpe \u003cfhimpe@telenet.be\u003e\nReferences: https://bugs.freedesktop.org/show_bug.cgi?id\u003d36394\nSigned-off-by: Chris Wilson \u003cchris@chris-wilson.co.uk\u003e\nSigned-off-by: Dave Airlie \u003cairlied@redhat.com\u003e\n" }, { "commit": "2bbd4492552867053b5a618a2474297e2b1c355d", "tree": "13f6e611009a3175af2aeebecb5a1d65cf3cd205", "parents": [ "ff68146acb98b689947692bffd38ec4ad67eb1cb" ], "author": { "name": "Daniel Vetter", "email": "daniel.vetter@ffwll.ch", "time": "Fri May 06 23:47:53 2011 +0200" }, "committer": { "name": "Dave Airlie", "email": "airlied@redhat.com", "time": "Mon May 09 09:14:45 2011 +1000" }, "message": "drm: mm: fix debug output\n\nThe looping helper didn\u0027t do anything due to a superficial\nsemicolon. Furthermore one of the two dump functions suffered\nfrom copy\u0026paste fail.\n\nWhile staring at the code I\u0027ve also noticed that the replace\nhelper (currently unused) is a bit broken.\n\nSigned-off-by: Daniel Vetter \u003cdaniel.vetter@ffwll.ch\u003e\nSigned-off-by: Dave Airlie \u003cairlied@redhat.com\u003e\n" }, { "commit": "8aeb96f80232e9a701b5c4715504f4c9173978bd", "tree": "59852e4f90221689eef0ed0ae8b7ff51e598b90a", "parents": [ "498548ec69c6897fe4376b2ca90758762fa0b817" ], "author": { "name": "Alex Deucher", "email": "alexdeucher@gmail.com", "time": "Tue May 03 19:28:02 2011 -0400" }, "committer": { "name": "Dave Airlie", "email": "airlied@redhat.com", "time": "Wed May 04 10:16:40 2011 +1000" }, "message": "drm/radeon/kms: fix gart setup on fusion parts (v2)\n\nOut of the entire GART/VM subsystem, the hw designers changed\nthe location of 3 regs.\n\nv2: airlied: add parameter for userspace to work from.\n\nSigned-off-by: Alex Deucher \u003calexdeucher@gmail.com\u003e\nSigned-off-by: Jerome Glisse \u003cjglisse@redhat.com\u003e\nCc: stable@kernel.org\nSigned-off-by: Dave Airlie \u003cairlied@redhat.com\u003e\n" }, { "commit": "e2c85d8e3974c9041ad7b080846b28d2243e771b", "tree": "f125faf647ac4bef10758a5294531ccd88564526", "parents": [ "609cfda586c7fe3e5d1a02c51edb587506294167" ], "author": { "name": "Alex Deucher", "email": "alexdeucher@gmail.com", "time": "Tue May 03 15:15:55 2011 -0400" }, "committer": { "name": "Dave Airlie", "email": "airlied@redhat.com", "time": "Wed May 04 09:28:59 2011 +1000" }, "message": "drm/radeon/kms: add some new pci 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": "e8e7a2b8ccfdae0d4cb6bd25824bbedcd42da316", "tree": "1b2140075e01d32af330370307004b9b73a9d796", "parents": [ "6565945b60922211c299968ba66a66617af32c9f" ], "author": { "name": "Dave Airlie", "email": "airlied@redhat.com", "time": "Thu Apr 21 22:18:32 2011 +0100" }, "committer": { "name": "Dave Airlie", "email": "airlied@redhat.com", "time": "Wed Apr 27 17:51:59 2011 +1000" }, "message": "drm/i915: restore only the mode of this driver on lastclose (v2)\n\ni915 calls the panic handler function on last close to reset the modes,\nhowever this is a really bad idea for multi-gpu machines, esp shareable\ngpus machines. So add a new entry point for the driver to just restore\nits own fbcon mode.\n\nv2: move code into fb helper, fix panic code to block mode change on\npowered off GPUs.\n\n[airlied: this hits drm core and I wrote it and it was reviewed on intel-gfx\n so really I signed it off twice ;-).]\nSigned-off-by: Chris Wilson \u003cchris@chris-wilson.co.uk\u003e\nSigned-off-by: Dave Airlie \u003cairlied@redhat.com\u003e\n" }, { "commit": "6565945b60922211c299968ba66a66617af32c9f", "tree": "fca477c8c1d8da6f918898fa6f1b75888779f47f", "parents": [ "834f0c353ae430c1a6ce023c9b77bbd3ff9241a7" ], "author": { "name": "Alex Deucher", "email": "alexdeucher@gmail.com", "time": "Tue Apr 26 13:27:43 2011 -0400" }, "committer": { "name": "Dave Airlie", "email": "airlied@redhat.com", "time": "Wed Apr 27 17:03:56 2011 +1000" }, "message": "drm/radeon/kms: add info query for tile pipes\n\nneeded by mesa for htile setup.\n\nSigned-off-by: Alex Deucher \u003calexdeucher@gmail.com\u003e\nSigned-off-by: Dave Airlie \u003cairlied@redhat.com\u003e\n" }, { "commit": "42933bac11e811f02200c944d8562a15f8ec4ff0", "tree": "fcdd9afe56eb0e746565ddd1f92f22d36678b843", "parents": [ "2b9accbee563f535046ff2cd382d0acaa92e130c", "25985edcedea6396277003854657b5f3cb31a628" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Apr 07 11:14:49 2011 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Apr 07 11:14:49 2011 -0700" }, "message": "Merge branch \u0027for-linus2\u0027 of git://git.profusion.mobi/users/lucas/linux-2.6\n\n* \u0027for-linus2\u0027 of git://git.profusion.mobi/users/lucas/linux-2.6:\n Fix common misspellings\n" }, { "commit": "5df23979bc628934febe02e80f9644ec67603ee8", "tree": "4b3dae80f394c673dd9452248dc9b885a5678fac", "parents": [ "758f231ea280d0e5f01d537f26ad8f5c0e3de1cc" ], "author": { "name": "Jan Engelhardt", "email": "jengelh@medozas.de", "time": "Mon Apr 04 01:25:18 2011 +0200" }, "committer": { "name": "Dave Airlie", "email": "airlied@redhat.com", "time": "Tue Apr 05 10:22:23 2011 +1000" }, "message": "drm: fix \"persistant\" typo\n\nSigned-off-by: Jan Engelhardt \u003cjengelh@medozas.de\u003e\nSigned-off-by: Dave Airlie \u003cairlied@redhat.com\u003e\n" }, { "commit": "758f231ea280d0e5f01d537f26ad8f5c0e3de1cc", "tree": "23310cb39bc6668cab1e662ebf0e7de134b596ae", "parents": [ "fb9674bd2cd3c18f6c756ee123967e43be501263" ], "author": { "name": "Alex Deucher", "email": "alexdeucher@gmail.com", "time": "Mon Apr 04 11:03:16 2011 -0400" }, "committer": { "name": "Dave Airlie", "email": "airlied@redhat.com", "time": "Tue Apr 05 09:21:16 2011 +1000" }, "message": "drm/radeon/kms: add some new ontario pci 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": "eccaca28e29861a63ebc067bfff59c7efa427371", "tree": "9a3ac124bb62876135ee41ebd5ff802d24323629", "parents": [ "97ea530f6fac1f9632b0c4792a2a56411454adbe" ], "author": { "name": "Ben Skeggs", "email": "bskeggs@redhat.com", "time": "Wed Mar 30 05:03:47 2011 +0000" }, "committer": { "name": "Dave Airlie", "email": "airlied@redhat.com", "time": "Fri Apr 01 10:16:17 2011 +1000" }, "message": "drm: export drm_find_cea_extension to drivers\n\nNouveau needs access to this structure to build an ELD block for use\nby the HDA audio codec.\n\nSigned-off-by: Ben Skeggs \u003cbskeggs@redhat.com\u003e\nSigned-off-by: Dave Airlie \u003cairlied@redhat.com\u003e\n" }, { "commit": "25985edcedea6396277003854657b5f3cb31a628", "tree": "f026e810210a2ee7290caeb737c23cb6472b7c38", "parents": [ "6aba74f2791287ec407e0f92487a725a25908067" ], "author": { "name": "Lucas De Marchi", "email": "lucas.demarchi@profusion.mobi", "time": "Wed Mar 30 22:57:33 2011 -0300" }, "committer": { "name": "Lucas De Marchi", "email": "lucas.demarchi@profusion.mobi", "time": "Thu Mar 31 11:26:23 2011 -0300" }, "message": "Fix common misspellings\n\nFixes generated by \u0027codespell\u0027 and manually reviewed.\n\nSigned-off-by: Lucas De Marchi \u003clucas.demarchi@profusion.mobi\u003e\n" }, { "commit": "51eab416c9b4b3ed16553d405ec4a5f67daa34cf", "tree": "f883ecb336132b9b069744a2a7b4a30c7954bf39", "parents": [ "1783e4bf6f4e5c3b13c09aff24da7dcc69fb3e2f" ], "author": { "name": "Dave Airlie", "email": "airlied@redhat.com", "time": "Thu Mar 24 20:54:35 2011 +1000" }, "committer": { "name": "Dave Airlie", "email": "airlied@redhat.com", "time": "Thu Mar 24 21:28:46 2011 +1000" }, "message": "drm/vblank: update recently added vbl interface to be more future proof.\n\nThis makes the interface a bit cleaner by leaving a single gap in the\nvblank bit space instead of creating two gaps.\n\nSuggestions from Michel on mailing list/irc.\n\nReviewed-by: Michel Dänzer \u003cmichel@daenzer.net\u003e\nSigned-off-by: Dave Airlie \u003cairlied@redhat.com\u003e\n" }, { "commit": "19b01b5fbf0b78930b3b06ee6080539c17b5d1fd", "tree": "b2cfeb6aeae49bc4061ce8923a63b6b8bd4d6e1d", "parents": [ "b74ad5ae14def5e81ad0be3dddb96e485b861b1b" ], "author": { "name": "Ilija Hadzic", "email": "ihadzic@research.bell-labs.com", "time": "Fri Mar 18 16:58:04 2011 -0500" }, "committer": { "name": "Dave Airlie", "email": "airlied@redhat.com", "time": "Mon Mar 21 09:25:54 2011 +1000" }, "message": "drm/kernel: vblank wait on crtc \u003e 1\n\nBelow is a patch against drm-next branch of 2.6.38-rc8+ kernel that adds\nthe capability to wait on vblank events for CRTCs that are greater than 1\nand thus cannot be represented with primary/secondary flags in the legacy\ninterface. It was discussed on the dri-devel list in these two threads:\n\nhttp://lists.freedesktop.org/archives/dri-devel/2011-March/009009.html\nhttp://lists.freedesktop.org/archives/dri-devel/2011-March/009025.html\n\nThis patch extends the interface to drm_wait_vblank ioctl so that crtc\u003e1\ncan be represented. It also adds a new capability to drm_getcap ioctl so\nthat the user space can check whether the new interface to drm_wait_vblank\nis supported (and fall back to the legacy interface if not)\n\nSigned-off-by: Ilija Hadzic \u003cihadzic@research.bell-labs.com\u003e\nReviewed-by: Mario Kleiner \u003cmario.kleiner at tuebingen.mpg.de\u003e\nAcked-by: Mario Kleiner \u003cmario.kleiner at tuebingen.mpg.de\u003e\nReviewed-by: Alex Deucher \u003calexdeucher@gmail.com\u003e\nTested-by: Alex Deucher \u003calexdeucher@gmail.com\u003e\nSigned-off-by: Dave Airlie \u003cairlied@redhat.com\u003e\n" }, { "commit": "34db18abd376b2075c760c38f0b861aed379415d", "tree": "c4174e39a2f445f17c25ab206d45c66217bbbf85", "parents": [ "e73f88af66fcc50083fae4b7e1c39b469179a97a", "47ae63e0c2e5fdb582d471dc906eb29be94c732f" ], "author": { "name": "Dave Airlie", "email": "airlied@redhat.com", "time": "Mon Mar 14 14:15:13 2011 +1000" }, "committer": { "name": "Dave Airlie", "email": "airlied@redhat.com", "time": "Mon Mar 14 14:15:13 2011 +1000" }, "message": "Merge remote branch \u0027intel/drm-intel-next\u0027 of ../drm-next into drm-core-next\n\n* \u0027intel/drm-intel-next\u0027 of ../drm-next: (755 commits)\n drm/i915: Only wait on a pending flip if we intend to write to the buffer\n drm/i915/dp: Sanity check eDP existence\n drm/i915: Rebind the buffer if its alignment constraints changes with tiling\n drm/i915: Disable GPU semaphores by default\n drm/i915: Do not overflow the MMADDR write FIFO\n Revert \"drm/i915: fix corruptions on i8xx due to relaxed fencing\"\n drm/i915: Don\u0027t save/restore hardware status page address register\n drm/i915: don\u0027t store the reg value for HWS_PGA\n drm/i915: fix memory corruption with GM965 and \u003e4GB RAM\n Linux 2.6.38-rc7\n Revert \"TPM: Long default timeout fix\"\n drm/i915: Re-enable GPU semaphores for SandyBridge mobile\n drm/i915: Replace vblank PM QoS with \"Interrupt-Based AGPBUSY#\"\n Revert \"drm/i915: Use PM QoS to prevent C-State starvation of gen3 GPU\"\n drm/i915: Allow relocation deltas outside of target bo\n drm/i915: Silence an innocuous compiler warning for an unused variable\n fs/block_dev.c: fix new kernel-doc warning\n ACPI: Fix build for CONFIG_NET unset\n mm: \u003casm-generic/pgtable.h\u003e must include \u003clinux/mm_types.h\u003e\n x86: Use u32 instead of long to set reset vector back to 0\n ...\n\nConflicts:\n\tdrivers/gpu/drm/i915/i915_gem.c\n" }, { "commit": "e73f88af66fcc50083fae4b7e1c39b469179a97a", "tree": "5c4a7a9a9c7223d017f3ab17708d6f57cebdb8d7", "parents": [ "9f35421e09c494c36079d7cf5724ae9f832431d7" ], "author": { "name": "Dave Airlie", "email": "airlied@redhat.com", "time": "Fri Mar 04 14:50:28 2011 +1000" }, "committer": { "name": "Dave Airlie", "email": "airlied@redhat.com", "time": "Fri Mar 04 15:56:22 2011 +1000" }, "message": "drm: add cap bit to denote if dumb ioctl is available or not.\n\nThis allows libkms to make an easier decision.\n\nSigned-off-by: Dave Airlie \u003cairlied@redhat.com\u003e\n" }, { "commit": "9f35421e09c494c36079d7cf5724ae9f832431d7", "tree": "1c9ab806a43a30df918e9e12505823a387779e34", "parents": [ "e1e84017f95504348308085ae7cd0bfe268caf10" ], "author": { "name": "Ben Skeggs", "email": "bskeggs@redhat.com", "time": "Mon Feb 21 11:17:35 2011 +1000" }, "committer": { "name": "Dave Airlie", "email": "airlied@redhat.com", "time": "Fri Mar 04 14:47:30 2011 +1000" }, "message": "drm/core: add ioctl to query device/driver capabilities\n\nWe\u0027re coming to see a need to have a set of generic capability checks in\nthe core DRM, in addition to the driver-specific ioctls that already\nexist.\n\nThis patch defines an ioctl to do as such, but does not yet define any\ncapabilities.\n\n[airlied: drop the driver callback for now.]\n\nSigned-off-by: Ben Skeggs \u003cbskeggs@redhat.com\u003e\nSigned-off-by: Dave Airlie \u003cairlied@redhat.com\u003e\n" }, { "commit": "64bc5524906e31c1144af29ba50c585afe333bb3", "tree": "5491e3ed0b5cf407cf1b28e4d7af862cde8735fe", "parents": [ "8aa75009bca5e700e9236c8e066d2f943069c883" ], "author": { "name": "Alex Deucher", "email": "alexdeucher@gmail.com", "time": "Wed Mar 02 20:07:41 2011 -0500" }, "committer": { "name": "Dave Airlie", "email": "airlied@redhat.com", "time": "Thu Mar 03 11:57:06 2011 +1000" }, "message": "drm/radeon/kms: add cayman pci ids\n\nSigned-off-by: Alex Deucher \u003calexdeucher@gmail.com\u003e\nSigned-off-by: Dave Airlie \u003cairlied@redhat.com\u003e\n" }, { "commit": "8d3c3ddfa85837e24fad6fa39318617cbb59e843", "tree": "f699dcaac2a11f0c9506ad111ae39fd5e3617c2d", "parents": [ "e8b2c3c47a53348aebbbeb5322e32937df958793", "6927faf30920b8c03dfa007e732642a1f1f20089" ], "author": { "name": "Chris Wilson", "email": "chris@chris-wilson.co.uk", "time": "Tue Mar 01 23:20:20 2011 +0000" }, "committer": { "name": "Chris Wilson", "email": "chris@chris-wilson.co.uk", "time": "Tue Mar 01 23:20:20 2011 +0000" }, "message": "Merge branch \u0027drm-intel-fixes\u0027 into drm-intel-next\n" }, { "commit": "271d81b84171d84723357ae6d172ec16b0d8139c", "tree": "ca4d1952f3e47e69706be5609143ae4d1b8e291a", "parents": [ "5d9faa16a73f3317177ec42d5b5d826947458eb9" ], "author": { "name": "Chris Wilson", "email": "chris@chris-wilson.co.uk", "time": "Tue Mar 01 15:24:41 2011 +0000" }, "committer": { "name": "Chris Wilson", "email": "chris@chris-wilson.co.uk", "time": "Tue Mar 01 16:01:02 2011 +0000" }, "message": "drm/i915: Allow relocation deltas outside of target bo\n\nUserspace has a legitimate requirement to use a delta that points to\noutside of the target bo, and so we need to enable this. (As this is an\nabi break, albeit a relaxation of the current restrictions, mark the change\nwith a new flag.)\n\nSigned-off-by: Chris Wilson \u003cchris@chris-wilson.co.uk\u003e\n" }, { "commit": "486af1896f3a4a388410215c5a2014b9d09a79f5", "tree": "bf3a29e4b2e9004ee80269944309fcfdf05abaa1", "parents": [ "91132d6bb6481da7c8280905a5db424885c458d0" ], "author": { "name": "Dave Airlie", "email": "airlied@redhat.com", "time": "Tue Mar 01 14:32:27 2011 +1000" }, "committer": { "name": "Dave Airlie", "email": "airlied@redhat.com", "time": "Tue Mar 01 15:01:20 2011 +1000" }, "message": "drm/radeon: add new getparam for number of backends.\n\nThis allows userspace to work out how many DBs there are\nfor conditional rendering to work.\n\nSigned-off-by: Dave Airlie \u003cairlied@redhat.com\u003e\n" }, { "commit": "1922756124ddd53846877416d92ba4a802bc658f", "tree": "22b5b5e5457d5eab364cd2c860814b29874e56f7", "parents": [ "3c0556e9673f79e386b27768e27d18b3ce29e40e" ], "author": { "name": "Dave Airlie", "email": "airlied@redhat.com", "time": "Thu Feb 24 08:35:06 2011 +1000" }, "committer": { "name": "Dave Airlie", "email": "airlied@redhat.com", "time": "Mon Feb 28 15:24:35 2011 +1000" }, "message": "drm: fix unsigned vs signed comparison issue in modeset ctl ioctl.\n\nThis fixes CVE-2011-1013.\n\nReported-by: Matthiew Herrb (OpenBSD X.org team)\nCc: stable@kernel.org\nSigned-off-by: Dave Airlie \u003cairlied@redhat.com\u003e\n" }, { "commit": "8f7286f8e4e80f7b868ba3d117ae900f0d207cbe", "tree": "018804469b7bce4033b4156442c904512282fab2", "parents": [ "26c0c9e33a2eb44b345d22d5928d5c8b7b261226" ], "author": { "name": "Ben Skeggs", "email": "bskeggs@redhat.com", "time": "Mon Feb 14 09:57:35 2011 +1000" }, "committer": { "name": "Ben Skeggs", "email": "bskeggs@redhat.com", "time": "Fri Feb 25 06:46:07 2011 +1000" }, "message": "drm/nv50: support for compression\n\nSigned-off-by: Ben Skeggs \u003cbskeggs@redhat.com\u003e\n" }, { "commit": "a2c06ee2fe5b48a71e697bae00c6e7195fc016b6", "tree": "ff1761280d173d8adc0a7e0339dc68fd44146c08", "parents": [ "63871f89d158e3f3e469dde00dd15763d474cb3c" ], "author": { "name": "Dave Airlie", "email": "airlied@redhat.com", "time": "Wed Feb 23 14:24:01 2011 +1000" }, "committer": { "name": "Dave Airlie", "email": "airlied@redhat.com", "time": "Wed Feb 23 14:24:01 2011 +1000" }, "message": "Revert \"ttm: Include the \u0027struct dev\u0027 when using the DMA API.\"\n\nThis reverts commit 5a893fc28f0393adb7c885a871b8c59e623fd528.\n\nThis causes a use after free in the ttm free alloc pages path,\nwhen it tries to get the be after the be has been destroyed.\n\nSigned-off-by: Dave Airlie \u003cairlied@redhat.com\u003e\n" }, { "commit": "63871f89d158e3f3e469dde00dd15763d474cb3c", "tree": "0872202dbe52d6a8160215487ae0386c8e475a44", "parents": [ "de1e7cd63a8ec26a3bd3740708cfd72dd76509e2", "4546b2c1d6e256c716e5240f5d6198a078fd7a22" ], "author": { "name": "Dave Airlie", "email": "airlied@redhat.com", "time": "Wed Feb 23 12:07:27 2011 +1000" }, "committer": { "name": "Dave Airlie", "email": "airlied@redhat.com", "time": "Wed Feb 23 12:07:27 2011 +1000" }, "message": "Merge branch \u0027drm-mm-cleanup\u0027 into drm-next\n\n* drm-mm-cleanup:\n radeon: move blit functions to radeon_asic.h\n radeon: kill decls for inline functions\n radeon: consolidate asic-specific function decls for r600 \u0026 later\n drm/radeon: kill radeon_bo-\u003egobj pointer\n drm/radeon: introduce gem_to_radeon_bo helper\n drm/radeon: embed struct drm_gem_object\n drm: mm: add helper to unwind scan state\n drm: mm: add api for embedding struct drm_mm_node\n drm: mm: extract node insert helper functions\n drm: mm: track free areas implicitly\n drm/nouveau: don\u0027t munge in drm_mm internals\n" }, { "commit": "de1e7cd63a8ec26a3bd3740708cfd72dd76509e2", "tree": "52bc82a71f34e92895d22821543a2be011834505", "parents": [ "7811bddb6654337fd85837ef14c1a96a0c264745", "5a893fc28f0393adb7c885a871b8c59e623fd528" ], "author": { "name": "Dave Airlie", "email": "airlied@redhat.com", "time": "Wed Feb 23 12:06:39 2011 +1000" }, "committer": { "name": "Dave Airlie", "email": "airlied@redhat.com", "time": "Wed Feb 23 12:06:39 2011 +1000" }, "message": "Merge branch \u0027stable/ttm.pci-api.v5\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/konrad/xen into drm-next\n\n* \u0027stable/ttm.pci-api.v5\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/konrad/xen:\n ttm: Include the \u0027struct dev\u0027 when using the DMA API.\n nouveau/ttm/PCIe: Use dma_addr if TTM has set it.\n radeon/ttm/PCIe: Use dma_addr if TTM has set it.\n ttm: Expand (*populate) to support an array of DMA addresses.\n ttm: Utilize the DMA API for pages that have TTM_PAGE_FLAG_DMA32 set.\n ttm: Introduce a placeholder for DMA (bus) addresses.\n" }, { "commit": "7811bddb6654337fd85837ef14c1a96a0c264745", "tree": "668ab27b5a002824f62434c9b8ffc0654e358ffd", "parents": [ "4cb81ac2028a18f3f872f56fb7527afe5f5d0278" ], "author": { "name": "Chris Wilson", "email": "chris@chris-wilson.co.uk", "time": "Wed Jan 26 18:33:25 2011 +0000" }, "committer": { "name": "Dave Airlie", "email": "airlied@redhat.com", "time": "Wed Feb 23 11:16:40 2011 +1000" }, "message": "drm: Remove unused members from struct drm_open_hash\n\nSigned-off-by: Chris Wilson \u003cchris@chris-wilson.co.uk\u003e\nSigned-off-by: Dave Airlie \u003cairlied@redhat.com\u003e\n" }, { "commit": "b1f559ecdc6026ef783ccadc62a61e7da906fcb4", "tree": "0191b560a045c6490c326ef0c027797ba9886ffa", "parents": [ "60b212f8ddcdbbfa8595f40300756b9ea8dd387e" ], "author": { "name": "Chris Wilson", "email": "chris@chris-wilson.co.uk", "time": "Wed Jan 26 09:49:47 2011 +0000" }, "committer": { "name": "Dave Airlie", "email": "airlied@redhat.com", "time": "Wed Feb 23 11:13:11 2011 +1000" }, "message": "drm: Mark constant arrays of drm_display_mode const\n\n... and fixup some methods to accept the constant argument.\n\nNow that constant module arrays are loaded into read-only memory, using\nconst appropriately has some benefits beyond warning the programmer\nabout likely mistakes.\n\nSigned-off-by: Chris Wilson \u003cchris@chris-wilson.co.uk\u003e\nSigned-off-by: Dave Airlie \u003cairlied@redhat.com\u003e\n" }, { "commit": "ae0cec2880a4dc6d90c7f8392bdc6705988389ca", "tree": "02a36c6ff5eb3e9f0554d9b5134ab374929c61fb", "parents": [ "b0b7af1884b7d807a3504804f9825d472de78708" ], "author": { "name": "Daniel Vetter", "email": "daniel.vetter@ffwll.ch", "time": "Fri Feb 18 17:59:15 2011 +0100" }, "committer": { "name": "Dave Airlie", "email": "airlied@redhat.com", "time": "Wed Feb 23 10:32:57 2011 +1000" }, "message": "drm: mm: add helper to unwind scan state\n\nWith the switch to implicit free space accounting one pointer\ngot unused when scanning. Use it to create a single-linked list\nto ensure correct unwinding of the scan state.\n\nSigned-off-by: Daniel Vetter \u003cdaniel.vetter@ffwll.ch\u003e\nSigned-off-by: Dave Airlie \u003cairlied@redhat.com\u003e\n" }, { "commit": "b0b7af1884b7d807a3504804f9825d472de78708", "tree": "ba9e2dde9575caab3ae6f4b0a1d1ef15c09caf67", "parents": [ "9fc935debb33d90bf302ba42f7234b78e322f195" ], "author": { "name": "Daniel Vetter", "email": "daniel.vetter@ffwll.ch", "time": "Fri Feb 18 17:59:14 2011 +0100" }, "committer": { "name": "Dave Airlie", "email": "airlied@redhat.com", "time": "Wed Feb 23 10:32:51 2011 +1000" }, "message": "drm: mm: add api for embedding struct drm_mm_node\n\nThe old api has a two-step process: First search for a suitable\nfree hole, then allocate from that specific hole. No user used\nthis to do anything clever. So drop it for the embeddable variant\nof the drm_mm api (the old one retains this ability, for the time\nbeing).\n\nWith struct drm_mm_node embedded, we cannot track allocations\nanymore by checking for a NULL pointer. So keep track of this\nand add a small helper drm_mm_node_allocated.\n\nAlso add a function to move allocations between different struct\ndrm_mm_node.\n\nv2: Implement suggestions by Chris Wilson.\n\nSigned-off-by: Daniel Vetter \u003cdaniel.vetter@ffwll.ch\u003e\nSigned-off-by: Dave Airlie \u003cairlied@redhat.com\u003e\n" }, { "commit": "ea7b1dd44867e9cd6bac67e7c9fc3f128b5b255c", "tree": "2feb9852ab18e2f726136ae460e414ef40425129", "parents": [ "31a5b8ce8f3bf20799eb68da9602de2bee58fdd3" ], "author": { "name": "Daniel Vetter", "email": "daniel.vetter@ffwll.ch", "time": "Fri Feb 18 17:59:12 2011 +0100" }, "committer": { "name": "Dave Airlie", "email": "airlied@redhat.com", "time": "Wed Feb 23 10:32:34 2011 +1000" }, "message": "drm: mm: track free areas implicitly\n\nThe idea is to track free holes implicitly by marking the allocation\nimmediatly preceeding a hole.\n\nTo avoid an ugly corner case add a dummy head_node to struct drm_mm\nto track the hole that spans to complete allocation area when the\nmemory manager is empty.\n\nTo guarantee that there\u0027s always a preceeding/following node (that might\nbe marked as hole_follows \u003d\u003d 1), move the mm-\u003enode_list list_head to the\nhead_node.\n\nThe main allocator and fair-lru scan code actually becomes simpler.\nOnly the debug code slightly suffers because free areas are no longer\nexplicit.\n\nAlso add drm_mm_for_each_node (which will be much more useful when\nstruct drm_mm_node is embeddable).\n\nSigned-off-by: Daniel Vetter \u003cdaniel.vetter@ffwll.ch\u003e\nSigned-off-by: Dave Airlie \u003cairlied@redhat.com\u003e\n" }, { "commit": "31a5b8ce8f3bf20799eb68da9602de2bee58fdd3", "tree": "59e1c0b9cf8b63ebcb6ca9607c6cc6610ad8c388", "parents": [ "a250b9fdc53a286d32e22f21170382a46b3a3ef5" ], "author": { "name": "Daniel Vetter", "email": "daniel.vetter@ffwll.ch", "time": "Fri Feb 18 17:59:11 2011 +0100" }, "committer": { "name": "Dave Airlie", "email": "airlied@redhat.com", "time": "Wed Feb 23 10:18:20 2011 +1000" }, "message": "drm/nouveau: don\u0027t munge in drm_mm internals\n\nNouveau was checking drm_mm internals on teardown to see whether the\nmemory manager was initialized. Hide these internals in a small\ninline helper function.\n\nAcked-by: Ben Skeggs \u003cbskeggs@redhat.com\u003e\nSigned-off-by: Daniel Vetter \u003cdaniel.vetter@ffwll.ch\u003e\nSigned-off-by: Dave Airlie \u003cairlied@redhat.com\u003e\n" }, { "commit": "5a893fc28f0393adb7c885a871b8c59e623fd528", "tree": "8d119f02b7d0ba7e60f0f554fa5000c2cce2fb87", "parents": [ "e0138c26cdeee8c033256ccd9e07d66db3c998be" ], "author": { "name": "Konrad Rzeszutek Wilk", "email": "konrad.wilk@oracle.com", "time": "Tue Feb 22 13:24:32 2011 -0500" }, "committer": { "name": "Konrad Rzeszutek Wilk", "email": "konrad.wilk@oracle.com", "time": "Tue Feb 22 13:26:23 2011 -0500" }, "message": "ttm: Include the \u0027struct dev\u0027 when using the DMA API.\n\nThis makes the accounting when using \u0027debug_dma_dump_mappings()\u0027\nand CONFIG_DMA_API_DEBUG\u003dy be assigned to the correct device\ninstead of \u0027fallback\u0027.\n\nNo functional change - just cosmetic.\n\nSigned-off-by: Konrad Rzeszutek Wilk \u003ckonrad.wilk@oracle.com\u003e\n" }, { "commit": "a250b9fdc53a286d32e22f21170382a46b3a3ef5", "tree": "46bca176ce307f951d3e154b7a41ddd43fdee0ac", "parents": [ "8410ea3b95d105a5be5db501656f44bbb91197c1" ], "author": { "name": "Dave Airlie", "email": "airlied@gmail.com", "time": "Wed Dec 15 07:13:55 2010 +1000" }, "committer": { "name": "Dave Airlie", "email": "airlied@redhat.com", "time": "Mon Feb 07 13:09:42 2011 +1000" }, "message": "drm: add usb framework\n\nThis adds an initial framework to plug USB graphics devices\ninto the drm/kms subsystem.\n\nI\u0027ve started writing a displaylink driver using this interface.\n\nSigned-off-by: Dave Airlie \u003cairlied@redhat.com\u003e\n" }, { "commit": "8410ea3b95d105a5be5db501656f44bbb91197c1", "tree": "6cd27f207e50c13ba2f4a78d6323bc23f751e380", "parents": [ "ff72145badb834e8051719ea66e024784d000cb4" ], "author": { "name": "Dave Airlie", "email": "airlied@gmail.com", "time": "Wed Dec 15 03:16:38 2010 +1000" }, "committer": { "name": "Dave Airlie", "email": "airlied@redhat.com", "time": "Mon Feb 07 13:09:36 2011 +1000" }, "message": "drm: rework PCI/platform driver interface.\n\nThis abstracts the pci/platform interface out a step further,\nwe can go further but this is far enough for now to allow USB\nto be plugged in.\n\nThe drivers now just call the init code directly for their\ndevice type.\n\nSigned-off-by: Dave Airlie \u003cairlied@redhat.com\u003e\n" }, { "commit": "ff72145badb834e8051719ea66e024784d000cb4", "tree": "39dc5fc512e3e0836713de9defb91ea8b4033aa2", "parents": [ "1f692a14cbfbeb11f9a9c16f25c8ecb8ab50d3d5" ], "author": { "name": "Dave Airlie", "email": "airlied@redhat.com", "time": "Mon Feb 07 12:16:14 2011 +1000" }, "committer": { "name": "Dave Airlie", "email": "airlied@redhat.com", "time": "Mon Feb 07 12:16:14 2011 +1000" }, "message": "drm: dumb scanout create/mmap for intel/radeon (v3)\n\nThis is just an idea that might or might not be a good idea,\nit basically adds two ioctls to create a dumb and map a dumb buffer\nsuitable for scanout. The handle can be passed to the KMS ioctls to create\na framebuffer.\n\nIt looks to me like it would be useful in the following cases:\na) in development drivers - we can always provide a shadowfb fallback.\nb) libkms users - we can clean up libkms a lot and avoid linking\nto libdrm_*.\nc) plymouth via libkms is a lot easier.\n\nUserspace bits would be just calls + mmaps. We could probably\nmark these handles somehow as not being suitable for acceleartion\nso as top stop people who are dumber than dumb.\n\nSigned-off-by: Dave Airlie \u003cairlied@redhat.com\u003e\n" }, { "commit": "7f50684717511d30bba180902105c4cd4efca732", "tree": "5383f403f9a1493afc021ce7d5bd5a85df9a17e0", "parents": [ "8dbdea8444d303a772bceb1ba963f0e3273bfc5e" ], "author": { "name": "Arnd Bergmann", "email": "arnd@arndb.de", "time": "Tue Jan 25 23:17:16 2011 +0100" }, "committer": { "name": "Dave Airlie", "email": "airlied@redhat.com", "time": "Mon Feb 07 12:14:18 2011 +1000" }, "message": "drm: remove i830 driver\n\nThis driver is one of the last users of the big kernel\nlock, which is going away. All the hardware supported\nby this driver also works with the newer i915 driver,\nand recent X.org releases only work with that driver\nanyway.\n\nSigned-off-by: Arnd Bergmann \u003carnd@arndb.de\u003e\nCc: Chris Wilson \u003cchris@chris-wilson.co.uk\u003e\nCc: dri-devel@lists.freedesktop.org\nSigned-off-by: Dave Airlie \u003cairlied@redhat.com\u003e\n" }, { "commit": "63a507800c8aca5a1891d598ae13f829346e8e39", "tree": "40e315c767028ad27f42fa5d6aa5d2273f50674e", "parents": [ "619efb105924d8cafa0c1dd9389e9ab506f5425d" ], "author": { "name": "Alex Deucher", "email": "alexdeucher@gmail.com", "time": "Tue Feb 01 19:06:46 2011 -0500" }, "committer": { "name": "Dave Airlie", "email": "airlied@redhat.com", "time": "Wed Feb 02 12:50:41 2011 +1000" }, "message": "drm/radeon: remove 0x4243 pci id\n\n0x4243 is a PCI bridge, not a GPU.\n\nFixes:\nhttps://bugs.freedesktop.org/show_bug.cgi?id\u003d33815\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": "a55205e229e4e16559cc2593fdfc37902b248879", "tree": "09286776b4c88e7721a4a313fe3064c1a79f9fd4", "parents": [ "e468e0017b656841b661e57a948c3b858d58b959", "5fe49d86f9d01044abf687a8cd21edef636d58aa" ], "author": { "name": "Dave Airlie", "email": "airlied@redhat.com", "time": "Wed Feb 02 11:22:34 2011 +1000" }, "committer": { "name": "Dave Airlie", "email": "airlied@redhat.com", "time": "Wed Feb 02 11:22:34 2011 +1000" }, "message": "Merge remote branch \u0027intel/drm-intel-fixes\u0027 of /ssd/git/drm-next into drm-fixes\n\n* \u0027intel/drm-intel-fixes\u0027 of /ssd/git/drm-next:\n drm/i915: Only bind to function 0 of the PCI device\n drm/i915: Suppress spurious vblank interrupts\n drm: Avoid leak of adjusted mode along quick set_mode paths\n drm: Simplify and defend later checks when disabling a crtc\n drm: Don\u0027t switch fb when disabling an output\n drm/i915: Reset crtc after resume\n drm/i915/crt: Force the initial probe after reset\n drm/i915: Reset state after a GPU reset or resume\n drm: Add an interface to reset the device\n drm/i915/sdvo: If at first we don\u0027t succeed in reading the response, wait\n" }, { "commit": "78c6e170badd22c86a5b50a7eb038a02024b8f03", "tree": "481dba4a9d30cf25ee25cda443a17cb6e209668c", "parents": [ "021a8455bedb01750fa8047c8576e19d5af9a99f" ], "author": { "name": "Chris Wilson", "email": "chris@chris-wilson.co.uk", "time": "Mon Jan 31 10:48:04 2011 +0000" }, "committer": { "name": "Chris Wilson", "email": "chris@chris-wilson.co.uk", "time": "Mon Jan 31 12:38:47 2011 +0000" }, "message": "drm/i915: Suppress spurious vblank interrupts\n\nHugh Dickins found that characters in xterm were going missing and oft\ndelayed. Being the curious type, he managed to associate this with the\nnew high-precision vblank patches; disabling these he found, restored\nthe orderliness of his characters.\n\nThe oddness begins when one realised that Hugh was not using vblanks at\nall on his system (fvwm and some xterms). Instead, all he had to go on\nwere warning of a pipe underrun, curiously enough at around 60Hz. He\npoked and found that in addition to the underrun warning, the hardware\nwas flagging the start of a new frame, a vblank, which in turn was\nkicking off the pending vblank processing code.\n\nThere is little we can do for the underruns on Hugh\u0027s machine, a\nCrestline [965GM], which must have its FIFO watermarks set to 8.\nHowever, we do not need to process the vblank if we know that they are\ndisabled...\n\nReported-by: Hugh Dickins \u003chughd@google.com\u003e\nSigned-off-by: Chris Wilson \u003cchris@chris-wilson.co.uk\u003e\n" }, { "commit": "27e8b237944af967e0a808580278d432cb028455", "tree": "28d1b8ef8ad2477afeb7874f3bdf5e86a9434e96", "parents": [ "69a07f0b117a40fcc1a479358d8e1f41793617f2" ], "author": { "name": "Konrad Rzeszutek Wilk", "email": "konrad.wilk@oracle.com", "time": "Thu Dec 02 10:24:13 2010 -0500" }, "committer": { "name": "Konrad Rzeszutek Wilk", "email": "konrad.wilk@oracle.com", "time": "Thu Jan 27 16:07:58 2011 -0500" }, "message": "ttm: Expand (*populate) to support an array of DMA addresses.\n\nWe pass in the array of ttm pages to be populated in the GART/MM\nof the card (or AGP). Patch titled: \"ttm: Utilize the DMA API for\npages that have TTM_PAGE_FLAG_DMA32 set.\" uses the DMA API to make\nthose pages have a proper DMA addresses (in the situation where\npage_to_phys or virt_to_phys do not give use the DMA (bus) address).\n\nSince we are using the DMA API on those pages, we should pass in the\nDMA address to this function so it can save it in its proper fields\n(later patches use it).\n\n[v2: Added reviewed-by tag]\n\nReviewed-by: Thomas Hellstrom \u003cthellstrom@shipmail.org\u003e\nSigned-off-by: Konrad Rzeszutek Wilk \u003ckonrad.wilk@oracle.com\u003e\nTested-by: Ian Campbell \u003cian.campbell@citrix.com\u003e\n" }, { "commit": "f9820a46dd7888b05a36e81166fb1abcc47dcc3f", "tree": "c29e32a8fe8b08bc42120ce66c6536afd5c102df", "parents": [ "e53beacd23d9cb47590da6a7a7f6d417b941a994" ], "author": { "name": "Konrad Rzeszutek Wilk", "email": "konrad.wilk@oracle.com", "time": "Mon Nov 29 13:52:18 2010 -0500" }, "committer": { "name": "Konrad Rzeszutek Wilk", "email": "konrad.wilk@oracle.com", "time": "Thu Jan 27 16:02:31 2011 -0500" }, "message": "ttm: Introduce a placeholder for DMA (bus) addresses.\n\nThis is right now limited to only non-pool constructs.\n\n[v2: Fixed indentation issues, add review-by tag]\n\nReviewed-by: Thomas Hellstrom \u003cthomas@shipmail.org\u003e\nSigned-off-by: Konrad Rzeszutek Wilk \u003ckonrad.wilk@oracle.com\u003e\nTested-by: Ian Campbell \u003cian.campbell@citrix.com\u003e\n" }, { "commit": "eb03355660b44cf6b1ed2f895085b9de8f74efbc", "tree": "2665733d7a13db780caf16a7920b7fe871079cdd", "parents": [ "d121a5d2a098ba6dd033dd195f5ccbf7558c37b6" ], "author": { "name": "Chris Wilson", "email": "chris@chris-wilson.co.uk", "time": "Mon Jan 24 15:11:08 2011 +0000" }, "committer": { "name": "Chris Wilson", "email": "chris@chris-wilson.co.uk", "time": "Tue Jan 25 19:23:28 2011 +0000" }, "message": "drm: Add an interface to reset the device\n\nIterate over the attached CRTCs, encoders and connectors and call the\nsupplied reset vfunc in order to reset any cached state back to unknown.\nUseful after an invalidation event such as a GPU reset or resuming.\n\nTested-by: Takashi Iwai \u003ctiwai@suse.de\u003e\nSigned-off-by: Chris Wilson \u003cchris@chris-wilson.co.uk\u003e\n" }, { "commit": "58bbf018a70c562437eeae121a5d021ba7fe56a5", "tree": "5a44a8c8f53710366e51208f63e86c3a441f256a", "parents": [ "b526ce2264e93b64853478ae50725a30c1dc7abf" ], "author": { "name": "Alex Deucher", "email": "alexdeucher@gmail.com", "time": "Mon Jan 24 17:14:26 2011 -0500" }, "committer": { "name": "Dave Airlie", "email": "airlied@gmail.com", "time": "Tue Jan 25 08:41:04 2011 +1000" }, "message": "drm/radeon/kms: add new radeon_info ioctl query for clock crystal freq\n\nNeeded for timer queries in the 3D driver.\n\nSigned-off-by: Alex Deucher \u003calexdeucher@gmail.com\u003e\nSigned-off-by: Dave Airlie \u003cairlied@gmail.com\u003e\n" }, { "commit": "3632ef8909118db9584e1bed9538dc180adb32f8", "tree": "033925e11aef3c700492b4da0a1332f710de1299", "parents": [ "8473dbb43db92fa8de7c24d1973aaf1e0276a89f" ], "author": { "name": "Dave Airlie", "email": "airlied@redhat.com", "time": "Sat Jan 15 09:27:00 2011 +1000" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri Jan 14 16:10:28 2011 -0800" }, "message": "Revert \"drm: Update fbdev fb_fix_screeninfo\"\n\nThis reverts commit dfe63bb0ad9810db13aab0058caba97866e0a681.\n\nThis commit was causing nouveau not to work properly, for -rc1 I\u0027d\nprefer it worked and we can look if this is useful for 2.6.39.\n\nCc: James Simmons \u003cjsimmons@infradead.org\u003e\nSigned-off-by: Dave Airlie \u003cairlied@redhat.com\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "c3307cd6a7ca91c257795c5275e887a3eafb6880", "tree": "e4ddaa114644f16ef44026c3f4e5376e90e9c25c", "parents": [ "0ba41e449fd0f45f5b29c1009020ab1b298bedda", "187f3da3d98a1740d71e1f5d4fb3c68df09ecca8" ], "author": { "name": "Dave Airlie", "email": "airlied@redhat.com", "time": "Mon Jan 10 09:27:06 2011 +1000" }, "committer": { "name": "Dave Airlie", "email": "airlied@redhat.com", "time": "Mon Jan 10 09:27:06 2011 +1000" }, "message": "Merge branch \u0027drm-radeon-ni\u0027 of ../drm-radeon-next into drm-core-next\n\n* \u0027drm-radeon-ni\u0027 of ../drm-radeon-next: (30 commits)\n radeon: consolidate asic-specific function decls for pre-r600\n drm/radeon/kms: add NI pci ids\n drm/radeon/kms: don\u0027t enable pcie gen2 on NI yet\n drm/radeon/kms: add radeon_asic struct for NI asics\n drm/radeon/kms/ni: load default sclk/mclk/vddc at pm init\n drm/radeon/kms: add ucode loader for NI\n drm/radeon/kms: add support for DCE5 display LUTs\n drm/radeon/kms: add ni_reg.h\n drm/radeon/kms: add bo blit support for NI\n drm/radeon/kms: always use writeback/events for fences on NI\n drm/radeon/kms: adjust default clock/vddc tracking for pm on DCE5\n drm/radeon/kms: add backend map workaround for barts\n drm/radeon/kms: fill gpu init for NI asics\n drm/radeon/kms: add disabled vbios accessor for NI asics\n drm/radeon/kms: handle NI thermal controller\n drm/radeon/kms: parse DCE5 encoder caps when setting up encoders\n drm/radeon/kms: dvo dpms updates for DCE5\n drm/radeon/kms: dac dpms updates for DCE5\n drm/radeon/kms: DCE5 atom dig encoder updates\n drm/radeon/kms: DCE5 atom transmitter control updates\n ...\n" }, { "commit": "2b2fd604bda01bfea9f1657ca468c134448e03a5", "tree": "1d583e96ec38551e11b9b9aca9a5afba7ec632f1", "parents": [ "0d1014a2f2d1ad660caafae6f62796a93307867f" ], "author": { "name": "Alex Deucher", "email": "alexdeucher@gmail.com", "time": "Thu Jan 06 21:19:35 2011 -0500" }, "committer": { "name": "Dave Airlie", "email": "airlied@redhat.com", "time": "Fri Jan 07 14:11:44 2011 +1000" }, "message": "drm/radeon/kms: add NI pci ids\n\nSigned-off-by: Alex Deucher \u003calexdeucher@gmail.com\u003e\nSigned-off-by: Dave Airlie \u003cairlied@redhat.com\u003e\n" }, { "commit": "dfe63bb0ad9810db13aab0058caba97866e0a681", "tree": "ffc5e9335283001c072aa0377ba9fd92ac3b1919", "parents": [ "f598aa7593427ffe3a61e7767c34bd695a5e7ed0" ], "author": { "name": "James Simmons", "email": "jsimmons@infradead.org", "time": "Thu Dec 23 16:40:37 2010 +0000" }, "committer": { "name": "Dave Airlie", "email": "airlied@redhat.com", "time": "Fri Jan 07 13:44:40 2011 +1000" }, "message": "drm: Update fbdev fb_fix_screeninfo\n\nIf you change the color depth via fbset or some other framebuffer aware\nuserland application struct fb_fix_screeninfo is not updated to this new\ninformation. This patch fixes this issue. Also the function is changed to\njust pass in struct drm_framebuffer so in the future we could use more\nfields. I\u0027m hoping some day fix-\u003esmem* could be set here :-)\n\nSigned-off-by: James Simmons \u003cjsimmons@infradead.org\u003e\nSigned-off-by: Dave Airlie \u003cairlied@redhat.com\u003e\n" }, { "commit": "9eba4a93ce520a627e876b0d1851d4f78a701c2b", "tree": "a0dbb86c2105b4ff89af724b835d0c40fbf59368", "parents": [ "2f299d5de02da3ffb1f9e1a05c91dcd1173ebd3c" ], "author": { "name": "Marek Olšák", "email": "maraeo@gmail.com", "time": "Wed Jan 05 05:46:48 2011 +0100" }, "committer": { "name": "Dave Airlie", "email": "airlied@redhat.com", "time": "Thu Jan 06 13:00:45 2011 +1000" }, "message": "drm/radeon/kms: manage r300 CMASK RAM access and allow CMASK clear\n\nThe CMASK RAM is for colorbuffer compression (used in conjunction\nwith MSAA). Only one user (filp) can access it.\n\nThe CMASK RAM access is managed in the same way as Hyper-Z, but there is\na separate ioctl, because an app that uses MSAA does not necessarily\nhave to use zbuffering.\n\nSigned-off-by: Marek Olšák \u003cmaraeo@gmail.com\u003e\nSigned-off-by: Dave Airlie \u003cairlied@redhat.com\u003e\n" }, { "commit": "5bcf719b7db0f9366cedaf102b081f99b1c325ae", "tree": "6929d42e1d61a3b1bd7b130a37a80b99718e14aa", "parents": [ "8d608aa6295242fe4c4b6105b8c59c6a5b232d89" ], "author": { "name": "Dave Airlie", "email": "airlied@redhat.com", "time": "Tue Dec 07 09:20:40 2010 +1000" }, "committer": { "name": "Dave Airlie", "email": "airlied@redhat.com", "time": "Wed Jan 05 13:45:30 2011 +1000" }, "message": "drm/switcheroo: track state of switch in drivers.\n\nWe need to track the state of the switch in drivers, so that after s/r\nwe don\u0027t resume the card we\u0027ve explicitly switched off before. Also\ndon\u0027t allow a userspace open to occur if we\u0027ve switched the gpu off.\n\nSigned-off-by: Dave Airlie \u003cairlied@redhat.com\u003e\n" }, { "commit": "72bfa19c8deb4d1db5ad068c34fd580cb295cbe8", "tree": "ff1af345701389b7c6b3c8cffa4c6d704f0ccdab", "parents": [ "3b8d8d91d51c7d15cda51052624169edf7b6dbc6" ], "author": { "name": "Chris Wilson", "email": "chris@chris-wilson.co.uk", "time": "Sun Dec 19 11:42:05 2010 +0000" }, "committer": { "name": "Chris Wilson", "email": "chris@chris-wilson.co.uk", "time": "Mon Dec 20 09:41:36 2010 +0000" }, "message": "drm/i915: Allow the application to choose the constant addressing mode\n\nThe relative-to-general state default is useless as it means having to\nrewrite the streaming kernels for each batch. Relative-to-surface is\nmore useful, as that stream usually needs to be rewritten for each\nbatch. And absolute addressing mode, vital if you start streaming\nstate, is also only available by adjusting the register...\n\nSigned-off-by: Chris Wilson \u003cchris@chris-wilson.co.uk\u003e\n" }, { "commit": "d8c58fabd75021cdd99abcd96513cb088d41092b", "tree": "f6554ecfb27c0d50f5ae6acae3a7077282813cab", "parents": [ "9c04f015ebc2cc2cca5a4a576deb82a311578edc", "b08ebe7e776e5be0271ed1e1bbb384e1f29dd117" ], "author": { "name": "Chris Wilson", "email": "chris@chris-wilson.co.uk", "time": "Thu Dec 16 21:02:15 2010 +0000" }, "committer": { "name": "Chris Wilson", "email": "chris@chris-wilson.co.uk", "time": "Thu Dec 16 21:02:15 2010 +0000" }, "message": "Merge remote branch \u0027airlied/drm-core-next\u0027 into drm-intel-next\n" }, { "commit": "5aa7d52aebfc11760bbc5b081ed621227bb77981", "tree": "1bb2542ff9f8f58599325a68f3861f80be27bf26", "parents": [ "382ab78c0e4866eb9a812e9ba20d0f876d9634d6", "bbf0c6b3620b3872929ef7d3c392ce436889110f" ], "author": { "name": "Chris Wilson", "email": "chris@chris-wilson.co.uk", "time": "Sun Dec 05 10:43:39 2010 +0000" }, "committer": { "name": "Chris Wilson", "email": "chris@chris-wilson.co.uk", "time": "Sun Dec 05 10:43:39 2010 +0000" }, "message": "Merge branch \u0027drm-intel-fixes\u0027 into drm-intel-next\n\nImmediate merge for the conflicting introduction of HAS_COHERENT_RINGS.\n\nConflicts:\n\tdrivers/gpu/drm/i915/i915_dma.c\n\tinclude/drm/i915_drm.h\n" }, { "commit": "bbf0c6b3620b3872929ef7d3c392ce436889110f", "tree": "bc0829f63f0fd3cb7b2188bac9e63623155db191", "parents": [ "136711be41ec97f7f1a9c3a5e8535eb7da5fea59" ], "author": { "name": "Daniel Vetter", "email": "daniel.vetter@ffwll.ch", "time": "Sun Dec 05 11:30:40 2010 +0100" }, "committer": { "name": "Chris Wilson", "email": "chris@chris-wilson.co.uk", "time": "Sun Dec 05 10:40:39 2010 +0000" }, "message": "drm/i915: announce to userspace that the bsd ring is coherent\n\nOtherwise we can\u0027t really fix the abi-braindeadness of forcing\nlibva to manually wait for rendering when switching rings. Which\nin turn makes implementing hw semaphores a pointless exercise\n(at least for ironlake).\n\n[Also added the relaxed fencing param to explain the jump in\nnumbering - relaxed fencing is in -next.]\n\nSigned-off-by: Daniel Vetter \u003cdaniel.vetter@ffwll.ch\u003e\nSigned-off-by: Chris Wilson \u003cchris@chris-wilson.co.uk\u003e\n" }, { "commit": "6d6c5a157af45a5bd50ab913b07d826811a9ea0a", "tree": "d1e823cef00bc8dad50a086656e924a5af8f5fec", "parents": [ "2cb3d3b6c64d37514fd8865748de66ff35a489af" ], "author": { "name": "Ben Skeggs", "email": "bskeggs@redhat.com", "time": "Tue Nov 16 10:17:53 2010 +1000" }, "committer": { "name": "Ben Skeggs", "email": "bskeggs@redhat.com", "time": "Fri Dec 03 15:11:57 2010 +1000" }, "message": "drm/nouveau: remove some useless GETPARAMs\n\nThese have been unused since UMS support was ripped out, so lets remove\nthem completely.\n\nSigned-off-by: Ben Skeggs \u003cbskeggs@redhat.com\u003e\n" }, { "commit": "332b242f47786d1a43bd7a19a0513dd5d493db8e", "tree": "f6681c1513c58db54f71c64184ebc033a14c49fe", "parents": [ "042206c0cd4924879c4292c5ffa2bf1e8023ae5a" ], "author": { "name": "Francisco Jerez", "email": "currojerez@riseup.net", "time": "Wed Oct 20 23:35:40 2010 +0200" }, "committer": { "name": "Ben Skeggs", "email": "bskeggs@redhat.com", "time": "Fri Dec 03 15:11:12 2010 +1000" }, "message": "drm/nouveau: Implement the pageflip ioctl.\n\nnv0x-nv4x should be mostly fine, nv50 doesn\u0027t work yet.\n\nSigned-off-by: Francisco Jerez \u003ccurrojerez@riseup.net\u003e\nSigned-off-by: Ben Skeggs \u003cbskeggs@redhat.com\u003e\n" }, { "commit": "21e86c1c8a844bf978f8fc431a59c9f5a578812d", "tree": "5434acc42e40ae575ec9bad16075424da771fcaf", "parents": [ "b12120a58e06cc6b799494c80215e418c14f9f5f" ], "author": { "name": "Ben Skeggs", "email": "bskeggs@redhat.com", "time": "Mon Oct 11 11:48:45 2010 +1000" }, "committer": { "name": "Ben Skeggs", "email": "bskeggs@redhat.com", "time": "Fri Dec 03 15:05:22 2010 +1000" }, "message": "drm/nouveau: remove cpu_writers lock\n\nNo other driver uses this, and userspace should be responsible for handling\nlocking between them if they share BOs.\n\nSigned-off-by: Ben Skeggs \u003cbskeggs@redhat.com\u003e\n" }, { "commit": "f7eb0c55416aba7478932cedbaccc2bdacd8a95d", "tree": "5fea622c3079e69803fe131402ab5d2827fe521f", "parents": [ "7e76c5cf6f4dbfb18325de5408c0ac8d3f271d85", "439bd6cde45d0bff4f97513b01b976b9f72ae1f0" ], "author": { "name": "Dave Airlie", "email": "airlied@redhat.com", "time": "Fri Dec 03 14:01:08 2010 +1000" }, "committer": { "name": "Dave Airlie", "email": "airlied@redhat.com", "time": "Fri Dec 03 14:01:08 2010 +1000" }, "message": "Merge branch \u0027drm-radeon-fusion\u0027 of ../drm-radeon-next into drm-core-next\n\n* \u0027drm-radeon-fusion\u0027 of ../drm-radeon-next:\n drm/radeon/kms: add Ontario APU ucode loading support\n drm/radeon/kms: add Ontario Fusion APU pci ids\n drm/radeon/kms: enable MSIs on fusion APUs\n drm/radeon/kms: add power table parsing support for Ontario fusion APUs\n drm/radeon/kms: refactor atombios power state fetching\n drm/radeon/kms: add bo blit support for Ontario fusion APUs\n drm/radeon/kms: add thermal sensor support for fusion APUs\n drm/radeon/kms: fill in GPU init for AMD Ontario Fusion APUs\n drm/radeon/kms: add radeon_asic struct for AMD Ontario fusion APUs\n drm/radeon/kms: evergreen.c updates for fusion\n drm/radeon/kms: MC setup changes for fusion APUs\n drm/radeon/kms: move r7xx/evergreen to its own vram_gtt setup function\n drm/radeon/kms: add support for ss overrides on Fusion APUs\n drm/radeon/kms: Add support for external encoders on fusion APUs\n drm/radeon/kms: atom changes for DCE4.1 devices\n drm/radeon/kms: add new family id for AMD Ontario APUs\n drm/radeon/kms: upstream power table updates\n drm/radeon/kms: upstream atombios.h updates\n drm/radeon/kms: upstream ObjectID.h updates\n drm/radeon/kms: setup mc chremap properly on r7xx/evergreen\n" }, { "commit": "4080775b60cc26044e7c4aba5e76e5041b0d7004", "tree": "46ee73a35bb1c99ff7e075e1c9b441faad98dc94", "parents": [ "7c2e6fdf452cddeff6a8ee5156edba39e53246fc" ], "author": { "name": "Daniel Vetter", "email": "daniel.vetter@ffwll.ch", "time": "Sat Nov 06 11:18:58 2010 +0100" }, "committer": { "name": "Chris Wilson", "email": "chris@chris-wilson.co.uk", "time": "Tue Nov 23 20:14:47 2010 +0000" }, "message": "intel-gtt: export api for drm/i915\n\nJust some minor shuffling to get rid of any agp traces in the\nexported functions.\n\nSigned-off-by: Daniel Vetter \u003cdaniel.vetter@ffwll.ch\u003e\nSigned-off-by: Chris Wilson \u003cchris@chris-wilson.co.uk\u003e\n" }, { "commit": "4af72e2865a23ac090884a421bd1a8b19e247a22", "tree": "a4188f9feed58258a13d8b00c907c19c5045c85e", "parents": [ "40ce6575102b23e432932b5ce41c44bf7cc5023b" ], "author": { "name": "Daniel Vetter", "email": "daniel.vetter@ffwll.ch", "time": "Fri Nov 05 18:13:43 2010 +0100" }, "committer": { "name": "Chris Wilson", "email": "chris@chris-wilson.co.uk", "time": "Tue Nov 23 20:14:44 2010 +0000" }, "message": "drm: kill drm_agp_chipset_flush\n\nNo longer used.\n\nCc: Dave Airlie \u003cairlied@gmail.com\u003e\nSigned-off-by: Daniel Vetter \u003cdaniel.vetter@ffwll.ch\u003e\nSigned-off-by: Chris Wilson \u003cchris@chris-wilson.co.uk\u003e\n" }, { "commit": "40ce6575102b23e432932b5ce41c44bf7cc5023b", "tree": "c14bb9bf62a83e35f81d0aaef55536c324bdbb3b", "parents": [ "23ed992a5ebe6964ebe312b54142fbc5e8185cdc" ], "author": { "name": "Daniel Vetter", "email": "daniel.vetter@ffwll.ch", "time": "Fri Nov 05 18:12:18 2010 +0100" }, "committer": { "name": "Chris Wilson", "email": "chris@chris-wilson.co.uk", "time": "Tue Nov 23 20:14:44 2010 +0000" }, "message": "drm/i915/gtt: call chipset flush directly\n\nSigned-off-by: Daniel Vetter \u003cdaniel.vetter@ffwll.ch\u003e\nSigned-off-by: Chris Wilson \u003cchris@chris-wilson.co.uk\u003e\n" }, { "commit": "23ed992a5ebe6964ebe312b54142fbc5e8185cdc", "tree": "c8ee2fa6f6a51fb1d0b43f19ec15dcc482b914ef", "parents": [ "ff26860fb53f2dcfaaaf1bf017b09dbdfddff5ee" ], "author": { "name": "Daniel Vetter", "email": "daniel.vetter@ffwll.ch", "time": "Fri Nov 05 18:04:52 2010 +0100" }, "committer": { "name": "Chris Wilson", "email": "chris@chris-wilson.co.uk", "time": "Tue Nov 23 20:14:43 2010 +0000" }, "message": "drm/i915|intel-gtt: consolidate intel-gtt.h headers\n\n... and a few other defines.\n\nSigned-off-by: Daniel Vetter \u003cdaniel.vetter@ffwll.ch\u003e\nSigned-off-by: Chris Wilson \u003cchris@chris-wilson.co.uk\u003e\n" }, { "commit": "c64f7ba5f1006d8c20eacafecf98d4d00a6902a0", "tree": "0309e263e05be06e718d6a07169802ac026aef68", "parents": [ "1b6064d79b9a1c5e5aa6fcc6855f3da5e639ff73" ], "author": { "name": "Chris Wilson", "email": "chris@chris-wilson.co.uk", "time": "Tue Nov 23 14:24:24 2010 +0000" }, "committer": { "name": "Chris Wilson", "email": "chris@chris-wilson.co.uk", "time": "Tue Nov 23 15:43:18 2010 +0000" }, "message": "agp/intel: Remove confusion of stolen entries not stolen memory\n\nSigned-off-by: Chris Wilson \u003cchris@chris-wilson.co.uk\u003e\n" }, { "commit": "11fa1618e327af7f08085e134b3325de9caf7a94", "tree": "0f711b9931b689d1eab6f2ee077f76cfdf06c71f", "parents": [ "bbbf9b7b02e0090d91c422398089c9f22361dc94" ], "author": { "name": "Alex Deucher", "email": "alexdeucher@gmail.com", "time": "Mon Nov 22 17:56:37 2010 -0500" }, "committer": { "name": "Dave Airlie", "email": "airlied@redhat.com", "time": "Tue Nov 23 09:23:34 2010 +1000" }, "message": "drm/radeon/kms: add Ontario Fusion APU pci ids\n\nSigned-off-by: Alex Deucher \u003calexdeucher@gmail.com\u003e\nSigned-off-by: Dave Airlie \u003cairlied@redhat.com\u003e\n" }, { "commit": "e624ae8e0d4243e71daedce7570e91290438eaca", "tree": "e2b9804379a6aab3d2471898d257fe5590feb70c", "parents": [ "c4a1d9e4dc5d5313cfec2cc0c9d630efe8a6f287", "4ab0fbd3a29067e1540f05093ae4ed07645d18c8" ], "author": { "name": "Chris Wilson", "email": "chris@chris-wilson.co.uk", "time": "Mon Nov 22 08:51:36 2010 +0000" }, "committer": { "name": "Chris Wilson", "email": "chris@chris-wilson.co.uk", "time": "Mon Nov 22 08:51:36 2010 +0000" }, "message": "Merge branch \u0027drm-intel-fixes\u0027 into drm-intel-next\n\nConflicts:\n\tdrivers/gpu/drm/i915/i915_gem.c\n" }, { "commit": "eba67093f535322cb4f1c4b737319c0907a0c81d", "tree": "695b9a43d558a2870b23d6813f60387d7d61c614", "parents": [ "65705962025df490d13df59ec57c5329d1bd0a16" ], "author": { "name": "Thomas Hellstrom", "email": "thellstrom@vmware.com", "time": "Thu Nov 11 09:41:57 2010 +0100" }, "committer": { "name": "Dave Airlie", "email": "airlied@redhat.com", "time": "Mon Nov 22 13:25:22 2010 +1000" }, "message": "drm/ttm: Fix up io_mem_reserve / io_mem_free calling\n\nThis patch attempts to fix up shortcomings with the current calling\nsequences.\n\n1) There\u0027s a fastpath where no locking occurs and only io_mem_reserved is\n called to obtain needed info for mapping. The fastpath is set per\n memory type manager.\n2) If the fastpath is disabled, io_mem_reserve and io_mem_free will be exactly\n balanced and not called recursively for the same struct ttm_mem_reg.\n3) Optionally the driver can choose to enable a per memory type manager LRU\n eviction mechanism that, when io_mem_reserve returns -EAGAIN will attempt\n to kill user-space mappings of memory in that manager to free up needed\n resources\n\nSigned-off-by: Thomas Hellstrom \u003cthellstrom@vmware.com\u003e\nReviewed-by: Ben Skeggs \u003cbskeggs@redhat.com\u003e\nSigned-off-by: Dave Airlie \u003cairlied@redhat.com\u003e\n" }, { "commit": "65705962025df490d13df59ec57c5329d1bd0a16", "tree": "aa9d40bbd1a842aaada664d9d0fa6a317ec1755f", "parents": [ "95762c2b34069bf4adb7929969f1f5f5fc8a38df" ], "author": { "name": "Thomas Hellstrom", "email": "thellstrom@vmware.com", "time": "Wed Nov 17 12:28:31 2010 +0000" }, "committer": { "name": "Dave Airlie", "email": "airlied@redhat.com", "time": "Mon Nov 22 13:25:21 2010 +1000" }, "message": "drm/ttm/vmwgfx: Have TTM manage the validation sequence.\n\nRather than having the driver supply the validation sequence, leave that\nresponsibility to TTM. This saves some confusion and a function argument.\n\nSigned-off-by: Thomas Hellstrom \u003cthellstrom@vmware.com\u003e\nSigned-off-by: Dave Airlie \u003cairlied@redhat.com\u003e\n" }, { "commit": "95762c2b34069bf4adb7929969f1f5f5fc8a38df", "tree": "5c792e65dbdb4e7cb2c04b5a8058a929e8acc23d", "parents": [ "702adba22433c175e8429a47760f35ca16caf1cd" ], "author": { "name": "Thomas Hellstrom", "email": "thellstrom@vmware.com", "time": "Wed Nov 17 12:28:30 2010 +0000" }, "committer": { "name": "Dave Airlie", "email": "airlied@redhat.com", "time": "Mon Nov 22 13:25:20 2010 +1000" }, "message": "drm/ttm: Improved fencing of buffer object lists\n\nDrastically reduce the number of spin lock / unlock operations by performing\nunreserving and fencing under global locks.\n\nSigned-off-by: Thomas Hellstrom \u003cthellstrom@vmware.com\u003e\nReviewed-by: Jerome Glisse \u003cj.glisse@redhat.com\u003e\nSigned-off-by: Dave Airlie \u003cairlied@redhat.com\u003e\n" }, { "commit": "702adba22433c175e8429a47760f35ca16caf1cd", "tree": "a9c6a1ad8ebaf9970a87b7047357b6d7232b70e6", "parents": [ "96726fe50feae74812a2ccf5d5da23cb01c0a413" ], "author": { "name": "Thomas Hellstrom", "email": "thellstrom@vmware.com", "time": "Wed Nov 17 12:28:29 2010 +0000" }, "committer": { "name": "Dave Airlie", "email": "airlied@redhat.com", "time": "Mon Nov 22 13:25:18 2010 +1000" }, "message": "drm/ttm/radeon/nouveau: Kill the bo lock in favour of a bo device fence_lock\n\nThe bo lock used only to protect the bo sync object members, and since it\nis a per bo lock, fencing a buffer list will see a lot of locks and unlocks.\nReplace it with a per-device lock that protects the sync object members on\n*all* bos. Reading and setting these members will always be very quick, so\nthe risc of heavy lock contention is microscopic. Note that waiting for\nsync objects will always take place outside of this lock.\n\nThe bo device fence lock will eventually be replaced with a seqlock /\nrcu mechanism so we can determine that a bo is idle under a\nrcu / read seqlock.\n\nHowever this change will allow us to batch fencing and unreserving of\nbuffers with a minimal amount of locking.\n\nSigned-off-by: Thomas Hellstrom \u003cthellstrom@vmware.com\u003e\nReviewed-by: Jerome Glisse \u003cj.glisse@gmail.com\u003e\nSigned-off-by: Dave Airlie \u003cairlied@redhat.com\u003e\n" }, { "commit": "96726fe50feae74812a2ccf5d5da23cb01c0a413", "tree": "1c5cb041b88e33ae5d10cb9292852cc5ee5fb24b", "parents": [ "68c4fa31aa52765314b4285a7835368ea35b509c" ], "author": { "name": "Thomas Hellstrom", "email": "thellstrom@vmware.com", "time": "Wed Nov 17 12:28:28 2010 +0000" }, "committer": { "name": "Dave Airlie", "email": "airlied@redhat.com", "time": "Mon Nov 22 13:25:17 2010 +1000" }, "message": "drm/ttm: Don\u0027t deadlock on recursive multi-bo reservations\n\nAdd an aid for the driver to detect deadlocks on multi-bo reservations\nUpdate documentation.\n\nSigned-off-by: Thomas Hellstrom \u003cthellstrom@vmware.com\u003e\nReviewed-by: Jerome Glisse \u003cj.glisse@gmail.com\u003e\nSigned-off-by: Dave Airlie \u003cairlied@redhat.com\u003e\n" }, { "commit": "d6ea88865d3e5b0c62040531310c1f2c6a994f46", "tree": "b80a7cbc6eeab003b412e3037fd335ce9d572f67", "parents": [ "27641c3f003e7f3b6585c01d8a788883603eb262" ], "author": { "name": "Dave Airlie", "email": "airlied@redhat.com", "time": "Mon Nov 22 13:24:40 2010 +1000" }, "committer": { "name": "Dave Airlie", "email": "airlied@redhat.com", "time": "Mon Nov 22 13:24:40 2010 +1000" }, "message": "drm/ttm: Add a bo list reserve fastpath (v2)\n\nMakes it possible to reserve a list of buffer objects with a single\nspin lock / unlock if there is no contention.\nShould improve cpu usage on SMP kernels.\n\nv2: Initialize private list members on reserve and don\u0027t call\nttm_bo_list_ref_sub() with zero put_count.\n\nSigned-off-by: Thomas Hellstrom \u003cthellstrom@vmware.com\u003e\nSigned-off-by: Dave Airlie \u003cairlied@redhat.com\u003e\n" }, { "commit": "27641c3f003e7f3b6585c01d8a788883603eb262", "tree": "e26eb639c4b5f429d30033d598544f82479d1ea3", "parents": [ "3561d43fd289f590fdae672e5eb831b8d5cf0bf6" ], "author": { "name": "Mario Kleiner", "email": "mario.kleiner@tuebingen.mpg.de", "time": "Sat Oct 23 04:20:23 2010 +0200" }, "committer": { "name": "Dave Airlie", "email": "airlied@redhat.com", "time": "Mon Nov 22 11:45:05 2010 +1000" }, "message": "drm/vblank: Add support for precise vblank timestamping.\n\nThe DRI2 swap \u0026 sync implementation needs precise\nvblank counts and precise timestamps corresponding\nto those vblank counts. For conformance to the OpenML\nOML_sync_control extension specification the DRM\ntimestamp associated with a vblank count should\ncorrespond to the start of video scanout of the first\nscanline of the video frame following the vblank\ninterval for that vblank count.\n\nTherefore we need to carry around precise timestamps\nfor vblanks. Currently the DRM and KMS drivers generate\ntimestamps ad-hoc via do_gettimeofday() in some\nplaces. The resulting timestamps are sometimes not\nvery precise due to interrupt handling delays, they\ndon\u0027t conform to OML_sync_control and some are wrong,\nas they aren\u0027t taken synchronized to the vblank.\n\nThis patch implements support inside the drm core\nfor precise and robust timestamping. It consists\nof the following interrelated pieces.\n\n1. Vblank timestamp caching:\n\nA per-crtc ringbuffer stores the most recent vblank\ntimestamps corresponding to vblank counts.\n\nThe ringbuffer can be read out lock-free via the\naccessor function:\n\nstruct timeval timestamp;\nvblankcount \u003d drm_vblank_count_and_time(dev, crtcid, \u0026timestamp).\n\nThe function returns the current vblank count and\nthe corresponding timestamp for start of video\nscanout following the vblank interval. It can be\nused anywhere between enclosing drm_vblank_get(dev, crtcid)\nand drm_vblank_put(dev,crtcid) statements. It is used\ninside the drmWaitVblank ioctl and in the vblank event\nqueueing and handling. It should be used by kms drivers for\ntimestamping of bufferswap completion.\n\nThe timestamp ringbuffer is reinitialized each time\nvblank irq\u0027s get reenabled in drm_vblank_get()/\ndrm_update_vblank_count(). It is invalidated when\nvblank irq\u0027s get disabled.\n\nThe ringbuffer is updated inside drm_handle_vblank()\nat each vblank irq.\n\n2. Calculation of precise vblank timestamps:\n\ndrm_get_last_vbltimestamp() is used to compute the\ntimestamp for the end of the most recent vblank (if\ninside active scanout), or the expected end of the\ncurrent vblank interval (if called inside a vblank\ninterval). The function calls into a new optional kms\ndriver entry point dev-\u003edriver-\u003eget_vblank_timestamp()\nwhich is supposed to provide the precise timestamp.\nIf a kms driver doesn\u0027t implement the entry point or\nif the call fails, a simple do_gettimeofday() timestamp\nis returned as crude approximation of the true vblank time.\n\nA new drm module parameter drm.timestamp_precision_usec\nallows to disable high precision timestamps (if set to\nzero) or to specify the maximum acceptable error in\nthe timestamps in microseconds.\n\nKms drivers could implement their get_vblank_timestamp()\nfunction in a gpu specific way, as long as returned\ntimestamps conform to OML_sync_control, e.g., by use\nof gpu specific hardware timestamps.\n\nOptionally, kms drivers can simply wrap and use the new\nutility function drm_calc_vbltimestamp_from_scanoutpos().\nThis function calls a new optional kms driver function\ndev-\u003edriver-\u003eget_scanout_position() which returns the\ncurrent horizontal and vertical video scanout position\nof the crtc. The scanout position together with the\ndrm_display_timing of the current video mode is used\nto calculate elapsed time relative to start of active scanout\nfor the current video frame. This elapsed time is subtracted\nfrom the current do_gettimeofday() time to get the timestamp\ncorresponding to start of video scanout. Currently\nnon-interlaced, non-doublescan video modes, with or\nwithout panel scaling are handled correctly. Interlaced/\ndoublescan modes are tbd in a future patch.\n\n3. Filtering of redundant vblank irq\u0027s and removal of\nsome race-conditions in the vblank irq enable/disable path:\n\nSome gpu\u0027s (e.g., Radeon R500/R600) send spurious vblank\nirq\u0027s outside the vblank if vblank irq\u0027s get reenabled.\nThese get detected by use of the vblank timestamps and\nfiltered out to avoid miscounting of vblanks.\n\nSome race-conditions between the vblank irq enable/disable\nfunctions, the vblank irq handler and the gpu itself (updating\nits hardware vblank counter in the \"wrong\" moment) are\nfixed inside vblank_disable_and_save() and\ndrm_update_vblank_count() by use of the vblank timestamps and\na new spinlock dev-\u003evblank_time_lock.\n\nThe time until vblank irq disable is now configurable via\na new drm module parameter drm.vblankoffdelay to allow\nexperimentation with timeouts that are much shorter than\nthe current 5 seconds and should allow longer vblank off\nperiods for better power savings.\n\nFollowup patches will use these new functions to\nimplement precise timestamping for the intel and radeon\nkms drivers.\n\nSigned-off-by: Mario Kleiner \u003cmario.kleiner@tuebingen.mpg.de\u003e\nSigned-off-by: Dave Airlie \u003cairlied@redhat.com\u003e\n" }, { "commit": "f13b32630dda7e583a84a8c535880cff7e4a9bdd", "tree": "a527aa3fd21cb58aaa95e0d70566acb14ea0586f", "parents": [ "1397b42b5a2e5b3b982078c89f3594c123e3c2b3" ], "author": { "name": "Francisco Jerez", "email": "currojerez@riseup.net", "time": "Sun Oct 10 06:01:08 2010 +0200" }, "committer": { "name": "Ben Skeggs", "email": "bskeggs@redhat.com", "time": "Thu Nov 18 14:38:29 2010 +1000" }, "message": "drm/nouveau: Expose some BO usage flags to userspace.\n\nThis will be needed for Z compression and to take smarter placement\ndecisions.\n\nSigned-off-by: Francisco Jerez \u003ccurrojerez@riseup.net\u003e\nAcked-by: Ben Skeggs \u003cbskeggs@redhat.com\u003e\nSigned-off-by: Ben Skeggs \u003cbskeggs@redhat.com\u003e\n" }, { "commit": "c94f28c383f58c9de74678e0f1624db9c5f8a8cb", "tree": "3281184f026cb79cee6c20fe29c994ba654cbbe4", "parents": [ "df15315899c0641412bd54b29565a70b078a6ac8", "1bb95834bbcdc969e477a9284cf96c17a4c2616f" ], "author": { "name": "Chris Wilson", "email": "chris@chris-wilson.co.uk", "time": "Mon Nov 15 06:49:30 2010 +0000" }, "committer": { "name": "Chris Wilson", "email": "chris@chris-wilson.co.uk", "time": "Mon Nov 15 06:49:30 2010 +0000" }, "message": "Merge branch \u0027drm-intel-fixes\u0027 into drm-intel-next\n\nConflicts:\n\tdrivers/gpu/drm/i915/i915_gem.c\n\tdrivers/gpu/drm/i915/intel_ringbuffer.c\n" }, { "commit": "7dfbbdcffebc41441e64278961f57d2840a76259", "tree": "5a536fdc99de855160409a33f5049ebb503c66de", "parents": [ "2b66b50b12cabc05f05543e792d4c9c2465d5702" ], "author": { "name": "Thomas Hellstrom", "email": "thellstrom@vmware.com", "time": "Tue Nov 09 21:31:44 2010 +0100" }, "committer": { "name": "Dave Airlie", "email": "airlied@redhat.com", "time": "Wed Nov 10 11:52:19 2010 +1000" }, "message": "drm/ttm: Be consistent on ttm_bo_init() failures\n\nCall destroy() on _all_ ttm_bo_init() failures, and make sure that\nbehavior is documented in the function description.\n\nSigned-off-by: Thomas Hellstrom \u003cthellstrom@vmware.com\u003e\nSigned-off-by: Dave Airlie \u003cairlied@redhat.com\u003e\n" }, { "commit": "3205bc242b5e3950c808049dbf199fca91f2c844", "tree": "95f458f86be450a08a604ccecaf23867d8a1fef1", "parents": [ "f5d8e0eb7a4308f46faf570fb7da1952c68992c5" ], "author": { "name": "Thomas Hellstrom", "email": "thellstrom@vmware.com", "time": "Fri Oct 29 10:46:44 2010 +0200" }, "committer": { "name": "Dave Airlie", "email": "airlied@redhat.com", "time": "Tue Nov 09 13:33:15 2010 +1000" }, "message": "drm/ttm: Documentation update\n\nRemove an obsolete comment about mm nodes.\nDocument the new bo range manager interface.\n\nSigned-off-by: Thomas Hellstrom \u003cthellstrom@vmware.com\u003e\nSigned-off-by: Dave Airlie \u003cairlied@redhat.com\u003e\n" }, { "commit": "0f8c6d7ca9257d6a01671ab69b897860d3ae9bc0", "tree": "e06b567e620e17d5ce983610ef3721d860d0cf27", "parents": [ "13b2928933919c5344716d49620a52493a243f8c" ], "author": { "name": "Chris Wilson", "email": "chris@chris-wilson.co.uk", "time": "Mon Nov 01 12:38:44 2010 +0000" }, "committer": { "name": "Chris Wilson", "email": "chris@chris-wilson.co.uk", "time": "Mon Nov 01 12:38:44 2010 +0000" }, "message": "drm/i915: Move the invalidate|flush information out of the device struct\n\n... and into a local structure scoped for the single function in which\nit is used.\n\nSigned-off-by: Chris Wilson \u003cchris@chris-wilson.co.uk\u003e\n" }, { "commit": "a00b10c360b35d6431a94cbf130a4e162870d661", "tree": "e1c06b90d161bc81e8d2c819da3b676f75527dda", "parents": [ "7465378fd7c681f6cf2b74b3494c4f0991d8c8ac" ], "author": { "name": "Chris Wilson", "email": "chris@chris-wilson.co.uk", "time": "Fri Sep 24 21:15:47 2010 +0100" }, "committer": { "name": "Chris Wilson", "email": "chris@chris-wilson.co.uk", "time": "Fri Oct 29 11:15:07 2010 +0100" }, "message": "drm/i915: Only enforce fence limits inside the GTT.\n\nSo long as we adhere to the fence registers rules for alignment and no\noverlaps (including with unfenced accesses to linear memory) and account\nfor the tiled access in our size allocation, we do not have to allocate\nthe full fenced region for the object. This allows us to fight the bloat\ntiling imposed on pre-i965 chipsets and frees up RAM for real use. [Inside\nthe GTT we still suffer the additional alignment constraints, so it doesn\u0027t\nmagic allow us to render larger scenes without stalls -- we need the\nexpanded GTT and fence pipelining to overcome those...]\n\nSigned-off-by: Chris Wilson \u003cchris@chris-wilson.co.uk\u003e\n" }, { "commit": "d935cc61d466f6cc7514032835f4fc379cb7e2ca", "tree": "c2ebcf0d6abe581a7a88fa87029d4a3bd55e80b7", "parents": [ "3cce469cab880ef8990d2d16d745bf85443fc998" ], "author": { "name": "Daniel Vetter", "email": "daniel.vetter@ffwll.ch", "time": "Thu Sep 16 15:13:11 2010 +0200" }, "committer": { "name": "Chris Wilson", "email": "chris@chris-wilson.co.uk", "time": "Wed Oct 27 23:31:04 2010 +0100" }, "message": "drm_mm: add support for range-restricted fair-lru scans\n\nSigned-off-by: Daniel Vetter \u003cdaniel.vetter@ffwll.ch\u003e\nSigned-off-by: Chris Wilson \u003cchris@chris-wilson.co.uk\u003e\n" }, { "commit": "e3ce8a0b277438591844847ac7c89a980b4cfa6d", "tree": "c9bf47675403a54be2e0c54df9357d2b9c65326b", "parents": [ "e1efc9b6ac22c605fd326b3f6af9b393325d43b4", "641934069d29211baf82afb93622a426172b67b6" ], "author": { "name": "Dave Airlie", "email": "airlied@redhat.com", "time": "Tue Oct 26 09:23:22 2010 +1000" }, "committer": { "name": "Dave Airlie", "email": "airlied@redhat.com", "time": "Tue Oct 26 09:23:22 2010 +1000" }, "message": "Merge remote branch \u0027intel/drm-intel-next\u0027 of ../drm-next into drm-core-next\n\n* \u0027intel/drm-intel-next\u0027 of ../drm-next: (63 commits)\n drm/i915: Move gpu_write_list to per-ring\n drm/i915: Invalidate the to-ring, flush the old-ring when updating domains\n drm/i915/ringbuffer: Write the value passed in to the tail register\n agp/intel: Restore valid PTE bit for Sandybridge after bdd3072\n drm/i915: Fix flushing regression from 9af90d19f\n drm/i915/sdvo: Remove unused encoding member\n i915: enable AVI infoframe for intel_hdmi.c [v4]\n drm/i915: Fix current fb blocking for page flip\n drm/i915: IS_IRONLAKE is synonymous with gen \u003d\u003d 5\n drm/i915: Enable SandyBridge blitter ring\n drm/i915/ringbuffer: Remove broken intel_fill_struct()\n drm/i915/ringbuffer: Fix emit batch buffer regression from 8187a2b\n drm/i915: Copy the updated reloc-\u003epresumed_offset back to the user\n drm/i915: Track objects in global active list (as well as per-ring)\n drm/i915: Simplify most HAS_BSD() checks\n drm/i915: cache the last object lookup during pin_and_relocate()\n drm/i915: Do interrupible mutex lock first to avoid locking for unreference\n drivers: gpu: drm: i915: Fix a typo.\n agp/intel: Also add B43.1 to list of supported devices\n drm/i915: rearrange mutex acquisition for pread\n ...\n" }, { "commit": "549f7365820a212a1cfd0871d377b1ad0d1e5723", "tree": "dbd39c10b32b35b762b083a358b7fc4c09783d5b", "parents": [ "e36c1cd7292efcb8daca26cd6331481736544742" ], "author": { "name": "Chris Wilson", "email": "chris@chris-wilson.co.uk", "time": "Tue Oct 19 11:19:32 2010 +0100" }, "committer": { "name": "Chris Wilson", "email": "chris@chris-wilson.co.uk", "time": "Thu Oct 21 19:08:39 2010 +0100" }, "message": "drm/i915: Enable SandyBridge blitter ring\n\nBased on an original patch by Zhenyu Wang, this initializes the BLT ring for\nSandyBridge and enables support for user execbuffers.\n\nCc: Zhenyu Wang \u003czhenyuw@linux.intel.com\u003e\nSigned-off-by: Chris Wilson \u003cchris@chris-wilson.co.uk\u003e\n" }, { "commit": "40d857bba2915a4e8d82f44744a186bfdd1a46ea", "tree": "75add808d5f133a2db13299c3336df33bb89c7cf", "parents": [ "21c74a8ea8b47eb6c3c621e36578f6e27f65c5c7" ], "author": { "name": "Thomas Hellstrom", "email": "thellstrom@vmware.com", "time": "Tue Oct 19 09:01:00 2010 +0200" }, "committer": { "name": "Dave Airlie", "email": "airlied@redhat.com", "time": "Thu Oct 21 11:53:24 2010 +1000" }, "message": "drm/ttm: Avoid using the ttm_mem_type_manager::put_locked function\n\nRelease the lru spinlock early.\n\nSigned-off-by: Thomas Hellstrom \u003cthellstrom@vmware.com\u003e\nSigned-off-by: Dave Airlie \u003cairlied@redhat.com\u003e\n" }, { "commit": "8fe9790d1652e7c306c862ea102a5e6126b412e1", "tree": "b3cdc7c842eef61efbdd63f791a210aa524df89f", "parents": [ "6d139a87b747aaebc969ac5f4eb8db766fcd9cbd" ], "author": { "name": "Zhenyu Wang", "email": "zhenyuw@linux.intel.com", "time": "Sun Sep 19 14:27:28 2010 +0800" }, "committer": { "name": "Chris Wilson", "email": "chris@chris-wilson.co.uk", "time": "Tue Oct 19 09:17:32 2010 +0100" }, "message": "drm/edid: add helper function to detect monitor audio capability\n\nTo help to determine if digital display port needs to enable\naudio output or not. This one adds a helper to get monitor\u0027s\naudio capability via EDID CEA extension block.\n\nTested-by: Wu Fengguang \u003cfengguang.wu@intel.com\u003e\nSigned-off-by: Zhenyu Wang \u003czhenyuw@linux.intel.com\u003e\nReviewed-by: Adam Jackson \u003cajax@redhat.com\u003e\nSigned-off-by: Chris Wilson \u003cchris@chris-wilson.co.uk\u003e\n" }, { "commit": "fb9a90f7c674f3ddef6baf55cb1612dadd8ea752", "tree": "f25cf2ce17449ba34cdfdfb948134eb3464e400e", "parents": [ "2d7b8366ae4a9ec2183c30e432a4a9a495c82bcd", "21c74a8ea8b47eb6c3c621e36578f6e27f65c5c7" ], "author": { "name": "Chris Wilson", "email": "chris@chris-wilson.co.uk", "time": "Tue Oct 19 09:13:00 2010 +0100" }, "committer": { "name": "Chris Wilson", "email": "chris@chris-wilson.co.uk", "time": "Tue Oct 19 09:14:50 2010 +0100" }, "message": "Merge remote branch \u0027airlied/drm-core-next\u0027 into tmp\n" }, { "commit": "21c74a8ea8b47eb6c3c621e36578f6e27f65c5c7", "tree": "c87eb392764e4bf2e8fe435d7bd70ddad7f75202", "parents": [ "99231028ff713820829b798d056c08a584281c25" ], "author": { "name": "Jason Wessel", "email": "jason.wessel@windriver.com", "time": "Wed Oct 13 14:09:44 2010 -0500" }, "committer": { "name": "Dave Airlie", "email": "airlied@redhat.com", "time": "Tue Oct 19 14:13:33 2010 +1000" }, "message": "drm, kdb, kms: Change mode_set_base_atomic() enter argument to be an enum\n\nThe enter argument as implemented by commit 413d45d3627 (drm, kdb, kms:\nAdd an enter argument to mode_set_base_atomic() API) should be more\ndescriptive as to what it does vs just passing 1 and 0 around.\n\nThere is no runtime behavior change as a result of this patch.\n\nReported-by: Jesse Barnes \u003cjbarnes@virtuousgeek.org\u003e\nSigned-off-by: Jason Wessel \u003cjason.wessel@windriver.com\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": "c9220b0f7cbd1d2272426aa81a72ae2f6582bb71", "tree": "223bf3f0edb2bf151687155b1f199ee280376276", "parents": [ "b7ae5056c94a8191c1fd0b5697707377516c0c5d" ], "author": { "name": "Dave Airlie", "email": "airlied@redhat.com", "time": "Fri Oct 08 08:57:10 2010 +1000" }, "committer": { "name": "Dave Airlie", "email": "airlied@redhat.com", "time": "Tue Oct 19 09:49:42 2010 +1000" }, "message": "drm/ttm: add unlocked variant of new manager put node.\n\nWe need the unlocked variant for the new codepath introduced to fix the\nrace condition in master recently.\n\nSigned-off-by: Dave Airlie \u003cairlied@redhat.com\u003e\n" }, { "commit": "b7ae5056c94a8191c1fd0b5697707377516c0c5d", "tree": "394f68003ea0bc2a0c24e510a7c5b13f479ce743", "parents": [ "2126d0a4a205e2d6b763434f892524cd60f74228", "6a2a11dbea5db417d200d38dda53c30a2e5603e0" ], "author": { "name": "Dave Airlie", "email": "airlied@redhat.com", "time": "Tue Oct 19 09:48:34 2010 +1000" }, "committer": { "name": "Dave Airlie", "email": "airlied@redhat.com", "time": "Tue Oct 19 09:48:34 2010 +1000" }, "message": "Merge branch \u0027drm-fixes\u0027 of /home/airlied/kernel/linux-2.6 into drm-core-next\n\nConflicts:\n\tdrivers/gpu/drm/i915/intel_fb.c\n\tdrivers/gpu/drm/radeon/r600_blit_kms.c\n\tdrivers/gpu/drm/ttm/ttm_bo.c\n" }, { "commit": "9f0e7ff4b366d27570cbe0ffa137ed1018009114", "tree": "47c12c05cb5089ea00bbdad7715a2acaa8890ad0", "parents": [ "723bfd707a97fee06eb3ba4d3e8b4714c29a1064" ], "author": { "name": "Jesse Barnes", "email": "jbarnes@virtuousgeek.org", "time": "Thu Oct 07 16:01:14 2010 -0700" }, "committer": { "name": "Chris Wilson", "email": "chris@chris-wilson.co.uk", "time": "Fri Oct 08 10:28:21 2010 +0100" }, "message": "drm/i915: fetch eDP configuration data from the VBT\n\nWe need to use some of these values in eDP configurations, so be sure to\nfetch them and store them in the i915 private structure.\n\nSigned-off-by: Jesse Barnes \u003cjbarnes@virtuousgeek.org\u003e\nSigned-off-by: Chris Wilson \u003cchris@chris-wilson.co.uk\u003e\n" }, { "commit": "96a03fce54af40b4f0820cd729608bc32c9b8949", "tree": "91fbbaaacba4fe8562c5544460e99f3b09122e85", "parents": [ "0c8eb0dc65f5a78b252eeff6c729ba4741390e23", "a424d761a00c0233cb7734a8cd572ecd6d0362aa" ], "author": { "name": "Dave Airlie", "email": "airlied@redhat.com", "time": "Wed Oct 06 12:57:50 2010 +1000" }, "committer": { "name": "Dave Airlie", "email": "airlied@redhat.com", "time": "Wed Oct 06 12:57:50 2010 +1000" }, "message": "Merge branch \u0027drm-kdb-next\u0027 into drm-core-next\n\n* drm-kdb-next:\n drm/nouveau/kms: Avoid a hang entering KDB with VT accel on.\n radeon, kdb, kms: Save and restore the LUT on atomic KMS enter/exit\n drm, kdb, kms: Add an enter argument to mode_set_base_atomic() API\n drm/nouveau/kms: Implement KDB debug hooks for nouveau KMS.\n drm/radeon/kms: Implement KDB debug hooks for radeon KMS.\n" }, { "commit": "0c8eb0dc65f5a78b252eeff6c729ba4741390e23", "tree": "b3a64b52e9357ca8ea99966d411842659e2a27cf", "parents": [ "e6b46ee712b92db1cc2449cf4f65bc635366cad4", "d961db75ce86a84f1f04e91ad1014653ed7d9f46" ], "author": { "name": "Dave Airlie", "email": "airlied@redhat.com", "time": "Wed Oct 06 12:38:04 2010 +1000" }, "committer": { "name": "Dave Airlie", "email": "airlied@redhat.com", "time": "Wed Oct 06 12:57:11 2010 +1000" }, "message": "Merge remote branch \u0027nouveau/for-airlied\u0027 of ../drm-nouveau-next into drm-core-next\n\n[airlied - add fix for vmwgfx build]\n\n* \u0027nouveau/for-airlied\u0027 of ../drm-nouveau-next: (93 commits)\n drm/ttm: restructure to allow driver to plug in alternate memory manager\n drm/ttm: introduce utility function to free an allocated memory node\n drm/nouveau: fix thinkos in mem timing table recordlen check\n drm/nouveau: parse voltage from perf 0x40 entires\n drm/nouveau: don\u0027t use the default pll limits in table v2.1 on nv50+ cards\n drm/nv50: Fix large 3D performance regression caused by the interchannel sync patches.\n drm/nouveau: Synchronize buffer object moves in hardware.\n drm/nouveau: Use semaphores to handle inter-channel sync in hardware.\n drm/nouveau: Provide a means to have arbitrary work run on fence completion.\n drm/nouveau: Minor refactoring/cleanup of the fence code.\n drm/nouveau: Add a module option to force card POST.\n drm/nv50: prevent (IB_PUT \u003d\u003d IB_GET) for occurring unless idle\n drm/nv0x-nv4x: Leave the 0x40 bit untouched when changing CRE_LCD.\n drm/nv30-nv40: Fix postdivider mask when writing engine/memory PLLs.\n drm/nouveau: Fix perf table parsing on BMP v5.25.\n drm/nouveau: fix required mode bandwidth calculation for DP\n drm/nouveau: fix typo in c2aa91afea5f7e7ae4530fabd37414a79c03328c\n drm/nva3: split pm backend out from nv50\n drm/nouveau: run perflvl and M table scripts on mem clock change\n drm/nouveau: pass perflvl struct to clock_pre()\n ...\n" }, { "commit": "413d45d3627be4748058dea697718ed6fb88bd01", "tree": "038e5d5e80eefbb5d9771c489460653c6ef3cf79", "parents": [ "be64c2bb4731b0e6223a496eed615b816ac879ec" ], "author": { "name": "Jason Wessel", "email": "jason.wessel@windriver.com", "time": "Sun Sep 26 06:47:25 2010 -0500" }, "committer": { "name": "Dave Airlie", "email": "airlied@redhat.com", "time": "Wed Oct 06 11:50:31 2010 +1000" }, "message": "drm, kdb, kms: Add an enter argument to mode_set_base_atomic() API\n\nSome devices such as the radeon chips receive information from user\nspace which needs to be saved when executing an atomic mode set\noperation, else the user space would have to be queried again for the\ninformation.\n\nThis patch extends the mode_set_base_atomic() call to pass an argument\nto indicate if this is an entry or an exit from an atomic kernel mode\nset change. Individual drm drivers can properly save and restore\nstate accordingly.\n\nSigned-off-by: Jason Wessel \u003cjason.wessel@windriver.com\u003e\nCC: Jesse Barnes \u003cjbarnes@virtuousgeek.org\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": "30f47fc85d524d25d63da9e6d77e55ab99c6cc4a", "tree": "f57fee13e97a278c22af096caba49eabc512bbee", "parents": [ "09e2601b5a7bb817fb07df6f430289484a9a2cad" ], "author": { "name": "Thomas Hellstrom", "email": "thellstrom@vmware.com", "time": "Tue Oct 05 12:43:06 2010 +0200" }, "committer": { "name": "Dave Airlie", "email": "airlied@redhat.com", "time": "Wed Oct 06 11:29:58 2010 +1000" }, "message": "drm/vmwgfx: Add a parameter to get the max fb size\n\nThis can be used by the X server to restrict mode resolutions and size of\nroot pixmap.\n\nBump minor to announce this availability.\nBump driver date.\n\nSigned-off-by: Thomas Hellstrom \u003cthellstrom@vmware.com\u003e\nSigned-off-by: Dave Airlie \u003cairlied@redhat.com\u003e\n" }, { "commit": "02b001624f0384540299d9288fdaf37b7d37c814", "tree": "93191693002394c0d02f9b7c4661349770ad63c9", "parents": [ "7fbd721ad35f8ffec8d9a82e0e4b390cb6c9f4f7" ], "author": { "name": "Thomas Hellstrom", "email": "thellstrom@vmware.com", "time": "Tue Oct 05 12:43:02 2010 +0200" }, "committer": { "name": "Dave Airlie", "email": "airlied@redhat.com", "time": "Wed Oct 06 11:29:41 2010 +1000" }, "message": "drm: vmwgfx: Add a struct drm_file parameter to the dirty framebuffer callback\n\nThis is needed for the callback to identify the caller and take\nappropriate locks if needed.\n\nSigned-off-by: Thomas Hellstrom \u003cthellstrom@vmware.com\u003e\nSigned-off-by: Dave Airlie \u003cairlied@redhat.com\u003e\n" }, { "commit": "fb7ba2114bcd8bb51640c20bc68f89164b29b9ed", "tree": "80b4a779130a477680a72109257fb8c19d66cf22", "parents": [ "9a170caed6fce89da77852575a7eee7dbadee332", "abb295f3b3db602f91accf58b526b30b48673af1" ], "author": { "name": "Dave Airlie", "email": "airlied@redhat.com", "time": "Wed Oct 06 11:10:48 2010 +1000" }, "committer": { "name": "Dave Airlie", "email": "airlied@redhat.com", "time": "Wed Oct 06 11:10:48 2010 +1000" }, "message": "Merge remote branch \u0027korg/drm-fixes\u0027 into drm-vmware-next\n\nnecessary for some of the vmware fixes to be pushed in.\n\nConflicts:\n\tdrivers/gpu/drm/drm_gem.c\n\tdrivers/gpu/drm/i915/intel_fb.c\n\tinclude/drm/drmP.h\n" }, { "commit": "1df6a2ebd75067aefbdf07482bf8e3d0584e04ee", "tree": "3cbe04b79b00b0ba15fda1e60e2544f152741a0e", "parents": [ "e1d9694cae722d00a94fb58f901aa69c9c324a16" ], "author": { "name": "Thomas Hellstrom", "email": "thellstrom@vmware.com", "time": "Thu Sep 30 12:36:45 2010 +0200" }, "committer": { "name": "Dave Airlie", "email": "airlied@redhat.com", "time": "Wed Oct 06 09:04:43 2010 +1000" }, "message": "drm/ttm: Fix two race conditions + fix busy codepaths\n\nThis fixes a race pointed out by Dave Airlie where we don\u0027t take a buffer\nobject about to be destroyed off the LRU lists properly. It also fixes a rare\ncase where a buffer object could be destroyed in the middle of an\naccelerated eviction.\n\nThe patch also adds a utility function that can be used to prematurely\nrelease GPU memory space usage of an object waiting to be destroyed.\nFor example during eviction or swapout.\n\nThe above mentioned commit didn\u0027t queue the buffer on the delayed destroy\nlist under some rare circumstances. It also didn\u0027t completely honor the\nremove_all parameter.\n\nFixes:\nhttps://bugzilla.redhat.com/show_bug.cgi?id\u003d615505\nhttp://bugs.debian.org/cgi-bin/bugreport.cgi?bug\u003d591061\n\nSigned-off-by: Thomas Hellstrom \u003cthellstrom@vmware.com\u003e\nSigned-off-by: Dave Airlie \u003cairlied@redhat.com\u003e\n" }, { "commit": "d961db75ce86a84f1f04e91ad1014653ed7d9f46", "tree": "a827b77524fdc0c37da70936fbb0627ac7e4b492", "parents": [ "42311ff90dc8746bd81427b2ed6efda9af791b77" ], "author": { "name": "Ben Skeggs", "email": "bskeggs@redhat.com", "time": "Thu Aug 05 10:48:18 2010 +1000" }, "committer": { "name": "Ben Skeggs", "email": "bskeggs@redhat.com", "time": "Tue Oct 05 10:01:20 2010 +1000" }, "message": "drm/ttm: restructure to allow driver to plug in alternate memory manager\n\nNouveau will need this on GeForce 8 and up to account for the GPU\nreordering physical VRAM for some memory types.\n\nReviewed-by: Jerome Glisse \u003cjglisse@redhat.com\u003e\nAcked-by: Thomas Hellström \u003cthellstrom@vmware.com\u003e\nSigned-off-by: Ben Skeggs \u003cbskeggs@redhat.com\u003e\n" }, { "commit": "42311ff90dc8746bd81427b2ed6efda9af791b77", "tree": "f41e0b9703463f712e1af5a817f0c81639336a9b", "parents": [ "a845fff841b13678b2d80f10425aba87db840e4a" ], "author": { "name": "Ben Skeggs", "email": "bskeggs@redhat.com", "time": "Wed Aug 04 12:07:08 2010 +1000" }, "committer": { "name": "Ben Skeggs", "email": "bskeggs@redhat.com", "time": "Tue Oct 05 10:00:34 2010 +1000" }, "message": "drm/ttm: introduce utility function to free an allocated memory node\n\nExisting core code/drivers call drm_mm_put_block on ttm_mem_reg.mm_node\ndirectly. Future patches will modify TTM behaviour in such a way that\nttm_mem_reg.mm_node doesn\u0027t necessarily belong to drm_mm.\n\nReviewed-by: Jerome Glisse \u003cjglisse@redhat.com\u003e\nAcked-by: Thomas Hellström \u003cthellstrom@vmware.com\u003e\nSigned-off-by: Ben Skeggs \u003cbskeggs@redhat.com\u003e\n" }, { "commit": "73aa808f10effc280e6eb70267314542a7c29426", "tree": "e8c7d0e25bb5d0658c47ff0339aec9a65367bbc2", "parents": [ "6a04002bea137d2c6359228316d9c827806e475f" ], "author": { "name": "Chris Wilson", "email": "chris@chris-wilson.co.uk", "time": "Thu Sep 30 11:46:12 2010 +0100" }, "committer": { "name": "Chris Wilson", "email": "chris@chris-wilson.co.uk", "time": "Fri Oct 01 14:45:20 2010 +0100" }, "message": "drm: Move the GTT accounting to i915\n\nOnly drm/i915 does the bookkeeping that makes the information useful,\nand the information maintained is driver specific, so move it out of the\ncore and into its single user.\n\nSigned-off-by: Chris Wilson \u003cchris@chris-wilson.co.uk\u003e\nCc: Dave Airlie \u003cairlied@redhat.com\u003e\n" }, { "commit": "39b4d07aa3583ceefe73622841303a0a3e942ca1", "tree": "d42f6e782f331b1d967f50ca3a02b9e51ea88515", "parents": [ "29d08b3efddca628b0360411ab2b85f7b1723f48" ], "author": { "name": "Chris Wilson", "email": "chris@chris-wilson.co.uk", "time": "Thu Sep 30 09:10:26 2010 +0100" }, "committer": { "name": "Dave Airlie", "email": "airlied@redhat.com", "time": "Fri Oct 01 21:08:45 2010 +1000" }, "message": "drm: Hold the mutex when dropping the last GEM reference (v2)\n\nIn order to be fully threadsafe we need to check that the drm_gem_object\nrefcount is still 0 after acquiring the mutex in order to call the free\nfunction. Otherwise, we may encounter scenarios like:\n\nThread A: Thread B:\ndrm_gem_close\nunreference_unlocked\nkref_put mutex_lock\n... i915_gem_evict\n... kref_get -\u003e BUG\n... i915_gem_unbind\n... kref_put\n... i915_gem_object_free\n... mutex_unlock\nmutex_lock\ni915_gem_object_free -\u003e BUG\ni915_gem_object_unbind\nkfree\nmutex_unlock\n\nNote that no driver is currently using the free_unlocked vfunc and it is\nscheduled for removal, hasten that process.\n\nBugzilla: https://bugs.freedesktop.org/show_bug.cgi?id\u003d30454\nReported-and-Tested-by: Magnus Kessler \u003cMagnus.Kessler@gmx.net\u003e\nSigned-off-by: Chris Wilson \u003cchris@chris-wilson.co.uk\u003e\nCc: stable@kernel.org\nSigned-off-by: Dave Airlie \u003cairlied@redhat.com\u003e\n" }, { "commit": "29d08b3efddca628b0360411ab2b85f7b1723f48", "tree": "f89a8a3069ebe9828b8a08c4b123f52625bf0bc7", "parents": [ "130b9851933e6da636502cd85e1ba8f45f862e8c" ], "author": { "name": "Dave Airlie", "email": "airlied@redhat.com", "time": "Mon Sep 27 16:17:17 2010 +1000" }, "committer": { "name": "Dave Airlie", "email": "airlied@redhat.com", "time": "Fri Oct 01 09:17:44 2010 +1000" }, "message": "drm/gem: handlecount isn\u0027t really a kref so don\u0027t make it one.\n\nThere were lots of places being inconsistent since handle count\nlooked like a kref but it really wasn\u0027t.\n\nFix this my just making handle count an atomic on the object,\nand have it increase the normal object kref.\n\nNow i915/radeon/nouveau drivers can drop the normal reference on\nuserspace object creation, and have the handle hold it.\n\nThis patch fixes a memory leak or corruption on unload, because\nthe driver had no way of knowing if a handle had been actually\nadded for this object, and the fbcon object needed to know this\nto clean itself up properly.\n\nReviewed-by: Chris Wilson \u003cchris@chris-wilson.co.uk\u003e\nSigned-off-by: Dave Airlie \u003cairlied@redhat.com\u003e\n" }, { "commit": "31dfbc93923c0aaa0440b809f80ff2830c6a531a", "tree": "9527de1c84f266ea23d6009c454d7cf1d1769889", "parents": [ "73758a5d51280ca0613b8380fc07351f4d64f9c8" ], "author": { "name": "Chris Wilson", "email": "chris@chris-wilson.co.uk", "time": "Mon Sep 27 21:28:30 2010 +0100" }, "committer": { "name": "Dave Airlie", "email": "airlied@redhat.com", "time": "Tue Sep 28 09:14:34 2010 +1000" }, "message": "drm: Prune GEM vma entries\n\nHook the GEM vm open/close ops into the generic drm vm open/close so\nthat the private vma entries are created and destroy appropriately.\nFixes the leak of the drm_vma_entries during the lifetime of the filp.\n\nReported-by: Matt Mackall \u003cmpm@selenic.com\u003e\nCc: Jesse Barnes \u003cjbarnes@virtuousgeek.org\u003e\nSigned-off-by: Chris Wilson \u003cchris@chris-wilson.co.uk\u003e\nAcked-by: Jesse Barnes \u003cjbarnes@virtuousgeek.org\u003e\nCc: stable@kernel.org\nSigned-off-by: Dave Airlie \u003cairlied@redhat.com\u003e\n" } ], "next": "f459ffbdfd04edb4a8ce6eea33170eb057a5e695" }