)]}' { "log": [ { "commit": "bb6baf76f45708dbba651ed76a7ad94462f30c0b", "tree": "a58c54d10d9f35f32799d59189467607a84c1b4c", "parents": [ "9731129c5e3077d0c2da13479f91c3a07e341f70" ], "author": { "name": "Chris Wilson", "email": "chris@chris-wilson.co.uk", "time": "Tue Sep 22 14:24:13 2009 +0100" }, "committer": { "name": "Chris Wilson", "email": "chris@chris-wilson.co.uk", "time": "Wed Sep 23 01:10:38 2009 +0100" }, "message": "drm/i915: Track purged state.\n\nIn order to correctly prevent the invalid reuse of a purged buffer, we\nneed to track such events and warn the user before something bad\nhappens.\n\nSigned-off-by: Chris Wilson \u003cchris@chris-wilson.co.uk\u003e\n" }, { "commit": "9731129c5e3077d0c2da13479f91c3a07e341f70", "tree": "0864d8f90f55a65051ad1971698e8d4ea1b214dc", "parents": [ "2d7ef395b310e17c86fa6190f21ea1f2eccae5d1" ], "author": { "name": "Chris Wilson", "email": "chris@chris-wilson.co.uk", "time": "Mon Sep 21 00:22:34 2009 +0100" }, "committer": { "name": "Chris Wilson", "email": "chris@chris-wilson.co.uk", "time": "Wed Sep 23 01:10:38 2009 +0100" }, "message": "drm/i915: Remove eviction debug spam\n\nSigned-off-by: Chris Wilson \u003cchris@chris-wilson.co.uk\u003e\n" }, { "commit": "2d7ef395b310e17c86fa6190f21ea1f2eccae5d1", "tree": "a1886204a9266fb87dbcc584eb02b0c947d5f08d", "parents": [ "963b483691314ed174ceb883f2b9f13b3ef7fb33" ], "author": { "name": "Chris Wilson", "email": "chris@chris-wilson.co.uk", "time": "Sun Sep 20 23:13:10 2009 +0100" }, "committer": { "name": "Chris Wilson", "email": "chris@chris-wilson.co.uk", "time": "Wed Sep 23 01:10:37 2009 +0100" }, "message": "drm/i915: Immediately discard any backing storage for uneeded objects\n\nSigned-off-by: Chris Wilson \u003cchris@chris-wilson.co.uk\u003e\n" }, { "commit": "963b483691314ed174ceb883f2b9f13b3ef7fb33", "tree": "14547cca5a646c19b5eb670143a90b28761b9462", "parents": [ "13a05fd978a110d1efcda4a09e225aa156204ea3" ], "author": { "name": "Chris Wilson", "email": "chris@chris-wilson.co.uk", "time": "Sun Sep 20 23:03:54 2009 +0100" }, "committer": { "name": "Chris Wilson", "email": "chris@chris-wilson.co.uk", "time": "Wed Sep 23 01:10:36 2009 +0100" }, "message": "drm/i915: Do not mis-classify clean objects as purgeable\n\nWhilst cleaning up the patches for submission, I mis-classified non-dirty\nobjects as purgeable. This was causing the backing pages for those\nobjects to be evicted under memory-pressure, discarding valid and\nunreplaceable texture data.\n\nSigned-off-by: Chris Wilson \u003cchris@chris-wilson.co.uk\u003e\n" }, { "commit": "13a05fd978a110d1efcda4a09e225aa156204ea3", "tree": "bc3965f6693dba52d6f8f94379e16a76c90aa083", "parents": [ "a32808c0a1244a52038bb94a3efcdd6a64a31a5b" ], "author": { "name": "Chris Wilson", "email": "chris@chris-wilson.co.uk", "time": "Sun Sep 20 23:03:19 2009 +0100" }, "committer": { "name": "Chris Wilson", "email": "chris@chris-wilson.co.uk", "time": "Wed Sep 23 01:10:35 2009 +0100" }, "message": "drm/i915: Whitespace correction for madv\n\nSigned-off-by: Chris Wilson \u003cchris@chris-wilson.co.uk\u003e\n" }, { "commit": "a32808c0a1244a52038bb94a3efcdd6a64a31a5b", "tree": "3c139a2191687cefb7217a6245e78072c8280435", "parents": [ "9a1e2582d8d397500d5241d1543709046e0f05ff" ], "author": { "name": "Chris Wilson", "email": "chris@chris-wilson.co.uk", "time": "Sun Sep 20 21:29:47 2009 +0100" }, "committer": { "name": "Chris Wilson", "email": "chris@chris-wilson.co.uk", "time": "Wed Sep 23 01:10:21 2009 +0100" }, "message": "drm/i915: BUG_ON page refleak during unbind\n\nSigned-off-by: Chris Wilson \u003cchris@chris-wilson.co.uk\u003e\n" }, { "commit": "9a1e2582d8d397500d5241d1543709046e0f05ff", "tree": "d058191799e7d32da24bec5caa64ee69085e1921", "parents": [ "ab5ee57650165dc342a20d1213d48d585f2a72bd" ], "author": { "name": "Chris Wilson", "email": "chris@chris-wilson.co.uk", "time": "Sun Sep 20 20:16:50 2009 +0100" }, "committer": { "name": "Chris Wilson", "email": "chris@chris-wilson.co.uk", "time": "Wed Sep 23 01:05:28 2009 +0100" }, "message": "drm/i915: Search harder for a reusable object\n\nAs evict_something() is called by routines that do not repeatedly search\nagain, try harder in the initial search to find an object that matches\nthe request.\n\nSigned-off-by: Chris Wilson \u003cchris@chris-wilson.co.uk\u003e\n" }, { "commit": "ab5ee57650165dc342a20d1213d48d585f2a72bd", "tree": "7fd6e26d6a0a317df77234b8d5612f8b954070de", "parents": [ "1c5d22f76dc721f3acb7a3dadc657a221e487fb7" ], "author": { "name": "Chris Wilson", "email": "chris@chris-wilson.co.uk", "time": "Sun Sep 20 19:25:47 2009 +0100" }, "committer": { "name": "Chris Wilson", "email": "chris@chris-wilson.co.uk", "time": "Wed Sep 23 01:05:26 2009 +0100" }, "message": "drm/i915: Clean up evict from list.\n\nFirst the routine attempted to unlock a mutex it did not own along the\nerror path.\n\nSecondly the routine should never be called on any list but the inactive\none, since we attempt to unbind those objects, so fix the calling semantics.\n\nSigned-off-by: Chris Wilson \u003cchris@chris-wilson.co.uk\u003e\n" }, { "commit": "1c5d22f76dc721f3acb7a3dadc657a221e487fb7", "tree": "99a69f1be4f10d1e38af2c5ece4b5905f7a5701a", "parents": [ "74dff282237ea8c0a5df1afd8526eac4b6cee063" ], "author": { "name": "Chris Wilson", "email": "chris@chris-wilson.co.uk", "time": "Tue Aug 25 11:15:50 2009 +0100" }, "committer": { "name": "Chris Wilson", "email": "chris@chris-wilson.co.uk", "time": "Wed Sep 23 01:05:21 2009 +0100" }, "message": "drm/i915: Add tracepoints\n\nBy adding tracepoint equivalents for WATCH_BUF/EXEC we are able to monitor\nthe lifetimes of objects, requests and significant events. These events can\nthen be probed using the tracing frameworks, such as systemtap and, in\nparticular, perf.\n\nFor example to record the stack trace for every GPU stall during a run, use\n\n $ perf record -e i915:i915_gem_request_wait_begin -c 1 -g\n\nAnd\n\n $ perf report\n\nto view the results.\n\n[Updated to fix compilation issues caused.]\nCc: Arjan van de Ven \u003carjan@linux.intel.com\u003e\nCc: Ben Gamari \u003cbgamari@gmail.com\u003e\nSigned-off-by: Chris Wilson \u003cchris@chris-wilson.co.uk\u003e\n" }, { "commit": "74dff282237ea8c0a5df1afd8526eac4b6cee063", "tree": "fd6f5f1ffb281a96de3d9746e15233d538ea8555", "parents": [ "e70236a8d3d0a4c100a0b9f7d394d9bda9c56aca" ], "author": { "name": "Jesse Barnes", "email": "jbarnes@virtuousgeek.org", "time": "Mon Sep 14 15:39:40 2009 -0700" }, "committer": { "name": "Eric Anholt", "email": "eric@anholt.net", "time": "Mon Sep 21 15:47:38 2009 -0700" }, "message": "drm/i915: framebuffer compression for GM45+\n\nAdd support for framebuffer compression on GM45 and above. Removes\nsome unnecessary I915_HAS_FBC checks as well (this is now part of the\nFBC display function).\n\nSigned-off-by: Jesse Barnes \u003cjbarnes@virtuousgeek.org\u003e\nSigned-off-by: Eric Anholt \u003ceric@anholt.net\u003e\n" }, { "commit": "e70236a8d3d0a4c100a0b9f7d394d9bda9c56aca", "tree": "b9852594a97f0f2c28060aa0397868d052a5ac69", "parents": [ "8542a0bbbbda412560820b4c3b04e8399e2e99c1" ], "author": { "name": "Jesse Barnes", "email": "jbarnes@virtuousgeek.org", "time": "Mon Sep 21 10:42:27 2009 -0700" }, "committer": { "name": "Eric Anholt", "email": "eric@anholt.net", "time": "Mon Sep 21 15:47:33 2009 -0700" }, "message": "drm/i915: split display functions by chip type\n\nThis patch splits out several of the display functions into a separate\ndisplay function table to avoid tons of chipset specific if..else\nif..else if blocks all over. There are more opportunities for this\n(some noted in the structure defintition); so more cleanup patches will\nfollow.\n\nSigned-off-by: Jesse Barnes \u003cjbarnes@virtuousgeek.org\u003e\nSigned-off-by: Eric Anholt \u003ceric@anholt.net\u003e\n" }, { "commit": "8542a0bbbbda412560820b4c3b04e8399e2e99c1", "tree": "aa4f27bfdc2444aad98aceb33f99fe06069610d4", "parents": [ "cd0b9fb400ba775737bdc3874c4cbee4047e66d8" ], "author": { "name": "Chris Wilson", "email": "chris@chris-wilson.co.uk", "time": "Wed Sep 09 21:15:15 2009 +0100" }, "committer": { "name": "Jesse Barnes", "email": "jbarnes@virtuousgeek.org", "time": "Fri Sep 18 15:31:39 2009 -0700" }, "message": "drm/i915: Skip the sanity checks if the current relocation is valid\n\nIf the presumed_offset as feed to userspace and returned to the kernel\nfrom a previous execbuffer is still valid, then we do not need to rewrite\nthe relocation entry and may skip the offset sanity checks.\n\nSigned-off-by: Chris Wilson \u003cchris@chris-wilson.co.uk\u003e\nSigned-off-by: Jesse Barnes \u003cjbarnes@virtuousgeek.org\u003e\n" }, { "commit": "cd0b9fb400ba775737bdc3874c4cbee4047e66d8", "tree": "f5816a8740c8bf4b01381f9fb67b58a1ebf0c82e", "parents": [ "edb81956422c9926553bb97e3e56b849da0f4bb5" ], "author": { "name": "Chris Wilson", "email": "chris@chris-wilson.co.uk", "time": "Tue Sep 15 23:23:18 2009 +0100" }, "committer": { "name": "Jesse Barnes", "email": "jbarnes@virtuousgeek.org", "time": "Fri Sep 18 15:31:21 2009 -0700" }, "message": "drm/i915: Check that the relocation points to within the target\n\nEric noted a potential concern with the low bits not being strictly used\nas part of the absolute offset (instead part of the command stream to the\nGPU), but in practice that should not be an issue.\n\nSigned-off-by: Chris Wilson \u003cchris@chris-wilson.co.uk\u003e\nTested-by: Andy Whitcroft \u003capw@canonical.com\u003e\nCc: Eric Anholt \u003ceric@anholt.net\u003e\nCC: stable@kernel.org\nSigned-off-by: Jesse Barnes \u003cjbarnes@virtuousgeek.org\u003e\n" }, { "commit": "edb81956422c9926553bb97e3e56b849da0f4bb5", "tree": "b8592223d0c9523ec3ab164e22f1fdcb6653686a", "parents": [ "7121413f2accf14cf05b38539fb7a8be77543370" ], "author": { "name": "Jesse Barnes", "email": "jbarnes@virtuousgeek.org", "time": "Thu Sep 17 17:06:47 2009 -0700" }, "committer": { "name": "Jesse Barnes", "email": "jbarnes@virtuousgeek.org", "time": "Thu Sep 17 17:06:47 2009 -0700" }, "message": "drm/i915: correct FBC update when pipe base update occurs\n\nWe usually don\u0027t have an SAREA, and we always want to update the FBC\nstatus anyway, so move the update up above the various master/sarea\nchecks.\n\nSigned-off-by: Jesse Barnes \u003cjbarnes@virtuousgeek.org\u003e\n" }, { "commit": "7121413f2accf14cf05b38539fb7a8be77543370", "tree": "7d7abb0b44052561b5f83ed229fa7ae9f9f12c67", "parents": [ "1a133e0c9dabda23e6693cabfdc1d5106dca5fc2" ], "author": { "name": "Jesse Barnes", "email": "jbarnes@virtuousgeek.org", "time": "Thu Sep 17 15:45:26 2009 -0700" }, "committer": { "name": "Jesse Barnes", "email": "jbarnes@virtuousgeek.org", "time": "Thu Sep 17 15:45:26 2009 -0700" }, "message": "drm/i915: blacklist Acer AspireOne lid status\n\nIt reports closed when open, leading to \"no outputs found\" at startup\nunless a VGA cable is plugged in.\n\nSigned-off-by: Jesse Barnes \u003cjbarnes@virtuousgeek.org\u003e\n" }, { "commit": "1a133e0c9dabda23e6693cabfdc1d5106dca5fc2", "tree": "04e0f95f130b65204c963a8f50c1c76d9cc3f04a", "parents": [ "d660467c3ff2a0b7413e1b7a51452b34ffb49e5f" ], "author": { "name": "Jesse Barnes", "email": "jbarnes@virtuousgeek.org", "time": "Tue Sep 15 16:57:24 2009 -0700" }, "committer": { "name": "Jesse Barnes", "email": "jbarnes@virtuousgeek.org", "time": "Thu Sep 17 14:48:23 2009 -0700" }, "message": "ACPI: make ACPI button funcs no-ops if not built in\n\nYakui pointed out that we don\u0027t properly no-op the ACPI button routines\nif the button driver isn\u0027t built in. This will cause problems if ACPI\nis disabled, so provide stub functions in that case.\n\nReported-by: ykzhao \u003cyakui.zhao@intel.com\u003e\nSigned-off-by: Jesse Barnes \u003cjbarnes@virtuousgeek.org\u003e\n" }, { "commit": "d660467c3ff2a0b7413e1b7a51452b34ffb49e5f", "tree": "39c562957364ba7c23c7d91b99b5e3041dcefc32", "parents": [ "decbbcda2965fadb9fbaaf4f9e057ae554aa3cfe" ], "author": { "name": "Jesse Barnes", "email": "jbarnes@virtuousgeek.org", "time": "Fri Sep 11 12:25:56 2009 -0700" }, "committer": { "name": "Jesse Barnes", "email": "jbarnes@virtuousgeek.org", "time": "Thu Sep 17 14:46:48 2009 -0700" }, "message": "drm/i915: prevent FIFO calculation overflows on 32 bits with high dotclocks\n\nA very high dotclock (e.g. 229500kHz as reported by Anton) can cause\nthe entries_required variable to overflow, potentially leading to a\nFIFO watermark value that\u0027s too low to support the given mode. Split\nthe division across the calculation to avoid this.\n\nCc: stable@kernel.org\nReported-by: Anton Khirnov \u003cwyskas@gmail.com\u003e\nTested-by: Anton Khirnov \u003cwyskas@gmail.com\u003e\nSigned-off-by: Jesse Barnes \u003cjbarnes@virtuousgeek.org\u003e\n" }, { "commit": "decbbcda2965fadb9fbaaf4f9e057ae554aa3cfe", "tree": "2a16261bc9eb11cbab878e259dc4e03c4750a2fc", "parents": [ "b7e53aba2f0e6abf23e3f07b38b241145c33a005" ], "author": { "name": "Jaswinder Singh Rajput", "email": "jaswinder@kernel.org", "time": "Sat Sep 12 23:15:07 2009 +0530" }, "committer": { "name": "Jesse Barnes", "email": "jbarnes@virtuousgeek.org", "time": "Thu Sep 17 14:43:34 2009 -0700" }, "message": "drm/i915: intel_display.c handle latency variable efficiently\n\nBy handling latency variable efficiently we also get rid of this warning :\n\n CC [M] drivers/gpu/drm/i915/intel_display.o\ndrivers/gpu/drm/i915/intel_display.c: In function ‘igd_enable_cxsr’:\ndrivers/gpu/drm/i915/intel_display.c:1918: warning: ‘latency’ may be used uninitialized in this function\n\nSigned-off-by: Jaswinder Singh Rajput \u003cjaswinderrajput@gmail.com\u003e\nSigned-off-by: Jesse Barnes \u003cjbarnes@virtuousgeek.org\u003e\n" }, { "commit": "b7e53aba2f0e6abf23e3f07b38b241145c33a005", "tree": "8fee47bd3e4b06ca876124c5a917e3eab068cd2c", "parents": [ "07f73f6912667621276b002e33844ef283d98203" ], "author": { "name": "Zhenyu Wang", "email": "zhenyuw@linux.intel.com", "time": "Mon Sep 14 10:47:07 2009 +0800" }, "committer": { "name": "Jesse Barnes", "email": "jbarnes@virtuousgeek.org", "time": "Thu Sep 17 14:43:33 2009 -0700" }, "message": "drm/i915: remove restore in resume\n\nDon\u0027t need extra config restore like for intel_agp, which\nmight cause resume hang issue found by Alan on 845G.\n\nCc: Stable Team \u003cstable@kernel.org\u003e\nCc: Alan Stern \u003cstern@rowland.harvard.edu\u003e\nSigned-off-by: Zhenyu Wang \u003czhenyuw@linux.intel.com\u003e\nSigned-off-by: Jesse Barnes \u003cjbarnes@virtuousgeek.org\u003e\n" }, { "commit": "07f73f6912667621276b002e33844ef283d98203", "tree": "4da6860e7d4a165ef1fe233becc74005f9964ca2", "parents": [ "3ef94daae7530b4ebcd2e5f48f1028cd2d2470ba" ], "author": { "name": "Chris Wilson", "email": "chris@chris-wilson.co.uk", "time": "Mon Sep 14 16:50:30 2009 +0100" }, "committer": { "name": "Jesse Barnes", "email": "jbarnes@virtuousgeek.org", "time": "Thu Sep 17 14:43:32 2009 -0700" }, "message": "drm/i915: Improve behaviour under memory pressure\n\nDue to the necessity of having to take the struct_mutex, the i915\nshrinker can not free the inactive lists if we fail to allocate memory\nwhilst processing a batch buffer, triggering an OOM and an ENOMEM that\nis reported back to userspace. In order to fare better under such\ncircumstances we need to manually retry a failed allocation after\nevicting inactive buffers.\n\nTo do so involves 3 steps:\n1. Marking the backing shm pages as NORETRY.\n2. Updating the get_pages() callers to evict something on failure and then\n retry.\n3. Revamping the evict something logic to be smarter about the required\n buffer size and prefer to use volatile or clean inactive pages.\n\nSigned-off-by: Chris Wilson \u003cchris@chris-wilson.co.uk\u003e\nSigned-off-by: Jesse Barnes \u003cjbarnes@virtuousgeek.org\u003e\n" }, { "commit": "3ef94daae7530b4ebcd2e5f48f1028cd2d2470ba", "tree": "130f7e46f4d34b3016775c9e1980d971c475dc55", "parents": [ "31169714fc928aed4e945b959dca2bedd259b9c9" ], "author": { "name": "Chris Wilson", "email": "chris@chris-wilson.co.uk", "time": "Mon Sep 14 16:50:29 2009 +0100" }, "committer": { "name": "Jesse Barnes", "email": "jbarnes@virtuousgeek.org", "time": "Thu Sep 17 14:43:31 2009 -0700" }, "message": "drm/i915: Add ioctl to set \u0027purgeability\u0027 of objects\n\nSimilar to the madvise() concept, the application may wish to mark some\ndata as volatile. That is in the event of memory pressure the kernel is\nfree to discard such buffers safe in the knowledge that the application\ncan recreate them on demand, and is simply using these as a cache.\n\nSigned-off-by: Chris Wilson \u003cchris@chris-wilson.co.uk\u003e\nSigned-off-by: Jesse Barnes \u003cjbarnes@virtuousgeek.org\u003e\n" }, { "commit": "31169714fc928aed4e945b959dca2bedd259b9c9", "tree": "3cd6aa12bd7da1e4202607597b3baf9a07f48290", "parents": [ "725ceaa08a98fcdb1ec1c302700e33b629aece4b" ], "author": { "name": "Chris Wilson", "email": "chris@chris-wilson.co.uk", "time": "Mon Sep 14 16:50:28 2009 +0100" }, "committer": { "name": "Jesse Barnes", "email": "jbarnes@virtuousgeek.org", "time": "Thu Sep 17 14:43:31 2009 -0700" }, "message": "drm/i915: Register a shrinker to free inactive lists under memory pressure\n\nThis should help GEM handle memory pressure sitatuions more gracefully.\n\nSigned-off-by: Chris Wilson \u003cchris@chris-wilson.co.uk\u003e\nSigned-off-by: Jesse Barnes \u003cjbarnes@virtuousgeek.org\u003e\n" }, { "commit": "725ceaa08a98fcdb1ec1c302700e33b629aece4b", "tree": "1c322e46b6d10a4eda7eb73d8f73cc58c311b2be", "parents": [ "e67b8ce1b59006ba41245838db60b6fcda365ba8" ], "author": { "name": "Chris Wilson", "email": "chris@chris-wilson.co.uk", "time": "Mon Sep 14 16:50:27 2009 +0100" }, "committer": { "name": "Jesse Barnes", "email": "jbarnes@virtuousgeek.org", "time": "Thu Sep 17 14:43:30 2009 -0700" }, "message": "drm/i915: Include buffer size and dirty state in debugfs lists\n\nSigned-off-by: Chris Wilson \u003cchris@chris-wilson.co.uk\u003e\nSigned-off-by: Jesse Barnes \u003cjbarnes@virtuousgeek.org\u003e\n" }, { "commit": "e67b8ce1b59006ba41245838db60b6fcda365ba8", "tree": "ea28aac9dc6468cf3fe2d76d045ce86c0a4baa97", "parents": [ "4960aaca14010b9ff92e5726dd178cbd6805d412" ], "author": { "name": "Chris Wilson", "email": "chris@chris-wilson.co.uk", "time": "Mon Sep 14 16:50:26 2009 +0100" }, "committer": { "name": "Jesse Barnes", "email": "jbarnes@virtuousgeek.org", "time": "Thu Sep 17 14:43:29 2009 -0700" }, "message": "drm/i915: Remove stored gtt_alignment\n\nThere is no need to store the gtt_alignment as it is either explicitly\nset according to the hardware requirements (e.g. scanout) or the\nminimum alignment is computed on demand.\n\nSigned-off-by: Chris Wilson \u003cchris@chris-wilson.co.uk\u003e\nSigned-off-by: Jesse Barnes \u003cjbarnes@virtuousgeek.org\u003e\n" }, { "commit": "4960aaca14010b9ff92e5726dd178cbd6805d412", "tree": "7795fc2e101ff49d9ad99386c1d6a8d0c1263bae", "parents": [ "c1a1cdc159e211f045290f61ac95092e9708f5bc" ], "author": { "name": "Chris Wilson", "email": "chris@chris-wilson.co.uk", "time": "Mon Sep 14 16:50:25 2009 +0100" }, "committer": { "name": "Jesse Barnes", "email": "jbarnes@virtuousgeek.org", "time": "Thu Sep 17 14:43:28 2009 -0700" }, "message": "drm/i915: Add buffer to inactive list immediately during fault\n\nIf we failed to set the domain, the buffer was no longer being tracked\non any list.\n\nCc: stable@kernel.org\nSigned-off-by: Chris Wilson \u003cchris@chris-wilson.co.uk\u003e\nSigned-off-by: Jesse Barnes \u003cjbarnes@virtuousgeek.org\u003e\n" }, { "commit": "c1a1cdc159e211f045290f61ac95092e9708f5bc", "tree": "79ce3088cfc82f0a93a5d315fcd380d274c7dd08", "parents": [ "06891e27a9b5dba5268bb80e41a283f51335afe7" ], "author": { "name": "Jesse Barnes", "email": "jbarnes@virtuousgeek.org", "time": "Wed Sep 16 15:05:00 2009 -0700" }, "committer": { "name": "Jesse Barnes", "email": "jbarnes@virtuousgeek.org", "time": "Thu Sep 17 14:43:27 2009 -0700" }, "message": "drm/i915: fix startup hang on some non-mobile platforms\n\nDue to a bogus FBC support check and failing to check for FBC support\nin the right places, mode setting on non-mobile platforms could fail\nand hang in the FBC disable routine. Fix it up.\n\nThis fix highlights the need for cleanups in this area (function\npointers and better feature support checks). Patches for that to\nfollow.\n\nTested-by: Kenny Graunke \u003ckenny@whitecape.org\u003e\nSigned-off-by: Jesse Barnes \u003cjbarnes@virtuousgeek.org\u003e\n" }, { "commit": "06891e27a9b5dba5268bb80e41a283f51335afe7", "tree": "252e7a4a096249c1b3db037c27631290bcfa7e8f", "parents": [ "ba1234d17b3b1fe7087defb191a3c705f208aca6" ], "author": { "name": "Jesse Barnes", "email": "jbarnes@virtuousgeek.org", "time": "Mon Sep 14 10:58:48 2009 -0700" }, "committer": { "name": "Jesse Barnes", "email": "jbarnes@virtuousgeek.org", "time": "Thu Sep 17 14:42:54 2009 -0700" }, "message": "drm/i915: fix suspend/resume breakage in lid notifier\n\nWe now unconditionally restore the mode at lid open time since some\nplatforms turn off the panel, pipes or other display elements when the\nlid is closed. There\u0027s a problem with doing this at resume time\nhowever.\n\nAt resume time, we\u0027ll get a lid event, but restoring the mode at that\ntime may not be safe (e.g. if we get the lid event before global state\nhas been restored), so check the suspended state and make sure our\nrestore is locked against other mode updates.\n\nTested-by: Ben Gamari \u003cbgamari.foss@gmail.com\u003e\nSigned-off-by: Jesse Barnes \u003cjbarnes@virtuousgeek.org\u003e\n" }, { "commit": "ba1234d17b3b1fe7087defb191a3c705f208aca6", "tree": "1d26be1196eeef15dda3e5386cd021d94249f0be", "parents": [ "f316a42cc49eca73b33d85feb6177e32431747ff" ], "author": { "name": "Ben Gamari", "email": "bgamari.foss@gmail.com", "time": "Mon Sep 14 17:48:47 2009 -0400" }, "committer": { "name": "Jesse Barnes", "email": "jbarnes@virtuousgeek.org", "time": "Thu Sep 17 14:36:46 2009 -0700" }, "message": "drm/i915: Make dev_priv-\u003emm.wedged an atomic_t\n\nThere is a very real possibility that multiple CPUs will notice that the\nGPU is wedged. This introduces all sorts of potential race conditions.\nMake the wedged flag atomic to mitigate this risk.\n\nSigned-off-by: Ben Gamari \u003cbgamari.foss@gmail.com\u003e\nSigned-off-by: Jesse Barnes \u003cjbarnes@virtuousgeek.org\u003e\n" }, { "commit": "f316a42cc49eca73b33d85feb6177e32431747ff", "tree": "d335898e54b08bb04304a1fa462cb50744665fe1", "parents": [ "11ed50ec2a316928c2bacc1149bded86c6a96068" ], "author": { "name": "Ben Gamari", "email": "bgamari.foss@gmail.com", "time": "Mon Sep 14 17:48:46 2009 -0400" }, "committer": { "name": "Jesse Barnes", "email": "jbarnes@virtuousgeek.org", "time": "Thu Sep 17 14:36:30 2009 -0700" }, "message": "drm/i915: Hookup chip reset in error handler\n\nThis patch uses the previously introduced chip reset logic to reset the\nchip when an error event is detected.\n\nSigned-off-by: Ben Gamari \u003cbgamari.foss@gmail.com\u003e\nSigned-off-by: Jesse Barnes \u003cjbarnes@virtuousgeek.org\u003e\n" }, { "commit": "11ed50ec2a316928c2bacc1149bded86c6a96068", "tree": "b363e00c943a34a04c1d48ec747d0a41f920e567", "parents": [ "f65d94211e2bcba17faf05a6a3809af0e4217767" ], "author": { "name": "Ben Gamari", "email": "bgamari.foss@gmail.com", "time": "Mon Sep 14 17:48:45 2009 -0400" }, "committer": { "name": "Jesse Barnes", "email": "jbarnes@virtuousgeek.org", "time": "Thu Sep 17 14:36:22 2009 -0700" }, "message": "drm/i915: Implement GPU reset on i965\n\nThis patch puts in place the machinery to attempt to reset the GPU. This\nwill be used when attempting to recover from a GPU hang.\n\nSigned-off-by: Owain G. Ainsworth \u003coga@openbsd.org\u003e\nSigned-off-by: Ben Gamari \u003cbgamari.foss@gmail.com\u003e\nSigned-off-by: Jesse Barnes \u003cjbarnes@virtuousgeek.org\u003e\n" }, { "commit": "f65d94211e2bcba17faf05a6a3809af0e4217767", "tree": "a040777b0311b5c5a7a26f64c7d8ae9a6ac872f1", "parents": [ "22be172423b0007a02a06d70db8aeb4d9e64c6b3" ], "author": { "name": "Ben Gamari", "email": "bgamari.foss@gmail.com", "time": "Mon Sep 14 17:48:44 2009 -0400" }, "committer": { "name": "Jesse Barnes", "email": "jbarnes@virtuousgeek.org", "time": "Thu Sep 17 14:36:01 2009 -0700" }, "message": "drm/i915: Add hangcheck timer\n\nWe set a periodic timer to check on the GPU, resetting it every time a\nbatch is completed. If the timer elapses, we check acthd. If acthd\nhasn\u0027t changed in two timer periods, we assume the chip is wedged.\n\nThis is implemented in such a way that it leaves the option open to\nemploy adaptive timer intervals in the future. One could wait until\nseveral timer periods have elapsed before declaring the chip dead. If\nthe chip comes back after several periods but before the \"dead\"\nthreshold, the timer interval or dead threshold could be raised.\n\nIt is important to note that while checking for active requests, we need\nto account for the fact that requests are removed from the list (i.e.\nretired) in a deferred work queue handler. This means that merely\nchecking for an empty request_list is insufficient; the list could be\nnon-empty yet the GPU still idle, causing the hangcheck timer to\nincorrectly mark the GPU as wedged (it took me a while to figure that\nout---sigh...)\n\nSigned-off-by: Ben Gamari \u003cbgamari.foss@gmail.com\u003e\nSigned-off-by: Jesse Barnes \u003cjbarnes@virtuousgeek.org\u003e\n" }, { "commit": "22be172423b0007a02a06d70db8aeb4d9e64c6b3", "tree": "c94f5cf0576193becc693e3719ac42973ab81ec5", "parents": [ "1341d655ddea37f307736af7030a3ef7c5648c31" ], "author": { "name": "Ben Gamari", "email": "bgamari.foss@gmail.com", "time": "Mon Sep 14 17:48:43 2009 -0400" }, "committer": { "name": "Jesse Barnes", "email": "jbarnes@virtuousgeek.org", "time": "Thu Sep 17 14:35:11 2009 -0700" }, "message": "drm/i915: make i915_seqno_passed non-static\n\nWe\u0027ll need it in i915_irq.c for checking whether there are outstanding\nrequests. Also, the function really ought to return a bool, not an int.\n\nSigned-off-by: Ben Gamari \u003cbgamari.foss@gmail.com\u003e\nSigned-off-by: Jesse Barnes \u003cjbarnes@virtuousgeek.org\u003e\n" }, { "commit": "1341d655ddea37f307736af7030a3ef7c5648c31", "tree": "f02820220000990ce0a798757c2651902871c50c", "parents": [ "ffed1d0920d180962469feb5e14bab7af2e29137" ], "author": { "name": "Ben Gamari", "email": "bgamari.foss@gmail.com", "time": "Mon Sep 14 17:48:42 2009 -0400" }, "committer": { "name": "Jesse Barnes", "email": "jbarnes@virtuousgeek.org", "time": "Thu Sep 17 14:34:27 2009 -0700" }, "message": "drm/i915: Refactor save/restore code\n\nWe move the display-specific code into it\u0027s own functions, called\nfrom the general GPU state save/restore functions. This will be needed\nlater by the GPU reset code.\n\nSigned-off-by: Ben Gamari \u003cbgamari.foss@gmail.com\u003e\nSigned-off-by: Jesse Barnes \u003cjbarnes@virtuousgeek.org\u003e\n" }, { "commit": "ffed1d0920d180962469feb5e14bab7af2e29137", "tree": "71cd35575969ed5e288fd9069afad79defc27059", "parents": [ "078a033f45471c44befd72ccacf3f31d75299dba" ], "author": { "name": "Ben Gamari", "email": "bgamari.foss@gmail.com", "time": "Mon Sep 14 17:48:41 2009 -0400" }, "committer": { "name": "Jesse Barnes", "email": "jbarnes@virtuousgeek.org", "time": "Thu Sep 17 14:33:52 2009 -0700" }, "message": "drm/i915: Check whether chip is wedged in i915_wait_request()\n\ni915_wait_request() only checks mm.wedged after it interacts with the\nhardware, generally causing the driver to lock up waiting for a wedged\nchip. Make sure we check mm.wedged as the first thing we do.\n\nReported-by: Chris Wilson \u003cchris@chris-wilson.co.uk\u003e\nSigned-off-by: Ben Gamari \u003cbgamari.foss@gmail.com\u003e\nSigned-off-by: Jesse Barnes \u003cjbarnes@virtuousgeek.org\u003e\n" }, { "commit": "078a033f45471c44befd72ccacf3f31d75299dba", "tree": "dc5b9c868684b28040fdafaeeef57cb6489feb8e", "parents": [ "8dd81a381e8886129c0923f1fe22ff5ca36ae8da" ], "author": { "name": "Li Peng", "email": "peng.li@linux.intel.com", "time": "Tue Sep 15 13:03:36 2009 +0800" }, "committer": { "name": "Jesse Barnes", "email": "jbarnes@virtuousgeek.org", "time": "Thu Sep 17 14:32:08 2009 -0700" }, "message": "drm/i915: fix opregion backlight chip detect and range\n\nBLC_PWM_CTL2 is for 965+ only, so add device model check for\nlegacy backlight control.\n\nFor native backlight control, it maps the backlight value (0~255)\nin opregion ASLE[BCLP] to backlight duty cycle (0~max_backlight)\nand set into control register.\n\nIt also add support for IGD device, which follows opregion spec.\n\nSigned-off-by: Li Peng \u003cpeng.li@intel.com\u003e\nSigned-off-by: Jesse Barnes \u003cjbarnes@virtuousgeek.org\u003e\n" }, { "commit": "8dd81a381e8886129c0923f1fe22ff5ca36ae8da", "tree": "6b0616a3e01f13789aaaf077585c6b3a82149603", "parents": [ "730915d65f9e763de9dc26c5f1b8abaae775b243" ], "author": { "name": "Zhenyu Wang", "email": "zhenyuw@linux.intel.com", "time": "Sat Sep 19 14:54:09 2009 +0800" }, "committer": { "name": "Jesse Barnes", "email": "jbarnes@virtuousgeek.org", "time": "Thu Sep 17 14:31:10 2009 -0700" }, "message": "drm/i915: Fix LVDS panel fitting on Arrandale\n\nArrandale has new window based method for panel fitting.\nThis one enables full screen aspect scaling on LVDS. It fixes\nstandard mode display failure on LVDS for Arrandale.\n\nCc: Stable Team \u003cstable@kernel.org\u003e\nSigned-off-by: Zhenyu Wang \u003czhenyuw@linux.intel.com\u003e\nSigned-off-by: Jesse Barnes \u003cjbarnes@virtuousgeek.org\u003e\n" }, { "commit": "730915d65f9e763de9dc26c5f1b8abaae775b243", "tree": "9b126607fd8a2eb0b475187c8e9d541f3af91201", "parents": [ "339e5a4c78041cd7b473ddf0a81eb06a131127bb" ], "author": { "name": "Zhenyu Wang", "email": "zhenyuw@linux.intel.com", "time": "Sat Sep 19 14:54:08 2009 +0800" }, "committer": { "name": "Jesse Barnes", "email": "jbarnes@virtuousgeek.org", "time": "Thu Sep 17 14:31:06 2009 -0700" }, "message": "drm/i915: Remove DAC disable in CRT force detect on IGDNG\n\nThis is not required on newer stepping hardware to get\nreliable force detect status. Removing this fixes screen\nblank flicker in CRT detect on IGDNG.\n\nCc: Stable Team \u003cstable@kernel.org\u003e\nSigned-off-by: Zhenyu Wang \u003czhenyuw@linux.intel.com\u003e\nSigned-off-by: Jesse Barnes \u003cjbarnes@virtuousgeek.org\u003e\n" }, { "commit": "339e5a4c78041cd7b473ddf0a81eb06a131127bb", "tree": "23ecc02965faad2a013ab2115b46207d56652b0f", "parents": [ "b09aea7fb38f328c02e9f9b79617cabed02455e4" ], "author": { "name": "Zhenyu Wang", "email": "zhenyuw@linux.intel.com", "time": "Sat Sep 19 14:54:07 2009 +0800" }, "committer": { "name": "Jesse Barnes", "email": "jbarnes@virtuousgeek.org", "time": "Thu Sep 17 14:31:01 2009 -0700" }, "message": "drm/i915: Fix SSC frequence for IGDNG\n\nIGDNG LVDS SSC uses 120Mhz freq. This fixes one\n1600x900 LVDS panel black issue on IGDNG with SSC enabled.\n\nCc: Stable Team \u003cstable@kernel.org\u003e\nSigned-off-by: Zhenyu Wang \u003czhenyuw@linux.intel.com\u003e\nSigned-off-by: Jesse Barnes \u003cjbarnes@virtuousgeek.org\u003e\n" }, { "commit": "b09aea7fb38f328c02e9f9b79617cabed02455e4", "tree": "aa85ac56e90308aed425eb1a40016639ca8eab13", "parents": [ "6f465a8925016633891f5bf030f9c37036529b39" ], "author": { "name": "Zhenyu Wang", "email": "zhenyuw@linux.intel.com", "time": "Sat Sep 19 14:54:06 2009 +0800" }, "committer": { "name": "Jesse Barnes", "email": "jbarnes@virtuousgeek.org", "time": "Thu Sep 17 14:30:14 2009 -0700" }, "message": "drm/i915: Fix typo for wrong LVDS clock setting on IGDNG\n\nNew register for PCH LVDS on IGDNG should be used.\nThis is a copy-n-paste typo. This fixes possible dual\nchannel LVDS panel failure on IGDNG.\n\nCc: Stable Team \u003cstable@kernel.org\u003e\nSigned-off-by: Zhenyu Wang \u003czhenyuw@linux.intel.com\u003e\nSigned-off-by: Jesse Barnes \u003cjbarnes@virtuousgeek.org\u003e\n" }, { "commit": "6f465a8925016633891f5bf030f9c37036529b39", "tree": "7c5e6075366efd8b79ffaac5de217c8b4323e061", "parents": [ "7e61615857c6fb3afbcb43f5c4e97511a923f5a8" ], "author": { "name": "Jesse Barnes", "email": "jbarnes@virtuousgeek.org", "time": "Thu Sep 17 14:22:44 2009 -0700" }, "committer": { "name": "Jesse Barnes", "email": "jbarnes@virtuousgeek.org", "time": "Thu Sep 17 14:22:44 2009 -0700" }, "message": "drm/i915: fix typo in compressed buffer setup\n\nWe want the compressed line length buffer address, not the framebuffer\naddress.\n\nSigned-off-by: Jesse Barnes \u003cjbarnes@virtuousgeek.org\u003e\n" }, { "commit": "7e61615857c6fb3afbcb43f5c4e97511a923f5a8", "tree": "a837ceb558c806ea68314b34a41c1685d15bc1ee", "parents": [ "e517a5e97080bbe52857bd0d7df9b66602d53c4d" ], "author": { "name": "Chris Wilson", "email": "chris@chris-wilson.co.uk", "time": "Thu Sep 10 08:53:04 2009 +0100" }, "committer": { "name": "Eric Anholt", "email": "eric@anholt.net", "time": "Fri Sep 11 11:40:39 2009 -0700" }, "message": "drm/i915: Only destroy a constructed mmap offset\n\ndrm_ht_remove_item() does not handle removing an absent item and the hlist\nin particular is incorrectly initialised. The easy remedy is simply skip\ncalling i915_gem_free_mmap_offset() unless we have actually created the\noffset and associated ht entry.\n\nThis also fixes the mishandling of a partially constructed offset which\nleaves pointers initialized after freeing them along the\ni915_gem_create_mmap_offset() error paths.\n\nIn particular this should fix the oops found here:\nhttps://bugs.launchpad.net/ubuntu/+source/xserver-xorg-video-intel/+bug/415357/comments/8\n\nSigned-off-by: Chris Wilson \u003cchris@chris-wilson.co.uk\u003e\nSigned-off-by: Eric Anholt \u003ceric@anholt.net\u003e\nCc: stable@kernel.org\n" }, { "commit": "e517a5e97080bbe52857bd0d7df9b66602d53c4d", "tree": "814e9345a91dba619f1c1ea4da9944e313490442", "parents": [ "8082400327d8d2ca54254b593644942bed0edd25" ], "author": { "name": "Eric Anholt", "email": "eric@anholt.net", "time": "Thu Sep 10 17:48:48 2009 -0700" }, "committer": { "name": "Eric Anholt", "email": "eric@anholt.net", "time": "Fri Sep 11 11:39:23 2009 -0700" }, "message": "agp/intel: Fix the pre-9xx chipset flush.\n\nEver since we enabled GEM, the pre-9xx chipsets (particularly 865) have had\nserious stability issues. Back in May a wbinvd was added to the DRM to\nwork around much of the problem. Some failure remained -- easily visible\nby dragging a window around on an X -retro desktop, or by looking at bugzilla.\n\nThe chipset flush was on the right track -- hitting the right amount of\nmemory, and it appears to be the only way to flush on these chipsets, but the\nflush page was mapped uncached. As a result, the writes trying to clear the\nwriteback cache ended up bypassing the cache, and not flushing anything! The\nwbinvd would flush out other writeback data and often cause the data we wanted\nto get flushed, but not always. By removing the setting of the page to UC\nand instead just clflushing the data we write to try to flush it, we get the\ndesired behavior with no wbinvd.\n\nThis exports clflush_cache_range(), which was laying around and happened to\nbasically match the code I was otherwise going to copy from the DRM.\n\nSigned-off-by: Eric Anholt \u003ceric@anholt.net\u003e\nSigned-off-by: Brice Goglin \u003cBrice.Goglin@ens-lyon.org\u003e\nCc: stable@kernel.org\n" }, { "commit": "8082400327d8d2ca54254b593644942bed0edd25", "tree": "43a32ac4e56e985341e2109d2c4d545d3d6df6cb", "parents": [ "06324194eee97a51b5f172270df49ec39192d6cc" ], "author": { "name": "Jesse Barnes", "email": "jbarnes@virtuousgeek.org", "time": "Thu Sep 10 15:28:06 2009 -0700" }, "committer": { "name": "Eric Anholt", "email": "eric@anholt.net", "time": "Thu Sep 10 19:46:07 2009 -0700" }, "message": "drm/i915: framebuffer compression for pre-GM45\n\nThis patch adds framebuffer compression (good for about ~0.5W power\nsavings in the best case) support for pre-GM45 chips. GM45+ have a new,\nmore flexible FBC scheme that will be added in a separate patch.\n\nFBC can\u0027t always be enabled: the compressed buffer must be physically\ncontiguous and reside in stolen space. So if you have a large display\nand a small amount of stolen memory, you may not be able to take\nadvantage of FBC. In some cases, a BIOS setting controls how much\nstolen space is available. Increasing this to 8 or 16M can help.\n\nSigned-off-by: Jesse Barnes \u003cjbarnes@virtuousgeek.org\u003e\nSigned-off-by: Eric Anholt \u003ceric@anholt.net\u003e\n" }, { "commit": "06324194eee97a51b5f172270df49ec39192d6cc", "tree": "a4a550cbaa909acfe09e40cc8e78e6204a94c23b", "parents": [ "b42d4c5c6a872815d711e5d51a600f5122c38eee" ], "author": { "name": "Jesse Barnes", "email": "jbarnes@virtuousgeek.org", "time": "Thu Sep 10 15:28:05 2009 -0700" }, "committer": { "name": "Eric Anholt", "email": "eric@anholt.net", "time": "Thu Sep 10 16:10:31 2009 -0700" }, "message": "drm/i915: generate a KMS uevent at lid open/close time\n\nWith all the other lid pieces in place, it\u0027s easy to generate a uevent\nfor the LVDS connector just like we do for other outputs. Should make\nlid open/close fit in with the rest of a userland based output\nreconfiguration scheme.\n\nSigned-off-by: Jesse Barnes \u003cjbarnes@virtuousgeek.org\u003e\nSigned-off-by: Eric Anholt \u003ceric@anholt.net\u003e\n" }, { "commit": "b42d4c5c6a872815d711e5d51a600f5122c38eee", "tree": "3cf56dff583ec83110d6d20466892642e71a9699", "parents": [ "c1c7af60892070e4b82ad63bbfb95ae745056de0" ], "author": { "name": "Jesse Barnes", "email": "jbarnes@virtuousgeek.org", "time": "Thu Sep 10 15:28:04 2009 -0700" }, "committer": { "name": "Eric Anholt", "email": "eric@anholt.net", "time": "Thu Sep 10 16:10:21 2009 -0700" }, "message": "drm/i915: use ACPI LID status for LVDS -\u003edetect hook\n\nWe can\u0027t load or hotplug detect LVDS like we can other outputs, but if\nthere\u0027s a lid device present we can use it as a proxy. This allows the\nLFP state to be determined at -\u003edetect time, making configurations\nrequiring manual intervention today \"just work\" assuming the lid device\nstatus is correct.\n\nSigned-off-by: Jesse Barnes \u003cjbarnes@virtuousgeek.org\u003e\nSigned-off-by: Eric Anholt \u003ceric@anholt.net\u003e\n" }, { "commit": "c1c7af60892070e4b82ad63bbfb95ae745056de0", "tree": "cac0b3068c8c85319f54d8ca8f43af040a6666c9", "parents": [ "7e12715ecc47a8a59154afe2746e48998225bb69" ], "author": { "name": "Jesse Barnes", "email": "jbarnes@virtuousgeek.org", "time": "Thu Sep 10 15:28:03 2009 -0700" }, "committer": { "name": "Eric Anholt", "email": "eric@anholt.net", "time": "Thu Sep 10 16:10:00 2009 -0700" }, "message": "drm/i915: force mode set at lid open time\n\nSome laptop platforms will disable pipes and/or planes at lid close time\nand not restore them when the lid is opened again. So catch the lid\nevent, and if the lid was opened, force a mode restore.\n\nFixes fdo bug #21230.\n\nAcked-by: Matthew Garrett \u003cmjg@redhat.com\u003e\nSigned-off-by: Jesse Barnes \u003cjbarnes@virtuousgeek.org\u003e\nSigned-off-by: Eric Anholt \u003ceric@anholt.net\u003e\n" }, { "commit": "7e12715ecc47a8a59154afe2746e48998225bb69", "tree": "308e53b58027772bd114585f57c4180eb89239a7", "parents": [ "af729a26ccc3ff9ad834a5e96f455aab20f176cd" ], "author": { "name": "Jesse Barnes", "email": "jbarnes@virtuousgeek.org", "time": "Thu Sep 10 15:28:02 2009 -0700" }, "committer": { "name": "Eric Anholt", "email": "eric@anholt.net", "time": "Thu Sep 10 16:09:11 2009 -0700" }, "message": "ACPI button: provide lid status functions\n\nSome drivers need to know when a lid event occurs and get the current\nstatus. This can be useful for when a platform firmware clobbers some\nhardware state at lid time, and a driver needs to restore things when\nthe lid is opened again.\n\nAcked-by: Matthew Garrett \u003cmjg59@srcf.ucam.org\u003e\nSigned-off-by: Jesse Barnes \u003cjbarnes@virtuousgeek.org\u003e\nSigned-off-by: Eric Anholt \u003ceric@anholt.net\u003e\n" }, { "commit": "af729a26ccc3ff9ad834a5e96f455aab20f176cd", "tree": "5eb23be4a94d1ffa81afbe5ec3adc186da7fa83f", "parents": [ "bb66c5122b4300b475b585fffb811311f39f5431" ], "author": { "name": "Li Peng", "email": "peng.li@intel.com", "time": "Tue Aug 25 10:43:01 2009 +0800" }, "committer": { "name": "Eric Anholt", "email": "eric@anholt.net", "time": "Thu Sep 10 11:32:49 2009 -0700" }, "message": "Add G33 series in VGA hotplug support category\n\nTest on the IGD chip, which is a G33-like graphic device.\n\nSigned-off-by: Li Peng \u003cpeng.li@intel.com\u003e\nSigned-off-by: Eric Anholt \u003ceric@anholt.net\u003e\n" }, { "commit": "bb66c5122b4300b475b585fffb811311f39f5431", "tree": "0d356b75e3d0e9002bf40df02b400bc137e8b4f3", "parents": [ "e270846fa7c350712553d767e61cf8b3bbfbd58a" ], "author": { "name": "Zhao Yakui", "email": "yakui.zhao@intel.com", "time": "Thu Sep 10 15:45:49 2009 +0800" }, "committer": { "name": "Eric Anholt", "email": "eric@anholt.net", "time": "Thu Sep 10 11:31:04 2009 -0700" }, "message": "drm/i915: Write zero to DPLL_MD Reg for non-SDVO output\n\nWhen the output device is LVDS, maybe the pixel clock of adjusted_mode will be\nless than that in mode. In such case it will set the incorrect multipler factor\nin DPLL_MD register.\nSo the dpll_md_reg will be reset when the output type is non-SDVO\n\nhttps://bugs.freedesktop.org/show_bug.cgi?id\u003d22761\n\nSigned-off-by: Zhao Yakui \u003cyakui.zhao@intel.com\u003e\nReviewd-by: Eric Anholt \u003ceric@anholt.net\u003e\nSigned-off-by: Eric Anholt \u003ceric@anholt.net\u003e\n" }, { "commit": "e270846fa7c350712553d767e61cf8b3bbfbd58a", "tree": "36f52b86559ac608fe7ed6eb4033d31ba3ce301e", "parents": [ "d0cbde93cc29a250de97ccb63d98da5bd1cbcfcd" ], "author": { "name": "Zhao Yakui", "email": "yakui.zhao@intel.com", "time": "Thu Sep 10 15:45:48 2009 +0800" }, "committer": { "name": "Eric Anholt", "email": "eric@anholt.net", "time": "Thu Sep 10 11:30:54 2009 -0700" }, "message": "drm/i915: Add the missing clone_mask for SDVO-VGA(RGB1)\n\nAdd the missing clone_mask for SDVO-VGA(RGB1)\n\nSigned-off-by: Zhao Yakui \u003cyakui.zhao@intel.com\u003e\nSigned-off-by: Eric Anholt \u003ceric@anholt.net\u003e\n" }, { "commit": "d0cbde93cc29a250de97ccb63d98da5bd1cbcfcd", "tree": "56ff1ca3a69c1fe8ff2053a558fb057d221b4ed2", "parents": [ "b9219c5e8be99ddd697e3f9b61069d7ea477ddec" ], "author": { "name": "Zhao Yakui", "email": "yakui.zhao@intel.com", "time": "Thu Sep 10 15:45:47 2009 +0800" }, "committer": { "name": "Eric Anholt", "email": "eric@anholt.net", "time": "Thu Sep 10 11:30:32 2009 -0700" }, "message": "drm/i915: Add the brightness property for SDVO-LVDS\n\nWhen the sdvo device is detected as SDVO-LVDS, we will check whether the\nbrightness is supported by issue SDVO enhancement command.\nIf it is supported, we will add the brightness property and then brightness\ncan be adjusted.\n\nSigned-off-by: Zhao Yakui \u003cyakui.zhao@intel.com\u003e\nSigned-off-by: Eric Anholt \u003ceric@anholt.net\u003e\n" }, { "commit": "b9219c5e8be99ddd697e3f9b61069d7ea477ddec", "tree": "7e6f6d5d5831350780eeca27901fd77abcb86809", "parents": [ "5323fd042f89164927ee8c311f0a975e8c846412" ], "author": { "name": "Zhao Yakui", "email": "yakui.zhao@intel.com", "time": "Thu Sep 10 15:45:46 2009 +0800" }, "committer": { "name": "Eric Anholt", "email": "eric@anholt.net", "time": "Thu Sep 10 11:28:57 2009 -0700" }, "message": "drm/i915: Add the enhancement property for SDVO-TV\n\nWhen the sdvo device is detected as SDVO-TV, we will check whether the\nsepecific picture enhancement is supported. If it is supported, we will\nadd the corresponnding property for SDVO-TV. We will add the following\nproperty for the SDVO-TV enhancements if they are supported:\n * Contrast/Brightness/Saturation/Hue.\n * left/right/top/bottom margin: This is implemented by using the\n horizontal/vertical overscan enhancements. When the overscan\n enhancements are supported, the above properties will be added. This is\n to be compatible with what we have done in integrated-TV.\n * horizontal pos/vertical pos.\n\nhttp://bugs.freedesktop.org/show_bug.cgi?id\u003d22891\n\nSigned-off-by: Zhao Yakui \u003cyakui.zhao@intel.com\u003e\nSigned-off-by: Eric Anholt \u003ceric@anholt.net\u003e\n" }, { "commit": "5323fd042f89164927ee8c311f0a975e8c846412", "tree": "a5328f9ce2dad76875652b0dfbc8f7530c5e6013", "parents": [ "7839c5d5519b6d9e2ccf3cdbf1c39e3817ad0835" ], "author": { "name": "Eric Anholt", "email": "eric@anholt.net", "time": "Wed Sep 09 11:50:45 2009 -0700" }, "committer": { "name": "Eric Anholt", "email": "eric@anholt.net", "time": "Wed Sep 09 12:52:05 2009 -0700" }, "message": "drm/i915: Zap mmaps of objects before unbinding them from the GTT.\n\nOtherwise, some other userland writing into its buffer may race to land\nwrites either after the CPU thinks it\u0027s got a coherent view, or after its\nGTT entries have been redirected to point at the scratch page. Either\nresult is unpleasant.\n\nSigned-off-by: Eric Anholt \u003ceric@anholt.net\u003e\n" }, { "commit": "7839c5d5519b6d9e2ccf3cdbf1c39e3817ad0835", "tree": "6cdb6bf350ee669c752c3deabbfdedff5de069c0", "parents": [ "38d8a95621b20ed7868e232a35a26ee61bdcae6f" ], "author": { "name": "Fabian Henze", "email": "hoacha@quantentunnel.de", "time": "Tue Sep 08 00:59:59 2009 +0800" }, "committer": { "name": "Eric Anholt", "email": "eric@anholt.net", "time": "Tue Sep 08 23:33:26 2009 -0700" }, "message": "drm/i915: add B43 chipset support\n\nSigned-off-by: Fabian Henze \u003choacha@quantentunnel.de\u003e\nSigned-off-by: Zhenyu Wang \u003czhenyuw@linux.intel.com\u003e\nSigned-off-by: Eric Anholt \u003ceric@anholt.net\u003e\n" }, { "commit": "38d8a95621b20ed7868e232a35a26ee61bdcae6f", "tree": "defe147543a934efc503305436bf6fbc38fe619a", "parents": [ "cecc6b63a5de547a345c491bb4c18c01a15984a4" ], "author": { "name": "Fabian Henze", "email": "hoacha@quantentunnel.de", "time": "Tue Sep 08 00:59:58 2009 +0800" }, "committer": { "name": "Eric Anholt", "email": "eric@anholt.net", "time": "Tue Sep 08 23:33:21 2009 -0700" }, "message": "agp/intel: Add B43 chipset support\n\nSigned-off-by: Fabian Henze \u003choacha@quantentunnel.de\u003e\n[Fix reversed HB \u0026 IG ids for B43]\nSigned-off-by: Zhenyu Wang \u003czhenyuw@linux.intel.com\u003e\nSigned-off-by: Eric Anholt \u003ceric@anholt.net\u003e\n" }, { "commit": "cecc6b63a5de547a345c491bb4c18c01a15984a4", "tree": "6092e559358347c5db904dec4070a9c2812704d1", "parents": [ "60d15f551abdbc5fef70d85f55aac1e85950bf59" ], "author": { "name": "Alex Deucher", "email": "alexdeucher@gmail.com", "time": "Tue Sep 08 14:45:05 2009 -0400" }, "committer": { "name": "Dave Airlie", "email": "airlied@linux.ie", "time": "Wed Sep 09 08:17:57 2009 +1000" }, "message": "drm/radeon/r600: use fence-\u003etimeout directly\n\nFixes fence timeouts on r6xx/r7xx. Noticed by\ntaiu on IRC.\n\nSigned-off-by: Alex Deucher \u003calexdeucher@gmail.com\u003e\n" }, { "commit": "60d15f551abdbc5fef70d85f55aac1e85950bf59", "tree": "6d60c7b83cdb714344609452c761f6046d3cecf7", "parents": [ "cc84ef3fd20ef6dfe5fbc4778e7017d015b3bf7d" ], "author": { "name": "Alex Deucher", "email": "alexdeucher@gmail.com", "time": "Tue Sep 08 14:22:45 2009 -0400" }, "committer": { "name": "Dave Airlie", "email": "airlied@linux.ie", "time": "Wed Sep 09 05:35:37 2009 +1000" }, "message": "drm/radeon/kms: re-apply 2007d633d639c896396e4c4b53b38068f3831307\n\nGot accidently reverted by c93bb85b5cba3e3a06f2cad8e9bc5c23d3d10aac\n\nSigned-off-by: Alex Deucher \u003calexdeucher@gmail.com\u003e\nSigned-off-by: Dave Airlie \u003cairlied@linux.ie\u003e\n" }, { "commit": "cc84ef3fd20ef6dfe5fbc4778e7017d015b3bf7d", "tree": "ce46a55f673cd2e669e9ccf625e6101a52138624", "parents": [ "c746e205f2fb6f74b4a622382607f065eca5eb49", "3ff323f89075624b6891e7c428edb8e8a35be13c" ], "author": { "name": "Dave Airlie", "email": "airlied@redhat.com", "time": "Tue Sep 08 14:49:32 2009 +1000" }, "committer": { "name": "Dave Airlie", "email": "airlied@redhat.com", "time": "Tue Sep 08 14:49:32 2009 +1000" }, "message": "Merge remote branch \u0027origin/master\u0027 of ../linux-2.6 into drm-next\n\nThis was a non-trivial merge with some patches sent to Linus\nin drm-fixes.\n\nConflicts:\n\tdrivers/gpu/drm/radeon/r300.c\n\tdrivers/gpu/drm/radeon/radeon_asic.h\n\tdrivers/gpu/drm/radeon/rs600.c\n\tdrivers/gpu/drm/radeon/rs690.c\n\tdrivers/gpu/drm/radeon/rv515.c\n" }, { "commit": "c746e205f2fb6f74b4a622382607f065eca5eb49", "tree": "f8eb3b1bd8dc09109aacf4f64d05aaf158c26392", "parents": [ "620f37811dcc9e0f97ee79fbf8908fcc097deaee" ], "author": { "name": "Dave Airlie", "email": "airlied@linux.ie", "time": "Tue Sep 08 14:38:45 2009 +1000" }, "committer": { "name": "Dave Airlie", "email": "airlied@redhat.com", "time": "Tue Sep 08 14:43:27 2009 +1000" }, "message": "drm/radeon/kms: don\u0027t allow ERESTART to hit userspace.\n\nthe pre-r600 fence code returns ebusy if we get hit by a signal\nso we should continue to do that.\n\nSigned-off-by: Dave Airlie \u003cairlied@redhat.com\u003e\n" }, { "commit": "620f37811dcc9e0f97ee79fbf8908fcc097deaee", "tree": "3622ded2c5a7f95bf0113097eb7d1a736a616d7c", "parents": [ "1ecff1eb0b83efa85be5b54c958e831e37f993f3" ], "author": { "name": "Adam Jackson", "email": "ajax@redhat.com", "time": "Tue Sep 08 11:51:46 2009 +1000" }, "committer": { "name": "Dave Airlie", "email": "airlied@redhat.com", "time": "Tue Sep 08 11:51:46 2009 +1000" }, "message": "drm: prune modes when output is disconnected.\n\nWhen an output was disconnected, its mode list would remain. If you later\nplugged into a sink with no EDID (projector, etc), you\u0027d inherit the mode\nlist from the old sink, which is not what you want.\n\ntaken from Fedora kernel\n\nSigned-off-by: Dave Airlie \u003cairlied@redhat.com\u003e\n" }, { "commit": "1ecff1eb0b83efa85be5b54c958e831e37f993f3", "tree": "8ccf8d132ee2866a91184fd18381f537b3c9a50f", "parents": [ "ec2a4c3fdc8e82fe82a25d800e85c1ea06b74372" ], "author": { "name": "Adam Jackson", "email": "ajax@redhat.com", "time": "Tue Sep 08 11:48:40 2009 +1000" }, "committer": { "name": "Dave Airlie", "email": "airlied@redhat.com", "time": "Tue Sep 08 11:48:40 2009 +1000" }, "message": "drm: shut the EDID warnings up.\n\nThese really aren\u0027t all that useful.\n\ntaken from Fedora kernel.\n\nSigned-off-by: Dave Airlie \u003cairlied@redhat.com\u003e\n" }, { "commit": "ec2a4c3fdc8e82fe82a25d800e85c1ea06b74372", "tree": "b49f3ebe3e356fa8d17f15e9a5421851cb90024b", "parents": [ "f1938cd6e900a85de64184e46d841efc9efd3484" ], "author": { "name": "Dave Airlie", "email": "airlied@redhat.com", "time": "Tue Aug 04 11:43:41 2009 +1000" }, "committer": { "name": "Dave Airlie", "email": "airlied@redhat.com", "time": "Tue Sep 08 11:45:15 2009 +1000" }, "message": "drm/i915: get the bridge device once.\n\nThe driver gets the bridge device in a number of places, upcoming\nvga arb code paths need the bridge device, however they need it in\nunder a lock, and the pci lookup can allocate memory. So clean\nthis code up before then and get the bridge once for the driver lifetime.\n\nSigned-off-by: Dave Airlie \u003cairlied@redhat.com\u003e\n" }, { "commit": "f1938cd6e900a85de64184e46d841efc9efd3484", "tree": "73b9b28ae608687dd374863f48ee886b9ca5562c", "parents": [ "f641e51e7469cc3a8115a3bd70b4526d566b1c60" ], "author": { "name": "Dave Airlie", "email": "airlied@redhat.com", "time": "Tue Sep 08 11:32:08 2009 +1000" }, "committer": { "name": "Dave Airlie", "email": "airlied@redhat.com", "time": "Tue Sep 08 11:32:08 2009 +1000" }, "message": "drm: include seq_file.h for debugfs builds.\n\nFixes a warning seen on powerpc.\n\nSigned-off-by: Dave Airlie \u003cairlied@redhat.com\u003e\n" }, { "commit": "f641e51e7469cc3a8115a3bd70b4526d566b1c60", "tree": "db64133c55e8c14d11aad1bd204f2f43d77adbc8", "parents": [ "a0cdc6495bdd0ea12390b9edaf13c8cb653df109" ], "author": { "name": "Dave Airlie", "email": "airlied@redhat.com", "time": "Tue Sep 08 11:17:38 2009 +1000" }, "committer": { "name": "Dave Airlie", "email": "airlied@redhat.com", "time": "Tue Sep 08 11:17:38 2009 +1000" }, "message": "drm/radeon/kms: lower debugging on dpms events.\n\nLower the debugging on encoders when getting DPMS events.\n\nSigned-off-by: Dave Airlie \u003cairlied@redhat.com\u003e\n" }, { "commit": "a0cdc6495bdd0ea12390b9edaf13c8cb653df109", "tree": "c9f77662adab2cb11b0b5bd801827e00eeeb7856", "parents": [ "6fcefd56f5060ca99ab03c9f2ad1f17c3a543ca1" ], "author": { "name": "Dave Airlie", "email": "airlied@redhat.com", "time": "Tue Sep 08 11:09:50 2009 +1000" }, "committer": { "name": "Dave Airlie", "email": "airlied@redhat.com", "time": "Tue Sep 08 11:15:59 2009 +1000" }, "message": "drm/kms/radeon: make kms default a runtime option\n\nThis makes the kms/enable disable a runtime not a build time\noption.\n\nSigned-off-by: Dave Airlie \u003cairlied@redhat.com\u003e\n" }, { "commit": "6fcefd56f5060ca99ab03c9f2ad1f17c3a543ca1", "tree": "0bab06d1bc08205f3598a0627041e9b2c4abc34c", "parents": [ "3ce0a23d2d253185df24e22e3d5f89800bb3dd1c" ], "author": { "name": "Dave Airlie", "email": "airlied@redhat.com", "time": "Tue Sep 08 11:08:32 2009 +1000" }, "committer": { "name": "Dave Airlie", "email": "airlied@redhat.com", "time": "Tue Sep 08 11:15:58 2009 +1000" }, "message": "drm/kms: fix kms helper license + Kconfig\n\nAllow the KMS module to work properly, and also rename\nit to KMS_HELPER so its clearer what its for.\n\nSigned-off-by: Dave Airlie \u003cairlied@redhat.com\u003e\n" }, { "commit": "3ce0a23d2d253185df24e22e3d5f89800bb3dd1c", "tree": "4b4defdbe33aec7317101cce0f89c33083f8d17b", "parents": [ "4ce001abafafe77e5dd943d1480fc9f87894e96f" ], "author": { "name": "Jerome Glisse", "email": "jglisse@redhat.com", "time": "Tue Sep 08 10:10:24 2009 +1000" }, "committer": { "name": "Dave Airlie", "email": "airlied@redhat.com", "time": "Tue Sep 08 11:15:52 2009 +1000" }, "message": "drm/radeon/kms: add r600 KMS support\n\nThis adds the r600 KMS + CS support to the Linux kernel.\n\nThe r600 TTM support is quite basic and still needs more\nwork esp around using interrupts, but the polled fencing\nshould work okay for now.\n\nAlso currently TTM is using memcpy to do VRAM moves,\nthe code is here to use a 3D blit to do this, but\nisn\u0027t fully debugged yet.\n\nAuthors:\nAlex Deucher \u003calexdeucher@gmail.com\u003e\nDave Airlie \u003cairlied@redhat.com\u003e\nJerome Glisse \u003cjglisse@redhat.com\u003e\n\nSigned-off-by: Jerome Glisse \u003cjglisse@redhat.com\u003e\nSigned-off-by: Dave Airlie \u003cairlied@redhat.com\u003e\n" }, { "commit": "4ce001abafafe77e5dd943d1480fc9f87894e96f", "tree": "4a22b42c58a80450992fcf5d7625b19fe045855b", "parents": [ "551ebd837c75fc75df81811a18b7136c39cab487" ], "author": { "name": "Dave Airlie", "email": "airlied@redhat.com", "time": "Thu Aug 13 16:32:14 2009 +1000" }, "committer": { "name": "Dave Airlie", "email": "airlied@redhat.com", "time": "Tue Sep 08 09:24:37 2009 +1000" }, "message": "drm/radeon/kms: add initial radeon tv-out support.\n\nThis ports the tv-out code from the DDX to KMS.\n\nadds a radeon.tv module option, radeon.tv\u003d0 to disable tv\n\nSigned-off-by: Dave Airlie \u003cairlied@redhat.com\u003e\n" }, { "commit": "551ebd837c75fc75df81811a18b7136c39cab487", "tree": "9703fd46cf9ad170012754f984375db37d2bf818", "parents": [ "11670d3c93210793562748d83502ecbef4034765" ], "author": { "name": "Dave Airlie", "email": "airlied@redhat.com", "time": "Tue Sep 01 15:25:57 2009 +1000" }, "committer": { "name": "Dave Airlie", "email": "airlied@redhat.com", "time": "Tue Sep 08 08:54:31 2009 +1000" }, "message": "drm/radeon/kms: add rn50/r100/r200 CS tracker.\n\nThis adds the command stream checker for the RN50, R100 and R200 cards.\n\nIt stops any access to 3D registers on RN50, and does checks\non buffer sizes on the r100/r200 cards. It also fixes some texture\nsizing checks on r300.\n\nSigned-off-by: Dave Airlie \u003cairlied@redhat.com\u003e\n" }, { "commit": "3ff323f89075624b6891e7c428edb8e8a35be13c", "tree": "24cbade6cffecfe334fd7d385b8731f7d999bfaf", "parents": [ "755ae761c5519929a97567d61a379b87352c337c", "a54775c8758a754186bc6adbfc518b1e9f8f1e4e" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon Sep 07 11:42:25 2009 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon Sep 07 11:42:25 2009 -0700" }, "message": "Merge branch \u0027drm-fixes\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/airlied/drm-2.6\n\n* \u0027drm-fixes\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/airlied/drm-2.6:\n drm/radeon/kms: add LTE/GTE discard + rv515 two sided stencil register.\n" }, { "commit": "755ae761c5519929a97567d61a379b87352c337c", "tree": "6942ac77009d3cab1acf6e6bea8cc339368423a9", "parents": [ "4886b5b485ec78fe4a16fedaccfab39bdf55410f", "acd0c935178649f72c44ec49ca83bee35ce1f79e" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon Sep 07 11:41:15 2009 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon Sep 07 11:41:15 2009 -0700" }, "message": "Merge branch \u0027for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/security-testing-2.6\n\n* \u0027for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/security-testing-2.6:\n IMA: update ima_counts_put\n" }, { "commit": "4886b5b485ec78fe4a16fedaccfab39bdf55410f", "tree": "3946e0e444311245db5248bac6658e9b8082f269", "parents": [ "cbeb2864b162f4298111196c8ce8ce492577cdee", "d9d8e0418ffd3d189345c435861e254c17ae06e5" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon Sep 07 11:40:24 2009 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon Sep 07 11:40:24 2009 -0700" }, "message": "Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6\n\n* git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6:\n gianfar: Fix build.\n" }, { "commit": "cbeb2864b162f4298111196c8ce8ce492577cdee", "tree": "0ddc68c3c1231a38955d7fca71a28cfc43eb0996", "parents": [ "f69fb9c39868463f6b0b8306824341bd5610250b", "c9a2bfd1f08973115c2fc3da9372e0e81ac42a19" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon Sep 07 11:40:15 2009 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon Sep 07 11:40:15 2009 -0700" }, "message": "Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/ide-2.6\n\n* git://git.kernel.org/pub/scm/linux/kernel/git/davem/ide-2.6:\n pcmcia: add CNF-CDROM-ID for ide\n" }, { "commit": "f69fb9c39868463f6b0b8306824341bd5610250b", "tree": "7ab396e5185772342bdf8a50e6dfb56ff0cd1f64", "parents": [ "e07cccf4046978df10f2e13fe2b99b2f9b3a65db", "07fb6111e7af5fac6b6076e2658d0e32b67f713b" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon Sep 07 11:38:30 2009 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon Sep 07 11:38:30 2009 -0700" }, "message": "Merge branch \u0027for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/anholt/drm-intel\n\n* \u0027for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/anholt/drm-intel:\n agp/intel: support for new chip variant of IGDNG mobile\n drm/i915: Unref old_obj on get_fence_reg() error path\n drm/i915: increase default latency constant (v2 w/comment)\n" }, { "commit": "11670d3c93210793562748d83502ecbef4034765", "tree": "9e2c33c6249e26b05a2b5db87d4f4840e9049840", "parents": [ "575dc34ee0de867ba83abf25998e0963bff451fa", "01dfba93d9dfcf6d7abfc55ff5d9d6e76fa01ba0" ], "author": { "name": "Dave Airlie", "email": "airlied@redhat.com", "time": "Mon Sep 07 20:27:20 2009 +1000" }, "committer": { "name": "Dave Airlie", "email": "airlied@redhat.com", "time": "Mon Sep 07 20:27:20 2009 +1000" }, "message": "Merge intel drm-intel-next branch\n\nMerge remote branch \u0027anholt/drm-intel-next\u0027 of ../anholt-2.6 into drm-next\n\nConflicts:\n\tdrivers/gpu/drm/i915/intel_display.c\n\tdrivers/gpu/drm/i915/intel_drv.h\n\tdrivers/gpu/drm/i915/intel_sdvo.c\n" }, { "commit": "575dc34ee0de867ba83abf25998e0963bff451fa", "tree": "b71c77f8741b15b432d274208a97ea14873ff7d6", "parents": [ "50fe4cfdc759fb3c0cffc3b90281efb139631fb7" ], "author": { "name": "Dave Airlie", "email": "airlied@redhat.com", "time": "Mon Sep 07 18:43:26 2009 +1000" }, "committer": { "name": "Dave Airlie", "email": "airlied@redhat.com", "time": "Mon Sep 07 18:44:46 2009 +1000" }, "message": "drm/kms: remove old std mode fallback code.\n\nThe new code adds modes in the helper, which makes more sense\nI disliked the non-driver code adding modes.\n\nSigned-off-by: Dave Airlie \u003cairlied@redhat.com\u003e\n" }, { "commit": "50fe4cfdc759fb3c0cffc3b90281efb139631fb7", "tree": "a714b85bd64e18143b2c6222642bc1d93005e9c3", "parents": [ "f0fda0a47b26aba986fe65897891956c1792b526" ], "author": { "name": "ykzhao", "email": "yakui.zhao@intel.com", "time": "Thu Sep 03 14:30:04 2009 +0800" }, "committer": { "name": "Dave Airlie", "email": "airlied@redhat.com", "time": "Mon Sep 07 18:44:45 2009 +1000" }, "message": "drm/kms/i915: Add the default mode for CRT output without EDID\n\nAdd the default mode for every output device when there\nis no mode for it.\n\nSigned-off-by: Zhao Yakui \u003cyakui.zhao@intel.com\u003e\nSigned-off-by: Dave Airlie \u003cairlied@redhat.com\u003e\n" }, { "commit": "f0fda0a47b26aba986fe65897891956c1792b526", "tree": "c3f53a5653179b51625f5f7962bae89f30282691", "parents": [ "559ee21d261a54c42594ef9405d27e9008eedf44" ], "author": { "name": "Zhao Yakui", "email": "yakui.zhao@intel.com", "time": "Thu Sep 03 09:33:48 2009 +0800" }, "committer": { "name": "Dave Airlie", "email": "airlied@redhat.com", "time": "Mon Sep 07 18:44:40 2009 +1000" }, "message": "drm/kms: add a function that can add the mode for the output device without EDID\n\nAdd a function that can be used to add the default mode for the output device\nwithout EDID.\nIt will add the default mode that meets with the requirements of given\nhdisplay/vdisplay limit.\n\nSigned-off-by: Zhao Yakui \u003cyakui.zhao@intel.com\u003e\nSigned-off-by: Dave Airlie \u003cairlied@redhat.com\u003e\n" }, { "commit": "559ee21d261a54c42594ef9405d27e9008eedf44", "tree": "474be3b0ca2645db1366c03753333b9f5c45a19f", "parents": [ "aa9eaa1f0962152d0bde821149d82fe7b70a6f92" ], "author": { "name": "Zhao Yakui", "email": "yakui.zhao@intel.com", "time": "Thu Sep 03 09:33:47 2009 +0800" }, "committer": { "name": "Dave Airlie", "email": "airlied@redhat.com", "time": "Mon Sep 07 16:04:15 2009 +1000" }, "message": "drm/kms: try to find the std mode in DMT table\n\nWhen we need to add the standard timing mode, we will firstly check whether it\ncan be found in DMT table by comparing the hdisplay/vdisplay/vfresh_rate.\nIf it can\u0027t be found, then we will use the cvt/gtf to add the required mode.\nIf it can be found, it will be returned.\n\nAt the same time the function of drm_mode_vrefresh is also fixed. It will\nreturn the result of actual refresh_rate plus 0.5.\nFor example:\nWhen the calculated value is 84.9, then the fresh_rate is 85.\nWhen the calculated value is 70.02, then the fresh_rate is 70.\n\nSigned-off-by: Zhao Yakui \u003cyakui.zhao@intel.com\u003e\nSigned-off-by: Dave Airlie \u003cairlied@redhat.com\u003e\n" }, { "commit": "aa9eaa1f0962152d0bde821149d82fe7b70a6f92", "tree": "4adc0e0ff7f62bbc179d60eec813ae793a1c55d8", "parents": [ "13a8195b148615b15a4f4385f695f2a232095414" ], "author": { "name": "Zhao Yakui", "email": "yakui.zhao@intel.com", "time": "Thu Sep 03 09:33:46 2009 +0800" }, "committer": { "name": "Dave Airlie", "email": "airlied@redhat.com", "time": "Mon Sep 07 16:03:35 2009 +1000" }, "message": "drm/kms: Add the default mode table\n\nWhen we add a standard timing mode in UMS, we will first check whether it can\nbe found in default mode table. If it can\u0027t be found, then we will use cvt/gtf\nto add the standard timing mode.\nAdd the default mode table so that we can check whether the given mode\ncan be found in the default mode table as what we have done in UMS mode.\n\nIf the status of one output device is connected but there is no EDID, it will\nhave no correct mode. In such case we can add some default modes for it. Of\ncourse we only add the modes in the default modes list that visible part is not\ngreater than 1024x768.\n\nThe default mode is autogenerated from the DMT spec. And it is copied from\nxserver/hw/xfree86/modes/xf86EdidModes.c. But the mode with reduced blank\nfeature is removed.\n\nSigned-off-by: Zhao Yakui \u003cyakui.zhao@intel.com\u003e\nSigned-off-by: Dave Airlie \u003cairlied@redhat.com\u003e\n" }, { "commit": "13a8195b148615b15a4f4385f695f2a232095414", "tree": "28b12c0ca74e88cd0b310598c6efb7f78f8a027f", "parents": [ "adf551bb25bfb83b79ce3c3887557ed817e26cc9" ], "author": { "name": "Dave Airlie", "email": "airlied@redhat.com", "time": "Mon Sep 07 15:45:33 2009 +1000" }, "committer": { "name": "Dave Airlie", "email": "airlied@redhat.com", "time": "Mon Sep 07 15:45:33 2009 +1000" }, "message": "drm: split crtc/fb helpers into a separate module\n\nI really don\u0027t want to have core drm module rely on CONFIG_FB,\nso this is the easiest answer.\n\nSigned-off-by: Dave Airlie \u003cairlied@redhat.com\u003e\n" }, { "commit": "a54775c8758a754186bc6adbfc518b1e9f8f1e4e", "tree": "bc351c6ae28e059132b66f8149a8a9d1b2be088a", "parents": [ "e07cccf4046978df10f2e13fe2b99b2f9b3a65db" ], "author": { "name": "Dave Airlie", "email": "airlied@redhat.com", "time": "Mon Sep 07 15:26:19 2009 +1000" }, "committer": { "name": "Dave Airlie", "email": "airlied@redhat.com", "time": "Mon Sep 07 15:26:19 2009 +1000" }, "message": "drm/radeon/kms: add LTE/GTE discard + rv515 two sided stencil register.\n\nThis adds some rv350+ register for LTE/GTE discard,\nand enables the rv515 two sided stencil register.\nIt also disables the DEPTHXY_OFFSET register which\ncan be used to workaround the CS checker.\nMoves rs690 to proper place in rs600 and uses correct\ntable on rs600.\n\nSigned-off-by: Dave Airlie \u003cairlied@redhat.com\u003e\n" }, { "commit": "adf551bb25bfb83b79ce3c3887557ed817e26cc9", "tree": "f80ea2b6183fb64c65d3749f0f490375a7f3e26c", "parents": [ "a498b8210f2f6ee0529c28048b5c4cecc17937c2" ], "author": { "name": "Dave Airlie", "email": "airlied@redhat.com", "time": "Mon Sep 07 13:49:07 2009 +1000" }, "committer": { "name": "Dave Airlie", "email": "airlied@redhat.com", "time": "Mon Sep 07 13:49:07 2009 +1000" }, "message": "drm/radeon/kms: add updated registers from drm-fixes.\n\nFixes up the DISCARD + 2 sided stencil in the new generator scripts.\n\nSigned-off-by: Dave Airlie \u003cairlied@redhat.com\u003e\n" }, { "commit": "a498b8210f2f6ee0529c28048b5c4cecc17937c2", "tree": "3fc3c8a1072cce63be19d096debbdf541df5b57c", "parents": [ "ff6fdbed8f465f796da7ab32cde67e2dfb9e1f8f" ], "author": { "name": "Dave Airlie", "email": "airlied@redhat.com", "time": "Tue Sep 01 14:40:41 2009 +1000" }, "committer": { "name": "Dave Airlie", "email": "airlied@redhat.com", "time": "Mon Sep 07 13:48:11 2009 +1000" }, "message": "drm/radeon/kms: block depthxy offset from use from userspace.\n\nThis could be used to bypass CS checks.\n\nSigned-off-by: Dave Airlie \u003cairlied@redhat.com\u003e\n" }, { "commit": "acd0c935178649f72c44ec49ca83bee35ce1f79e", "tree": "c0cb2f8fbbaa54567785b5430e5be8c8b51f5724", "parents": [ "e07cccf4046978df10f2e13fe2b99b2f9b3a65db" ], "author": { "name": "Mimi Zohar", "email": "zohar@linux.vnet.ibm.com", "time": "Fri Sep 04 13:08:46 2009 -0400" }, "committer": { "name": "James Morris", "email": "jmorris@namei.org", "time": "Mon Sep 07 11:54:58 2009 +1000" }, "message": "IMA: update ima_counts_put\n\n- As ima_counts_put() may be called after the inode has been freed,\nverify that the inode is not NULL, before dereferencing it.\n\n- Maintain the IMA file counters in may_open() properly, decrementing\nany counter increments on subsequent errors.\n\nReported-by: Ciprian Docan \u003cdocan@eden.rutgers.edu\u003e\nReported-by: J.R. Okajima \u003chooanon05@yahoo.co.jp\u003e\nSigned-off-by: Mimi Zohar \u003czohar@us.ibm.com\u003e\nAcked-by: Eric Paris \u003ceparis@redhat.com\nSigned-off-by: James Morris \u003cjmorris@namei.org\u003e\n" }, { "commit": "01dfba93d9dfcf6d7abfc55ff5d9d6e76fa01ba0", "tree": "df8fe0fba80b54492084025ffcda480bc810990f", "parents": [ "0ef82af7253c1929a3995f271b8b0db462d1a0c3" ], "author": { "name": "Eric Anholt", "email": "eric@anholt.net", "time": "Sun Sep 06 15:18:53 2009 -0700" }, "committer": { "name": "Eric Anholt", "email": "eric@anholt.net", "time": "Sun Sep 06 15:18:53 2009 -0700" }, "message": "drm/i915: Put the idle reclocking work on our private workqueue as well.\n\nFixes (again) whole-system lockups due to GPU lockups.\n\nSigned-off-by: Eric Anholt \u003ceric@anholt.net\u003e\n" }, { "commit": "0ef82af7253c1929a3995f271b8b0db462d1a0c3", "tree": "fb34eee409dffa5bfef725b00d38d6d54b8d31c8", "parents": [ "5e17ee74b541b56b5d4cfab6502a5116f224e32c" ], "author": { "name": "Chris Wilson", "email": "chris@chris-wilson.co.uk", "time": "Sat Sep 05 18:07:06 2009 +0100" }, "committer": { "name": "Eric Anholt", "email": "eric@anholt.net", "time": "Sun Sep 06 11:29:06 2009 -0700" }, "message": "drm/i915: Pad ringbuffer with NOOPs before wrapping\n\nAccording to the docs, the ringbuffer is not allowed to wrap in the middle\nof an instruction.\n\nG45 PRM, Vol 1b, p101:\n While the “free space” wrap may allow commands to be wrapped around the\n end of the Ring Buffer, the wrap should only occur between commands.\n Padding (with NOP) may be required to follow this restriction.\n\nDo as commanded.\n\n[Having seen bug reports where there is evidence of split commands, but\napparently the GPU has continued on merrily before a bizarre and untimely\ndeath, this may or may not fix a few random hangs.]\n\nSigned-off-by: Chris Wilson \u003cchris@chris-wilson.co.uk\u003e\nCC: Eric Anholt \u003ceric@anholt.net\u003e\nSigned-off-by: Eric Anholt \u003ceric@anholt.net\u003e\n" }, { "commit": "d9d8e0418ffd3d189345c435861e254c17ae06e5", "tree": "ee97d40fa4ccfd3c802e6844b3d38097ff7a6c7a", "parents": [ "16ebb5e0b36ceadc8186f71d68b0c4fa4b6e781b" ], "author": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Sun Sep 06 01:41:02 2009 -0700" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Sun Sep 06 01:41:24 2009 -0700" }, "message": "gianfar: Fix build.\n\nReported by Michael Guntsche \u003cmike@it-loops.com\u003e\n\n--------------------\nCommit\n38bddf04bcfe661fbdab94888c3b72c32f6873b3 gianfar: gfar_remove needs to call unregister_netdev()\n\nbreaks the build of the gianfar driver because \"dev\" is undefined in\nthis function. To quickly test rc9 I changed this to priv-\u003endev but I do\nnot know if this is the correct one.\n--------------------\n\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "e07cccf4046978df10f2e13fe2b99b2f9b3a65db", "tree": "086f3d6b72cb6b70ba451c78b8147231d54219c3", "parents": [ "f815c335d21f9965f8dbe142fd168aaba1baf98e" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sat Sep 05 16:38:12 2009 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sat Sep 05 16:38:12 2009 -0700" }, "message": "Linux 2.6.31-rc9\n" }, { "commit": "f815c335d21f9965f8dbe142fd168aaba1baf98e", "tree": "4e9a65b7810de10141595125cc65f2b0e7533dfc", "parents": [ "74a01180db4bbfd61304ae0ba1f60af55ffc803d", "baed6b82d9f160184c1c14cdb4accb08f3eb6b87" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sat Sep 05 14:59:00 2009 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sat Sep 05 14:59:00 2009 -0700" }, "message": "Merge branch \u0027for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/ieee1394/linux1394-2.6\n\n* \u0027for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/ieee1394/linux1394-2.6:\n firewire: sbp2: fix freeing of unallocated memory\n firewire: ohci: fix Ricoh R5C832, video reception\n firewire: ohci: fix Agere FW643 and multiple cameras\n firewire: core: fix crash in iso resource management\n" }, { "commit": "74a01180db4bbfd61304ae0ba1f60af55ffc803d", "tree": "2f61aac8deb306a164f04a7d2753fbd723c906fc", "parents": [ "5136a6c0fd5b26bbf39ad761cf7a4fc563ad83a3" ], "author": { "name": "Roderick Colenbrander", "email": "thunderbird2k@gmail.com", "time": "Thu Sep 03 09:57:23 2009 -0600" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sat Sep 05 14:58:07 2009 -0700" }, "message": "powerpc: Fix i8259 interrupt driver kernel crash on ML510\n\nThis patch fixes a null pointer exception caused by removal of\n\u0027ack()\u0027 for level interrupts in the Xilinx interrupt driver. A recent\nchange to the xilinx interrupt controller removed the ack hook for\nlevel irqs.\n\nSigned-off-by: Roderick Colenbrander \u003cthunderbird2k@gmail.com\u003e\nSigned-off-by: Grant Likely \u003cgrant.likely@secretlab.ca\u003e\nAcked-by: Benjamin Herrenschmidt \u003cbenh@kernel.crashing.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "5136a6c0fd5b26bbf39ad761cf7a4fc563ad83a3", "tree": "7c905238cb2c5c9cd959cd652010b0eaf5f91db3", "parents": [ "e505a8d5f96a84f3043ce0c4eaee8f045996896c", "bc8cec0dff072f1a45ce7f6b2c5234bb3411ac51" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sat Sep 05 14:57:04 2009 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sat Sep 05 14:57:04 2009 -0700" }, "message": "Merge git://git.infradead.org/~dwmw2/mtd-2.6.31\n\n* git://git.infradead.org/~dwmw2/mtd-2.6.31:\n JFFS2: add missing verify buffer allocation/deallocation\n mtd: nftl: fix offset alignments\n mtd: nftl: write support is broken\n mtd: m25p80: fix null pointer dereference bug\n" }, { "commit": "e505a8d5f96a84f3043ce0c4eaee8f045996896c", "tree": "622b5b817b9434b114d7015dbd3d8c83198fe350", "parents": [ "b71b7dc09abaeb4417c37b96a898096286b65e3c", "c295fc05789653ef24f296299df7c5f92fe74dce" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sat Sep 05 14:56:13 2009 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sat Sep 05 14:56:13 2009 -0700" }, "message": "Merge branch \u0027for-linus\u0027 of git://git.kernel.dk/linux-2.6-block\n\n* \u0027for-linus\u0027 of git://git.kernel.dk/linux-2.6-block:\n block: Allow changing max_sectors_kb above the default 512\n" }, { "commit": "b71b7dc09abaeb4417c37b96a898096286b65e3c", "tree": "548585e8e26281f9602d61e04bf4d2c1f4078b5a", "parents": [ "59430c2f437767094298f30dd02ca038da0df755", "92653453c3015c083b9fe0ad48261c6b2267d482" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sat Sep 05 14:55:30 2009 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sat Sep 05 14:55:30 2009 -0700" }, "message": "Merge branch \u0027fix/oxygen\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6\n\n* \u0027fix/oxygen\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6:\n sound: oxygen: handle cards with missing EEPROM\n sound: oxygen: fix MCLK rate for 192 kHz playback\n" }, { "commit": "59430c2f437767094298f30dd02ca038da0df755", "tree": "3c79740e3580e403df02daafba26fa6e67552c16", "parents": [ "e9ee3a54a164c249a0a576c403eba367a6d97be5", "16ebb5e0b36ceadc8186f71d68b0c4fa4b6e781b" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sat Sep 05 14:52:41 2009 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sat Sep 05 14:52:41 2009 -0700" }, "message": "Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6\n\n* git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6:\n tc: Fix unitialized kernel memory leak\n pkt_sched: Revert tasklet_hrtimer changes.\n net: sk_free() should be allowed right after sk_alloc()\n gianfar: gfar_remove needs to call unregister_netdev()\n ipw2200: firmware DMA loading rework\n" }, { "commit": "e9ee3a54a164c249a0a576c403eba367a6d97be5", "tree": "bd1200f8d3c7481aa152cbb277fb79e181bb34fd", "parents": [ "3bb314f01c189f0c48c0946424955c6d8ddce3d8", "0c7d400fafaeab6014504a6a6249f01bac7f7db4" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sat Sep 05 14:51:45 2009 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sat Sep 05 14:51:45 2009 -0700" }, "message": "Merge git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6\n\n* git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6:\n crypto: skcipher - Fix skcipher_dequeue_givcrypt NULL test\n" }, { "commit": "3bb314f01c189f0c48c0946424955c6d8ddce3d8", "tree": "d0de7369247689f009c2e0f3fb3bd121555efce1", "parents": [ "535e0c1726bec699a8f0f5b86fe7d399546b2555", "ce6c3997c2fce74d12e6d8887a1d8cdf024fa850" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sat Sep 05 14:51:24 2009 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sat Sep 05 14:51:24 2009 -0700" }, "message": "Merge branch \u0027fixes\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/davej/cpufreq\n\n* \u0027fixes\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/davej/cpufreq:\n [CPUFREQ] Re-enable cpufreq suspend and resume code\n" }, { "commit": "535e0c1726bec699a8f0f5b86fe7d399546b2555", "tree": "9aa71d6908e4255b5a864cdae14ef164dea66665", "parents": [ "0edfa2b1b5a5e1475e76dd3c792447687d966de4", "5afe18d2f58812f3924edbd215464e5e3e8545e7" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sat Sep 05 14:50:53 2009 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sat Sep 05 14:50:53 2009 -0700" }, "message": "Merge branch \u0027release\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux-2.6\n\n* \u0027release\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux-2.6:\n [IA64] fix csum_ipv6_magic()\n [IA64] Fix warning in dma-mapping.c\n" }, { "commit": "0edfa2b1b5a5e1475e76dd3c792447687d966de4", "tree": "a811a6955bb0fffc883e59eb261206b132e9e6dc", "parents": [ "5a09adf13067609d8ab9fcae11dc99fd0084e35c", "3725867dccfb83e4b0cff64e916a04258f300591" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sat Sep 05 14:25:14 2009 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sat Sep 05 14:25:14 2009 -0700" }, "message": "Merge branch \u0027for-linus\u0027 of git://oss.sgi.com/xfs/xfs\n\n* \u0027for-linus\u0027 of git://oss.sgi.com/xfs/xfs:\n xfs: actually enable the swapext compat handler\n" }, { "commit": "5a09adf13067609d8ab9fcae11dc99fd0084e35c", "tree": "be2908bf2a8a20e9bebb4a064611ca5c2e2977f9", "parents": [ "931f70350e9c298887c78e852d179ef7efcce304", "b1f1b8ce0a1d71cbc72f7540134d52b79bd8f5ac" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sat Sep 05 14:24:33 2009 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sat Sep 05 14:24:33 2009 -0700" }, "message": "Merge branch \u0027for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/ryusuke/nilfs2\n\n* \u0027for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/ryusuke/nilfs2:\n nilfs2: fix preempt count underflow in nilfs_btnode_prepare_change_key\n" } ], "next": "931f70350e9c298887c78e852d179ef7efcce304" }