)]}' { "log": [ { "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": "2b66b50b12cabc05f05543e792d4c9c2465d5702", "tree": "d56cc1a158d22e4485db7ceb96d108e0d9bef640", "parents": [ "b2298fd27127f872881048fd37cb9217a648ae06" ], "author": { "name": "Michel Dänzer", "email": "daenzer@vmware.com", "time": "Tue Nov 09 11:50:05 2010 +0100" }, "committer": { "name": "Dave Airlie", "email": "airlied@redhat.com", "time": "Wed Nov 10 11:51:11 2010 +1000" }, "message": "drm/radeon/kms: Fix retrying ttm_bo_init() after it failed once.\n\nIf ttm_bo_init() returns failure, it already destroyed the BO, so we need to\nretry from scratch.\n\nSigned-off-by: Michel Dänzer \u003cdaenzer@vmware.com\u003e\nTested-by: Markus Trippelsdorf \u003cmarkus@trippelsdorf.de\u003e\nCc: stable@kernel.org\nSigned-off-by: Dave Airlie \u003cairlied@redhat.com\u003e\n" }, { "commit": "b2298fd27127f872881048fd37cb9217a648ae06", "tree": "6399cc95f47a3ae434074a96ed8b1e1c967a3765", "parents": [ "bdd91b2b571c80dacfca88667d935f9907e62931" ], "author": { "name": "Alex Deucher", "email": "alexdeucher@gmail.com", "time": "Mon Nov 08 18:39:18 2010 +0000" }, "committer": { "name": "Dave Airlie", "email": "airlied@redhat.com", "time": "Tue Nov 09 13:44:18 2010 +1000" }, "message": "drm/radeon/kms: fix thermal sensor reporting on rv6xx\n\nTemperature is not shifted as on newer asics.\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": "bdd91b2b571c80dacfca88667d935f9907e62931", "tree": "a5921ad85a60122b05d9a9a6391cc117500a3f10", "parents": [ "fb939dfcf2a3a70357000617799925b6a11f9348" ], "author": { "name": "Tyson Whitehead", "email": "twhitehead@gmail.com", "time": "Mon Nov 08 16:08:30 2010 +0000" }, "committer": { "name": "Dave Airlie", "email": "airlied@redhat.com", "time": "Tue Nov 09 13:43:43 2010 +1000" }, "message": "drm/radeon/kms: fix bugs in ddc and cd path router code\n\nThis is a follow on to:\n2b5b1d7da9583484b3a9e7e375a90ca0e8ca07c2\n(drm/radeon/kms: add support for clock/data path routers)\n\nThat patch completed mux support for ddc and cd line routing\nbetween connectors. This patch fixes an indexing typo that was\nresulting in the atom bios router objects not always being walked,\nensures the validity entries for the reused router structure are\nreset for every connector object walked, and corrects the masking\noperations used to update the mux control bits.\n\nFixes:\nhttps://bugs.freedesktop.org/show_bug.cgi?id\u003d31339\n\nSigned-off-by: Tyson Whitehead \u003ctwhitehead@gmail.com\u003e\nSigned-off-by: Alex Deucher \u003calexdeucher@gmail.com\u003e\nSigned-off-by: Dave Airlie \u003cairlied@redhat.com\u003e\n" }, { "commit": "fb939dfcf2a3a70357000617799925b6a11f9348", "tree": "7b307b6edbd6e6c6f7b8a93a9fc95e1d87abcc8f", "parents": [ "dccb2a952b1f0b51978fcb3f9899c7f46ffd4b28" ], "author": { "name": "Alex Deucher", "email": "alexdeucher@gmail.com", "time": "Mon Nov 08 16:08:29 2010 +0000" }, "committer": { "name": "Dave Airlie", "email": "airlied@redhat.com", "time": "Tue Nov 09 13:43:32 2010 +1000" }, "message": "drm/radeon/kms: add support for clock/data path routers\n\nThis is a follow on to:\n26b5bc986423cf3887e09188cb662ed651c5374d\n(drm/radeon/kms: add support for router objects)\n\nThat patch added support for systems that use a mux to control\nthe ddc line routing between the connectors. This patch adds\nsupport for systems that use a mux to control the encoder\nclock and data path routing to the connectors.\n\nShould fix:\nhttps://bugs.freedesktop.org/show_bug.cgi?id\u003d31339\n\nSigned-off-by: Alex Deucher \u003calexdeucher@gmail.com\u003e\nSigned-off-by: Dave Airlie \u003cairlied@redhat.com\u003e\n" }, { "commit": "dccb2a952b1f0b51978fcb3f9899c7f46ffd4b28", "tree": "afa1f5821dcd4e1ca2035a0fdc374bfa1ecd45cb", "parents": [ "ec3789ccccc4ded3b136ea93dec94b764b014525" ], "author": { "name": "Kulikov Vasiliy", "email": "segooon@gmail.com", "time": "Sat Nov 06 14:41:16 2010 +0000" }, "committer": { "name": "Dave Airlie", "email": "airlied@redhat.com", "time": "Tue Nov 09 13:42:15 2010 +1000" }, "message": "drm: vmwgfx: fix information leak to userland\n\nStructure drm_vmw_fence_rep is copied to userland with field \"pad64\"\nuninitialized. It leads to leaking of contents of kernel stack memory.\n\nSigned-off-by: Vasiliy Kulikov \u003csegooon@gmail.com\u003e\nReviewed-by: Thomas Hellstrom \u003cthellstrom@vmware.com\u003e\nSigned-off-by: Dave Airlie \u003cairlied@redhat.com\u003e\n" }, { "commit": "ec3789ccccc4ded3b136ea93dec94b764b014525", "tree": "41439c65d529e1d6ea08a602d7172ef49e9fbe17", "parents": [ "1ef0724dbd9c9e6f421a8987f58b8e034da43ec2" ], "author": { "name": "Joe Perches", "email": "joe@perches.com", "time": "Fri Nov 05 03:07:34 2010 +0000" }, "committer": { "name": "Dave Airlie", "email": "airlied@redhat.com", "time": "Tue Nov 09 13:41:35 2010 +1000" }, "message": "drivers/gpu: Use vzalloc\n\nSigned-off-by: Joe Perches \u003cjoe@perches.com\u003e\nReviewed-by: Thomas Hellstrom \u003cthellstrom@vmware.com\u003e\nSigned-off-by: Dave Airlie \u003cairlied@redhat.com\u003e\n" }, { "commit": "1ef0724dbd9c9e6f421a8987f58b8e034da43ec2", "tree": "3d2b02a4e89e17eef46f269b0bbca057e06a8cc8", "parents": [ "29e190e049168b01dc5fa26d577ef99cafd753ee" ], "author": { "name": "Thomas Hellstrom", "email": "thellstrom@vmware.com", "time": "Tue Nov 02 13:21:49 2010 +0000" }, "committer": { "name": "Dave Airlie", "email": "airlied@redhat.com", "time": "Tue Nov 09 13:39:34 2010 +1000" }, "message": "drm/vmwgfx: Fix oops on failing bo pin\n\nWhen bo pin failed during modesetting,\nvmwgfx would try to unref a non-existing buffer object.\n\nSigned-off-by: Thomas Hellstrom \u003cthellstrom@vmware.com\u003e\nSigned-off-by: Dave Airlie \u003cairlied@redhat.com\u003e\n" }, { "commit": "29e190e049168b01dc5fa26d577ef99cafd753ee", "tree": "e8e6a543caa6ad85bd2e3467f0326a8d27ef777c", "parents": [ "aa123268c2623c62e33248dafc0572f091689e86" ], "author": { "name": "Thomas Hellstrom", "email": "thellstrom@vmware.com", "time": "Tue Nov 02 13:21:48 2010 +0000" }, "committer": { "name": "Dave Airlie", "email": "airlied@redhat.com", "time": "Tue Nov 09 13:39:06 2010 +1000" }, "message": "drm/ttm: Remove the CAP_SYS_ADMIN requirement for bo pinning\n\nThis breaks vmwgfx non-root EGL clients and is a remnant from the\nTTM user-space interface. This test should be done in the driver.\nReplace the remaining placement test with a BUG_ON, since triggering\nit is a driver bug.\n\nSigned-off-by: Thomas Hellstrom \u003cthellstrom@vmware.com\u003e\nSigned-off-by: Dave Airlie \u003cairlied@redhat.com\u003e\n" }, { "commit": "aa123268c2623c62e33248dafc0572f091689e86", "tree": "8a61fcdcc61849b5b931466bc4560b543bc75527", "parents": [ "a0ae5864d42b41c411368bd689462bf063c029c8" ], "author": { "name": "Thomas Hellstrom", "email": "thellstrom@vmware.com", "time": "Tue Nov 02 13:21:47 2010 +0000" }, "committer": { "name": "Dave Airlie", "email": "airlied@redhat.com", "time": "Tue Nov 09 13:38:32 2010 +1000" }, "message": "drm/ttm: Make sure a sync object doesn\u0027t disappear while we use it\n\nThe sync object may disappear as soon as we release the bo::lock, so\ntake a reference on it while we use it.\nOne option would be to call sync_object_flush() before releasing the bo::lock,\nbut that would put an atomic requirement on that function.\n\nSigned-off-by: Thomas Hellstrom \u003cthellstrom@vmware.com\u003e\nSigned-off-by: Dave Airlie \u003cairlied@redhat.com\u003e\n" }, { "commit": "a0ae5864d42b41c411368bd689462bf063c029c8", "tree": "c8a450cdf031f9d3b2450994451c2938ca1c716a", "parents": [ "fce7d61be01ad7606056608be08fef15b70eeb84" ], "author": { "name": "Alex Deucher", "email": "alexdeucher@gmail.com", "time": "Tue Nov 02 05:26:48 2010 +0000" }, "committer": { "name": "Dave Airlie", "email": "airlied@redhat.com", "time": "Tue Nov 09 13:37:47 2010 +1000" }, "message": "drm/radeon/kms: don\u0027t disable shared encoders on pre-DCE3 display blocks\n\nThe A/B links aren\u0027t independantly useable on these blocks so when\nwe disable the encoders, make sure to only disable the encoder when\nthere is no connector using it.\n\nShould fix:\nhttps://bugs.freedesktop.org/show_bug.cgi?id\u003d18564\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": "fce7d61be01ad7606056608be08fef15b70eeb84", "tree": "362887ff2bd2b0e034b882345886cbdbedfa4e5c", "parents": [ "85b54e0c194fe216eb70cbce44365cef42cdc33e" ], "author": { "name": "Joe Perches", "email": "joe@perches.com", "time": "Sat Oct 30 21:08:30 2010 +0000" }, "committer": { "name": "Dave Airlie", "email": "airlied@redhat.com", "time": "Tue Nov 09 13:37:15 2010 +1000" }, "message": "drivers/gpu/drm: Update WARN uses\n\nCoalesce long formats.\nAlign arguments.\nAdd missing newlines.\n\nSigned-off-by: Joe Perches \u003cjoe@perches.com\u003e\nSigned-off-by: Dave Airlie \u003cairlied@redhat.com\u003e\n" }, { "commit": "85b54e0c194fe216eb70cbce44365cef42cdc33e", "tree": "df75b40feb4cd2aa6b89e112895e77c678a67674", "parents": [ "0ea75e23356f73b4300492e04a62c90787a55c2d" ], "author": { "name": "Joe Perches", "email": "joe@perches.com", "time": "Sun Oct 31 22:33:53 2010 +0000" }, "committer": { "name": "Dave Airlie", "email": "airlied@redhat.com", "time": "Tue Nov 09 13:35:42 2010 +1000" }, "message": "drivers/gpu/drm/vmwgfx: Fix k.alloc switched arguments\n\nSigned-off-by: Joe Perches \u003cjoe@perches.com\u003e\nReviewed-by: Matt Turner \u003cmattst88@gmail.com\u003e\nReviewed-by: Thomas Hellstrom \u003cthellstrom@vmware.com\u003e\nSigned-off-by: Dave Airlie \u003cairlied@redhat.com\u003e\n" }, { "commit": "0ea75e23356f73b4300492e04a62c90787a55c2d", "tree": "5c5c193ed9c77b9acd0c74a0fe4745529e81af6a", "parents": [ "c5d46b4e9f5604ba3e97986ffbd461d3cca79e8b" ], "author": { "name": "Sam Tygier", "email": "samtygier@yahoo.co.uk", "time": "Thu Sep 23 10:11:01 2010 +0100" }, "committer": { "name": "Dave Airlie", "email": "airlied@redhat.com", "time": "Tue Nov 09 13:34:14 2010 +1000" }, "message": "DRM: ignore invalid EDID extensions\n\nCurrently an invalid EDID extension will cause the whole EDID to be considered invalid. Instead just drop the invalid extensions, and return the valid ones. The base block is modified to claim to have the number valid extensions, and the check sum is updated.\n\nFor my EIZO S2242W the base block is fine, but the extension block is all zeros. Without this patch I get no X and no VTs.\n\nSigned-off-by: Sam Tygier \u003csamtygier@yahoo.co.uk\u003e\nSigned-off-by: Dave Airlie \u003cairlied@redhat.com\u003e\n" }, { "commit": "c5d46b4e9f5604ba3e97986ffbd461d3cca79e8b", "tree": "56b3d6129087a805a3fe2dfb993bfc33138ef8ff", "parents": [ "7dcebb52f6e0cd5150660a4c37f27cf4c0f1b9b9" ], "author": { "name": "Alex Deucher", "email": "alexdeucher@gmail.com", "time": "Fri Oct 29 13:49:25 2010 -0400" }, "committer": { "name": "Dave Airlie", "email": "airlied@redhat.com", "time": "Tue Nov 09 13:34:07 2010 +1000" }, "message": "drm/radeon/kms: make the connector code less verbose\n\nMake more of the connector code debug only to avoid\nspamming the kernel logs with detect and add modes\nmessages.\n\nSigned-off-by: Alex Deucher \u003calexdeucher@gmail.com\u003e\nSigned-off-by: Dave Airlie \u003cairlied@redhat.com\u003e\n" }, { "commit": "7dcebb52f6e0cd5150660a4c37f27cf4c0f1b9b9", "tree": "237693d0d7876b77707fc09fe98997871d01c2b2", "parents": [ "06fba6d4168069d818593e2fcc2d4bd0f888e97b" ], "author": { "name": "Thomas Hellstrom", "email": "thellstrom@vmware.com", "time": "Fri Oct 29 10:46:49 2010 +0200" }, "committer": { "name": "Dave Airlie", "email": "airlied@redhat.com", "time": "Tue Nov 09 13:33:57 2010 +1000" }, "message": "drm/ttm: remove failed ttm binding error printout\n\nThe driver (for example vmwgfx) may want to silently deal with the\nerror itself.\n\nSigned-off-by: Thomas Hellstrom \u003cthellstrom@vmware.com\u003e\nSigned-off-by: Dave Airlie \u003cairlied@redhat.com\u003e\n" }, { "commit": "06fba6d4168069d818593e2fcc2d4bd0f888e97b", "tree": "25f0d1338da8942ef54b8ab926a48c1789317eee", "parents": [ "dbc4a5b83585e89a6bce650d32426f61c8d4bca5" ], "author": { "name": "Thomas Hellstrom", "email": "thellstrom@vmware.com", "time": "Fri Oct 29 10:46:48 2010 +0200" }, "committer": { "name": "Dave Airlie", "email": "airlied@redhat.com", "time": "Tue Nov 09 13:33:49 2010 +1000" }, "message": "drm/ttm: Add a barrier when unreserving\n\nSince we\u0027re doing this outside of a spinlock to provide the necessary\nbarriers, add an explicit barrier.\n\nSigned-off-by: Thomas Hellstrom \u003cthellstrom@vmware.com\u003e\nSigned-off-by: Dave Airlie \u003cairlied@redhat.com\u003e\n" }, { "commit": "dbc4a5b83585e89a6bce650d32426f61c8d4bca5", "tree": "8b15b17b56b207bccf156ddd02305a80c642544c", "parents": [ "6e4c55db120b03d411e0eff7cd35f3edabbefe14" ], "author": { "name": "Thomas Hellstrom", "email": "thellstrom@vmware.com", "time": "Fri Oct 29 10:46:47 2010 +0200" }, "committer": { "name": "Dave Airlie", "email": "airlied@redhat.com", "time": "Tue Nov 09 13:33:42 2010 +1000" }, "message": "drm/ttm: Remove mm init error printouts and checks\n\nReplace with BUG_ON(). These error messages remained from the time\nwhen TTM was initialized from user-space. Nowadays hitting one of those\nis really a kernel bug.\n\nSigned-off-by: Thomas Hellstrom \u003cthellstrom@vmware.com\u003e\nSigned-off-by: Dave Airlie \u003cairlied@redhat.com\u003e\n" }, { "commit": "6e4c55db120b03d411e0eff7cd35f3edabbefe14", "tree": "998197578cb7824f7a4812b600b0b384f75d3aea", "parents": [ "d7a67cb16238abb3109c111761797e0584a6caf9" ], "author": { "name": "Thomas Hellstrom", "email": "thellstrom@vmware.com", "time": "Fri Oct 29 10:46:46 2010 +0200" }, "committer": { "name": "Dave Airlie", "email": "airlied@redhat.com", "time": "Tue Nov 09 13:33:33 2010 +1000" }, "message": "drm/ttm: Remove pointless list_empty check\n\nSigned-off-by: Thomas Hellstrom \u003cthellstrom@vmware.com\u003e\nSigned-off-by: Dave Airlie \u003cairlied@redhat.com\u003e\n" }, { "commit": "d7a67cb16238abb3109c111761797e0584a6caf9", "tree": "19ac4ed6632d24adda3c5b311612ef34c40fb7bd", "parents": [ "3205bc242b5e3950c808049dbf199fca91f2c844" ], "author": { "name": "Thomas Hellstrom", "email": "thellstrom@vmware.com", "time": "Fri Oct 29 10:46:45 2010 +0200" }, "committer": { "name": "Dave Airlie", "email": "airlied@redhat.com", "time": "Tue Nov 09 13:33:24 2010 +1000" }, "message": "drm/ttm: Use private locks for the default bo range manager\n\nSearching for a free block in the range manager may in some situations be a\nlenghty operation, and we want to avoid holding the global lru lock\nduring that time. Instead use a per-manager spinlock.\n\nThis leaves the global lru lock for quick lru list and swap list manipulation\nonly, including list manipulation associated with reserving buffer objects.\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": "f5d8e0eb7a4308f46faf570fb7da1952c68992c5", "tree": "f0f22b2812ab091b08a3271f4860499f68f84fea", "parents": [ "7c6048b7c83690ce59e65922fb2875479a22300e" ], "author": { "name": "Alex Deucher", "email": "alexdeucher@gmail.com", "time": "Thu Oct 28 19:00:24 2010 -0400" }, "committer": { "name": "Dave Airlie", "email": "airlied@redhat.com", "time": "Tue Nov 09 13:33:08 2010 +1000" }, "message": "drm/radeon/kms/evergreen: add missing pm.vblank_sync update in vbl handler\n\nShould fix dynpm problems on evergreen boards\n\nSigned-off-by: Alex Deucher \u003calexdeucher@gmail.com\u003e\nSigned-off-by: Dave Airlie \u003cairlied@redhat.com\u003e\n" }, { "commit": "7c6048b7c83690ce59e65922fb2875479a22300e", "tree": "89d754eb7203b5a43bea8fb4cd5a8c631c54836a", "parents": [ "91839fd577abc5fb39fb2238e05e847c70c9dec3" ], "author": { "name": "Ingo Molnar", "email": "mingo@elte.hu", "time": "Thu Oct 28 15:12:04 2010 +0200" }, "committer": { "name": "Dave Airlie", "email": "airlied@redhat.com", "time": "Tue Nov 09 13:33:00 2010 +1000" }, "message": "drm/stub/Kconfig: fix Kconfig for stub driver.\n\n* Dave Airlie \u003cairlied@linux.ie\u003e wrote:\n\n\u003e \u003e Lee, Chun-Yi (1):\n\u003e \u003e gpu: Add Intel GMA500(Poulsbo) Stub Driver\n\nToday\u0027s -tip fails to build due to upstream commit e26fd11 (\"gpu: Add Intel\nGMA500(Poulsbo) Stub Driver\"), committed two days ago and merged yesterday, on\nx86 allmodconfig with BACKLIGHT_CLASS_DEVICE disabled:\n\n drivers/built-in.o: In function `acpi_video_bus_put_one_device\u0027:\n video.c:(.text+0x7d26f): undefined reference to `backlight_device_unregister\u0027\n drivers/built-in.o: In function `acpi_video_switch_brightness\u0027:\n video.c:(.text+0x7d6f5): undefined reference to `backlight_force_update\u0027\n drivers/built-in.o: In function `acpi_video_device_find_cap\u0027:\n video.c:(.text+0x7dfdb): undefined reference to `backlight_device_register\u0027\n\ndrivers/gpu/stub/Kconfig selects ACPI_VIDEO, but ACPI_VIDEO is a complex interactive\nKconfig option with a lot of dependencies:\n\n config ACPI_VIDEO\n\ttristate \"Video\"\n\tdepends on X86 \u0026\u0026 BACKLIGHT_CLASS_DEVICE \u0026\u0026 VIDEO_OUTPUT_CONTROL\n\tdepends on INPUT\n\tselect THERMAL\n\thelp\n\t This driver implements the ACPI Extensions For Display Adapters\n\nand if any of its dependencies are not met, we get a build failure. This problem was\napparently realized in the driver at a certain stage:\n\n config STUB_POULSBO\n tristate \"Intel GMA500 Stub Driver\"\n depends on PCI\n # Poulsbo stub depends on ACPI_VIDEO when ACPI is enabled\n # but for select to work, need to select ACPI_VIDEO\u0027s dependencies, ick\n select ACPI_VIDEO if ACPI\n\nbut not fully understood and not fully fixed.\n\nAs a quick fix select these secondary dependencies, like drivers/gpu/drm/Kconfig\ndoes:\n\n config DRM_I915\n\ttristate \"i915 driver\"\n\tdepends on AGP_INTEL\n\tselect SHMEM\n\tselect DRM_KMS_HELPER\n\tselect FB_CFB_FILLRECT\n\tselect FB_CFB_COPYAREA\n\tselect FB_CFB_IMAGEBLIT\n\t# i915 depends on ACPI_VIDEO when ACPI is enabled\n\t# but for select to work, need to select ACPI_VIDEO\u0027s dependencies, ick\n\tselect VIDEO_OUTPUT_CONTROL if ACPI\n\tselect BACKLIGHT_CLASS_DEVICE if ACPI\n\tselect INPUT if ACPI\n\tselect ACPI_VIDEO if ACPI\n\tselect ACPI_BUTTON if ACPI\n\thelp\n\t Choose this option if you have a system that has Intel 830M, 845G,\n\t 852GM, 855GM 865G or 915G integrated graphics. If M is selected, the\n\nBut it\u0027s arguably not particularly nice looking, so maybe this area of code is ripe\nfor a Kconfig restructuring/cleanup.\n\nSigned-off-by: Ingo Molnar \u003cmingo@elte.hu\u003e\nSigned-off-by: Dave Airlie \u003cairlied@redhat.com\u003e\n" }, { "commit": "91839fd577abc5fb39fb2238e05e847c70c9dec3", "tree": "86238c628c368aab28e96d61de99b7d739eec1ff", "parents": [ "a7bcf21e60c73cb7f7c13fad928967d7e47c3cac", "3f8ff0e72d75fdbe7f2cba2c4015fd9fdd9e13fd" ], "author": { "name": "Dave Airlie", "email": "airlied@redhat.com", "time": "Tue Nov 09 13:26:13 2010 +1000" }, "committer": { "name": "Dave Airlie", "email": "airlied@redhat.com", "time": "Tue Nov 09 13:26:13 2010 +1000" }, "message": "Merge branch \u0027drm-intel-fixes\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/ickle/drm-intel\n\n* \u0027drm-intel-fixes\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/ickle/drm-intel:\n drm/i915: Fix LVDS fixed-mode regression from 219adae1\n drm/i915/ringbuffer: Use the HEAD auto-reporting mechanism\n drm/i915: Avoid might_fault during pwrite whilst holding our mutex\n agp/intel: fix cache control for sandybridge\n agp/intel: restore cache behavior on sandybridge\n drm/i915; Don\u0027t apply Ironlake FDI clock workaround to Sandybridge\n drm/i915: Fix KMS regression on Sandybridge/CPT\n i915: reprogram power monitoring registers on resume\n drm/i915: SNB BLT workaround\n drm/i915: Fix the graphics frequency clamping at init and when IPS is active.\n drm/i915: Allow powersave modparam to be adjusted at runtime.\n drm/i915: Apply big hammer to serialise buffer access between rings\n drm/i915: opregion_setup: iounmap correct address\n drm/i915: Flush read-only buffers from the active list upon idle as well\n i915: signedness bug in check_overlay_src()\n drm/i915: Fix typo from \"Enable DisplayPort Audio\"\n" }, { "commit": "3f8ff0e72d75fdbe7f2cba2c4015fd9fdd9e13fd", "tree": "8ff3d7b542e72604eabe107ea90d96afb22dd3e2", "parents": [ "08deebf98783d3de553eed2c9b6b8dcc7e168567" ], "author": { "name": "Chris Wilson", "email": "chris@chris-wilson.co.uk", "time": "Mon Nov 08 23:20:52 2010 +0000" }, "committer": { "name": "Chris Wilson", "email": "chris@chris-wilson.co.uk", "time": "Tue Nov 09 00:59:32 2010 +0000" }, "message": "drm/i915: Fix LVDS fixed-mode regression from 219adae1\n\nCommit 219adae1 cached the EDID found during LVDS init, but in the\nprocess prevented the init routine from discovering the preferred\nfixed-mode for the panel. This was causing us to guess the correct mode,\nwhich sometimes is wide of the mark.\n\nReported-and-tested-by: Jon Masters \u003cjonathan@jonmasters.org\u003e\nSigned-off-by: Chris Wilson \u003cchris@chris-wilson.co.uk\u003e\n" }, { "commit": "08deebf98783d3de553eed2c9b6b8dcc7e168567", "tree": "c47353e5384038c34614cd8c00025976a8de5b28", "parents": [ "b47b30ccdaad5f2fc39a1a65921bffd150574a91" ], "author": { "name": "Chris Wilson", "email": "chris@chris-wilson.co.uk", "time": "Fri Nov 05 08:56:38 2010 +0000" }, "committer": { "name": "Chris Wilson", "email": "chris@chris-wilson.co.uk", "time": "Mon Nov 08 09:21:47 2010 +0000" }, "message": "drm/i915/ringbuffer: Use the HEAD auto-reporting mechanism\n\nMy Sandybridge only reports 0 for the ring buffer registers, causing it\nto hang as soon as we exhaust the available ring. As a workaround, take\nadvantage of our huge ring buffers and use the auto-reporting mechanism\nto update the status page with the HEAD location every 64 KiB.\n\nCherry-picked from 6aa56062eaba67adfb247cded244fd877329588d.\n\nBugzilla: https://bugs.freedesktop.org/show_bug.cgi?id\u003d31404\nTested-by: Zhao Jian \u003cjian.j.zhao@intel.com\u003e\nCc: stable@kernel.org\nSigned-off-by: Chris Wilson \u003cchris@chris-wilson.co.uk\u003e\n" }, { "commit": "b47b30ccdaad5f2fc39a1a65921bffd150574a91", "tree": "9eaef1721b05daa71010de638e02b2e6b4850598", "parents": [ "16a02cf08a2de0863daf7ebb91718d7c6bbe7f9c" ], "author": { "name": "Chris Wilson", "email": "chris@chris-wilson.co.uk", "time": "Mon Nov 08 01:12:29 2010 +0000" }, "committer": { "name": "Chris Wilson", "email": "chris@chris-wilson.co.uk", "time": "Mon Nov 08 09:19:11 2010 +0000" }, "message": "drm/i915: Avoid might_fault during pwrite whilst holding our mutex\n\n... and so prevent a potential circular reference:\n\n [ INFO: possible circular locking dependency detected ]\n 2.6.37-rc1-uwe1+ #4\n -------------------------------------------------------\n Xorg/1401 is trying to acquire lock:\n (\u0026mm-\u003emmap_sem){++++++}, at: [\u003cc01e4ddb\u003e] might_fault+0x4b/0xa0\n\n but task is already holding lock:\n (\u0026dev-\u003estruct_mutex){+.+.+.}, at: [\u003cf869c3ac\u003e]\n i915_mutex_lock_interruptible+0x3c/0x60 [i915]\n\n which lock already depends on the new lock.\n\nWhen the locking around the pwrite ioctl was simplified, I did not spot\nthat the phys path never took any locks and so we introduced this\npotential circular reference.\n\nReported-by: Uwe Helm \u003cuwe.helm@googlemail.com\u003e\nSigned-off-by: Chris Wilson \u003cchris@chris-wilson.co.uk\u003e\n" }, { "commit": "e07ac3a0b17ed9dec26b742ea41514063ef12386", "tree": "d02accfc81e76a60a3bf29e93c24213aa6aea2e4", "parents": [ "5e84e1a487bf6ae912aac1142bdf399b8bdc9238" ], "author": { "name": "Zhenyu Wang", "email": "zhenyu.z.wang@intel.com", "time": "Thu Nov 04 09:02:54 2010 +0000" }, "committer": { "name": "Chris Wilson", "email": "chris@chris-wilson.co.uk", "time": "Thu Nov 04 09:39:15 2010 +0000" }, "message": "drm/i915; Don\u0027t apply Ironlake FDI clock workaround to Sandybridge\n\nSigned-off-by: Zhenyu Wang \u003czhenyu.z.wang@intel.com\u003e\nCc: stable@kernel.org\nSigned-off-by: Chris Wilson \u003cchris@chris-wilson.co.uk\u003e\n" }, { "commit": "5e84e1a487bf6ae912aac1142bdf399b8bdc9238", "tree": "756d9acaeb7e449d3bfb005347cb456c3568fe5e", "parents": [ "48fcfc888b48ad49dd83faa107264bbfb0089cad" ], "author": { "name": "Zhenyu Wang", "email": "zhenyuw@linux.intel.com", "time": "Thu Oct 28 16:38:08 2010 +0800" }, "committer": { "name": "Chris Wilson", "email": "chris@chris-wilson.co.uk", "time": "Thu Nov 04 09:39:08 2010 +0000" }, "message": "drm/i915: Fix KMS regression on Sandybridge/CPT\n\nWe should enable FDI normal training on Sandybridge/CPT system\nas well.\n\nSigned-off-by: Zhenyu Wang \u003czhenyuw@linux.intel.com\u003e\n[ickle: removed unrelated chunks]\nCc: stable@kernel.org\nSigned-off-by: Chris Wilson \u003cchris@chris-wilson.co.uk\u003e\n" }, { "commit": "48fcfc888b48ad49dd83faa107264bbfb0089cad", "tree": "7742a70634d76cbccf3e7a020b8a7e5cfe5a8eaa", "parents": [ "5588978882b5f4b81169bd7f9bc941e3a12ee8ba" ], "author": { "name": "Kyle McMartin", "email": "kyle@redhat.com", "time": "Wed Nov 03 16:27:57 2010 -0400" }, "committer": { "name": "Chris Wilson", "email": "chris@chris-wilson.co.uk", "time": "Wed Nov 03 21:44:47 2010 +0000" }, "message": "i915: reprogram power monitoring registers on resume\n\nFixes issue where i915_gfx_val was reporting values several\norders of magnitude higher than physically possible (without\nleaving scorch marks on my thighs at least.)\n\nSigned-off-by: Kyle McMartin \u003ckyle@redhat.com\u003e\nReviewed-by: Jesse Barnes \u003cjbarnes@virtuousgeek.org\u003e\nCc: stable@kernel.org\nSigned-off-by: Chris Wilson \u003cchris@chris-wilson.co.uk\u003e\n" }, { "commit": "5588978882b5f4b81169bd7f9bc941e3a12ee8ba", "tree": "01c9af11069c0402e483369728bc9a879ce0a86e", "parents": [ "80dbf4b72b0bcac71fc683914293555edb7bc7ee" ], "author": { "name": "Chris Wilson", "email": "chris@chris-wilson.co.uk", "time": "Tue Nov 02 10:38:58 2010 +0000" }, "committer": { "name": "Chris Wilson", "email": "chris@chris-wilson.co.uk", "time": "Tue Nov 02 10:48:48 2010 +0000" }, "message": "drm/i915: SNB BLT workaround\n\nOn some stepping of SNB cpu, the first command to be parsed in BLT\ncommand streamer should be MI_BATCHBUFFER_START otherwise the GPU\nmay hang.\n\n(cherry picked from commit 8d19215be8254f4f75e9c5a0d28345947b0382db)\n\nConflicts:\n\n\tdrivers/gpu/drm/i915/intel_ringbuffer.c\n\tdrivers/gpu/drm/i915/intel_ringbuffer.h\n\nSigned-off-by: Zou Nan hai \u003cnanhai.zou@intel.com\u003e\nCc: stable@kernel.org\nSigned-off-by: Chris Wilson \u003cchris@chris-wilson.co.uk\u003e\n" }, { "commit": "80dbf4b72b0bcac71fc683914293555edb7bc7ee", "tree": "0d18207f1db8ad651eee96680cc470c52464dba3", "parents": [ "0aa992777270f0ea7097170fa50a1d98615eb0d4" ], "author": { "name": "Jesse Barnes", "email": "jbarnes@virtuousgeek.org", "time": "Mon Nov 01 14:12:01 2010 -0700" }, "committer": { "name": "Chris Wilson", "email": "chris@chris-wilson.co.uk", "time": "Tue Nov 02 09:34:52 2010 +0000" }, "message": "drm/i915: Fix the graphics frequency clamping at init and when IPS is active.\n\nPart of the issue here was that Eric slipped in a debug hack for\ntesting the i915 IPS code before the intel_ips.c driver had landed.\nThis caused the driver to always use the full range of frequencies,\nwhich is only legal when IPS tells us we have the headroom. Once that\nhack was removed, there was confusion about the driver\u0027s frequency\nclamping variables: max_delay is the driver\u0027s current limit on the\nhighest frequency the IPS driver wants us to use, while dev_priv-\u003efmax\nis the hardware-reported limit that the IPS driver can increase up to.\n\nTested with IPS driver loaded or not. Note that on Ironlake systems\nwithout the IPS driver loaded this will result in a performance\nreduction, and the inital warmup of frequency limits can impact\nbenchmarking on systems with IPS loaded.\n\nSigned-off-by: Jesse Barnes \u003cjbarnes@virtuousgeek.org\u003e\nSigned-off-by: Eric Anholt \u003ceric@anholt.net\u003e\n[ickle: demoted a debugging printk]\nCc: stable@kernel.org\nSigned-off-by: Chris Wilson \u003cchris@chris-wilson.co.uk\u003e\n" }, { "commit": "0aa992777270f0ea7097170fa50a1d98615eb0d4", "tree": "a0afff465cbd442a64a0fb322dbfd46329719db7", "parents": [ "c6afd658073f9fdb4cc80664dac71fa9db6fdf35" ], "author": { "name": "Chris Wilson", "email": "chris@chris-wilson.co.uk", "time": "Tue Nov 02 09:20:50 2010 +0000" }, "committer": { "name": "Chris Wilson", "email": "chris@chris-wilson.co.uk", "time": "Tue Nov 02 09:23:22 2010 +0000" }, "message": "drm/i915: Allow powersave modparam to be adjusted at runtime.\n\n2.6.36 appears to respect the 0400 mode we assigned to the parameter\npreventing it from being adjusted after loading. However, this is safe\nto adjust at runtime.\n\nBugzilla: https://bugs.freedesktop.org/show_bug.cgi?id\u003d31311\nReported-by: Fernando Lemos \u003cfernandotcl@gmail.com\u003e\nCc: stable@kernel.org\nSigned-off-by: Chris Wilson \u003cchris@chris-wilson.co.uk\u003e\n" }, { "commit": "c6afd658073f9fdb4cc80664dac71fa9db6fdf35", "tree": "80dad4b719a2900195491669da178ababcb80c40", "parents": [ "30c56660fc4ba9bad7847ad43bb059d2447001d4" ], "author": { "name": "Chris Wilson", "email": "chris@chris-wilson.co.uk", "time": "Mon Nov 01 13:39:24 2010 +0000" }, "committer": { "name": "Chris Wilson", "email": "chris@chris-wilson.co.uk", "time": "Mon Nov 01 13:39:24 2010 +0000" }, "message": "drm/i915: Apply big hammer to serialise buffer access between rings\n\nSigned-off-by: Chris Wilson \u003cchris@chris-wilson.co.uk\u003e\nCc: stable@kernel.org\n" }, { "commit": "30c56660fc4ba9bad7847ad43bb059d2447001d4", "tree": "ca58a3e4d8fa624da0df04a570e39a82090f4a2b", "parents": [ "395b70be54bed5fdf6c4173c78e8a49f960f241d" ], "author": { "name": "Christoph Fritz", "email": "chf.fritz@googlemail.com", "time": "Mon Nov 01 11:32:22 2010 +0100" }, "committer": { "name": "Chris Wilson", "email": "chris@chris-wilson.co.uk", "time": "Mon Nov 01 10:29:12 2010 +0000" }, "message": "drm/i915: opregion_setup: iounmap correct address\n\nIn case of an opregion signature mismatch in intel_opregion_setup(),\niounmap the correct address.\n\nSigned-off-by: Christoph Fritz \u003cchf.fritz@googlemail.com\u003e\nCc: stable@kernel.org\nSigned-off-by: Chris Wilson \u003cchris@chris-wilson.co.uk\u003e\n" }, { "commit": "395b70be54bed5fdf6c4173c78e8a49f960f241d", "tree": "b9ba0a69fdacb2808d093a436a53ceab51619c5a", "parents": [ "8f28f54aad8bcf52a47afb6447fac34f96597b6f" ], "author": { "name": "Chris Wilson", "email": "chris@chris-wilson.co.uk", "time": "Thu Oct 28 21:28:46 2010 +0100" }, "committer": { "name": "Chris Wilson", "email": "chris@chris-wilson.co.uk", "time": "Thu Oct 28 21:31:19 2010 +0100" }, "message": "drm/i915: Flush read-only buffers from the active list upon idle as well\n\nIt is possible for the active list to only contain a read-only buffer so\nthat the ring-\u003egpu_write_list remains entry. This leads to an\ninconsistency between i915_gpu_is_active() and i915_gpu_idle() causing\nan infinite spin during the shrinker and an assertion failure that\ni915_gpu_idle() does indeed flush all buffers from the active lists.\n\nSigned-off-by: Chris Wilson \u003cchris@chris-wilson.co.uk\u003e\n" }, { "commit": "b83db1deb29eb4eea9bf5992431d26978e039ce6", "tree": "a59a4d94c41de6889be93b6963c791aa64181f25", "parents": [ "7d2f280e75f05919314e250cadf361a327ed555c", "7e94250312d8b32a18e7e96cee19f2795d224e8c" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Oct 27 20:37:06 2010 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Oct 27 20:37:06 2010 -0700" }, "message": "Merge branch \u0027drm-core-next\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/airlied/drm-2.6\n\n* \u0027drm-core-next\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/airlied/drm-2.6:\n drm/radeon/kms: enable unmappable vram for evergreen\n drm/radeon/kms: fix tiled db height calculation on 6xx/7xx\n drm/radeon/kms: fix handling of tex lookup disable in cs checker on r2xx\n" }, { "commit": "7e94250312d8b32a18e7e96cee19f2795d224e8c", "tree": "fda0c98857ca57d52589aef32c4f40f19ce585b6", "parents": [ "2c7d81acf432fad02073c139355e94a6f7e4df45" ], "author": { "name": "Alex Deucher", "email": "alexdeucher@gmail.com", "time": "Tue Oct 19 00:36:19 2010 -0400" }, "committer": { "name": "Dave Airlie", "email": "airlied@redhat.com", "time": "Thu Oct 28 11:27:24 2010 +1000" }, "message": "drm/radeon/kms: enable unmappable vram for evergreen\n\nEvergreen now has blit support, but unmappable vram support\nwas disabled in c919b371cb734f42b1130e706ecee262f8d9261d\n(drm/radeon/kms: avoid corner case issue with unmappable vram V2)\ndue to merge ordering. This re-enables unmappable vram on\nevergreen.\n\nSigned-off-by: Alex Deucher \u003calexdeucher@gmail.com\u003e\nSigned-off-by: Dave Airlie \u003cairlied@redhat.com\u003e\n" }, { "commit": "2c7d81acf432fad02073c139355e94a6f7e4df45", "tree": "4ee9dbcb3e556b0d67fc67919271202ef3c47284", "parents": [ "43b93fbffc2c080dba2e84df6fce8d7e6c0a2581" ], "author": { "name": "Alex Deucher", "email": "alexdeucher@gmail.com", "time": "Wed Oct 27 01:44:35 2010 -0400" }, "committer": { "name": "Dave Airlie", "email": "airlied@redhat.com", "time": "Thu Oct 28 11:27:07 2010 +1000" }, "message": "drm/radeon/kms: fix tiled db height calculation on 6xx/7xx\n\nCalculate height based on the slice bitfield rather than the size.\nSame as Dave\u0027s CB fix.\n\nSigned-off-by: Alex Deucher \u003calexdeucher@gmail.com\u003e\nSigned-off-by: Dave Airlie \u003cairlied@redhat.com\u003e\n" }, { "commit": "43b93fbffc2c080dba2e84df6fce8d7e6c0a2581", "tree": "10b747157c8fb249b7b86807281d6d61fe5a39d3", "parents": [ "135cba0dc399fdd47bd3ae305c1db75fcd77243f" ], "author": { "name": "Alex Deucher", "email": "alexdeucher@gmail.com", "time": "Wed Oct 27 01:02:35 2010 -0400" }, "committer": { "name": "Dave Airlie", "email": "airlied@redhat.com", "time": "Thu Oct 28 11:27:04 2010 +1000" }, "message": "drm/radeon/kms: fix handling of tex lookup disable in cs checker on r2xx\n\nThere are cases when multiple texture units have to be enabled,\nbut not actually used to sample. This patch checks to see if\nthe lookup_disable bit is set and if so, skips the texture check.\n\nFixes:\nhttps://bugs.freedesktop.org/show_bug.cgi?id\u003d25544\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": "8f28f54aad8bcf52a47afb6447fac34f96597b6f", "tree": "4d6f3b91909ec80b5015ac73b293279d3e5dfce1", "parents": [ "dd2b379f071424f36f9f90ff83cb4ad058c7b6ed" ], "author": { "name": "Dan Carpenter", "email": "error27@gmail.com", "time": "Wed Oct 27 23:17:25 2010 +0200" }, "committer": { "name": "Chris Wilson", "email": "chris@chris-wilson.co.uk", "time": "Wed Oct 27 22:57:59 2010 +0100" }, "message": "i915: signedness bug in check_overlay_src()\n\n\"depth\" should be signed in case packed_depth_bytes() returns -EINVAL.\n\nThis probably doesn\u0027t make a difference at runtime. In the original\ncode we would return -EINVAL later if (rec-\u003eoffset_Y % 4294967274) is\nnon-zero.\n\nSigned-off-by: Dan Carpenter \u003cerror27@gmail.com\u003e\nSigned-off-by: Chris Wilson \u003cchris@chris-wilson.co.uk\u003e\n" }, { "commit": "dd2b379f071424f36f9f90ff83cb4ad058c7b6ed", "tree": "c85bb5c756a36156da7e51683fe6248cfee3ea15", "parents": [ "12ba8d1e9262ce81a695795410bd9ee5c9407ba1" ], "author": { "name": "Takashi Iwai", "email": "tiwai@suse.de", "time": "Tue Oct 26 17:14:36 2010 +0100" }, "committer": { "name": "Chris Wilson", "email": "chris@chris-wilson.co.uk", "time": "Wed Oct 27 08:53:28 2010 +0100" }, "message": "drm/i915: Fix typo from \"Enable DisplayPort Audio\"\n\nHi,\n\nwhile I looked through your changes in drm-intel git tree (as I\u0027ve got\na pressure for supporting DisplayPort audio), I stumbled on the\npossible bug in the commit a9756bb5b25d5d997df0c5d8c95db01292191bea\n\n\tAuthor: Zhenyu Wang \u003czhenyuw@linux.intel.com\u003e\n\tDate: Sun Sep 19 13:09:06 2010 +0800\n\tdrm/i915: Enable DisplayPort audio\n\nIn this commit, you changed the return value of g4x_dp_detect()\nto \"bit\", but it should be \"status\", I suppose.\n\n[ickle: mea culpa.]\nBugzilla: https://bugs.freedesktop.org/show_bug.cgi?id\u003d31094\nSigned-off-by: Chris Wilson \u003cchris@chris-wilson.co.uk\u003e\n" }, { "commit": "c48c43e422c1404fd72c57d1d21a6f6d01e18900", "tree": "48e5d3828b4f5479361986535f71a1ae44e4f3c1", "parents": [ "520045db940a381d2bee1c1b2179f7921b40fb10", "135cba0dc399fdd47bd3ae305c1db75fcd77243f" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Oct 26 18:57:59 2010 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Oct 26 18:57:59 2010 -0700" }, "message": "Merge branch \u0027drm-core-next\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/airlied/drm-2.6\n\n* \u0027drm-core-next\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/airlied/drm-2.6: (476 commits)\n vmwgfx: Implement a proper GMR eviction mechanism\n drm/radeon/kms: fix r6xx/7xx 1D tiling CS checker v2\n drm/radeon/kms: properly compute group_size on 6xx/7xx\n drm/radeon/kms: fix 2D tile height alignment in the r600 CS checker\n drm/radeon/kms/evergreen: set the clear state to the blit state\n drm/radeon/kms: don\u0027t poll dac load detect.\n gpu: Add Intel GMA500(Poulsbo) Stub Driver\n drm/radeon/kms: MC vram map needs to be \u003e\u003d pci aperture size\n drm/radeon/kms: implement display watermark support for evergreen\n drm/radeon/kms/evergreen: add some additional safe regs v2\n drm/radeon/r600: fix tiling issues in CS checker.\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 ...\n\nFix up conflicts in\n - drivers/gpu/drm/i915/{i915_gem.c, i915/intel_overlay.c}: due to the\n new simplified stack-based kmap_atomic() interface\n - drivers/gpu/drm/vmwgfx/vmwgfx_drv.c: added .llseek entry due to BKL\n removal cleanups.\n" }, { "commit": "135cba0dc399fdd47bd3ae305c1db75fcd77243f", "tree": "3eedcd7c5701dfe05246aca3479ab7396169f2e7", "parents": [ "8f895da57da80b307efa2f94b5d4caf801e959a5" ], "author": { "name": "Thomas Hellstrom", "email": "thellstrom@vmware.com", "time": "Tue Oct 26 21:21:47 2010 +0200" }, "committer": { "name": "Dave Airlie", "email": "airlied@redhat.com", "time": "Wed Oct 27 11:07:46 2010 +1000" }, "message": "vmwgfx: Implement a proper GMR eviction mechanism\n\nUse Ben\u0027s new range manager hooks to implement a manager for\nGMRs that manages ids rather than ranges.\nThis means we can use the standard TTM code for binding, unbinding and\neviction.\n\nSigned-off-by: Thomas Hellstrom \u003cthellstrom@vmware.com\u003e\nSigned-off-by: Dave Airlie \u003cairlied@redhat.com\u003e\n" }, { "commit": "8f895da57da80b307efa2f94b5d4caf801e959a5", "tree": "155f6787a13314f65964f745ebba51193a6fcb43", "parents": [ "881fe6c1d06bf49f4ab7aef212cdaf66bd059614" ], "author": { "name": "Alex Deucher", "email": "alexdeucher@gmail.com", "time": "Tue Oct 26 20:22:42 2010 -0400" }, "committer": { "name": "Dave Airlie", "email": "airlied@redhat.com", "time": "Wed Oct 27 10:46:52 2010 +1000" }, "message": "drm/radeon/kms: fix r6xx/7xx 1D tiling CS checker v2\n\nbroken by:\ndrm/radeon/r600: fix tiling issues in CS checker.\n\nv2: only apply it to 1D tiling case.\n\nSigned-off-by: Alex Deucher \u003calexdeucher@gmail.com\u003e\nSigned-off-by: Dave Airlie \u003cairlied@redhat.com\u003e\n" }, { "commit": "3e4d3af501cccdc8a8cca41bdbe57d54ad7e7e73", "tree": "2ce507f7ec7275563653e52f18606aba4f99b7f1", "parents": [ "61ecdb801ef2cd28e32442383106d7837d76deac" ], "author": { "name": "Peter Zijlstra", "email": "a.p.zijlstra@chello.nl", "time": "Tue Oct 26 14:21:51 2010 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Oct 26 16:52:08 2010 -0700" }, "message": "mm: stack based kmap_atomic()\n\nKeep the current interface but ignore the KM_type and use a stack based\napproach.\n\nThe advantage is that we get rid of crappy code like:\n\n\t#define __KM_PTE\t\t\t\\\n\t\t(in_nmi() ? KM_NMI_PTE : \t\\\n\t\t in_irq() ? KM_IRQ_PTE :\t\\\n\t\t KM_PTE0)\n\nand in general can stop worrying about what context we\u0027re in and what kmap\nslots might be appropriate for that.\n\nThe downside is that FRV kmap_atomic() gets more expensive.\n\nFor now we use a CPP trick suggested by Andrew:\n\n #define kmap_atomic(page, args...) __kmap_atomic(page)\n\nto avoid having to touch all kmap_atomic() users in a single patch.\n\n[ not compiled on:\n - mn10300: the arch doesn\u0027t actually build with highmem to begin with ]\n\n[akpm@linux-foundation.org: coding-style fixes]\n[akpm@linux-foundation.org: fix up drivers/gpu/drm/i915/intel_overlay.c]\nAcked-by: Rik van Riel \u003criel@redhat.com\u003e\nSigned-off-by: Peter Zijlstra \u003ca.p.zijlstra@chello.nl\u003e\nAcked-by: Chris Metcalf \u003ccmetcalf@tilera.com\u003e\nCc: David Howells \u003cdhowells@redhat.com\u003e\nCc: Hugh Dickins \u003chughd@google.com\u003e\nCc: Ingo Molnar \u003cmingo@elte.hu\u003e\nCc: Thomas Gleixner \u003ctglx@linutronix.de\u003e\nCc: \"H. Peter Anvin\" \u003chpa@zytor.com\u003e\nCc: Steven Rostedt \u003crostedt@goodmis.org\u003e\nCc: Russell King \u003crmk@arm.linux.org.uk\u003e\nCc: Ralf Baechle \u003cralf@linux-mips.org\u003e\nCc: David Miller \u003cdavem@davemloft.net\u003e\nCc: Paul Mackerras \u003cpaulus@samba.org\u003e\nCc: Benjamin Herrenschmidt \u003cbenh@kernel.crashing.org\u003e\nCc: Dave Airlie \u003cairlied@linux.ie\u003e\nCc: Li Zefan \u003clizf@cn.fujitsu.com\u003e\nSigned-off-by: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "881fe6c1d06bf49f4ab7aef212cdaf66bd059614", "tree": "53b482c43c60ba9301e312f27d05631f0780fd4c", "parents": [ "354da653233898ed1e51f20cebac9705456bf9b1" ], "author": { "name": "Alex Deucher", "email": "alexdeucher@gmail.com", "time": "Mon Oct 18 23:54:56 2010 -0400" }, "committer": { "name": "Dave Airlie", "email": "airlied@redhat.com", "time": "Tue Oct 26 14:47:54 2010 +1000" }, "message": "drm/radeon/kms: properly compute group_size on 6xx/7xx\n\nNeeded for tiled surfaces.\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": "354da653233898ed1e51f20cebac9705456bf9b1", "tree": "5a5dcd470d57ca867da35ea3f2b8fc7938efd51f", "parents": [ "2281a378e1830d7ab78d3067f228e4e55d368b0d" ], "author": { "name": "Alex Deucher", "email": "alexdeucher@gmail.com", "time": "Mon Oct 18 23:45:39 2010 -0400" }, "committer": { "name": "Dave Airlie", "email": "airlied@redhat.com", "time": "Tue Oct 26 14:47:44 2010 +1000" }, "message": "drm/radeon/kms: fix 2D tile height alignment in the r600 CS checker\n\nmacro tile heights are aligned to num channels, not num banks.\n\nNoticed by Dave Airlie.\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": "2281a378e1830d7ab78d3067f228e4e55d368b0d", "tree": "8fce4594a1d1b8854d219f5297ccb5ecfc263b10", "parents": [ "c3cceeddf0b5f97b0d2352b98ef0f025e31a9ae3" ], "author": { "name": "Alex Deucher", "email": "alexdeucher@gmail.com", "time": "Thu Oct 21 13:31:38 2010 -0400" }, "committer": { "name": "Dave Airlie", "email": "airlied@redhat.com", "time": "Tue Oct 26 14:42:39 2010 +1000" }, "message": "drm/radeon/kms/evergreen: set the clear state to the blit state\n\nThe hw stores a default clear state for registers in the context\nrange that can be initialized when the CP is set up. Set the\nblit state as the default clear state and use the CLEAR_STATE\npacket to load the blit state rather than loading it from an IB.\nThis reduces overhead when doing bo moves using the 3D engine.\n\nSigned-off-by: Alex Deucher \u003calexdeucher@gmail.com\u003e\nSigned-off-by: Dave Airlie \u003cairlied@redhat.com\u003e\n" }, { "commit": "c3cceeddf0b5f97b0d2352b98ef0f025e31a9ae3", "tree": "b1507f654f74198094145b4991f37c93c3ea1ea0", "parents": [ "e26fd1199ebab0d469fc3e037da5932d382f0669" ], "author": { "name": "Dave Airlie", "email": "airlied@redhat.com", "time": "Tue Oct 26 12:55:52 2010 +1000" }, "committer": { "name": "Dave Airlie", "email": "airlied@redhat.com", "time": "Tue Oct 26 12:55:52 2010 +1000" }, "message": "drm/radeon/kms: don\u0027t poll dac load detect.\n\nThis is slightly destructive, cpu intensive and can cause lockups.\n\nSigned-off-by: Dave Airlie \u003cairlied@redhat.com\u003e\n" }, { "commit": "e26fd1199ebab0d469fc3e037da5932d382f0669", "tree": "1346180916600ba8ee7dc9d8beb44d163fb8f1bc", "parents": [ "b7d8cce5b558e0c0aa6898c9865356481598b46d" ], "author": { "name": "Lee, Chun-Yi", "email": "joeyli.kernel@gmail.com", "time": "Wed Oct 20 13:51:19 2010 +0800" }, "committer": { "name": "Dave Airlie", "email": "airlied@redhat.com", "time": "Tue Oct 26 11:00:13 2010 +1000" }, "message": "gpu: Add Intel GMA500(Poulsbo) Stub Driver\n\nCurrently, there have no GMA500(Poulsbo) native video driver to support\nintel opregion. So, use this stub driver to enable the acpi backlight\ncontrol sysfs entry files by requrest acpi_video_register.\n\n[airlied: fix warnings]\n\nSigned-off-by: Lee, Chun-Yi \u003cjlee@novell.com\u003e\nSigned-off-by: Dave Airlie \u003cairlied@redhat.com\u003e\n" }, { "commit": "b7d8cce5b558e0c0aa6898c9865356481598b46d", "tree": "07f0f80e625e4a60d3f8c3fba89f97ac01c75923", "parents": [ "f9d9c36204243d81e9d4dd28e58ee335257847d2" ], "author": { "name": "Alex Deucher", "email": "alexdeucher@gmail.com", "time": "Mon Oct 25 19:44:00 2010 -0400" }, "committer": { "name": "Dave Airlie", "email": "airlied@redhat.com", "time": "Tue Oct 26 10:26:41 2010 +1000" }, "message": "drm/radeon/kms: MC vram map needs to be \u003e\u003d pci aperture size\n\nThe vram map in the radeon memory controller needs to be\n\u003e\u003d the pci aperture size. Fixes:\nhttps://bugs.freedesktop.org/show_bug.cgi?id\u003d28402\n\nThe problematic cards in the above bug have 64 MB of vram,\nbut the pci aperture is 128 MB and the MC vram map was only\n64 MB. This can lead to hangs.\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": "f9d9c36204243d81e9d4dd28e58ee335257847d2", "tree": "dfa501a208584f6302927d6c6031a2c8884ca306", "parents": [ "71901cc4109b3794b863884e348aff3c71e693cc" ], "author": { "name": "Alex Deucher", "email": "alexdeucher@gmail.com", "time": "Fri Oct 22 02:51:05 2010 -0400" }, "committer": { "name": "Dave Airlie", "email": "airlied@redhat.com", "time": "Tue Oct 26 10:26:39 2010 +1000" }, "message": "drm/radeon/kms: implement display watermark support for evergreen\n\nImproper display watermarks can result in underflow to the display\ncontrollers which can cause flickering or other artifacts.\nThis patch implements display watermark support and line buffer\nallocation for evergreen asics.\n\nSigned-off-by: Alex Deucher \u003calexdeucher@gmail.com\u003e\nSigned-off-by: Dave Airlie \u003cairlied@redhat.com\u003e\n" }, { "commit": "71901cc4109b3794b863884e348aff3c71e693cc", "tree": "922338f00f8a468e298809a7a6280c1acd6220bf", "parents": [ "f30df2fad0c901e74ac9a52a488a54c69a373a41" ], "author": { "name": "Alex Deucher", "email": "alexdeucher@gmail.com", "time": "Thu Oct 21 13:45:30 2010 -0400" }, "committer": { "name": "Dave Airlie", "email": "airlied@redhat.com", "time": "Tue Oct 26 10:26:37 2010 +1000" }, "message": "drm/radeon/kms/evergreen: add some additional safe regs v2\n\nThese are needed for enabling dynamic GPR allocation in the shaders\nin the userspace acceleration drivers.\n\nv2: fix typo in reg name\n\nSigned-off-by: Alex Deucher \u003calexdeucher@gmail.com\u003e\nSigned-off-by: Dave Airlie \u003cairlied@redhat.com\u003e\n" }, { "commit": "f30df2fad0c901e74ac9a52a488a54c69a373a41", "tree": "8f7ab96e9cbc373b20833e764a07f78091b41fb6", "parents": [ "e3ce8a0b277438591844847ac7c89a980b4cfa6d" ], "author": { "name": "Dave Airlie", "email": "airlied@redhat.com", "time": "Thu Oct 21 13:55:40 2010 +1000" }, "committer": { "name": "Dave Airlie", "email": "airlied@redhat.com", "time": "Tue Oct 26 10:26:35 2010 +1000" }, "message": "drm/radeon/r600: fix tiling issues in CS checker.\n\nThe CS checker had some incorrect alignment requirements for 2D surfaces,\nthis made rendering to mipmap levels that were 2D broken.\n\nAlso the CB height was being worked out from the BO size, this doesn\u0027t work\nat all when rendering mipmap levels, instead we work out what height userspace\nwanted from slice max and use that to check it fits inside the BO, however\nthe DDX send the wrong slice max for an unaligned buffer so we have to workaround\nfor that even though its a userspace bug.\n\nReviewed-by: Alex Deucher \u003calexdeucher@gmail.com\u003e\nSigned-off-by: Dave Airlie \u003cairlied@redhat.com\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": "229aebb873e29726b91e076161649cf45154b0bf", "tree": "acc02a3702215bce8d914f4c8cc3d7a1382b1c67", "parents": [ "8de547e1824437f3c6af180d3ed2162fa4b3f389", "50a23e6eec6f20d55a3a920e47adb455bff6046e" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sun Oct 24 13:41:39 2010 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sun Oct 24 13:41:39 2010 -0700" }, "message": "Merge branch \u0027for-next\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial\n\n* \u0027for-next\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial: (39 commits)\n Update broken web addresses in arch directory.\n Update broken web addresses in the kernel.\n Revert \"drivers/usb: Remove unnecessary return\u0027s from void functions\" for musb gadget\n Revert \"Fix typo: configuation \u003d\u003e configuration\" partially\n ida: document IDA_BITMAP_LONGS calculation\n ext2: fix a typo on comment in ext2/inode.c\n drivers/scsi: Remove unnecessary casts of private_data\n drivers/s390: Remove unnecessary casts of private_data\n net/sunrpc/rpc_pipe.c: Remove unnecessary casts of private_data\n drivers/infiniband: Remove unnecessary casts of private_data\n drivers/gpu/drm: Remove unnecessary casts of private_data\n kernel/pm_qos_params.c: Remove unnecessary casts of private_data\n fs/ecryptfs: Remove unnecessary casts of private_data\n fs/seq_file.c: Remove unnecessary casts of private_data\n arm: uengine.c: remove C99 comments\n arm: scoop.c: remove C99 comments\n Fix typo configue \u003d\u003e configure in comments\n Fix typo: configuation \u003d\u003e configuration\n Fix typo interrest[ing|ed] \u003d\u003e interest[ing|ed]\n Fix various typos of valid in comments\n ...\n\nFix up trivial conflicts in:\n\tdrivers/char/ipmi/ipmi_si_intf.c\n\tdrivers/usb/gadget/rndis.c\n\tnet/irda/irnet/irnet_ppp.c\n" }, { "commit": "641934069d29211baf82afb93622a426172b67b6", "tree": "d00f3e69c1c02ddc96a43f744644e263a8e77a9d", "parents": [ "b6651458d33c309767762a6c3da041573413fd88" ], "author": { "name": "Chris Wilson", "email": "chris@chris-wilson.co.uk", "time": "Sun Oct 24 12:38:05 2010 +0100" }, "committer": { "name": "Chris Wilson", "email": "chris@chris-wilson.co.uk", "time": "Sun Oct 24 20:22:51 2010 +0100" }, "message": "drm/i915: Move gpu_write_list to per-ring\n\n... to prevent flush processing of an idle (or even absent) ring.\n\nThis fixes a regression during suspend from 87acb0a5.\n\nReported-and-tested-by: Alexey Fisher \u003cbug-track@fisher-privat.net\u003e\nTested-by: Peter Clifton \u003cpcjc2@cam.ac.uk\u003e\nSigned-off-by: Chris Wilson \u003cchris@chris-wilson.co.uk\u003e\n" }, { "commit": "a8d7be818fbe0f8a4e7dc251712958ca369f9d45", "tree": "bc75d349e17806f35a000af0ce8cb2d56c8df516", "parents": [ "97cc4d49cfcda1c2dad89c00b62a25b628ce2115" ], "author": { "name": "Jean Delvare", "email": "khali@linux-fr.org", "time": "Sun Oct 24 18:16:58 2010 +0200" }, "committer": { "name": "Jean Delvare", "email": "khali@endymion.delvare", "time": "Sun Oct 24 18:16:58 2010 +0200" }, "message": "i2c: Remove unneeded inclusions of \u003clinux/i2c-id.h\u003e\n\nThese drivers don\u0027t use anything which is defined in \u003clinux/i2c-id.h\u003e.\nThis header file was never meant to be included directly anyway, and\nwill be deleted soon.\n\nSigned-off-by: Jean Delvare \u003ckhali@linux-fr.org\u003e\nAcked-by: Ben Dooks \u003cben-linux@fluff.org\u003e\nAcked-by: Dave Airlie \u003cairlied@linux.ie\u003e\nCc: Hans Verkuil \u003chverkuil@xs4all.nl\u003e\n" }, { "commit": "b6651458d33c309767762a6c3da041573413fd88", "tree": "cf929107666824633ce8406816abf7f7595f89c4", "parents": [ "297b0c5be3b6e08890cbd7149313408847e81715" ], "author": { "name": "Chris Wilson", "email": "chris@chris-wilson.co.uk", "time": "Sat Oct 23 10:15:06 2010 +0100" }, "committer": { "name": "Chris Wilson", "email": "chris@chris-wilson.co.uk", "time": "Sat Oct 23 11:07:21 2010 +0100" }, "message": "drm/i915: Invalidate the to-ring, flush the old-ring when updating domains\n\nWhen the object has been written to by the gpu it remains on the ring\nuntil its flush has been retired. However, when the object is moving to\nthe ring and the associated cache needs to be invalidated, we need to\nperform the flush on the target ring, not the one it came from (which is\nNULL in the reported case and so the flush was entirely absent).\n\nReported-by: Peter Clifton \u003cpcjc2@cam.ac.uk\u003e\nReported-and-tested-by: Alexey Fisher \u003cbug-track@fisher-privat.net\u003e\nSigned-off-by: Chris Wilson \u003cchris@chris-wilson.co.uk\u003e\n" }, { "commit": "092e0e7e520a1fca03e13c9f2d157432a8657ff2", "tree": "451897252c4c08c4b5a8ef535da156f1e817e80b", "parents": [ "79f14b7c56d3b3ba58f8b43d1f70b9b71477a800", "776c163b1b93c8dfa5edba885bc2bfbc2d228a5f" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri Oct 22 10:52:56 2010 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri Oct 22 10:52:56 2010 -0700" }, "message": "Merge branch \u0027llseek\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/arnd/bkl\n\n* \u0027llseek\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/arnd/bkl:\n vfs: make no_llseek the default\n vfs: don\u0027t use BKL in default_llseek\n llseek: automatically add .llseek fop\n libfs: use generic_file_llseek for simple_attr\n mac80211: disallow seeks in minstrel debug code\n lirc: make chardev nonseekable\n viotape: use noop_llseek\n raw: use explicit llseek file operations\n ibmasmfs: use generic_file_llseek\n spufs: use llseek in all file operations\n arm/omap: use generic_file_llseek in iommu_debug\n lkdtm: use generic_file_llseek in debugfs\n net/wireless: use generic_file_llseek in debugfs\n drm: use noop_llseek\n" }, { "commit": "5704e44d283e907623e3775c1262f206a2c48cf3", "tree": "0a981b24173e90854e7b7d812b35859e1e5f0174", "parents": [ "91151240ed8e97cc4457dae4094153c2744f1eb8", "6de5bd128d381ad88ac6d419a5e597048eb468cf" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri Oct 22 10:43:11 2010 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri Oct 22 10:43:11 2010 -0700" }, "message": "Merge branch \u0027config\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/arnd/bkl\n\n* \u0027config\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/arnd/bkl:\n BKL: introduce CONFIG_BKL.\n dabusb: remove the BKL\n sunrpc: remove the big kernel lock\n init/main.c: remove BKL notations\n blktrace: remove the big kernel lock\n rtmutex-tester: make it build without BKL\n dvb-core: kill the big kernel lock\n dvb/bt8xx: kill the big kernel lock\n tlclk: remove big kernel lock\n fix rawctl compat ioctls breakage on amd64 and itanic\n uml: kill big kernel lock\n parisc: remove big kernel lock\n cris: autoconvert trivial BKL users\n alpha: kill big kernel lock\n isapnp: BKL removal\n s390/block: kill the big kernel lock\n hpet: kill BKL, add compat_ioctl\n" }, { "commit": "297b0c5be3b6e08890cbd7149313408847e81715", "tree": "0a7dd5febbe0904eed9424bc861c807dba76be95", "parents": [ "85ccc35b7e4a5e7894570fe9b4e4b56d82fc3181" ], "author": { "name": "Chris Wilson", "email": "chris@chris-wilson.co.uk", "time": "Fri Oct 22 17:02:41 2010 +0100" }, "committer": { "name": "Chris Wilson", "email": "chris@chris-wilson.co.uk", "time": "Fri Oct 22 17:57:43 2010 +0100" }, "message": "drm/i915/ringbuffer: Write the value passed in to the tail register\n\nThis should fix the error along the reset path were we tried to clear the\ntail register by setting it to 0, but were in fact setting it to the\ncurrent value and complaining when it did not reset to 0.\n\nSigned-off-by: Chris Wilson \u003cchris@chris-wilson.co.uk\u003e\n" }, { "commit": "878a3c37d36142a192bdf5b6bfcf920832f431d7", "tree": "871fd2a166abcf08e7054a4bc4667b43f714a114", "parents": [ "e27d8538695d1aee69eb4fdd6f98988e6ffc5c33" ], "author": { "name": "Chris Wilson", "email": "chris@chris-wilson.co.uk", "time": "Fri Oct 22 10:48:12 2010 +0100" }, "committer": { "name": "Chris Wilson", "email": "chris@chris-wilson.co.uk", "time": "Fri Oct 22 10:48:12 2010 +0100" }, "message": "drm/i915: Fix flushing regression from 9af90d19f\n\nWhilst moving the code around in 9af90d19f, I dropped the or\u0027ing in of\nnew write domains which would zero out the write domain for a render\ntarget if later reused as a source later in the batch. This meant that\nwe might drop a required flush before reading from the render target.\n\nBugzilla: https://bugs.freedesktop.org/show_bug.cgi?id\u003d31043\nReported-by: xunx.fang@intel.com\nSigned-off-by: Chris Wilson \u003cchris@chris-wilson.co.uk\u003e\n" }, { "commit": "e27d8538695d1aee69eb4fdd6f98988e6ffc5c33", "tree": "ec3920c70e3d3ed9ac3c18b46c654145020d0cab", "parents": [ "3c17fe4b8f40a112a85758a9ab2aebf772bdd647" ], "author": { "name": "Chris Wilson", "email": "chris@chris-wilson.co.uk", "time": "Fri Oct 22 09:15:22 2010 +0100" }, "committer": { "name": "Chris Wilson", "email": "chris@chris-wilson.co.uk", "time": "Fri Oct 22 09:15:22 2010 +0100" }, "message": "drm/i915/sdvo: Remove unused encoding member\n\nThis block is only used when detecting whether the connector is HDMI and\nnever again, so scope the variable to the detection routine.\n\nSigned-off-by: Chris Wilson \u003cchris@chris-wilson.co.uk\u003e\n" }, { "commit": "3c17fe4b8f40a112a85758a9ab2aebf772bdd647", "tree": "11200d46545ce7d139cd5be8268ee43c402fa433", "parents": [ "dc3f82c2e5c3f06e43855f417e4fcfc244383916" ], "author": { "name": "David Härdeman", "email": "david@hardeman.nu", "time": "Fri Sep 24 21:44:32 2010 +0200" }, "committer": { "name": "Chris Wilson", "email": "chris@chris-wilson.co.uk", "time": "Fri Oct 22 09:14:30 2010 +0100" }, "message": "i915: enable AVI infoframe for intel_hdmi.c [v4]\n\nThis patch enables the sending of AVI infoframes in\ndrivers/gpu/drm/i915/intel_hdmi.c.\n\nMy receiver currently loses sync when the HDMI output on my computer\n(DG45FC motherboard) is switched from 800x600 (the BIOS resolution) to\n1920x1080 as part of the boot. Fixable by switching inputs on the receiver\na couple of times.\n\nWith this patch, my receiver has not lost sync yet (\u003e 40 tries).\n\nFourth version, now based on drm-intel-next from:\ngit://git.kernel.org/pub/scm/linux/kernel/git/ickle/drm-intel.git\n\nTwo questions still remain:\n\nI\u0027m assuming that the sdvo hardware also stores a header ECC byte in\nthe MSB of the first dword - is this correct?\n\nDoes the SDVOB and SDVOC handling in intel_hdmi_set_avi_infoframe()\nlook correct?\n\nSigned-off-by: David Härdeman \u003cdavid@hardeman.nu\u003e\nSigned-off-by: Chris Wilson \u003cchris@chris-wilson.co.uk\u003e\n" }, { "commit": "dc3f82c2e5c3f06e43855f417e4fcfc244383916", "tree": "1e7b48d80495c0ce2911ad397cb35b55578c87cb", "parents": [ "f00a3ddf91d596bece5fa31e8ce2e8a3b4c0623b" ], "author": { "name": "Chia-I Wu", "email": "olvaffe@gmail.com", "time": "Thu Oct 21 19:35:54 2010 +0100" }, "committer": { "name": "Chris Wilson", "email": "chris@chris-wilson.co.uk", "time": "Thu Oct 21 19:38:25 2010 +0100" }, "message": "drm/i915: Fix current fb blocking for page flip\n\nBlock execbuffer for the fb to be flipped away, not the one that is to\nbe flipped in.\n\n[ickle: rewritten for -next]\nSigned-off-by: Chia-I Wu \u003colvaffe@gmail.com\u003e\nAcked-by: Jesse Barnes \u003cjbarnes@virtuousgeek.org\u003e\nAcked-by: Kristian Høgsberg \u003ckrh@bitplanet.net\u003e\nSigned-off-by: Chris Wilson \u003cchris@chris-wilson.co.uk\u003e\n" }, { "commit": "f00a3ddf91d596bece5fa31e8ce2e8a3b4c0623b", "tree": "cae4beb61a2ae44ffa6d892bbd207b4022094dc2", "parents": [ "549f7365820a212a1cfd0871d377b1ad0d1e5723" ], "author": { "name": "Chris Wilson", "email": "chris@chris-wilson.co.uk", "time": "Thu Oct 21 14:57:17 2010 +0100" }, "committer": { "name": "Chris Wilson", "email": "chris@chris-wilson.co.uk", "time": "Thu Oct 21 19:08:39 2010 +0100" }, "message": "drm/i915: IS_IRONLAKE is synonymous with gen \u003d\u003d 5\n\nSo remove the redundant bit in the capabilities block and\ns/IS_IRONLAKE/IS_GEN5/.\n\nSigned-off-by: Chris Wilson \u003cchris@chris-wilson.co.uk\u003e\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": "e36c1cd7292efcb8daca26cd6331481736544742", "tree": "d952a08fc4540175842c3dd94e8409355ff491c1", "parents": [ "c717966744e618af76aa5d7fe6cc44dba487bdc6" ], "author": { "name": "Chris Wilson", "email": "chris@chris-wilson.co.uk", "time": "Thu Oct 21 19:00:02 2010 +0100" }, "committer": { "name": "Chris Wilson", "email": "chris@chris-wilson.co.uk", "time": "Thu Oct 21 19:00:02 2010 +0100" }, "message": "drm/i915/ringbuffer: Remove broken intel_fill_struct()\n\n... before someone tries to use it. The code both calls\nintel_ring_begin/advance() and open-codes the bookkeeping performed by\nthose two functions.\n\nSigned-off-by: Chris Wilson \u003cchris@chris-wilson.co.uk\u003e\n" }, { "commit": "c717966744e618af76aa5d7fe6cc44dba487bdc6", "tree": "ce5c9e7eb06895d4bc5721387533ace7539006f0", "parents": [ "b5dc608c98d929abbf2fe932ed07b3c868d83342" ], "author": { "name": "Chris Wilson", "email": "chris@chris-wilson.co.uk", "time": "Thu Oct 21 18:51:09 2010 +0100" }, "committer": { "name": "Chris Wilson", "email": "chris@chris-wilson.co.uk", "time": "Thu Oct 21 18:51:09 2010 +0100" }, "message": "drm/i915/ringbuffer: Fix emit batch buffer regression from 8187a2b\n\nIn commit 8187a2b, the number of dwords used in the ringbuffer for\nexecuting the batch buffer was erroneously changed from 2 to 4.\n\nSigned-off-by: Chris Wilson \u003cchris@chris-wilson.co.uk\u003e\n" }, { "commit": "6de5bd128d381ad88ac6d419a5e597048eb468cf", "tree": "7b3a0440f645c6e98367a87b1ca0ed1e0df204dd", "parents": [ "7ff52efdca367d4bfe2449bd3d4a1f8172c5953a" ], "author": { "name": "Arnd Bergmann", "email": "arnd@arndb.de", "time": "Sat Sep 11 18:00:57 2010 +0200" }, "committer": { "name": "Arnd Bergmann", "email": "arnd@arndb.de", "time": "Thu Oct 21 15:44:13 2010 +0200" }, "message": "BKL: introduce CONFIG_BKL.\n\nWith all the patches we have queued in the BKL removal tree, only a\nfew dozen modules are left that actually rely on the BKL, and even\nthere are lots of low-hanging fruit. We need to decide what to do\nabout them, this patch illustrates one of the options:\n\nEvery user of the BKL is marked as \u0027depends on BKL\u0027 in Kconfig,\nand the CONFIG_BKL becomes a user-visible option. If it gets\ndisabled, no BKL using module can be built any more and the BKL\ncode itself is compiled out.\n\nThe one exception is file locking, which is practically always\nenabled and does a \u0027select BKL\u0027 instead. This effectively forces\nCONFIG_BKL to be enabled until we have solved the fs/lockd\nmess and can apply the patch that removes the BKL from fs/locks.c.\n\nSigned-off-by: Arnd Bergmann \u003carnd@arndb.de\u003e\n" }, { "commit": "e1efc9b6ac22c605fd326b3f6af9b393325d43b4", "tree": "98960a29a6b4217b3ac219fd2be37e6b648e4589", "parents": [ "40d857bba2915a4e8d82f44744a186bfdd1a46ea" ], "author": { "name": "Thomas Hellstrom", "email": "thellstrom@vmware.com", "time": "Tue Oct 19 09:01:01 2010 +0200" }, "committer": { "name": "Dave Airlie", "email": "airlied@redhat.com", "time": "Thu Oct 21 11:53:28 2010 +1000" }, "message": "drm/ttm: Optimize delayed buffer destruction\n\nThis commit replaces the ttm_bo_cleanup_ref function with two new functions.\nOne for the case where the bo is not yet on the delayed destroy list, and\none for the case where the bo was on the delayed destroy list, at least at\nthe time of call. This makes it possible to optimize the two cases somewhat.\n\nIt also enables the possibility to directly destroy buffers on the\ndelayed delete list when they are about to be evicted or swapped out.\nCurrently they were only evicted / swapped and destruction was left for the\ndelayed buffer destruction thread.\n\nSigned-off-by: Thomas Hellstrom \u003cthellstrom@vmware.com\u003e\nSigned-off-by: Dave Airlie \u003cairlied@redhat.com\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": "b5dc608c98d929abbf2fe932ed07b3c868d83342", "tree": "856fe6ba9133fe9b3019ff578fb808aa79027a9f", "parents": [ "69dc4987cbe5fe70ae1c2a08906d431d53cdd242" ], "author": { "name": "Chris Wilson", "email": "chris@chris-wilson.co.uk", "time": "Wed Oct 20 20:59:57 2010 +0100" }, "committer": { "name": "Chris Wilson", "email": "chris@chris-wilson.co.uk", "time": "Wed Oct 20 21:06:34 2010 +0100" }, "message": "drm/i915: Copy the updated reloc-\u003epresumed_offset back to the user\n\nIf the userspace driver is using a constant relocation array with a\nstatic buffer, they will pass the same relocation array back to the\nkernel. So we *do* need to update the presumed offset value in those\nrelocations to reflect the current object so that they remain correct\nwith future batchbuffers and we avoid the necessity of having to suspend\nexecution and perform redundant relocations.\n\nFixes the regression introduced by 12f889c for applications using\nabsolute addressing on trees of buffer (i.e. the current consumers of\nlibdrm_intel.so).\n\nBugzilla: https://bugs.freedesktop.org/show_bug.cgi?id\u003d30996\nReported-by: Wang, Jinjin \u003cjinjin.wang@intel.com\u003e\nSigned-off-by: Chris Wilson \u003cchris@chris-wilson.co.uk\u003e\n" }, { "commit": "69dc4987cbe5fe70ae1c2a08906d431d53cdd242", "tree": "e8864d862538096b70a7d12eb1f9763f6faa8c39", "parents": [ "87acb0a550694ff1a7725ea3a73b80d8ccf56180" ], "author": { "name": "Chris Wilson", "email": "chris@chris-wilson.co.uk", "time": "Tue Oct 19 10:36:51 2010 +0100" }, "committer": { "name": "Chris Wilson", "email": "chris@chris-wilson.co.uk", "time": "Wed Oct 20 10:51:51 2010 +0100" }, "message": "drm/i915: Track objects in global active list (as well as per-ring)\n\nTo handle retirements, we need per-ring tracking of active objects.\nTo handle evictions, we need global tracking of active objects.\n\nAs we enable more rings, rebuilding the global list from the individual\nper-ring lists quickly grows tiresome and overly complicated. Tracking the\nactive objects in two lists is the lesser of two evils.\n\nSigned-off-by: Chris Wilson \u003cchris@chris-wilson.co.uk\u003e\n" }, { "commit": "87acb0a550694ff1a7725ea3a73b80d8ccf56180", "tree": "da29fd24edf57a01c69d094490da80ae3511cc48", "parents": [ "9af90d19f8a166694753b3f0558d3a8bcd66c0b5" ], "author": { "name": "Chris Wilson", "email": "chris@chris-wilson.co.uk", "time": "Tue Oct 19 10:13:00 2010 +0100" }, "committer": { "name": "Chris Wilson", "email": "chris@chris-wilson.co.uk", "time": "Wed Oct 20 10:51:51 2010 +0100" }, "message": "drm/i915: Simplify most HAS_BSD() checks\n\n... by always initialising the empty ringbuffer it is always then safe\nto check whether it is active.\n\nSigned-off-by: Chris Wilson \u003cchris@chris-wilson.co.uk\u003e\n" }, { "commit": "9af90d19f8a166694753b3f0558d3a8bcd66c0b5", "tree": "7433b151f076c956717fec54b2e42f14ef6723d8", "parents": [ "1d7cfea152cae6159aa30ceae38c3eaf13ea083c" ], "author": { "name": "Chris Wilson", "email": "chris@chris-wilson.co.uk", "time": "Sun Oct 17 10:01:56 2010 +0100" }, "committer": { "name": "Chris Wilson", "email": "chris@chris-wilson.co.uk", "time": "Wed Oct 20 10:51:50 2010 +0100" }, "message": "drm/i915: cache the last object lookup during pin_and_relocate()\n\nThe most frequent relocation within a batchbuffer is a contiguous sequence\nof vertex buffer relocations, for which we can virtually eliminate the\ndrm_gem_object_lookup() overhead by caching the last handle to object\ntranslation.\n\nIn doing so we refactor the pin and relocate retry loop out of\ndo_execbuffer into its own helper function and so improve the error\npaths.\n\nSigned-off-by: Chris Wilson \u003cchris@chris-wilson.co.uk\u003e\n" }, { "commit": "1d7cfea152cae6159aa30ceae38c3eaf13ea083c", "tree": "f9d8b2536555c3a5af75d461f16d7374af988cf8", "parents": [ "139d363bcf2d995a72694ddd2b8665af6cb7fb54" ], "author": { "name": "Chris Wilson", "email": "chris@chris-wilson.co.uk", "time": "Sun Oct 17 09:45:41 2010 +0100" }, "committer": { "name": "Chris Wilson", "email": "chris@chris-wilson.co.uk", "time": "Tue Oct 19 09:20:23 2010 +0100" }, "message": "drm/i915: Do interrupible mutex lock first to avoid locking for unreference\n\nOne of the primarily consumers of the i915 driver is X, a large signal\ndriven application. Frequently when writing into the buffers, there is a\npending signal which causes us not to take the interruptible lock but\nthen we need to take that same lock around the object unreference. By\nrearranging the code to do the interruptible lock as the first check, we\ncan avoid the frequent additional locking around the unreference.\n\nSigned-off-by: Chris Wilson \u003cchris@chris-wilson.co.uk\u003e\n" }, { "commit": "139d363bcf2d995a72694ddd2b8665af6cb7fb54", "tree": "ee6f47ead3415361c5985644659627b915dcc5b8", "parents": [ "3dde04b0152634d42994b34b86bbf3c70fbc6b19" ], "author": { "name": "Andrea Gelmini", "email": "andrea.gelmini@gelma.net", "time": "Fri Oct 15 17:14:33 2010 +0200" }, "committer": { "name": "Chris Wilson", "email": "chris@chris-wilson.co.uk", "time": "Tue Oct 19 09:20:12 2010 +0100" }, "message": "drivers: gpu: drm: i915: Fix a typo.\n\n\"userpace\" -\u003e \"userspace\"\n\nSigned-off-by: Andrea Gelmini \u003candrea.gelmini@gelma.net\u003e\nSigned-off-by: Chris Wilson \u003cchris@chris-wilson.co.uk\u003e\n" }, { "commit": "4f27b75d56334f33cbccff5da8372dc4aba122ba", "tree": "9b22fab1e6cf69085a03c43a5c541db1c1658ca7", "parents": [ "fbd5a26d500c7cd8943cc5f37ccc7e49cf386053" ], "author": { "name": "Chris Wilson", "email": "chris@chris-wilson.co.uk", "time": "Thu Oct 14 15:26:45 2010 +0100" }, "committer": { "name": "Chris Wilson", "email": "chris@chris-wilson.co.uk", "time": "Tue Oct 19 09:19:55 2010 +0100" }, "message": "drm/i915: rearrange mutex acquisition for pread\n\n... to avoid the double acquisition along fast[er] paths.\n\nSigned-off-by: Chris Wilson \u003cchris@chris-wilson.co.uk\u003e\n" }, { "commit": "fbd5a26d500c7cd8943cc5f37ccc7e49cf386053", "tree": "28d8aa6e9d9818589f2abee0ca1f798c3cd63255", "parents": [ "b5e4feb6615fe07150f05bb0e0ccc0ff9138b9ec" ], "author": { "name": "Chris Wilson", "email": "chris@chris-wilson.co.uk", "time": "Thu Oct 14 15:03:58 2010 +0100" }, "committer": { "name": "Chris Wilson", "email": "chris@chris-wilson.co.uk", "time": "Tue Oct 19 09:19:47 2010 +0100" }, "message": "drm/i915: Rearrange acquisition of mutex during pwrite\n\n... to avoid reacquiring it to drop the object reference count on\nexit. Note we have to make sure we now drop (and reacquire) the lock\naround acquiring the mm semaphore on the slow paths.\n\nSigned-off-by: Chris Wilson \u003cchris@chris-wilson.co.uk\u003e\n" }, { "commit": "b5e4feb6615fe07150f05bb0e0ccc0ff9138b9ec", "tree": "920be74c3946e1b882258a7d8c0af5266417fa66", "parents": [ "202f2fef7a1aa6b2e4fa6e1de3ef582342fd41f0" ], "author": { "name": "Chris Wilson", "email": "chris@chris-wilson.co.uk", "time": "Thu Oct 14 13:47:43 2010 +0100" }, "committer": { "name": "Chris Wilson", "email": "chris@chris-wilson.co.uk", "time": "Tue Oct 19 09:19:37 2010 +0100" }, "message": "drm/i915: Attempt to prefault user pages for pread/pwrite\n\n... in the hope that it makes the atomic fast paths more likely.\n\nSigned-off-by: Chris Wilson \u003cchris@chris-wilson.co.uk\u003e\n" }, { "commit": "202f2fef7a1aa6b2e4fa6e1de3ef582342fd41f0", "tree": "4094308fc3d12f51920e1889ff0160d78095f0d7", "parents": [ "f0c43d9b7ec1bb9827b3dd5ac5915d22ceed8f6a" ], "author": { "name": "Chris Wilson", "email": "chris@chris-wilson.co.uk", "time": "Thu Oct 14 13:20:40 2010 +0100" }, "committer": { "name": "Chris Wilson", "email": "chris@chris-wilson.co.uk", "time": "Tue Oct 19 09:19:28 2010 +0100" }, "message": "drm/i915: Avoid taking the mutex for dropping the refcnt upon creation\n\nAfter allocation a handle for the fresh object, we know that we can\nsafely drop the refcnt without triggering a free so we do not need the\nmutex. Strangely, this mutex acquisition is the one that appears on\ndriver profiles.\n\nSigned-off-by: Chris Wilson \u003cchris@chris-wilson.co.uk\u003e\n" }, { "commit": "f0c43d9b7ec1bb9827b3dd5ac5915d22ceed8f6a", "tree": "4dc15b6745685c3d1c7ad380fa020c6d6c316576", "parents": [ "2549d6c26ce1c85a76990b972a2c7e8f440455cd" ], "author": { "name": "Chris Wilson", "email": "chris@chris-wilson.co.uk", "time": "Thu Oct 14 12:44:48 2010 +0100" }, "committer": { "name": "Chris Wilson", "email": "chris@chris-wilson.co.uk", "time": "Tue Oct 19 09:19:18 2010 +0100" }, "message": "drm/i915: Perform relocations in CPU domain [if in CPU domain]\n\nAvoid an early eviction of the batch buffer into the uncached GTT\ndomain, and so do the relocation fixup in cacheable memory.\n\nSigned-off-by: Chris Wilson \u003cchris@chris-wilson.co.uk\u003e\n" }, { "commit": "2549d6c26ce1c85a76990b972a2c7e8f440455cd", "tree": "1e9e3f948ca2f15a1c98c76f1307f87174fd7252", "parents": [ "55b7d6e8c4690047ac001026cb75a47f747db816" ], "author": { "name": "Chris Wilson", "email": "chris@chris-wilson.co.uk", "time": "Thu Oct 14 12:10:41 2010 +0100" }, "committer": { "name": "Chris Wilson", "email": "chris@chris-wilson.co.uk", "time": "Tue Oct 19 09:18:36 2010 +0100" }, "message": "drm/i915: Avoid vmallocing a buffer for the relocations\n\n... perform an access validation check up front instead and copy them in\non-demand, during i915_gem_object_pin_and_relocate(). As around 20% of\nthe CPU overhead may be spent inside vmalloc for the relocation entries\nwhen submitting an execbuffer [for x11perf -aa10text], the savings are\nconsiderable and result in around a 10% throughput increase [for glyphs].\n\nSigned-off-by: Chris Wilson \u003cchris@chris-wilson.co.uk\u003e\n" }, { "commit": "55b7d6e8c4690047ac001026cb75a47f747db816", "tree": "ac22b2f7c44238213f7f5ced223df19cc19e28c8", "parents": [ "7f36e7edd6c1851ea1f061ddbefb6f820a0575a2" ], "author": { "name": "Chris Wilson", "email": "chris@chris-wilson.co.uk", "time": "Sun Sep 19 09:29:33 2010 +0100" }, "committer": { "name": "Chris Wilson", "email": "chris@chris-wilson.co.uk", "time": "Tue Oct 19 09:18:25 2010 +0100" }, "message": "drm/i915/hdmi: Add \u0027force_audio\u0027 property\n\nAllow the user to override the detection of the sink\u0027s audio capabilities\nfrom EDID. Not all sinks support the required EDID level to specify\nwhether they handle audio over the display connection, so allow the user\nto enable it manually.\n\nSigned-off-by: Chris Wilson \u003cchris@chris-wilson.co.uk\u003e\n" }, { "commit": "7f36e7edd6c1851ea1f061ddbefb6f820a0575a2", "tree": "e4c721a0694270b79db70fad857ea5fb1e0c3162", "parents": [ "f684960ed5b902994ba6540138d910f5caf7ea2a" ], "author": { "name": "Chris Wilson", "email": "chris@chris-wilson.co.uk", "time": "Sun Sep 19 09:29:33 2010 +0100" }, "committer": { "name": "Chris Wilson", "email": "chris@chris-wilson.co.uk", "time": "Tue Oct 19 09:18:12 2010 +0100" }, "message": "drm/i915/sdvo: Add \u0027force_audio\u0027 property\n\nAllow the user to override the detection of the sink\u0027s audio capabilities\nfrom EDID. Not all sinks support the required EDID level to specify\nwhether they handle audio over the display connection, so allow the user\nto enable it manually.\n\nSigned-off-by: Chris Wilson \u003cchris@chris-wilson.co.uk\u003e\n" }, { "commit": "f684960ed5b902994ba6540138d910f5caf7ea2a", "tree": "21a5b129fae31381a3124ca74f251fb805bfd8fa", "parents": [ "2e3d6006aca163db3eeb931cec631974aaa3c293" ], "author": { "name": "Chris Wilson", "email": "chris@chris-wilson.co.uk", "time": "Sun Sep 19 09:29:33 2010 +0100" }, "committer": { "name": "Chris Wilson", "email": "chris@chris-wilson.co.uk", "time": "Tue Oct 19 09:17:58 2010 +0100" }, "message": "drm/i915/dp: Add \u0027force_audio\u0027 property\n\nAllow the user to override the detection of the sink\u0027s audio capabilities\nfrom EDID. Not all sinks support the required EDID level to specify\nwhether they handle audio over the display connection, so allow the user\nto enable it manually.\n\nSigned-off-by: Chris Wilson \u003cchris@chris-wilson.co.uk\u003e\n" }, { "commit": "2e3d6006aca163db3eeb931cec631974aaa3c293", "tree": "b2b3fe639cc44508f77c61e20c1af641593d85a7", "parents": [ "a9756bb5b25d5d997df0c5d8c95db01292191bea" ], "author": { "name": "Zhenyu Wang", "email": "zhenyuw@linux.intel.com", "time": "Fri Sep 10 10:39:40 2010 +0800" }, "committer": { "name": "Chris Wilson", "email": "chris@chris-wilson.co.uk", "time": "Tue Oct 19 09:17:50 2010 +0100" }, "message": "drm/i915: Enable HDMI audio for monitor with audio support\n\nRely on monitor\u0027s audio capability to turn on audio output for HDMI.\n\nTested-by: Wu Fengguang \u003cfengguang.wu@intel.com\u003e\nSigned-off-by: Zhenyu Wang \u003czhenyuw@linux.intel.com\u003e\nSigned-off-by: Chris Wilson \u003cchris@chris-wilson.co.uk\u003e\n" }, { "commit": "a9756bb5b25d5d997df0c5d8c95db01292191bea", "tree": "c1d27fcd8a006cef31f40b71b01ed9e11168d938", "parents": [ "8fe9790d1652e7c306c862ea102a5e6126b412e1" ], "author": { "name": "Zhenyu Wang", "email": "zhenyuw@linux.intel.com", "time": "Sun Sep 19 13:09:06 2010 +0800" }, "committer": { "name": "Chris Wilson", "email": "chris@chris-wilson.co.uk", "time": "Tue Oct 19 09:17:41 2010 +0100" }, "message": "drm/i915: Enable DisplayPort audio\n\nThis will turn on DP audio output by checking monitor\u0027s audio\ncapability.\n\nSigned-off-by: Zhenyu Wang \u003czhenyuw@linux.intel.com\u003e\n[ickle: rebase onto recent changes and rearranged for clarity]\nSigned-off-by: Chris Wilson \u003cchris@chris-wilson.co.uk\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": "6d139a87b747aaebc969ac5f4eb8db766fcd9cbd", "tree": "62e4a8aa1b01f0b3ba6e11b989be4d64c0057fae", "parents": [ "e60a0b107b3df072e23cb6d68510aa2615b059ce" ], "author": { "name": "Bryan Freed", "email": "bfreed@chromium.org", "time": "Thu Oct 14 09:14:51 2010 +0100" }, "committer": { "name": "Chris Wilson", "email": "chris@chris-wilson.co.uk", "time": "Tue Oct 19 09:17:24 2010 +0100" }, "message": "drm/i915: Initialize panel timing registers if VBIOS did not\n\nThe time between start of the pixel clock and backlight enable is a basic\npanel timing constraint. If the Panel Power On/Off registers are found\nto be 0, assume we are booting without VBIOS initialization and set these\nregisters to something reasonable.\n\nChange-Id: Ibed6cc10d46bf52fd92e0beb25ae3525b5eef99d\nSigned-off-by: Bryan Freed \u003cbfreed@chromium.org\u003e\n[ickle: rearranged into a separate function to distinguish its role from\nsimply parsing the VBIOS tables.]\nSigned-off-by: Chris Wilson \u003cchris@chris-wilson.co.uk\u003e\n" }, { "commit": "e60a0b107b3df072e23cb6d68510aa2615b059ce", "tree": "2cb350c6d8bd2a67bcb32b26e6d74808a86d042e", "parents": [ "7b5337ddbaf7e4b71ef6fd6307c6f9ef84f636e9" ], "author": { "name": "Chris Wilson", "email": "chris@chris-wilson.co.uk", "time": "Wed Oct 13 10:09:14 2010 +0100" }, "committer": { "name": "Chris Wilson", "email": "chris@chris-wilson.co.uk", "time": "Tue Oct 19 09:17:11 2010 +0100" }, "message": "drm/i915: Sleep whilst waiting for the ring\n\nIf userspace is submitting so many long running batches that the ring\nbecomes full, throttle by sleeping for a 1ms before checking for free\nspace. Simply yielding was causing excessive scheduler overhead whilst\nmaking no progress.\n\nSigned-off-by: Chris Wilson \u003cchris@chris-wilson.co.uk\u003e\n" }, { "commit": "7b5337ddbaf7e4b71ef6fd6307c6f9ef84f636e9", "tree": "917a09722f54de57c14e6d0561113561292dde2f", "parents": [ "8b99e68c0a40bcf082c1ba9aaad83cca4def8cec" ], "author": { "name": "Zhenyu Wang", "email": "zhenyuw@linux.intel.com", "time": "Wed Oct 13 16:40:12 2010 +0800" }, "committer": { "name": "Chris Wilson", "email": "chris@chris-wilson.co.uk", "time": "Tue Oct 19 09:17:02 2010 +0100" }, "message": "drm/i915: Fix GPIO pin to register mapping\n\nIn i2c GPIO fallback, index 6 is reserved for nothing.\n\nSigned-off-by: Zhenyu Wang \u003czhenyuw@linux.intel.com\u003e\nSigned-off-by: Chris Wilson \u003cchris@chris-wilson.co.uk\u003e\n" }, { "commit": "8b99e68c0a40bcf082c1ba9aaad83cca4def8cec", "tree": "a4f39bd07c900cc7202e78f8fe9fd628c9215396", "parents": [ "736085bcf91720fd90175c288c542c721c281bb0" ], "author": { "name": "Chris Wilson", "email": "chris@chris-wilson.co.uk", "time": "Wed Oct 13 09:59:17 2010 +0100" }, "committer": { "name": "Chris Wilson", "email": "chris@chris-wilson.co.uk", "time": "Tue Oct 19 09:16:52 2010 +0100" }, "message": "drm/i915: restore fixed FDI link rate on Sandybridge\n\nFDI_PLL_BIOS_0 register is for Ironlake only, don\u0027t apply to\nSandybridge.\n\nOriginal-patch-by: Zhenyu Wang \u003czhenyuw@linux.intel.com\u003e\nSigned-off-by: Chris Wilson \u003cchris@chris-wilson.co.uk\u003e\n" }, { "commit": "736085bcf91720fd90175c288c542c721c281bb0", "tree": "893e59a82d08e777bf502a904dfb46dd983a8fd9", "parents": [ "701394cc534a4a7883ddc4f8f82fb438b3d664ff" ], "author": { "name": "Jesse Barnes", "email": "jbarnes@virtuousgeek.org", "time": "Fri Oct 08 10:35:55 2010 -0700" }, "committer": { "name": "Chris Wilson", "email": "chris@chris-wilson.co.uk", "time": "Tue Oct 19 09:16:44 2010 +0100" }, "message": "drm/i915/dp: down the DP link even if the reg indicates it\u0027s already down\n\nSince the PLL may still be on, and the training pattern may not be\ncorrect. Fixes suspend/resume on my PCH eDP test system.\n\nSigned-off-by: Jesse Barnes \u003cjbarnes@virtuousgeek.org\u003e\n[ickle: minor merge conflict and silence the compiler]\nSigned-off-by: Chris Wilson \u003cchris@chris-wilson.co.uk\u003e\n" }, { "commit": "701394cc534a4a7883ddc4f8f82fb438b3d664ff", "tree": "249ba3988a902be66e701f4acc9cf1a1f5ba8a55", "parents": [ "939fe4d7d6e2c92370ca5d1fb70e81043f5ff8d9" ], "author": { "name": "Daniel Vetter", "email": "daniel.vetter@ffwll.ch", "time": "Sun Oct 10 18:54:08 2010 +0100" }, "committer": { "name": "Chris Wilson", "email": "chris@chris-wilson.co.uk", "time": "Tue Oct 19 09:16:35 2010 +0100" }, "message": "drm/i915: Fix oops on HWS unload\n\nFreeing the Hardware Status Page was writing to the HWS register in\norder to disable the GPU writing to the HWS page. Unfortunately, we were\nwriting to the mmio register after unmapping the register space, hence\nthe oops.\n\nSigned-off-by: Daniel Vetter \u003cdaniel.vetter@ffwll.ch\u003e\nSigned-off-by: Chris Wilson \u003cchris@chris-wilson.co.uk\u003e\n" }, { "commit": "939fe4d7d6e2c92370ca5d1fb70e81043f5ff8d9", "tree": "cffcf208f082ebb9cd5a93781c057393230647a3", "parents": [ "83e41eb9cc3de6c08d63bbcf2c953bfbf65c025c" ], "author": { "name": "Chris Wilson", "email": "chris@chris-wilson.co.uk", "time": "Sat Oct 09 10:33:26 2010 +0100" }, "committer": { "name": "Chris Wilson", "email": "chris@chris-wilson.co.uk", "time": "Tue Oct 19 09:16:19 2010 +0100" }, "message": "drm/i915: Remove duplicate set of ADPA definitions\n\nSigned-off-by: Chris Wilson \u003cchris@chris-wilson.co.uk\u003e\n" }, { "commit": "83e41eb9cc3de6c08d63bbcf2c953bfbf65c025c", "tree": "562ef084d4a477bf35cf6af8fd308856f3270124", "parents": [ "fb9a90f7c674f3ddef6baf55cb1612dadd8ea752" ], "author": { "name": "Chris Wilson", "email": "chris@chris-wilson.co.uk", "time": "Fri Oct 08 16:28:27 2010 +0100" }, "committer": { "name": "Chris Wilson", "email": "chris@chris-wilson.co.uk", "time": "Tue Oct 19 09:16:10 2010 +0100" }, "message": "Revert \"drm/i915: Prevent module unload to avoid random memory corruption\"\n\nThis reverts commit 6939a5aca7cfada279a24c307e772f33104fca20.\n\nDaniel Vetter supplied a set of fixes for all the module unload bugs he\ncould trigger on his machines, so let the fun recommence!\n" } ], "next": "fb9a90f7c674f3ddef6baf55cb1612dadd8ea752" }