)]}' { "log": [ { "commit": "bfce281c287a427d0841fadf5d59242757b4e620", "tree": "abca9ebeef4c668021e85e4d54e6e779121e92cc", "parents": [ "9f3a4afb276e4d8b3be7f3e678d4dbd11470416f" ], "author": { "name": "Al Viro", "email": "viro@zeniv.linux.org.uk", "time": "Fri Apr 20 21:57:04 2012 -0400" }, "committer": { "name": "Al Viro", "email": "viro@zeniv.linux.org.uk", "time": "Sat Apr 21 01:58:20 2012 -0400" }, "message": "kill mm argument of vm_munmap()\n\nit\u0027s always current-\u003emm\n\nSigned-off-by: Al Viro \u003cviro@zeniv.linux.org.uk\u003e\n" }, { "commit": "6be5ceb02e98eaf6cfc4f8b12a896d04023f340d", "tree": "f34de1392300bbf63549f4eeb20f7606d6f7b1f9", "parents": [ "a46ef99d80817a167477ed1c8b4d90ee0c2e726f" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri Apr 20 17:13:58 2012 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri Apr 20 17:29:13 2012 -0700" }, "message": "VM: add \"vm_mmap()\" helper function\n\nThis continues the theme started with vm_brk() and vm_munmap():\nvm_mmap() does the same thing as do_mmap(), but additionally does the\nrequired VM locking.\n\nThis uninlines (and rewrites it to be clearer) do_mmap(), which sadly\nduplicates it in mm/mmap.c and mm/nommu.c. But that way we don\u0027t have\nto export our internal do_mmap_pgoff() function.\n\nSome day we hopefully don\u0027t have to export do_mmap() either, if all\nmodular users can become the simpler vm_mmap() instead. We\u0027re actually\nvery close to that already, with the notable exception of the (broken)\nuse in i810, and a couple of stragglers in binfmt_elf.\n\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "a46ef99d80817a167477ed1c8b4d90ee0c2e726f", "tree": "3d8c980c627e8b9c009dbf63628a9be8b8d1069f", "parents": [ "e4eb1ff61b323d6141614e5458a1f53c7046ff8e" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri Apr 20 16:20:01 2012 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri Apr 20 17:29:13 2012 -0700" }, "message": "VM: add \"vm_munmap()\" helper function\n\nLike the vm_brk() function, this is the same as \"do_munmap()\", except it\ndoes the VM locking for the caller.\n\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "273a50fbcd2d2c0652bbda58dd1985f932ce6d75", "tree": "374e749b12767ebd585730552cb7d8ccb4b244f6", "parents": [ "a09d431f344d854e4fe9cfac44f78cb8202f3eb7" ], "author": { "name": "Henrik Rydberg", "email": "rydberg@euromail.se", "time": "Fri Apr 13 00:37:00 2012 +0200" }, "committer": { "name": "Dave Airlie", "email": "airlied@redhat.com", "time": "Thu Apr 19 16:37:53 2012 +0100" }, "message": "nouveau: Set special lane map for the right chipset\n\nThe refactoring of the nv50 logic, introduced in 8663bc7c, modified the\ntest for the special lane map used on some Apple computers with Nvidia\nchipsets. The tested MBA3,1 would still boot, but resume from suspend\nstopped working. This patch restores the old test, which fixes the problem.\n\nSigned-off-by: Henrik Rydberg \u003crydberg@euromail.se\u003e\nAcked-by: Ben Skeggs \u003cbskeggs@redhat.com\u003e\nSigned-off-by: Dave Airlie \u003cairlied@redhat.com\u003e\n" }, { "commit": "a09d431f344d854e4fe9cfac44f78cb8202f3eb7", "tree": "615e865c8b18250218a6a6209573ae8960b74f0b", "parents": [ "4e47e02d1ac47b6eb591b2a632a6c059ce3e5002" ], "author": { "name": "Dave Airlie", "email": "airlied@redhat.com", "time": "Thu Apr 19 15:42:58 2012 +0100" }, "committer": { "name": "Dave Airlie", "email": "airlied@redhat.com", "time": "Thu Apr 19 16:02:18 2012 +0100" }, "message": "drm/radeon: fix load detect on rn50 with hardcoded EDIDs.\n\nWhen the force changes went in back in 3.3.0, we ended up returning\ndisconnected in the !force case, and the connected in when forced,\nas it hit the hardcoded check.\n\nFix it so all exits go via the hardcoded check and stop spurious\nmodesets on platforms with hardcoded EDIDs.\n\nReported-by: Evan McNabb (Red Hat)\nReviewed-by: Alex Deucher \u003calexander.deucher@amd.com\u003e\nCc: stable@vger.kernel.org\nSigned-off-by: Dave Airlie \u003cairlied@redhat.com\u003e\n" }, { "commit": "4e47e02d1ac47b6eb591b2a632a6c059ce3e5002", "tree": "e9f67b84304f3fbe4dc54c16251ea21646c0db76", "parents": [ "5799d9e2eab20ef694fb92a7636f451e1b0e456c" ], "author": { "name": "Prathyush", "email": "prathyush.k@samsung.com", "time": "Sat Apr 14 17:22:13 2012 +0530" }, "committer": { "name": "Dave Airlie", "email": "airlied@redhat.com", "time": "Thu Apr 19 14:40:41 2012 +0100" }, "message": "drm: Releasing FBs before releasing GEM objects during drm_release\n\nDuring DRM release, all the FBs and gem objects are released. If\na gem object is being used as a FB and set to a crtc, it must not\nbe freed before releasing the framebuffer first.\n\nIf FBs are released first, the crtc using the FB is disabled first\nso now the GEM object can be freed safely. The CRTC will be enabled\nagain when the driver restores fbdev mode.\n\nSigned-off-by: Prathyush K \u003cprathyush.k@samsung.com\u003e\nSigned-off-by: Dave Airlie \u003cairlied@redhat.com\u003e\n" }, { "commit": "5799d9e2eab20ef694fb92a7636f451e1b0e456c", "tree": "2146fbc6521a354b9194bc46954a394802a6e68e", "parents": [ "5edaad87000a143504a8f8e2864bb415a9287d94" ], "author": { "name": "Jim Meyering", "email": "jim@meyering.net", "time": "Tue Apr 17 21:27:54 2012 +0200" }, "committer": { "name": "Dave Airlie", "email": "airlied@redhat.com", "time": "Thu Apr 19 14:38:54 2012 +0100" }, "message": "drm/nouveau/pm: don\u0027t read/write beyond end of stack buffer\n\nNUL-terminate after strncpy.\n\nIf the parameter \"profile\" has length 16 or more, then strncpy\nleaves \"string\" with no NUL terminator, so the following search\nfor \u0027\\n\u0027 may read beyond the end of that 16-byte buffer.\nIf it finds a newline there, then it will also write beyond the\nend of that stack buffer.\n\nSigned-off-by: Jim Meyering \u003cmeyering@redhat.com\u003e\nSigned-off-by: Dave Airlie \u003cairlied@redhat.com\u003e\n" }, { "commit": "5edaad87000a143504a8f8e2864bb415a9287d94", "tree": "c8898bd1612617d0b1a571fd42100448eb915aae", "parents": [ "dfc6ae5bd70d3a22a0e977943c31f6d55fc32820" ], "author": { "name": "Marcos Paulo de Souza", "email": "marcos.souza.org@gmail.com", "time": "Wed Apr 18 01:30:02 2012 -0300" }, "committer": { "name": "Dave Airlie", "email": "airlied@redhat.com", "time": "Thu Apr 19 14:38:02 2012 +0100" }, "message": "drivers: gpu: drm: gma500: mdfld_dsi_output.h: Remove not unneeded include of version.h\n\nThe output of \"make versioncheck\" points a incorrect include of\nversion.h in the drivers/gpu/drm/gma500/mdfld_dsi_output.h:\n\ndrivers/gpu/drm/gma500/mdfld_dsi_output.h: 32 linux/version.h not needed.\n\nIf we take a look in the file, we can agree to remove it.\n\nCc: David Airlie \u003cairlied@linux.ie\u003e\nCc: \u003cdri-devel@lists.freedesktop.org\u003e\nSigned-off-by: Marcos Paulo de Souza \u003cmarcos.souza.org@gmail.com\u003e\nSigned-off-by: Dave Airlie \u003cairlied@redhat.com\u003e\n" }, { "commit": "dfc6ae5bd70d3a22a0e977943c31f6d55fc32820", "tree": "48bf399247ccdbd4f9b6917fa52eee3c52f5c634", "parents": [ "aef6a7eeac6fd867eda415f65a7f0247fb82baf4" ], "author": { "name": "Jerome Glisse", "email": "jglisse@redhat.com", "time": "Tue Apr 17 16:51:38 2012 -0400" }, "committer": { "name": "Dave Airlie", "email": "airlied@redhat.com", "time": "Thu Apr 19 14:37:42 2012 +0100" }, "message": "radeon: fix r600/agp when vram is after AGP (v3)\n\nIf AGP is placed in the middle, the size_af is off-by-one, it results\nin VRAM being placed at 0x7fffffff instead of 0x8000000.\n\nv2: fix the vram_start setup.\nv3: also fix r7xx \u0026 newer ASIC\n\nReported-by: russiane39 on #radeon\n\nSigned-off-by: Jerome Glisse \u003cjglisse@redhat.com\u003e\nSigned-off-by: Dave Airlie \u003cairlied@redhat.com\u003e\n" }, { "commit": "aef6a7eeac6fd867eda415f65a7f0247fb82baf4", "tree": "af52dcf49550f4791e02296e49af1f0c6ca15536", "parents": [ "d6b8395262a9d90e4ab11b614a5fb8f858e2b3df" ], "author": { "name": "Joonyoung Shim", "email": "jy0922.shim@samsung.com", "time": "Wed Apr 18 13:47:02 2012 +0900" }, "committer": { "name": "Dave Airlie", "email": "airlied@redhat.com", "time": "Thu Apr 19 14:36:51 2012 +0100" }, "message": "drm: fix page_flip error handling\n\nFree event and restore event_space only when page_flip-\u003eflags has\nDRM_MODE_PAGE_FLIP_EVENT if page_flip() is failed.\n\nSigned-off-by: Joonyoung Shim \u003cjy0922.shim@samsung.com\u003e\nSigned-off-by: Kyungmin Park \u003ckyungmin.park@samsung.com\u003e\nReviewed-by: Michel Dänzer \u003cmichel.daenzer@amd.com\u003e\nSigned-off-by: Dave Airlie \u003cairlied@redhat.com\u003e\n" }, { "commit": "d6b8395262a9d90e4ab11b614a5fb8f858e2b3df", "tree": "afe4b8ae6affe84e95169bcc0c3bf1c32004a568", "parents": [ "e36325071832f1ba96ac54fb8ba1459f08b05dd8", "99d9acdd0c5ce970eaf8e8671c0bc4cb7c6fb0c1" ], "author": { "name": "Dave Airlie", "email": "airlied@redhat.com", "time": "Thu Apr 19 14:13:52 2012 +0100" }, "committer": { "name": "Dave Airlie", "email": "airlied@redhat.com", "time": "Thu Apr 19 14:13:52 2012 +0100" }, "message": "Merge branch \u0027drm-intel-fixes\u0027 of git://people.freedesktop.org/~danvet/drm-intel into drm-fixes\n\n* \u0027drm-intel-fixes\u0027 of git://people.freedesktop.org/~danvet/drm-intel:\n drm/i915: Do not set \"Enable Panel Fitter\" on SNB pageflips\n drm/i915: Hold mode_config lock whilst changing mode for lastclose()\n drm/i915: don\u0027t clobber the special upscaling lvds timings\n" }, { "commit": "e36325071832f1ba96ac54fb8ba1459f08b05dd8", "tree": "a08edb9a701651f007c750ab8b1c55ed5d7a6ff7", "parents": [ "b10c6d4b50cbbdccce2187c1ccc516a9c7335835" ], "author": { "name": "Takashi Iwai", "email": "tiwai@suse.de", "time": "Wed Apr 18 15:21:07 2012 +0200" }, "committer": { "name": "Dave Airlie", "email": "airlied@redhat.com", "time": "Thu Apr 19 14:01:10 2012 +0100" }, "message": "drm/radeon/kms: fix the regression of DVI connector check\n\nThe check of the encoder type in the commit [e00e8b5e: drm/radeon/kms:\nfix analog load detection on DVI-I connectors] is obviously wrong, and\nit\u0027s the culprit of the regression on my workstation with DVI-analog\nconnection resulting in the blank output.\n\nFixed the typo now.\n\nSigned-off-by: Takashi Iwai \u003ctiwai@suse.de\u003e\nReviewed-by: Alex Deucher \u003calexander.deucher@amd.com\u003e\nCc: \u003cstable@vger.kernel.org\u003e\nSigned-off-by: Dave Airlie \u003cairlied@redhat.com\u003e\n" }, { "commit": "b10c6d4b50cbbdccce2187c1ccc516a9c7335835", "tree": "d4c91637312c1621835142e866db1d7aa6b070d0", "parents": [ "5273db706f8b673902638fee7f907909ed6ae3f9" ], "author": { "name": "Dave Airlie", "email": "airlied@redhat.com", "time": "Thu Apr 19 09:33:32 2012 +0100" }, "committer": { "name": "Dave Airlie", "email": "airlied@redhat.com", "time": "Thu Apr 19 09:33:32 2012 +0100" }, "message": "drm/usb: fix module license on drm/usb layer.\n\nAllows this module to load correctly with certain debugging options on.\n\nReported on irc by scientes\nSigned-off-by: Dave Airlie \u003cairlied@redhat.com\u003e\n" }, { "commit": "99d9acdd0c5ce970eaf8e8671c0bc4cb7c6fb0c1", "tree": "35dbf99f409b890b92040d64c0384d34e39ded83", "parents": [ "c291be9dba370ba696a0d482249a212cf5c15f45" ], "author": { "name": "Chris Wilson", "email": "chris@chris-wilson.co.uk", "time": "Tue Apr 17 20:37:00 2012 +0100" }, "committer": { "name": "Daniel Vetter", "email": "daniel.vetter@ffwll.ch", "time": "Wed Apr 18 10:30:47 2012 +0200" }, "message": "drm/i915: Do not set \"Enable Panel Fitter\" on SNB pageflips\n\nNot only do the pageflip work without it at non-native modes (i.e. with\nthe panel fitter enabled), it also causes normal (non-pageflipped)\nmodesets to fail.\n\nReported-by: Adam Jackson \u003cajax@redhat.com\u003e\nTested-by: Adam Jackson \u003cajax@redhat.com\u003e\nSigned-off-by: Chris Wilson \u003cchris@chris-wilson.co.uk\u003e\nWanted-by-for-fixes: Dave Airlie \u003cairlied@gmail.com\u003e\nSigned-Off-by: Daniel Vetter \u003cdaniel.vetter@ffwll.ch\u003e\n" }, { "commit": "c291be9dba370ba696a0d482249a212cf5c15f45", "tree": "f0b9fbeb40068c4040f61d2e4d0c7478ec532e9b", "parents": [ "f9bef081c3c3f77bec54454872e98d3ec635756f" ], "author": { "name": "Chris Wilson", "email": "chris@chris-wilson.co.uk", "time": "Mon Apr 16 15:16:42 2012 +0100" }, "committer": { "name": "Daniel Vetter", "email": "daniel.vetter@ffwll.ch", "time": "Mon Apr 16 20:37:38 2012 +0200" }, "message": "drm/i915: Hold mode_config lock whilst changing mode for lastclose()\n\nUpon lastclose(), we switch back to the fbcon configuration. This\nrequires taking the mode_config lock in order to serialise the change\nwith output probing elsewhere.\n\nReported-by: Oleksij Rempel \u003cbug-track@fisher-privat.net\u003e\nReferences: https://bugs.freedesktop.org/show_bug.cgi?id\u003d48652\nSigned-off-by: Chris Wilson \u003cchris@chris-wilson.co.uk\u003e\nCc: stable@kernel.org\nAcked-by: Jesse Barnes \u003cjbarnes@virtuousgeek.org\u003e\nSigned-Off-by: Daniel Vetter \u003cdaniel.vetter@ffwll.ch\u003e\n" }, { "commit": "5273db706f8b673902638fee7f907909ed6ae3f9", "tree": "2560f045e71db2a2b498277505133602d45faa1f", "parents": [ "16a5e32b83fd946312b9b13590c75d20c95c5202" ], "author": { "name": "Alex Deucher", "email": "alexander.deucher@amd.com", "time": "Fri Apr 13 10:26:36 2012 -0400" }, "committer": { "name": "Dave Airlie", "email": "airlied@redhat.com", "time": "Mon Apr 16 13:42:04 2012 +0100" }, "message": "drm/radeon/si: add missing radeon_bo_unreserve in si_rlc_init() v2\n\nForget to unreserve after pinning. This can lead to problems in\nsoft reset and resume.\n\nv2: rework patch as per Michel\u0027s suggestion.\n\nSigned-off-by: Alex Deucher \u003calexander.deucher@amd.com\u003e\nReviewed-by: Michel Dänzer \u003cmichel.daenzer@amd.com\u003e\nSigned-off-by: Dave Airlie \u003cairlied@redhat.com\u003e\n" }, { "commit": "16a5e32b83fd946312b9b13590c75d20c95c5202", "tree": "e0f47cb17a899203deb0f8aa05dbfc4be3d4e5e0", "parents": [ "e816b57a337ea3b755de72bec38c10c864f23015" ], "author": { "name": "Dave Airlie", "email": "airlied@redhat.com", "time": "Fri Apr 13 11:14:50 2012 +0100" }, "committer": { "name": "Dave Airlie", "email": "airlied@redhat.com", "time": "Mon Apr 16 13:40:04 2012 +0100" }, "message": "drm/radeon: disable MSI on RV515\n\nMy rv515 card is very flaky with msi enabled. Every so often it loses a rearm\nand never comes back, manually banging the rearm brings it back.\n\nReviewed-by: Alex Deucher \u003calexander.deucher@amd.com\u003e\nCc: stable@vger.kernel.org\nSigned-off-by: Dave Airlie \u003cairlied@redhat.com\u003e\n" }, { "commit": "f9bef081c3c3f77bec54454872e98d3ec635756f", "tree": "5cde18385cd7c3b582c5ab537bdd16fec2b148c7", "parents": [ "e816b57a337ea3b755de72bec38c10c864f23015" ], "author": { "name": "Daniel Vetter", "email": "daniel.vetter@ffwll.ch", "time": "Sun Apr 15 19:53:19 2012 +0200" }, "committer": { "name": "Daniel Vetter", "email": "daniel.vetter@ffwll.ch", "time": "Mon Apr 16 09:21:55 2012 +0200" }, "message": "drm/i915: don\u0027t clobber the special upscaling lvds timings\n\nThis regression has been introduced in\n\ncommit ca9bfa7eed20ea34e862804e62aae10eb159edbb\nAuthor: Daniel Vetter \u003cdaniel.vetter@ffwll.ch\u003e\nDate: Sat Jan 28 14:49:20 2012 +0100\n\n drm/i915: fixup interlaced vertical timings confusion, part 1\n\nUnfortunately that commit failed to take into account that the lvds\ncode does some special adjustements to the crtc timings for upscaling\nan centering.\n\nFix this by explicitly computing crtc timings in the lvds mode fixup\nfunction and setting a special flag in mode-\u003eprivate_flags if the crtc\ntimings have been adjusted.\n\nv2: Add a comment to explain the new mode driver private flag,\nsuggested by Eugeni Dodonov.\n\nv3: Kill the confusing and now redundant set_crtcinfo call in\nintel_fixed_panel_mode, noticed by Chris Wilson.\n\nReported-and-Tested-by: Hans de Bruin \u003cjmdebruin@xmsnet.nl\u003e\nBugzilla: https://bugzilla.kernel.org/show_bug.cgi?id\u003d43071\nReviewed-by: Eugeni Dodonov \u003ceugeni.dodonov@intel.com\u003e\nReviewed-by: Chris Wilson \u003cchris@chris-wilson.co.uk\u003e\nSigned-Off-by: Daniel Vetter \u003cdaniel.vetter@ffwll.ch\u003e\n" }, { "commit": "173fa4eccc39b04fbc0b569fabac6dbcec33507a", "tree": "5d73a6eb84c6f029f0934c0548b641471a23decb", "parents": [ "19e5c4e72c7287491f0da64e26b6b7175942f502", "490aa60ee7e884febf4818234d5c97669665db9a" ], "author": { "name": "Dave Airlie", "email": "airlied@redhat.com", "time": "Thu Apr 12 17:42:01 2012 +0100" }, "committer": { "name": "Dave Airlie", "email": "airlied@redhat.com", "time": "Thu Apr 12 17:42:01 2012 +0100" }, "message": "Merge branch \u0027exynos-drm-fixes\u0027 of git://git.infradead.org/users/kmpark/linux-samsung into drm-intel-fixes\n\n* \u0027exynos-drm-fixes\u0027 of git://git.infradead.org/users/kmpark/linux-samsung:\n drm/exynos: fixed exynos broken ioctl\n drm/exynos: fix to pointer manager member of struct exynos_drm_subdrv\n drm/exynos: fix struct for operation callback functions to driver name\n drm/exynos: use define instead of default_win member in struct mixer_context\n drm/exynos: rename s/HDMI_OVERLAY_NUMBER/MIXER_WIN_NR\n drm/exynos: remove unused codes in hdmi and mixer\n drm/exynos: remove unnecessary type conversion of hdmi and mixer\n drm/exynos: add format list of plane\n drm/exynos: fixed duplicated page allocation bug.\n drm/exynos: fixed page align and code clean.\n" }, { "commit": "19e5c4e72c7287491f0da64e26b6b7175942f502", "tree": "e6dd9e513b68ec8febd77e7779fb831190a6a9be", "parents": [ "46783150a6552f9513f08e62cfcc07125d6e502b", "15a13bbdffb0d6288a5dd04aee9736267da1335f" ], "author": { "name": "Dave Airlie", "email": "airlied@redhat.com", "time": "Thu Apr 12 13:01:57 2012 +0100" }, "committer": { "name": "Dave Airlie", "email": "airlied@redhat.com", "time": "Thu Apr 12 17:41:10 2012 +0100" }, "message": "Merge branch \u0027drm-intel-fixes\u0027 of git://people.freedesktop.org/~danvet/drm-intel into drm-intel-fixes\n\nDaniel Vetter writes:\n3 regression fixes:\n- disable gmbus again, too broken for 3.4, we\u0027ll try again for 3.5\n- dp bandwidth computation fix, we\u0027ve lost the 6bpc dithering flag\n sometimes, this is a 3.3 regression (maybe even earlier for some\n configurations).\n- fix resume regression caused by the gen2/3 fencing fix merged into -rc2.\n\nAnd a few other fixes:\n- gpu hang fix for i845 (Chris)\n- sprite fix (Armin Reese)\n- crtc disable vs. scanlinewait race fix (Chris)\n- rc6 module option read-only, it confused testers (Jesse)\n- fbc related blitter death hw workaround, note that we disable fbc on snb\n by default anyway.\n\nWith these fixes we have one 3.4 regression outstanding: One of the\ncleanup patches for the interlaced support managed to confuse the lvds\npanel fitter when upscaling. The root-cause is still unclear, but test\npatches are awaiting feedback from the reporter.\n\n* \u0027drm-intel-fixes\u0027 of git://people.freedesktop.org/~danvet/drm-intel:\n drm/i915: clear fencing tracking state when retiring requests\n drm/i915: make rc6 module parameter read-only\n drm/i915: implement ColorBlt w/a\n drm/i915/ringbuffer: Exclude last 2 cachlines of ring on 845g\n Revert \"drm/i915: reenable gmbus on gen3+ again\"\n drm/i915: properly compute dp dithering for user-created modes\n drm/i915: Finish any pending operations on the framebuffer before disabling\n drm/i915: Removed IVB forced enable of sprite dest key.\n" }, { "commit": "15a13bbdffb0d6288a5dd04aee9736267da1335f", "tree": "7cc3e8326352191e8171bf448ed9c4684eb670f7", "parents": [ "f57f9c167af7cb3fd315e6a8ebe194a8aea0832a" ], "author": { "name": "Daniel Vetter", "email": "daniel.vetter@ffwll.ch", "time": "Thu Apr 12 01:27:57 2012 +0200" }, "committer": { "name": "Daniel Vetter", "email": "daniel.vetter@ffwll.ch", "time": "Thu Apr 12 09:02:37 2012 +0200" }, "message": "drm/i915: clear fencing tracking state when retiring requests\n\nThis fixes a resume regression introduced in\n\ncommit 7dd4906586274f3945f2aeaaa5a33b451c3b4bba\nAuthor: Chris Wilson \u003cchris@chris-wilson.co.uk\u003e\nDate: Wed Mar 21 10:48:18 2012 +0000\n\n drm/i915: Mark untiled BLT commands as fenced on gen2/3\n\nwhich fixed fencing tracking for untiled blt commands.\n\nA side effect of that patch was that now also untiled objects have a\nnon-zero obj-\u003elast_fenced_seqno to track when a fence can be set up\nafter a pipelined tiling change. Unfortunately this was only cleared\nby the fence setup and teardown code, resulting in tons of untiled but\ninactive objects with non-zero last_fenced_seqno.\n\nNow after resume we completely reset the seqno tracking, both on the\ndriver side (by setting dev_priv-\u003enext_seqno \u003d 1) and on the hw side\n(by allocating a new hws page, which contains the seqnos). Hilarity\nand indefinite waits ensued from the stale seqnos in\nobj-\u003elast_fenced_seqno from before the suspend.\n\nThe fix is to properly clear the fencing tracking state like we\nalready do for the normal gpu rendering while moving objects off the\nactive list.\n\nReported-and-tested-by: \"Rafael J. Wysocki\" \u003crjw@sisk.pl\u003e\nCc: Jiri Slaby \u003cjslaby@suse.cz\u003e\nReviewed-by: Chris Wilson \u003cchris@chris-wilson.co.uk\u003e\nSigned-Off-by: Daniel Vetter \u003cdaniel.vetter@ffwll.ch\u003e\n" }, { "commit": "677e84c1b5c8533ea351a9556308071ca47a1eb2", "tree": "38ab6a72f214433ef294403b6c5cdb3dd25afb0a", "parents": [ "578b6065adc8805a8774e4bf3145e18de123f8b2" ], "author": { "name": "Joonyoung Shim", "email": "jy0922.shim@samsung.com", "time": "Thu Apr 05 20:49:27 2012 +0900" }, "committer": { "name": "Inki Dae", "email": "inki.dae@samsung.com", "time": "Thu Apr 12 14:51:27 2012 +0900" }, "message": "drm/exynos: fix to pointer manager member of struct exynos_drm_subdrv\n\nThe struct exynos_drm_manager has to exist for exynos drm sub driver\nusing encoder and connector. If it isn\u0027t NULL to member of struct\nexynos_drm_subdrv, will create encoder and connector else will not. And\nthe is_local member also doesn\u0027t need.\n\nSigned-off-by: Joonyoung Shim \u003cjy0922.shim@samsung.com\u003e\nSigned-off-by: Kyungmin Park \u003ckyungmin.park@samsung.com\u003e\nSigned-off-by: Inki Dae \u003cinki.dae@samsung.com\u003e\n" }, { "commit": "578b6065adc8805a8774e4bf3145e18de123f8b2", "tree": "88e563c3edb1fea30c8cb71836e45cd3e0420726", "parents": [ "a2ee151b6b6863d108552de82e02b77166ca23a8" ], "author": { "name": "Joonyoung Shim", "email": "jy0922.shim@samsung.com", "time": "Thu Apr 05 20:49:26 2012 +0900" }, "committer": { "name": "Inki Dae", "email": "inki.dae@samsung.com", "time": "Thu Apr 12 14:51:26 2012 +0900" }, "message": "drm/exynos: fix struct for operation callback functions to driver name\n\nThe mixer driver and hdmi driver have each operation callback functions\nand they is registered to hdmi common driver. Their struct names in hdmi\ncommon driver include display, manager and overlay. It confuses to\nappear whose operation and two driver cannot register same operation\ncallback functions at the same time. Use their struct names to driver\nname.\n\nSigned-off-by: Joonyoung Shim \u003cjy0922.shim@samsung.com\u003e\nSigned-off-by: Kyungmin Park \u003ckyungmin.park@samsung.com\u003e\nSigned-off-by: Inki Dae \u003cinki.dae@samsung.com\u003e\n" }, { "commit": "a2ee151b6b6863d108552de82e02b77166ca23a8", "tree": "9e1ec043e025cd89415d0731a8aa039b54d0c544", "parents": [ "a634dd54c05636a89a272e27e59118374065975e" ], "author": { "name": "Joonyoung Shim", "email": "jy0922.shim@samsung.com", "time": "Thu Apr 05 20:49:25 2012 +0900" }, "committer": { "name": "Inki Dae", "email": "inki.dae@samsung.com", "time": "Thu Apr 12 14:51:24 2012 +0900" }, "message": "drm/exynos: use define instead of default_win member in struct mixer_context\n\nThe default_win member in struct mixer_context isn\u0027t change its value\nafter initialized to 0, so it\u0027s better using to define.\n\nSigned-off-by: Joonyoung Shim \u003cjy0922.shim@samsung.com\u003e\nSigned-off-by: Kyungmin Park \u003ckyungmin.park@samsung.com\u003e\nSigned-off-by: Inki Dae \u003cinki.dae@samsung.com\u003e\n" }, { "commit": "a634dd54c05636a89a272e27e59118374065975e", "tree": "efae3c63bb5dfb3530dbac391e76e14f1cb675f9", "parents": [ "46da222be7873bd1c79fa110d6988a2b826f7dee" ], "author": { "name": "Joonyoung Shim", "email": "jy0922.shim@samsung.com", "time": "Thu Apr 05 20:49:24 2012 +0900" }, "committer": { "name": "Inki Dae", "email": "inki.dae@samsung.com", "time": "Thu Apr 12 14:51:21 2012 +0900" }, "message": "drm/exynos: rename s/HDMI_OVERLAY_NUMBER/MIXER_WIN_NR\n\nHDMI_OVERLAY_NUMBER is specific of mixer driver and be used \"windows\nlayer\" term in exynos user manaual, so rename it.\n\nSigned-off-by: Joonyoung Shim \u003cjy0922.shim@samsung.com\u003e\nSigned-off-by: Kyungmin Park \u003ckyungmin.park@samsung.com\u003e\nSigned-off-by: Inki Dae \u003cinki.dae@samsung.com\u003e\n" }, { "commit": "46da222be7873bd1c79fa110d6988a2b826f7dee", "tree": "3f537ffba07d760ff3bfb08a6d464c15be7cbcaf", "parents": [ "f9309d1bf220122659328040db47eede32514656" ], "author": { "name": "Joonyoung Shim", "email": "jy0922.shim@samsung.com", "time": "Thu Apr 05 20:49:23 2012 +0900" }, "committer": { "name": "Inki Dae", "email": "inki.dae@samsung.com", "time": "Thu Apr 12 14:51:18 2012 +0900" }, "message": "drm/exynos: remove unused codes in hdmi and mixer\n\nSome members in struct mixer_context aren\u0027t used and the define\nHDMI_OVERLAY_NUMBER is unused in hdmi driver, remove them.\n\nSigned-off-by: Joonyoung Shim \u003cjy0922.shim@samsung.com\u003e\nSigned-off-by: Kyungmin Park \u003ckyungmin.park@samsung.com\u003e\nSigned-off-by: Inki Dae \u003cinki.dae@samsung.com\u003e\n" }, { "commit": "f9309d1bf220122659328040db47eede32514656", "tree": "e611a15e167289b1496eefb612a7afeec9afebb3", "parents": [ "6b1c762da98fd0d475a4539f94541aec91a8de30" ], "author": { "name": "Joonyoung Shim", "email": "jy0922.shim@samsung.com", "time": "Thu Apr 05 20:49:22 2012 +0900" }, "committer": { "name": "Inki Dae", "email": "inki.dae@samsung.com", "time": "Thu Apr 12 14:51:16 2012 +0900" }, "message": "drm/exynos: remove unnecessary type conversion of hdmi and mixer\n\nWhen the void pointer type variable is assigned to the specific pointer\ntype variable, don\u0027t need to do type conversion.\n\nSigned-off-by: Joonyoung Shim \u003cjy0922.shim@samsung.com\u003e\nSigned-off-by: Kyungmin Park \u003ckyungmin.park@samsung.com\u003e\nSigned-off-by: Inki Dae \u003cinki.dae@samsung.com\u003e\n" }, { "commit": "f57f9c167af7cb3fd315e6a8ebe194a8aea0832a", "tree": "5a7be1cbce225f51aff28e6e79020dd842649242", "parents": [ "80e829fade4eea5f07c410df6a551c42e2d0ca9c" ], "author": { "name": "Jesse Barnes", "email": "jbarnes@virtuousgeek.org", "time": "Wed Apr 11 09:39:02 2012 -0700" }, "committer": { "name": "Daniel Vetter", "email": "daniel.vetter@ffwll.ch", "time": "Wed Apr 11 21:36:38 2012 +0200" }, "message": "drm/i915: make rc6 module parameter read-only\n\nPeople have been getting confused and thinking this is a runtime control.\n\nCc: stable@vger.kernel.org\nSigned-off-by: Jesse Barnes \u003cjbarnes@virtuousgeek.org\u003e\nSigned-off-by: Daniel Vetter \u003cdaniel.vetter@ffwll.ch\u003e\n" }, { "commit": "80e829fade4eea5f07c410df6a551c42e2d0ca9c", "tree": "c347937e2a2d83b0e9154b33866a0bfdc99251b3", "parents": [ "27c1cbd06a7620b354cbb363834f3bb8df4f410d" ], "author": { "name": "Daniel Vetter", "email": "daniel.vetter@ffwll.ch", "time": "Sat Mar 31 11:21:57 2012 +0200" }, "committer": { "name": "Daniel Vetter", "email": "daniel.vetter@ffwll.ch", "time": "Wed Apr 11 12:16:53 2012 +0200" }, "message": "drm/i915: implement ColorBlt w/a\n\nAccording to an internal workaround master list, we need to set bit 5\nof register 9400 to avoid issues with color blits.\n\nTesting shows that this seems to fix the blitter hangs when fbc is\nenabled on snb, thanks to Chris Wilson for figuring this out.\n\nTested-by: Chris Wilson \u003cchris@chris-wilson.co.uk\u003e\nTested-by: Michael \"brot\" Groh \u003cmichael.groh@minad.de\u003e\nAcked-by: Ben Widawsky \u003cben@bwidawsk.net\u003e\nSigned-Off-by: Daniel Vetter \u003cdaniel.vetter@ffwll.ch\u003e\n" }, { "commit": "27c1cbd06a7620b354cbb363834f3bb8df4f410d", "tree": "0c65a9e811897758f568b73ee0466b1f5fa66f19", "parents": [ "6a562e3daee217ce99fe0e31150acd89a5b22606" ], "author": { "name": "Chris Wilson", "email": "chris@chris-wilson.co.uk", "time": "Mon Apr 09 13:59:46 2012 +0100" }, "committer": { "name": "Daniel Vetter", "email": "daniel.vetter@ffwll.ch", "time": "Wed Apr 11 12:14:24 2012 +0200" }, "message": "drm/i915/ringbuffer: Exclude last 2 cachlines of ring on 845g\n\nThe 845g shares the errata with i830 whereby executing a command\nwithin 2 cachelines of the end of the ringbuffer may cause a GPU hang.\n\nSigned-off-by: Chris Wilson \u003cchris@chris-wilson.co.uk\u003e\nCc: stable@kernel.org\nSigned-off-by: Daniel Vetter \u003cdaniel.vetter@ffwll.ch\u003e\n" }, { "commit": "6a562e3daee217ce99fe0e31150acd89a5b22606", "tree": "1503bbee0b49118ea47d3fbb9573c5fdffaf32cf", "parents": [ "c4867936474183332db4c19791a65fdad6474fd5" ], "author": { "name": "Daniel Vetter", "email": "daniel.vetter@ffwll.ch", "time": "Mon Apr 09 21:10:38 2012 +0200" }, "committer": { "name": "Daniel Vetter", "email": "daniel.vetter@ffwll.ch", "time": "Wed Apr 11 12:11:23 2012 +0200" }, "message": "Revert \"drm/i915: reenable gmbus on gen3+ again\"\n\nThis reverts commit c3dfefa0a6d235bd465309e12f4c56ea16e71111.\n\ngmbus in 3.4 has simply too many known issues:\n- gmbus is too noisy, we need to rework the logging:\n https://bugs.freedesktop.org/show_bug.cgi?id\u003d48248\n- zero-length writes cause an OOPS, and they are\n userspace-triggerable:\n https://lkml.org/lkml/2012/3/30/176\n- same for zero-length reads:\n https://bugs.freedesktop.org/show_bug.cgi?id\u003d48269\n\nWe can try again for 3.5.\n\nAcked-by: Chris Wilson \u003cchris@chris-wilson.co.uk\u003e\nSigned-Off-by: Daniel Vetter \u003cdaniel.vetter@ffwll.ch\u003e\n" }, { "commit": "46783150a6552f9513f08e62cfcc07125d6e502b", "tree": "fd34912299b2e6fedd7e5fd1c2bba57b083b8437", "parents": [ "6069a4c988d75c0fb309fa7da0909df2a222a65e" ], "author": { "name": "Alex Deucher", "email": "alexander.deucher@amd.com", "time": "Tue Apr 10 12:14:27 2012 -0400" }, "committer": { "name": "Dave Airlie", "email": "airlied@redhat.com", "time": "Wed Apr 11 09:36:53 2012 +0100" }, "message": "drm/radeon: only add the mm i2c bus if the hw_i2c module param is set\n\nIt seems it can corrupt the monitor EDID in certain cases on certain\nboards when running sensors detect. It\u0027s rarely used anyway outside\nof AIW boards.\n\nhttp://lists.lm-sensors.org/pipermail/lm-sensors/2012-April/035847.html\nhttp://lists.freedesktop.org/archives/xorg/2011-January/052239.html\n\nSigned-off-by: Alex Deucher \u003calexander.deucher@amd.com\u003e\nCc: stable@vger.kernel.org\nAcked-by: Jean Delvare \u003ckhali@linux-fr.org\u003e\nSigned-off-by: Dave Airlie \u003cairlied@redhat.com\u003e\n" }, { "commit": "c4867936474183332db4c19791a65fdad6474fd5", "tree": "1c6c943a8186935b42e02e9adc521cc506cf4e85", "parents": [ "14667a4bde4361b7ac420d68a2e9e9b9b2df5231" ], "author": { "name": "Daniel Vetter", "email": "daniel.vetter@ffwll.ch", "time": "Tue Apr 10 10:42:36 2012 +0200" }, "committer": { "name": "Daniel Vetter", "email": "daniel.vetter@ffwll.ch", "time": "Tue Apr 10 19:23:02 2012 +0200" }, "message": "drm/i915: properly compute dp dithering for user-created modes\n\nWe\u0027ve only computed whether we need to fall back to 6bpc due to dp\nlink bandwidth constrains in mode_valid, but not mode_fixup. Under\nvarious circumstances X likes to create new modes which then lack\nproper 6bpc flags (if required), resulting in mode_fixup failures and\nultimately black screens.\n\nChris Wilson pointed out that we still get things wrong for bpp \u003e 24,\nbut that should be fixed in another patch (and it\u0027ll be easier because\nthis patch consolidates the logic).\n\nThe likely culprit for this regression is\n\ncommit 3d794f87238f74d80e78a7611c7fbde8a54c85c2\nAuthor: Keith Packard \u003ckeithp@keithp.com\u003e\nDate: Wed Jan 25 08:16:25 2012 -0800\n\n drm/i915: Force explicit bpp selection for intel_dp_link_required\n\nv2: Fix indentation and tune down the too bold claim that this should\nfix the world. Both noticed by Chris Wilson.\n\nv3: Try to really git add things.\n\nReported-and-tested-by: Brice Goglin \u003cBrice.Goglin@ens-lyon.org\u003e\nBugzilla: https://bugs.freedesktop.org/show_bug.cgi?id\u003d48170\nCc: stable@kernel.org\nReviewed-by: Adam Jackson \u003cajax@redhat.com\u003e\nSigned-Off-by: Daniel Vetter \u003cdaniel.vetter@ffwll.ch\u003e\n" }, { "commit": "afceb9319f21b18ee3bc15ee9a5f92e18ef8a8c9", "tree": "3e874864cea99e260b48f5b0717317510e7cdf15", "parents": [ "6587eb82617f7913c13e750e73e13fa9c829863c" ], "author": { "name": "Alex Deucher", "email": "alexander.deucher@amd.com", "time": "Tue Apr 03 17:05:41 2012 -0400" }, "committer": { "name": "Dave Airlie", "email": "airlied@redhat.com", "time": "Tue Apr 10 10:27:46 2012 +0100" }, "message": "drm/radeon/kms: fix DVO setup on some r4xx chips\n\nSome r4xx chips have the wrong frev in the\nDVOEncoderControl table. It should always be 1\non r4xx. Fixes modesetting on DVO on r4xx chips\nwith the bad frev.\n\nReported by twied on #radeon.\n\nSigned-off-by: Alex Deucher \u003calexander.deucher@amd.com\u003e\nCc: stable@vger.kernel.org\nSigned-off-by: Dave Airlie \u003cairlied@redhat.com\u003e\n" }, { "commit": "6587eb82617f7913c13e750e73e13fa9c829863c", "tree": "47795de3efba773e42336c954b8f15675c156536", "parents": [ "4de833c337509916b7931982734d858191cf0700" ], "author": { "name": "Xi Wang", "email": "xi.wang@gmail.com", "time": "Fri Apr 06 17:38:24 2012 -0400" }, "committer": { "name": "Dave Airlie", "email": "airlied@redhat.com", "time": "Tue Apr 10 10:22:51 2012 +0100" }, "message": "drm/savage: fix integer overflows in savage_bci_cmdbuf()\n\nSince cmdbuf-\u003esize and cmdbuf-\u003enbox are from userspace, a large value\nwould overflow the allocation size, leading to out-of-bounds access.\n\nSigned-off-by: Xi Wang \u003cxi.wang@gmail.com\u003e\nSigned-off-by: Dave Airlie \u003cairlied@redhat.com\u003e\n" }, { "commit": "4de833c337509916b7931982734d858191cf0700", "tree": "f5eeaeff34fe4f8b2a51ee3a6817a1fa4dcae68c", "parents": [ "258f742635360175564e9470eb060ff4d4b984e7" ], "author": { "name": "Arnd Bergmann", "email": "arnd@arndb.de", "time": "Thu Apr 05 12:58:22 2012 -0600" }, "committer": { "name": "Dave Airlie", "email": "airlied@redhat.com", "time": "Tue Apr 10 10:21:00 2012 +0100" }, "message": "drm/radeon: replace udelay with mdelay for long timeouts\n\nSome architectures require that delays longer than a few\nmiliseconds are called through mdelay. This was triggered\non ARM randconfig builds.\n\nSigned-off-by: Arnd Bergmann \u003carnd@arndb.de\u003e\nSigned-off-by: Mathieu Poirier \u003cmathieu.poirier@linaro.org\u003e\nSigned-off-by: Dave Airlie \u003cairlied@redhat.com\u003e\n" }, { "commit": "14667a4bde4361b7ac420d68a2e9e9b9b2df5231", "tree": "2a26ed34eb36153d485d7f385be64aa365dc5cc8", "parents": [ "b2a71642b8bfa1965700ba248a99016e4d6b685d" ], "author": { "name": "Chris Wilson", "email": "chris@chris-wilson.co.uk", "time": "Tue Apr 03 17:58:35 2012 +0100" }, "committer": { "name": "Daniel Vetter", "email": "daniel.vetter@ffwll.ch", "time": "Mon Apr 09 21:53:30 2012 +0200" }, "message": "drm/i915: Finish any pending operations on the framebuffer before disabling\n\nSimilar to the case where we are changing from one framebuffer to\nanother, we need to be sure that there are no pending WAIT_FOR_EVENTs on\nthe pipe for the current framebuffer before switching. If we disable the\npipe, and then try to execute a WAIT_FOR_EVENT it will block\nindefinitely and cause a GPU hang.\n\nWe attempted to fix this in commit 85345517fe6d4de27b0d6ca19fef9d28ac947c4a\n(drm/i915: Retire any pending operations on the old scanout when switching)\nfor the case of mode switching, but this leaves the condition where we\nare switching off the pipe vulnerable.\n\nThere still remains the race condition were a display may be unplugged,\nswitched off by the core, a uevent sent to notify the DDX and the DDX\nmay issue a WAIT_FOR_EVENT before it processes the uevent. This window\ndoes not exist if the pipe is only switched off in response to the\nuevent. Time to make sure that is so...\n\nReported-by: Francis Leblanc \u003cFrancis.Leblanc-Lebeau@verint.com\u003e\nBugzilla: https://bugs.freedesktop.org/show_bug.cgi?id\u003d36515\nBugzilla: https://bugs.freedesktop.org/show_bug.cgi?id\u003d45413\nSigned-off-by: Chris Wilson \u003cchris@chris-wilson.co.uk\u003e\nReviewed-by: Eugeni Dodonov \u003ceugeni.dodonov@intel.com\u003e\n[danvet: fixup spelling in comment, noticed by Eugeni.]\nSigned-off-by: Daniel Vetter \u003cdaniel.vetter@ffwll.ch\u003e\n" }, { "commit": "b2a71642b8bfa1965700ba248a99016e4d6b685d", "tree": "cdde642d5df7ebb2affea5b76f5de79508b6f1d1", "parents": [ "0034102808e0dbbf3a2394b82b1bb40b5778de9e" ], "author": { "name": "acreese", "email": "armin.c.reese@intel.com", "time": "Wed Apr 04 16:22:32 2012 -0700" }, "committer": { "name": "Daniel Vetter", "email": "daniel.vetter@ffwll.ch", "time": "Mon Apr 09 21:53:20 2012 +0200" }, "message": "drm/i915: Removed IVB forced enable of sprite dest key.\n\nThe destination color key is always enabled for IVB. Removed\nthe line that does this.\n\nSigned-off-by: Armin Reese \u003carmin.c.reese@intel.com\u003e\nAcked-by: Jesse Barnes \u003cjbarnes@virtuousgeek.org\u003e\nCc: stable@kernel.org\nSigned-off-by: Daniel Vetter \u003cdaniel.vetter@ffwll.ch\u003e\n" }, { "commit": "5d32c88f0b94061b3af2e3ade92422407282eb12", "tree": "2e1f81aa47b2cf59625c8fba17199617e33802e6", "parents": [ "43f63c8711ce02226b7bbdafeba7b8031faf3fb4", "dac23b0d0513916498d40412818bd2c581b365f7" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Apr 05 15:30:34 2012 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Apr 05 15:30:34 2012 -0700" }, "message": "Merge branch \u0027akpm\u0027 (Andrew\u0027s patch-bomb)\n\nMerge batch of fixes from Andrew Morton:\n \"The simple_open() cleanup was held back while I wanted for laggards to\n merge things.\n\n I still need to send a few checkpoint/restore patches. I\u0027ve been\n wobbly about merging them because I\u0027m wobbly about the overall\n prospects for success of the project. But after speaking with Pavel\n at the LSF conference, it sounds like they\u0027re further toward\n completion than I feared - apparently davem is at the \"has stopped\n complaining\" stage regarding the net changes. So I need to go back\n and re-review those patchs and their (lengthy) discussion.\"\n\n* emailed from Andrew Morton \u003cakpm@linux-foundation.org\u003e: (16 patches)\n memcg swap: use mem_cgroup_uncharge_swap fix\n backlight: add driver for DA9052/53 PMIC v1\n C6X: use set_current_blocked() and block_sigmask()\n MAINTAINERS: add entry for sparse checker\n MAINTAINERS: fix REMOTEPROC F: typo\n alpha: use set_current_blocked() and block_sigmask()\n simple_open: automatically convert to simple_open()\n scripts/coccinelle/api/simple_open.cocci: semantic patch for simple_open()\n libfs: add simple_open()\n hugetlbfs: remove unregister_filesystem() when initializing module\n drivers/rtc/rtc-88pm860x.c: fix rtc irq enable callback\n fs/xattr.c:setxattr(): improve handling of allocation failures\n fs/xattr.c:listxattr(): fall back to vmalloc() if kmalloc() failed\n fs/xattr.c: suppress page allocation failure warnings from sys_listxattr()\n sysrq: use SEND_SIG_FORCED instead of force_sig()\n proc: fix mount -t proc -o AAA\n" }, { "commit": "234e340582901211f40d8c732afc49f0630ecf05", "tree": "753076500dfd883b3db56d4f5410af31d8945623", "parents": [ "9b3ae64be658a573b33d05a8dc73b08d3345fa44" ], "author": { "name": "Stephen Boyd", "email": "sboyd@codeaurora.org", "time": "Thu Apr 05 14:25:11 2012 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Apr 05 15:25:50 2012 -0700" }, "message": "simple_open: automatically convert to simple_open()\n\nMany users of debugfs copy the implementation of default_open() when\nthey want to support a custom read/write function op. This leads to a\nproliferation of the default_open() implementation across the entire\ntree.\n\nNow that the common implementation has been consolidated into libfs we\ncan replace all the users of this function with simple_open().\n\nThis replacement was done with the following semantic patch:\n\n\u003csmpl\u003e\n@ open @\nidentifier open_f !\u003d simple_open;\nidentifier i, f;\n@@\n-int open_f(struct inode *i, struct file *f)\n-{\n(\n-if (i-\u003ei_private)\n-f-\u003eprivate_data \u003d i-\u003ei_private;\n|\n-f-\u003eprivate_data \u003d i-\u003ei_private;\n)\n-return 0;\n-}\n\n@ has_open depends on open @\nidentifier fops;\nidentifier open.open_f;\n@@\nstruct file_operations fops \u003d {\n...\n-.open \u003d open_f,\n+.open \u003d simple_open,\n...\n};\n\u003c/smpl\u003e\n\n[akpm@linux-foundation.org: checkpatch fixes]\nSigned-off-by: Stephen Boyd \u003csboyd@codeaurora.org\u003e\nCc: Greg Kroah-Hartman \u003cgregkh@linuxfoundation.org\u003e\nCc: Al Viro \u003cviro@zeniv.linux.org.uk\u003e\nCc: Julia Lawall \u003cJulia.Lawall@lip6.fr\u003e\nAcked-by: Ingo Molnar \u003cmingo@elte.hu\u003e\nSigned-off-by: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "6b1c762da98fd0d475a4539f94541aec91a8de30", "tree": "666b56a41e6a3527287c778b5408e74cbf3a54d1", "parents": [ "61db75d83ca2ac7d46b72fe94b253bbe277bb178" ], "author": { "name": "Seung-Woo Kim", "email": "sw0312.kim@samsung.com", "time": "Thu Apr 05 11:21:09 2012 +0900" }, "committer": { "name": "Inki Dae", "email": "inki.dae@samsung.com", "time": "Thu Apr 05 19:41:04 2012 +0900" }, "message": "drm/exynos: add format list of plane\n\nNV12, NV12M and NV12MT are added to format list of plane to use these\nformats for hdmi vp layer.\n\nSigned-off-by: Seung-Woo Kim \u003csw0312.kim@samsung.com\u003e\nSigned-off-by: Inki Dae \u003cinki.dae@samsung.com\u003e\nSigned-off-by: Kyungmin Park \u003ckyungmin.park@samsung.com\u003e\n" }, { "commit": "f3718a818f7fb3636130d5f34bde8df34f45c5e5", "tree": "1fafcb0f15ac4c6d964aa9b8e70527ac479df624", "parents": [ "01627d968c8b5e2810fe8c417b406b968297c236" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Apr 04 08:16:25 2012 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Apr 04 08:16:25 2012 -0700" }, "message": "Revert \"nouveau/bios: Fix tracking of BIOS image data\"\n\nThis reverts commit d06221c0617ab6d0bc41c4980cefdd9c8cc9a1c1.\n\nIt turns out to trigger the \"BUG_ON(!PageCompound(page))\" in kfree(),\napparently because the code ends up trying to free somethng that was\nnever kmalloced in the first place.\n\nBenH points out that the patch was untested and wasn\u0027t meant to go into\nthe upstream kernel that quickly in the first place.\n\nBacktrace:\n bios_shadow\n bios_shadow_prom\n nv_mask\n init_io\n bios_shadow\n nouveau_bios_init\n NVReadVgaCrtc\n NVSetOwner\n nouveau_card_init\n nouveau_load\n\nReported-by: Meelis Roos \u003cmroos@linux.ee\u003e\nRequested-by: Dave Airlie \u003cairlied@gmail.com\u003e\nAcked-by: Benjamin Herrenschmidt \u003cbenh@kernel.crashing.org\u003e\nCc: Ben Skeggs \u003cbskeggs@redhat.com\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "01627d968c8b5e2810fe8c417b406b968297c236", "tree": "e49077d45d6998adee302f142f7d54e472c81bc3", "parents": [ "e1a7eb08ee097e97e928062a242b0de5b2599a11", "e37acc0f5ea18ff1ea4db96a84a51b90044c0dbd" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Apr 03 10:13:34 2012 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Apr 03 10:13:34 2012 -0700" }, "message": "Merge branch \u0027drm-fixes-intel\u0027 of git://people.freedesktop.org/~airlied/linux\n\nPull drm update from Dave Airlie:\n \"This pull just contains a forward of the Intel fixes from Daniel.\n\n The only annoyance is the RC6 enable, which really should have made\n -next, but since Ubuntu are shipping it I reckon its getting a good\n testing now by the time 3.4 comes out.\n\n The pull from Daniel contains his pull message to me:\n\n \"A few patches for 3.4, major part is 3 regression fixes:\n - ppgtt broke hibernate on snb/ivb. Somehow our QA claims that it\n still works, which is why this has not been caught earlier.\n - ppgtt flails in combination with dmar. I kinda expected this one :(\n - fence handling bugfix for gen2/3. Iirc this one is about a year\n old, fix curtesy Chris Wilson. I\u0027ve created an shockingly simple\n i-g-t test to catch this in the future.\"\n\n Wrt regressions I\u0027ve just got a report that gmbus (newly enabled\n again in 3.4) is a bit noisy. I\u0027m looking into this atm.\n\n Also included are the rc6 enable patches for snb from Eugeni. I\n wanted to include these in the main 3.4 pull but screwed it up.\n Please hit me. Imo these kind of patches really should go in\n before -rc1, but in thise case rc6 has brought us tons of press and\n guinea pigs^W^W testers and ubuntu is already running with it. So\n I estimate a pretty small chance for this to blow up.\n\n And some smaller things:\n - two minor locking snafus\n - server gt2 ivb pciid\n - 2 patches to sanitize the register state left behind by the bios\n some more\n - 2 new quirk entries\n - cs readback trick against missed IRQs from ivb also enabled on snb\n - sprite fix from Jesse\"\n\nLet\u0027s see if the \"enable RC6 on sandybridge\" finally works and sticks.\nI\u0027ve been enabling it by hand (i915.i915_enable_rc6\u003d1) for several\nmonths on my Macbook Air, and it definitely makes a difference (and has\nworked for me). But every time we enabled it before it showed some odd\nhw buglet for *somebody*.\n\nThis time it\u0027s all good, I\u0027m sure.\n\n* \u0027drm-fixes-intel\u0027 of git://people.freedesktop.org/~airlied/linux:\n drm/i915: treat src w \u0026 h as fixed point in sprite handling code\n drm/i915: no-lvds quirk on MSI DC500\n drm/i915: Add lock on drm_helper_resume_force_mode\n drm/i915: don\u0027t leak struct_mutex lock on ppgtt init failures\n drm/i915: disable ppgtt on snb when dmar is enabled\n drm/i915: add Ivy Bridge GT2 Server entries\n drm/i915: properly clear SSC1 bit in the pch refclock init code\n drm/i915: apply CS reg readback trick against missed IRQ on snb\n drm/i915: quirk away broken OpRegion VBT\n drm/i915: enable plain RC6 on Sandy Bridge by default\n drm/i915: allow to select rc6 modes via kernel parameter\n drm/i915: Mark untiled BLT commands as fenced on gen2/3\n drm/i915: properly restore the ppgtt page directory on resume\n drm/i915: Sanitize BIOS debugging bits from PIPECONF\n" }, { "commit": "e1a7eb08ee097e97e928062a242b0de5b2599a11", "tree": "2e94ca0bd2ac5a53a4a7234b2f1b5f98f669cca8", "parents": [ "464662b91614188b4af9df51baaa0d6b3d89a15f", "62fb376e214d3c1bfdf6fbb77dac162f6da04d7e" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Apr 03 10:12:21 2012 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Apr 03 10:12:21 2012 -0700" }, "message": "Merge branch \u0027drm-fixes\u0027 of git://people.freedesktop.org/~airlied/linux\n\nPull drm fixes from Dave Airlie:\n \"Mainly nouveau fixes, one for a regressions in -rc1, fixes for booting\n on a ppc G5, and a Kconfig fix. Two radeon fixes, one oops, one s/r\n fix. One udl mmap fix. And one core drm fix to stop bad fbdev apps\n overwriting bits of ram.\"\n\n* \u0027drm-fixes\u0027 of git://people.freedesktop.org/~airlied/linux:\n drm: Validate requested virtual size against allocated fb size\n drm/radeon: Don\u0027t dereference possibly-NULL pointer.\n mm, drm/udl: fixup vma flags on mmap\n drm/radeon/kms: fix fans after resume\n nouveau/bios: Fix tracking of BIOS image data\n nouveau: Fix crash when pci_ram_rom() returns a size of 0\n drm/nouveau: select POWER_SUPPLY\n drm/nouveau: inform userspace of relaxed kernel subchannel requirements\n Revert \"drm/nouveau: inform userspace of new kernel subchannel requirements\"\n drm/nouveau: oops, create m2mf for nvd9 too\n" }, { "commit": "61db75d83ca2ac7d46b72fe94b253bbe277bb178", "tree": "c0f6ff4b14ac941f4e6cf802caa26dc0869c9236", "parents": [ "dcf9af822803bcc2cd9e8009648547e6060b59a0" ], "author": { "name": "Inki Dae", "email": "inki.dae@samsung.com", "time": "Tue Apr 03 21:49:15 2012 +0900" }, "committer": { "name": "Inki Dae", "email": "inki.dae@samsung.com", "time": "Tue Apr 03 21:49:15 2012 +0900" }, "message": "drm/exynos: fixed duplicated page allocation bug.\n\nthis patch fixes that buf-\u003epages is allocated two times when it allocates\nphysically continuous memory region and removes unnecessary codes.\n\nSigned-off-by: Inki Dae \u003cinki.dae@samsung.com\u003e\nSigned-off-by: Kyungmin Park \u003ckyungmin.park@samsung.com\u003e\n" }, { "commit": "dcf9af822803bcc2cd9e8009648547e6060b59a0", "tree": "f9c9d0d96d6685d04f46ee8190f8e3c24d95d125", "parents": [ "62fb376e214d3c1bfdf6fbb77dac162f6da04d7e" ], "author": { "name": "Inki Dae", "email": "inki.dae@samsung.com", "time": "Tue Apr 03 21:27:58 2012 +0900" }, "committer": { "name": "Inki Dae", "email": "inki.dae@samsung.com", "time": "Tue Apr 03 21:27:58 2012 +0900" }, "message": "drm/exynos: fixed page align and code clean.\n\n1M section, 64k page count also should be rounded up so this patch\nrounds up them and caculates page count of them properly and also\nchecks memory flags from user.\n\nSigned-off-by: Inki Dae \u003cinki.dae@samsung.com\u003e\nSigned-off-by: Kyungmin Park \u003ckyungmin.park@samsung.com\u003e\n" }, { "commit": "62fb376e214d3c1bfdf6fbb77dac162f6da04d7e", "tree": "e740485e5c058ad0f8e22f26081c24014e127d5a", "parents": [ "e199fd422420d1620cf64fd9bdd4ff8bc255cc76" ], "author": { "name": "Chris Wilson", "email": "chris@chris-wilson.co.uk", "time": "Mon Mar 26 21:15:53 2012 +0100" }, "committer": { "name": "Dave Airlie", "email": "airlied@redhat.com", "time": "Tue Apr 03 11:18:46 2012 +0100" }, "message": "drm: Validate requested virtual size against allocated fb size\n\nmplayer -vo fbdev tries to create a screen that is twice as tall as the\nallocated framebuffer for \"doublebuffering\". By default, and all in-tree\nusers, only sufficient memory is allocated and mapped to satisfy the\nsmallest framebuffer and the virtual size is no larger than the actual.\nFor these users, we should therefore reject any userspace request to\ncreate a screen that requires a buffer larger than the framebuffer\noriginally allocated.\n\nReferences: https://bugs.freedesktop.org/show_bug.cgi?id\u003d38138\nSigned-off-by: Chris Wilson \u003cchris@chris-wilson.co.uk\u003e\nReviewed-by: Daniel Vetter \u003cdaniel.vetter@ffwll.ch\u003e\nCc: stable@kernel.org\nSigned-off-by: Dave Airlie \u003cairlied@redhat.com\u003e\n" }, { "commit": "b4db1e35ac59c144965f517bc575a0d75b60b03f", "tree": "c54ef9a06165265e89213eaf9a4c00095cdf2045", "parents": [ "97effadb65ed08809e1720c8d3ee80b73a93665c" ], "author": { "name": "Jesse Barnes", "email": "jbarnes@virtuousgeek.org", "time": "Tue Mar 20 10:59:09 2012 -0700" }, "committer": { "name": "Daniel Vetter", "email": "daniel.vetter@ffwll.ch", "time": "Tue Apr 03 11:33:33 2012 +0200" }, "message": "drm/i915: treat src w \u0026 h as fixed point in sprite handling code\n\nThis was missed when we converted the source values to 16.16 fixed point.\n\nCc: stable@vger.kernel.org\nSigned-off-by: Jesse Barnes \u003cjbarnes@virtuousgeek.org\u003e\nTested-by: Chris Wilson \u003cchris@chris-wilson.co.uk\u003e\nSigned-off-by: Daniel Vetter \u003cdaniel.vetter@ffwll.ch\u003e\n" }, { "commit": "97effadb65ed08809e1720c8d3ee80b73a93665c", "tree": "0a70d3114495a58424ac1ab9eabbec2e3b8f9e74", "parents": [ "927a2f119e8235238a2fc64871051b16c9bdae75" ], "author": { "name": "Anisse Astier", "email": "anisse@astier.eu", "time": "Wed Mar 07 18:36:35 2012 +0100" }, "committer": { "name": "Daniel Vetter", "email": "daniel.vetter@ffwll.ch", "time": "Tue Apr 03 10:44:05 2012 +0200" }, "message": "drm/i915: no-lvds quirk on MSI DC500\n\nThis hardware doesn\u0027t have an LVDS, it\u0027s a desktop box. Fix incorrect\nLVDS detection.\n\nCc: stable@kernel.org\nSigned-off-by: Anisse Astier \u003canisse@astier.eu\u003e\nAcked-by: Chris Wilson \u003cchris@chris-wilson.co.uk\u003e\nSigned-off-by: Daniel Vetter \u003cdaniel.vetter@ffwll.ch\u003e\n" }, { "commit": "927a2f119e8235238a2fc64871051b16c9bdae75", "tree": "982fd48fc0a39dd5ce0e073b3475283219bd11a7", "parents": [ "e02f14cd48a5da0ebaecf88c93dbd54a81e0dead" ], "author": { "name": "Sean Paul", "email": "seanpaul@chromium.org", "time": "Fri Mar 23 08:52:58 2012 -0400" }, "committer": { "name": "Daniel Vetter", "email": "daniel.vetter@ffwll.ch", "time": "Tue Apr 03 10:37:37 2012 +0200" }, "message": "drm/i915: Add lock on drm_helper_resume_force_mode\n\ni915_drm_thaw was not locking the mode_config lock when calling\ndrm_helper_resume_force_mode. When there were multiple wake sources,\nthis caused FDI training failure on SNB which in turn corrupted the\ndisplay.\n\nSigned-off-by: Sean Paul \u003cseanpaul@chromium.org\u003e\nReviewed-by: Chris Wilson \u003cchris@chris-wilson.co.uk\u003e\nCc: stable@kernel.org\nSigned-Off-by: Daniel Vetter \u003cdaniel.vetter@ffwll.ch\u003e\n" }, { "commit": "e02f14cd48a5da0ebaecf88c93dbd54a81e0dead", "tree": "9a5af6d70c2a8e9c499f73f42ca3b6e548715190", "parents": [ "650dc07ec3b0eba8ff21da706d2b1876ada59fc3" ], "author": { "name": "Daniel Vetter", "email": "daniel.vetter@ffwll.ch", "time": "Mon Apr 02 23:33:03 2012 +0200" }, "committer": { "name": "Daniel Vetter", "email": "daniel.vetter@ffwll.ch", "time": "Tue Apr 03 10:25:33 2012 +0200" }, "message": "drm/i915: don\u0027t leak struct_mutex lock on ppgtt init failures\n\nReported-by: Konstantin Belousov \u003ckostikbel@gmail.com\u003e\nReviewed-by: Chris Wilson \u003cchris@chris-wilson.co.uk\u003e\nSigned-Off-by: Daniel Vetter \u003cdaniel.vetter@ffwll.ch\u003e\n" }, { "commit": "650dc07ec3b0eba8ff21da706d2b1876ada59fc3", "tree": "337809fc7c960a6c525f473d498c339aa7075ab3", "parents": [ "cc22a938fc1db0c8ef5e693a69b159c4b851dab3" ], "author": { "name": "Daniel Vetter", "email": "daniel.vetter@ffwll.ch", "time": "Mon Apr 02 10:08:35 2012 +0200" }, "committer": { "name": "Daniel Vetter", "email": "daniel.vetter@ffwll.ch", "time": "Mon Apr 02 15:59:07 2012 +0200" }, "message": "drm/i915: disable ppgtt on snb when dmar is enabled\n\nTotally unexpected that this regressed. Luckily it sounds like we just\nneed to have dmar disable on the igfx, not the entire system. At least\nthat\u0027s what a few days of testing between Tony Vroon and me indicates.\n\nReported-by: Tony Vroon \u003ctony@linx.net\u003e\nCc: Tony Vroon \u003ctony@linx.net\u003e\nBugzilla: https://bugzilla.kernel.org/show_bug.cgi?id\u003d43024\nAcked-by: Chris Wilson \u003cchris@chris-wilson.co.uk\u003e\nSigned-Off-by: Daniel Vetter \u003cdaniel.vetter@ffwll.ch\u003e\n" }, { "commit": "cc22a938fc1db0c8ef5e693a69b159c4b851dab3", "tree": "9d2e52caed1d848c267dcb33997b6fc8e6b3f739", "parents": [ "e77166b5a653728f312d07e60a80819d1c54fca4" ], "author": { "name": "Eugeni Dodonov", "email": "eugeni.dodonov@intel.com", "time": "Thu Mar 29 20:55:48 2012 -0300" }, "committer": { "name": "Daniel Vetter", "email": "daniel.vetter@ffwll.ch", "time": "Mon Apr 02 15:58:47 2012 +0200" }, "message": "drm/i915: add Ivy Bridge GT2 Server entries\n\nThis adds PCI ID for IVB GT2 server variant which we were missing.\n\nSigned-off-by: Eugeni Dodonov \u003ceugeni.dodonov@intel.com\u003e\n[danvet: fix up conflict because the patch has been diffed against next. tsk.]\nSigned-Off-by: Daniel Vetter \u003cdaniel.vetter@ffwll.ch\u003e\n" }, { "commit": "e199fd422420d1620cf64fd9bdd4ff8bc255cc76", "tree": "305939ba483e3c935a29aea84c624a536e68e353", "parents": [ "fa9e855025b19e96e493ee00de7d933a9794f742" ], "author": { "name": "Michel Dänzer", "email": "michel.daenzer@amd.com", "time": "Thu Mar 29 16:47:43 2012 +0200" }, "committer": { "name": "Dave Airlie", "email": "airlied@redhat.com", "time": "Mon Apr 02 11:09:50 2012 +0100" }, "message": "drm/radeon: Don\u0027t dereference possibly-NULL pointer.\n\nReported-by: Dan Carpenter \u003cdan.carpenter@oracle.com\u003e\nSigned-off-by: Michel Dänzer \u003cmichel.daenzer@amd.com\u003e\nReviewed-by: Alex Deucher \u003calexander.deucher@amd.com\u003e\nSigned-off-by: Dave Airlie \u003cairlied@redhat.com\u003e\n" }, { "commit": "fa9e855025b19e96e493ee00de7d933a9794f742", "tree": "f58d289ecb25d82483b9158406f510a3783022fb", "parents": [ "402976fe51b2d1a58a29ba06fa1ca5ace3a4cdcd" ], "author": { "name": "Konstantin Khlebnikov", "email": "khlebnikov@openvz.org", "time": "Sat Mar 31 13:29:25 2012 +0400" }, "committer": { "name": "Dave Airlie", "email": "airlied@redhat.com", "time": "Mon Apr 02 11:08:17 2012 +0100" }, "message": "mm, drm/udl: fixup vma flags on mmap\n\nThere should be VM_MIXEDMAP, not VM_PFNMAP, because udl_gem_fault() inserts\npages via vm_insert_page(). Other drm/gem drivers already do this.\n\nSigned-off-by: Konstantin Khlebnikov \u003ckhlebnikov@openvz.org\u003e\nCc: Dave Airlie \u003cairlied@redhat.com\u003e\nCc: dri-devel@lists.freedesktop.org\nSigned-off-by: Dave Airlie \u003cairlied@redhat.com\u003e\n" }, { "commit": "402976fe51b2d1a58a29ba06fa1ca5ace3a4cdcd", "tree": "2de887cae4ddcaf291562f796231c4feb829ad42", "parents": [ "d06221c0617ab6d0bc41c4980cefdd9c8cc9a1c1" ], "author": { "name": "Alex Deucher", "email": "alexander.deucher@amd.com", "time": "Thu Mar 29 19:04:08 2012 -0400" }, "committer": { "name": "Dave Airlie", "email": "airlied@redhat.com", "time": "Mon Apr 02 11:07:42 2012 +0100" }, "message": "drm/radeon/kms: fix fans after resume\n\nOn pre-R600 asics, the SpeedFanControl table is not\nexecuted as part of ASIC_Init as it is on newer asics.\n\nFixes:\nhttps://bugzilla.kernel.org/show_bug.cgi?id\u003d29412\n\nSigned-off-by: Alex Deucher \u003calexander.deucher@amd.com\u003e\nReviewed-by: Michel Dänzer \u003cmichel.daenzer@amd.com\u003e\nCc: stable@vger.kernel.org\nSigned-off-by: Dave Airlie \u003cairlied@redhat.com\u003e\n" }, { "commit": "d06221c0617ab6d0bc41c4980cefdd9c8cc9a1c1", "tree": "5ec7d22876848e194036c019aaea9f6a14e63c2a", "parents": [ "ea71f98d680c9ac768a7849d26d7ce4744064510" ], "author": { "name": "Benjamin Herrenschmidt", "email": "benh@kernel.crashing.org", "time": "Mon Apr 02 13:38:19 2012 +1000" }, "committer": { "name": "Dave Airlie", "email": "airlied@redhat.com", "time": "Mon Apr 02 11:06:33 2012 +0100" }, "message": "nouveau/bios: Fix tracking of BIOS image data\n\nThe code tries various methods for retreiving the BIOS data. However\nit doesn\u0027t clear the bios-\u003edata pointer between the iterations.\n\nIn some cases, the shadow() method will fail and not update bios-\u003edata\nat all, which will cause us to \"score\" the old data and incorrectly\nattribute that score to the new method. This can cause double frees\nlater when disposing of the unused data.\n\nAdditionally, we were not freeing the data for methods that fail the\nscore test (we only freed when a \"best\" is superseeded, not when the\nnew method has a lower score than the exising \"best\"). Fix that as well.\n\nSigned-off-by: Benjamin Herrenschmidt \u003cbenh@kernel.crashing.org\u003e\nAcked-by: Ben Skeggs \u003cbskeggs@redhat.com\u003e\nSigned-off-by: Dave Airlie \u003cairlied@redhat.com\u003e\n" }, { "commit": "ea71f98d680c9ac768a7849d26d7ce4744064510", "tree": "696b8eb9fc6541f71caede709857de3f07d08f06", "parents": [ "40c61046ee3007d73f141e96aa2f3dd56ee321c6" ], "author": { "name": "Benjamin Herrenschmidt", "email": "benh@kernel.crashing.org", "time": "Mon Apr 02 13:37:13 2012 +1000" }, "committer": { "name": "Dave Airlie", "email": "airlied@redhat.com", "time": "Mon Apr 02 11:05:58 2012 +0100" }, "message": "nouveau: Fix crash when pci_ram_rom() returns a size of 0\n\nFrom b15b244d6e6e20964bd4b85306722cb60c3c0809 Mon Sep 17 00:00:00 2001\nFrom: Benjamin Herrenschmidt \u003cbenh@kernel.crashing.org\u003e\nDate: Mon, 2 Apr 2012 13:28:18 +1000\nSubject:\n\nUnder some circumstances, pci_map_rom() can return a valid mapping\nbut a size of 0 (if it cannot find an image in the header).\n\nThis causes nouveau to try to kmalloc() a 0 sized pointer and\ndereference it, which crashes.\n\nSigned-off-by: Benjamin Herrenschmidt \u003cbenh@kernel.crashing.org\u003e\nAcked-by: Ben Skeggs \u003cbskeggs@redhat.com\u003e\nSigned-off-by: Dave Airlie \u003cairlied@redhat.com\u003e\n" }, { "commit": "40c61046ee3007d73f141e96aa2f3dd56ee321c6", "tree": "8ae9f4dc5aa83a4e7cc8664de97d1001fcddd92b", "parents": [ "e0d2e320210a0e0a75110bad8501b1cd498221de" ], "author": { "name": "Dave Airlie", "email": "airlied@redhat.com", "time": "Mon Apr 02 10:45:49 2012 +0100" }, "committer": { "name": "Dave Airlie", "email": "airlied@redhat.com", "time": "Mon Apr 02 10:45:49 2012 +0100" }, "message": "drm/nouveau: select POWER_SUPPLY\n\nBen H. reported that building nouveau into the kernel and power supply\nas a module was broken.\n\nJust have nouveau select it, like radeon does.\n\nReported-by: Benjamin Herrenschmidt \u003cbenh@kernel.crashing.org\u003e\nSigned-off-by: Dave Airlie \u003cairlied@redhat.com\u003e\n" }, { "commit": "e77166b5a653728f312d07e60a80819d1c54fca4", "tree": "52c6517f27f31b2b2b216a08f1e8d0978ccf7456", "parents": [ "1c7eaac737e4cca24703531ebcb566afc3ed285f" ], "author": { "name": "Daniel Vetter", "email": "daniel.vetter@ffwll.ch", "time": "Fri Mar 30 22:14:05 2012 +0200" }, "committer": { "name": "Daniel Vetter", "email": "daniel.vetter@ffwll.ch", "time": "Sun Apr 01 12:32:32 2012 +0200" }, "message": "drm/i915: properly clear SSC1 bit in the pch refclock init code\n\nNoticed by staring at intel_reg_dumper diffs. Unfortunately it does\nnot seem to completely fix the bug.\n\nStill, it\u0027s good to get this right, and maybe it helps someplace else.\n\nBugzilla: https://bugs.freedesktop.org/show_bug.cgi?id\u003d47117\nSigned-Off-by: Daniel Vetter \u003cdaniel.vetter@ffwll.ch\u003e\n" }, { "commit": "1c7eaac737e4cca24703531ebcb566afc3ed285f", "tree": "cfdbf8ca115e1de50e83f6f9f049144f901ddecb", "parents": [ "25e341cfc33d94435472983825163e97fe370a6c" ], "author": { "name": "Daniel Vetter", "email": "daniel.vetter@ffwll.ch", "time": "Tue Mar 27 09:31:24 2012 +0200" }, "committer": { "name": "Daniel Vetter", "email": "daniel.vetter@ffwll.ch", "time": "Sun Apr 01 12:30:24 2012 +0200" }, "message": "drm/i915: apply CS reg readback trick against missed IRQ on snb\n\nBen Widawsky reported missed IRQ issues and this patch here helps.\n\nWe have one other missed IRQ report still left on snb, reported by QA:\n\nhttps://bugs.freedesktop.org/show_bug.cgi?id\u003d46145\n\nThis is _not_ a regression due to the forcewake voodoo though, it\nstarted showing up before that was applied and has been on-and-off for\nthe past few weeks. According to QA this patch does not help. But the\nmissed IRQ is always from the blt ring (despite running piglit, so\nalso render activity expected), so I\u0027m hopefully that this is an issue\nwith the blt ring itself.\n\nTested-by: Ben Widawsky \u003cben@bwidawsk.net\u003e\nSigned-Off-by: Daniel Vetter \u003cdaniel.vetter@ffwll.ch\u003e\n" }, { "commit": "25e341cfc33d94435472983825163e97fe370a6c", "tree": "ff7a27ab018509561894d018e5f2a21eb6a921bd", "parents": [ "aa46419186992e6b8b8010319f0ca7f40a0d13f5" ], "author": { "name": "Daniel Vetter", "email": "daniel.vetter@ffwll.ch", "time": "Sat Mar 24 23:51:30 2012 +0100" }, "committer": { "name": "Daniel Vetter", "email": "daniel.vetter@ffwll.ch", "time": "Sun Apr 01 12:29:44 2012 +0200" }, "message": "drm/i915: quirk away broken OpRegion VBT\n\nSomehow the BIOS manages to screw things up when copying the VBT\naround, because the one we scrap from the VBIOS rom actually works.\n\nCc: stable@kernel.org\nTested-by: Markus Heinz \u003cmarkus.heinz@uni-dortmund.de\u003e\nAcked-by: Chris Wilson \u003cchris@chris-wilson.co.uk\u003e\nReviewed-by: Rodrigo Vivi \u003crodrigo.vivi@gmail.com\u003e\nBugzilla: https://bugzilla.kernel.org/show_bug.cgi?id\u003d28812\nSigned-Off-by: Daniel Vetter \u003cdaniel.vetter@ffwll.ch\u003e\n" }, { "commit": "aa46419186992e6b8b8010319f0ca7f40a0d13f5", "tree": "b6cd7d2870de63808e31143607a3e5ec2a740720", "parents": [ "83b7f9ac9126f0532ca34c14e4f0582c565c6b0d" ], "author": { "name": "Eugeni Dodonov", "email": "eugeni.dodonov@intel.com", "time": "Fri Mar 23 11:57:19 2012 -0300" }, "committer": { "name": "Daniel Vetter", "email": "daniel.vetter@ffwll.ch", "time": "Sun Apr 01 12:28:22 2012 +0200" }, "message": "drm/i915: enable plain RC6 on Sandy Bridge by default\n\nThis is yet another chapter in the ongoing saga of bringing RC6 to Sandy\nBridge machines by default.\n\nNow that we have discovered that RC6 issues are triggered by RC6+ state,\nlet\u0027s try to disable it by default. Plain RC6 is the one responsible for\nmost energy savings, and so far it haven\u0027t given any problems - at least,\nnone we are aware of.\n\nSo with this, when i915_enable_rc6\u003d-1 (e.g., the default value), we\u0027ll\nattempt to enable plain RC6 only on SNB. For Ivy Bridge, the behavior\nstays the same as always - we enable both RC6 and deep RC6.\n\nNote that while this exact patch does not has explicit tested-by\u0027s, the\nequivalent settings were fixed in 3.3 kernel by a smaller patch. And it\nhas also received considerable testing through Canonical RC6 task-force\ntesting at https://wiki.ubuntu.com/Kernel/PowerManagementRC6. Up to date,\nit looks like all the known issues are gone.\n\nv2: improve description and reference a couple of open bugs related to\nRC6 which seem to be fixed with this change.\n\nReferences: https://bugs.freedesktop.org/show_bug.cgi?id\u003d41682\nReferences: https://bugs.freedesktop.org/show_bug.cgi?id\u003d38567\nReferences: https://bugs.freedesktop.org/show_bug.cgi?id\u003d44867\nAcked-by: Chris Wilson \u003cchris@chris-wilson.co.uk\u003e\nSigned-off-by: Eugeni Dodonov \u003ceugeni.dodonov@intel.com\u003e\nSigned-off-by: Daniel Vetter \u003cdaniel.vetter@ffwll.ch\u003e\n" }, { "commit": "83b7f9ac9126f0532ca34c14e4f0582c565c6b0d", "tree": "4c3b9359270a0009150719eae585acd679cc5324", "parents": [ "7dd4906586274f3945f2aeaaa5a33b451c3b4bba" ], "author": { "name": "Eugeni Dodonov", "email": "eugeni.dodonov@intel.com", "time": "Fri Mar 23 11:57:18 2012 -0300" }, "committer": { "name": "Daniel Vetter", "email": "daniel.vetter@ffwll.ch", "time": "Sun Apr 01 12:27:50 2012 +0200" }, "message": "drm/i915: allow to select rc6 modes via kernel parameter\n\nThis allows to select which rc6 modes are to be used via kernel parameter,\nvia a bitmask parameter. E.g.:\n\n- to enable rc6, i915_enable_rc6\u003d1\n- to enable rc6 and deep rc6, i915_enable_rc6\u003d3\n- to enable rc6 and deepest rc6, use i915_enable_rc6\u003d5\n- to enable rc6, deep and deepest rc6, use i915_enable_rc6\u003d7\n\nPlease keep in mind that the deepest RC6 state really should NOT be used\nby default, as it could potentially worsen the issues with deep RC6. So do\nenable it only when you know what you are doing. However, having it around\ncould help solving possible future rc6-related issues and their debugging\non user machines.\n\nNote that this changes behavior - previously, value of 1 would enable both\nRC6 and deep RC6. Now it should only enable RC6 and deep/deepest RC6\nstages must be enabled manually.\n\nv2: address Chris Wilson comments and clean up the code.\n\nReferences: https://bugs.freedesktop.org/show_bug.cgi?id\u003d42579\nReviewed-by: Chris Wilson \u003cchris@chris-wilson.co.uk\u003e\nReviewed-by: Ben Widawsky \u003cbenjamin.widawsky@intel.com\u003e\nSigned-off-by: Eugeni Dodonov \u003ceugeni.dodonov@intel.com\u003e\nSigned-off-by: Daniel Vetter \u003cdaniel.vetter@ffwll.ch\u003e\n" }, { "commit": "7dd4906586274f3945f2aeaaa5a33b451c3b4bba", "tree": "fa0258dcd2325e7ffef04adedf471a0a5afa8f10", "parents": [ "55a254ac63a3ac1867d1501030e7fba69c7d4aeb" ], "author": { "name": "Chris Wilson", "email": "chris@chris-wilson.co.uk", "time": "Wed Mar 21 10:48:18 2012 +0000" }, "committer": { "name": "Daniel Vetter", "email": "daniel.vetter@ffwll.ch", "time": "Sun Apr 01 12:26:05 2012 +0200" }, "message": "drm/i915: Mark untiled BLT commands as fenced on gen2/3\n\nThe BLT commands on gen2/3 utilize the fence registers and so we cannot\nmodify any fences for the object whilst those commands are in flight.\nCurrently we marked tiled commands as occupying a fence, but forgot to\nrestrict the untiled commands from preventing a fence being assigned\nbefore they were completed.\n\nOne side-effect is that we ten have to double check that a fence was\nallocated for a fenced buffer during move-to-active.\n\nReported-by: Jiri Slaby \u003cjirislaby@gmail.com\u003e\nBugzilla: https://bugs.freedesktop.org/show_bug.cgi?id\u003d43427\nBugzilla: https://bugs.freedesktop.org/show_bug.cgi?id\u003d47990\nReviewed-by: Daniel Vetter \u003cdaniel.vetter@ffwll.ch\u003e\nTestcase: i-g-t/tests/gem_tiled_after_untiled_blt\nTested-by: Daniel Vetter \u003cdaniel.vetter@ffwll.ch\u003e\nSigned-off-by: Chris Wilson \u003cchris@chris-wilson.co.uk\u003e\nCc: stable@kernel.org\nSigned-off-by: Daniel Vetter \u003cdaniel.vetter@ffwll.ch\u003e\n" }, { "commit": "55a254ac63a3ac1867d1501030e7fba69c7d4aeb", "tree": "a0438e133793dcce412879537d49214c29a8fefd", "parents": [ "f47166d2b0001fcb752b40c5a2d4db986dfbea68" ], "author": { "name": "Daniel Vetter", "email": "daniel.vetter@ffwll.ch", "time": "Thu Mar 22 00:14:43 2012 +0100" }, "committer": { "name": "Daniel Vetter", "email": "daniel.vetter@ffwll.ch", "time": "Sun Apr 01 12:25:29 2012 +0200" }, "message": "drm/i915: properly restore the ppgtt page directory on resume\n\nThe ppgtt page directory lives in a snatched part of the gtt pte\nrange. Which naturally gets cleared on hibernate when we pull the\npower. Suspend to ram (which is what I\u0027ve tested) works because\ndespite the fact that this is a mmio region, it is actually back by\nsystem ram.\n\nFix this by moving the page directory setup code to the ppgtt init\ncode (which gets called on resume).\n\nThis fixes hibernate on my ivb and snb.\n\nReviewed-by: Ben Widawsky \u003cben@bwidawsk.net\u003e\nSigned-Off-by: Daniel Vetter \u003cdaniel.vetter@ffwll.ch\u003e\n" }, { "commit": "f47166d2b0001fcb752b40c5a2d4db986dfbea68", "tree": "439aa744068a97f0ab402e8e91b8d524ff0d3b8e", "parents": [ "dd775ae2549217d3ae09363e3edb305d0fa19928" ], "author": { "name": "Chris Wilson", "email": "chris@chris-wilson.co.uk", "time": "Thu Mar 22 15:00:50 2012 +0000" }, "committer": { "name": "Daniel Vetter", "email": "daniel.vetter@ffwll.ch", "time": "Sun Apr 01 12:23:53 2012 +0200" }, "message": "drm/i915: Sanitize BIOS debugging bits from PIPECONF\n\nQuoting the BSpec from time immemorial:\n\n PIPEACONF, bits 28:27: Frame Start Delay (Debug)\n\n Used to delay the frame start signal that is sent to the display planes.\n Care must be taken to insure that there are enough lines during VBLANK\n to support this setting.\n\nAn instance of the BIOS leaving these bits set was found in the wild,\nwhere it caused our modesetting to go all squiffy and skewiff.\n\nBugzilla: https://bugs.freedesktop.org/show_bug.cgi?id\u003d47271\nReported-and-tested-by: Eva Wang \u003cevawang@linpus.com\u003e\nBugzilla: https://bugzilla.kernel.org/show_bug.cgi?id\u003d43012\nReported-and-tested-by: Carl Richell \u003ccarl@system76.com\u003e\nCc: stable@kernel.org\nSigned-off-by: Chris Wilson \u003cchris@chris-wilson.co.uk\u003e\nSigned-off-by: Daniel Vetter \u003cdaniel.vetter@ffwll.ch\u003e\n" }, { "commit": "3248877ea1796915419fba7c89315fdbf00cb56a", "tree": "4fab8743212004bc033e71e02a2e051b64001606", "parents": [ "f52b69f86e27903d6896ed5fa7cd280fec8de532" ], "author": { "name": "Dave Airlie", "email": "airlied@redhat.com", "time": "Fri Nov 25 15:21:02 2011 +0000" }, "committer": { "name": "Dave Airlie", "email": "airlied@redhat.com", "time": "Fri Mar 30 11:52:44 2012 +0100" }, "message": "drm: base prime/dma-buf support (v5)\n\nThis adds the basic drm dma-buf interface layer, called PRIME. This\ncommit doesn\u0027t add any driver support, it is simply and agreed upon starting\npoint so we can work towards merging driver support for the next merge window.\n\nCurrent drivers with work done are nouveau, i915, udl, exynos and omap.\n\nThe main APIs exposed to userspace allow translating a 32-bit object handle\nto a file descriptor, and a file descriptor to a 32-bit object handle.\n\nThe flags value is currently limited to O_CLOEXEC.\n\nAcknowledgements:\nDaniel Vetter: lots of review\nRob Clark: cleaned up lots of the internals and did lifetime review.\n\nv2: rename some functions after Chris preferred a green shed\nfix IS_ERR_OR_NULL -\u003e IS_ERR\nv3: Fix Ville pointed out using buffer + kmalloc\nv4: add locking as per ickle review\nv5: allow re-exporting the original dma-buf (Daniel)\n\nReviewed-by: Daniel Vetter \u003cdaniel.vetter@ffwll.ch\u003e\nReviewed-by: Rob Clark \u003crob.clark@linaro.org\u003e\nReviewed-by: Sumit Semwal \u003csumit.semwal@linaro.org\u003e\nReviewed-by: Inki Dae \u003cinki.dae@samsung.com\u003e\nAcked-by: Ben Widawsky \u003cbenjamin.widawsky@intel.com\u003e\nSigned-off-by: Dave Airlie \u003cairlied@redhat.com\u003e\n" }, { "commit": "02bfc2881e0d5b23147211bb6420798d946a7b5c", "tree": "19c8a6cd4373c84f4c9dab2ab19a21fd73cb0de5", "parents": [ "acde2d8037f4502669af251e44b05579681e0dc1" ], "author": { "name": "Ben Skeggs", "email": "bskeggs@redhat.com", "time": "Thu Mar 29 20:24:34 2012 +1000" }, "committer": { "name": "Ben Skeggs", "email": "bskeggs@redhat.com", "time": "Thu Mar 29 23:16:35 2012 +1000" }, "message": "drm/nouveau: inform userspace of relaxed kernel subchannel requirements\n\nSigned-off-by: Ben Skeggs \u003cbskeggs@redhat.com\u003e\n" }, { "commit": "acde2d8037f4502669af251e44b05579681e0dc1", "tree": "b01f174e2a29a04a0e625c443df9bc7cd162004d", "parents": [ "4a206ffc0bfe8e8c3fc0468a052f5b0bb625a57b" ], "author": { "name": "Ben Skeggs", "email": "bskeggs@redhat.com", "time": "Thu Mar 29 20:21:32 2012 +1000" }, "committer": { "name": "Ben Skeggs", "email": "bskeggs@redhat.com", "time": "Thu Mar 29 23:16:31 2012 +1000" }, "message": "Revert \"drm/nouveau: inform userspace of new kernel subchannel requirements\"\n\nThis reverts commit a81f15499887d3f9f24ec70bb9b7e778942a6b7b.\n\nGah, we have a released userspace component using fixed subc assignment\nthat conflicts with this. To avoid breaking ABI this needs to be\nreverted.\n\nSigned-off-by: Ben Skeggs \u003cbskeggs@redhat.com\u003e\n" }, { "commit": "4a206ffc0bfe8e8c3fc0468a052f5b0bb625a57b", "tree": "b29f6895f4ee96628f3519f3763e7c38be956096", "parents": [ "3fa016a0b5c5237e9c387fc3249592b2cb5391c6" ], "author": { "name": "Ben Skeggs", "email": "bskeggs@redhat.com", "time": "Tue Mar 27 14:41:04 2012 +1000" }, "committer": { "name": "Ben Skeggs", "email": "bskeggs@redhat.com", "time": "Thu Mar 29 23:16:25 2012 +1000" }, "message": "drm/nouveau: oops, create m2mf for nvd9 too\n\nSigned-off-by: Ben Skeggs \u003cbskeggs@redhat.com\u003e\n" }, { "commit": "3fa016a0b5c5237e9c387fc3249592b2cb5391c6", "tree": "7633de525107d0ce289039fdf136b3dbc4eedd22", "parents": [ "d936622c36273a9ecfbb4aacf26cd29405995159" ], "author": { "name": "Dave Airlie", "email": "airlied@redhat.com", "time": "Wed Mar 28 10:48:49 2012 +0100" }, "committer": { "name": "Dave Airlie", "email": "airlied@redhat.com", "time": "Thu Mar 29 07:44:27 2012 +0100" }, "message": "drm/i915: suspend fbdev device around suspend/hibernate\n\nLooking at hibernate overwriting I though it looked like a cursor,\nso I tracked down this missing piece to stop the cursor blink\ntimer. I\u0027ve no idea if this is sufficient to fix the hibernate\nproblems people are seeing, but please test it.\n\nBoth radeon and nouveau have done this for a long time.\n\nI\u0027ve run this personally all night hib/resume cycles with no fails.\n\nReviewed-by: Keith Packard \u003ckeithp@keithp.com\u003e\nReported-by: Petr Tesarik \u003ckernel@tesarici.cz\u003e\nReported-by: Stanislaw Gruszka \u003csgruszka@redhat.com\u003e\nReported-by: Lots of misc segfaults after hibernate across the world.\nBugzilla: https://bugzilla.kernel.org/show_bug.cgi?id\u003d37142\nTested-by: Dave Airlie \u003cairlied@redhat.com\u003e\nTested-by: Bojan Smojver \u003cbojan@rexursive.com\u003e\nTested-by: Andreas Hartmann \u003candihartmann@01019freenet.de\u003e\nCc: stable@vger.kernel.org\nSigned-off-by: Dave Airlie \u003cairlied@redhat.com\u003e\n" }, { "commit": "d936622c36273a9ecfbb4aacf26cd29405995159", "tree": "f843bbce85385560288ace9402db14f772337044", "parents": [ "88f50c80748bf5238c88e70ee26c68ac48b94e68" ], "author": { "name": "Michel Dänzer", "email": "michel.daenzer@amd.com", "time": "Wed Mar 28 08:52:32 2012 +0200" }, "committer": { "name": "Dave Airlie", "email": "airlied@redhat.com", "time": "Wed Mar 28 13:50:05 2012 +0100" }, "message": "drm/radeon: Only warn if the intra-domain offset actually exceeds the limit.\n\nFixes spurious warnings.\n\nTested-by: Dave Jones \u003cdavej@redhat.com\u003e\nTested-by: Steven Rostedt \u003crostedt@goodmis.org\u003e\nTested-by: Benjamin Herrenschmidt \u003cbenh@kernel.crashing.org\u003e\nSigned-off-by: Michel Dänzer \u003cmichel.daenzer@amd.com\u003e\nSigned-off-by: Dave Airlie \u003cairlied@redhat.com\u003e\n" }, { "commit": "88f50c80748bf5238c88e70ee26c68ac48b94e68", "tree": "2b4df17fdb6c690bfdeee9dd7e5b4ed30bbf1836", "parents": [ "017d213f649c6775e4a4349e50a5631a4e4c7308" ], "author": { "name": "Jerome Glisse", "email": "jglisse@redhat.com", "time": "Wed Mar 21 19:18:21 2012 -0400" }, "committer": { "name": "Dave Airlie", "email": "airlied@redhat.com", "time": "Mon Mar 26 09:53:22 2012 +0100" }, "message": "drm/radeon/kms: add htile support to the cs checker v3\n\nFor 6xx+. Required for mesa to use htile support for HiZ/HiS.\nUserspace will check radeon version 2.14 with is bumped either\nby tiling patch or stream out patch. This patch only add support\nfor htile relocation which should be enough for any userspace\nto implement the hyperz (using htile buffer) feature.\n\nv2: Jerome: Fix size checking for htile buffer.\nv3: Jerome: Adapt on top of r600/evergreen cs checker changes,\n also check htile surface in case only stencil is\n present.\n\nSigned-off-by: Pierre-Eric Pelloux-Prayer \u003cpelloux@gmail.com\u003e\nSigned-off-by: Alex Deucher \u003calexander.deucher@amd.com\u003e\nSigned-off-by: Jerome Glisse \u003cjglisse@redhat.com\u003e\nSigned-off-by: Dave Airlie \u003cairlied@redhat.com\u003e\n" }, { "commit": "017d213f649c6775e4a4349e50a5631a4e4c7308", "tree": "a07fe71740f6c9901ee43a54c4f2e5855866dece", "parents": [ "59365671464539dc695bbf4d4bf37aabfd8604f2" ], "author": { "name": "Alex Deucher", "email": "alexander.deucher@amd.com", "time": "Fri Mar 23 14:44:47 2012 -0400" }, "committer": { "name": "Dave Airlie", "email": "airlied@redhat.com", "time": "Mon Mar 26 09:53:12 2012 +0100" }, "message": "drm/radeon/kms/atom: force bpc to 8 for now\n\nUsing the bpc (bits per color) specified by the monitor\ncan cause problems in some cases. Until we get a better\nhandle on how to deal with those cases, just use a bpc of 8.\n\nReported-by: Lennert Buytenhek \u003cbuytenh@wantstofly.org\u003e\nSigned-off-by: Alex Deucher \u003calexander.deucher@amd.com\u003e\nCc: stable@kernel.org\nSigned-off-by: Dave Airlie \u003cairlied@redhat.com\u003e\n" }, { "commit": "59365671464539dc695bbf4d4bf37aabfd8604f2", "tree": "f4db0448c489db9ec50b01b1be5a91108d8de546", "parents": [ "c8435362f2211086b34ce871fa9c3fcc7ca79ff9" ], "author": { "name": "Ben Skeggs", "email": "bskeggs@redhat.com", "time": "Mon Mar 26 17:18:40 2012 +1000" }, "committer": { "name": "Dave Airlie", "email": "airlied@redhat.com", "time": "Mon Mar 26 09:36:07 2012 +0100" }, "message": "drm/nouveau/i2c: fix thinko/regression on really old chipsets\n\nFixes i2c on my TNT2.\n\nSigned-off-by: Ben Skeggs \u003cbskeggs@redhat.com\u003e\nSigned-off-by: Dave Airlie \u003cairlied@redhat.com\u003e\n" }, { "commit": "c8435362f2211086b34ce871fa9c3fcc7ca79ff9", "tree": "b7b506e6ca9409d6c1509b13051856e98dda6d1d", "parents": [ "c61205b24b79cd3708e751ed9c33970f487686ab" ], "author": { "name": "Ben Skeggs", "email": "bskeggs@redhat.com", "time": "Sat Mar 24 16:26:13 2012 +1000" }, "committer": { "name": "Dave Airlie", "email": "airlied@redhat.com", "time": "Mon Mar 26 09:36:03 2012 +0100" }, "message": "drm/nouveau: default to 8bpc for non-LVDS panels if EDID isn\u0027t useful\n\nA few reports of bad behaviour since the autodetection defaulted to 6bpc,\nlets fix this.\n\nSigned-off-by: Ben Skeggs \u003cbskeggs@redhat.com\u003e\nSigned-off-by: Dave Airlie \u003cairlied@redhat.com\u003e\n" }, { "commit": "c61205b24b79cd3708e751ed9c33970f487686ab", "tree": "a83fa311dfd2f4900a65c4d2e41d623dc7816349", "parents": [ "a1978f74da69565a2e472394c7dcb2cfb31b3e45" ], "author": { "name": "Ben Skeggs", "email": "bskeggs@redhat.com", "time": "Fri Mar 23 09:10:22 2012 +1000" }, "committer": { "name": "Dave Airlie", "email": "airlied@redhat.com", "time": "Mon Mar 26 09:35:56 2012 +0100" }, "message": "drm/nouveau: fix thinko causing init to fail on cards without accel\n\nSigned-off-by: Ben Skeggs \u003cbskeggs@redhat.com\u003e\nSigned-off-by: Dave Airlie \u003cairlied@redhat.com\u003e\n" }, { "commit": "a1978f74da69565a2e472394c7dcb2cfb31b3e45", "tree": "716d036a66ce013d138ad9f8a5b989fbf7b5ad45", "parents": [ "e22057c8599373e5caef0bc42bdb95d2a361ab0d" ], "author": { "name": "Kirill A. Shutemov", "email": "kirill.shutemov@linux.intel.com", "time": "Sat Mar 24 00:01:52 2012 +0200" }, "committer": { "name": "Dave Airlie", "email": "airlied@redhat.com", "time": "Mon Mar 26 09:33:24 2012 +0100" }, "message": "gma500: medfield: fix build without CONFIG_BACKLIGHT_CLASS_DEVICE\n\ndrivers/built-in.o: In function `mdfld_dsi_connector_set_property\u0027:\nmdfld_dsi_output.c:(.text+0x6e909): undefined reference to `mdfld_set_brightness\u0027\nmake: *** [.tmp_vmlinux1] Error 1\n\nSigned-off-by: Kirill A. Shutemov \u003ckirill.shutemov@linux.intel.com\u003e\nSigned-off-by: Dave Airlie \u003cairlied@redhat.com\u003e\n" }, { "commit": "ed2d265d1266736bd294332d7f649003943ae36e", "tree": "860e5b7bb72933e4a9abacdc2f2d75a0e6254e32", "parents": [ "f1d38e423a697b7aa06e12d3ca4753bcc1aa3531", "6c03438edeb5c359af35f060ea016ca65671c269" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sat Mar 24 10:08:39 2012 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sat Mar 24 10:08:39 2012 -0700" }, "message": "Merge tag \u0027bug-for-3.4\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/paulg/linux\n\nPull \u003clinux/bug.h\u003e cleanup from Paul Gortmaker:\n \"The changes shown here are to unify linux\u0027s BUG support under the one\n \u003clinux/bug.h\u003e file. Due to historical reasons, we have some BUG code\n in bug.h and some in kernel.h -- i.e. the support for BUILD_BUG in\n linux/kernel.h predates the addition of linux/bug.h, but old code in\n kernel.h wasn\u0027t moved to bug.h at that time. As a band-aid, kernel.h\n was including \u003casm/bug.h\u003e to pseudo link them.\n\n This has caused confusion[1] and general yuck/WTF[2] reactions. Here\n is an example that violates the principle of least surprise:\n\n CC lib/string.o\n lib/string.c: In function \u0027strlcat\u0027:\n lib/string.c:225:2: error: implicit declaration of function \u0027BUILD_BUG_ON\u0027\n make[2]: *** [lib/string.o] Error 1\n $\n $ grep linux/bug.h lib/string.c\n #include \u003clinux/bug.h\u003e\n $\n\n We\u0027ve included \u003clinux/bug.h\u003e for the BUG infrastructure and yet we\n still get a compile fail! [We\u0027ve not kernel.h for BUILD_BUG_ON.] Ugh -\n very confusing for someone who is new to kernel development.\n\n With the above in mind, the goals of this changeset are:\n\n 1) find and fix any include/*.h files that were relying on the\n implicit presence of BUG code.\n 2) find and fix any C files that were consuming kernel.h and hence\n relying on implicitly getting some/all BUG code.\n 3) Move the BUG related code living in kernel.h to \u003clinux/bug.h\u003e\n 4) remove the asm/bug.h from kernel.h to finally break the chain.\n\n During development, the order was more like 3-4, build-test, 1-2. But\n to ensure that git history for bisect doesn\u0027t get needless build\n failures introduced, the commits have been reorderd to fix the problem\n areas in advance.\n\n\t[1] https://lkml.org/lkml/2012/1/3/90\n\t[2] https://lkml.org/lkml/2012/1/17/414\"\n\nFix up conflicts (new radeon file, reiserfs header cleanups) as per Paul\nand linux-next.\n\n* tag \u0027bug-for-3.4\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/paulg/linux:\n kernel.h: doesn\u0027t explicitly use bug.h, so don\u0027t include it.\n bug: consolidate BUILD_BUG_ON with other bug code\n BUG: headers with BUG/BUG_ON etc. need linux/bug.h\n bug.h: add include of it to various implicit C users\n lib: fix implicit users of kernel.h for TAINT_WARN\n spinlock: macroize assert_spin_locked to avoid bug.h dependency\n x86: relocate get/set debugreg fcns to include/asm/debugreg.\n" }, { "commit": "ba331d5decbfe1cc8b1bf10fb7005f4b972c4f0e", "tree": "af12491d851d3d953f6b482df450045e83368ed9", "parents": [ "09fa30226130652af75152d9010c603c66d46f6e", "1898f4426b3863216a9041389b34a3b995883027" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Mar 22 13:27:02 2012 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Mar 22 13:27:02 2012 -0700" }, "message": "Merge branch \u0027drm-nouveau-destage\u0027 of git://people.freedesktop.org/~airlied/linux\n\nPull nouveau destaging + Kelper modesetting support from Dave Airlie:\n \"This pull request is unexpected and not something I had mentioned\n previously.\n\n So NVIDIA announced new Kepler GPUs this morning, and Ben has killed\n himself getting modesetting support for them together to have on\n launch day. Most of the code to support the new chips has already\n gone in, however this pull contains a few more pieces along with the\n final enables so the driver binds to the new Kepler cards. Its quite\n amazing that nouveau can support a GPU on its launch day even if its\n just unaccelerated modesetting, and I\u0027d like to have support in the\n next kernel.\n\n In order to sweeten the deal, Ben has also requested nouveau destage\n and become ABI stable, the only change is the version number bump\n which he prepared userspace for quite a long time ago. The driver\n hasn\u0027t broken ABI since that one big break that caused a lot of fuss.\n\n It\u0027s also quite a small set of code, and not likely to break anything.\"\n\n* \u0027drm-nouveau-destage\u0027 of git://people.freedesktop.org/~airlied/linux:\n drm/nouveau/dp: support version 4.0 of DP table\n drm/nve0/disp: nvidia randomly decided to move the dithering method\n drm/nve0: initial modesetting support for kepler chipsets\n drm/nouveau: add bios connector type for dms59\n drm/nouveau: move out of staging drivers\n drm/nouveau: bump version to 1.0.0\n drm/nvd0/disp: ignore clock set if no pclk\n drm/nouveau: oops, increase channel dispc_vma to 4\n drm/nouveau: inform userspace of new kernel subchannel requirements\n drm/nouveau: remove m2mf creation on userspace channels\n drm/nvc0-/disp: reimplement flip completion method as fifo method\n drm/nouveau: move fence sequence check to start of loop\n drm/nouveau: remove subchannel names from places where it doesn\u0027t matter\n drm/nouveau/ttm: always do buffer moves on kernel channel\n" }, { "commit": "09fa30226130652af75152d9010c603c66d46f6e", "tree": "26dc4ba7fc66dc0c10e442d81595dd319eef4c75", "parents": [ "be53bfdb8088e9d1924199cc1a96e113756b1075", "1b2681ba271c9f5bb66cb0d8ceeaa215fcd218d8" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Mar 22 13:23:46 2012 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Mar 22 13:23:46 2012 -0700" }, "message": "Merge branch \u0027drm-radeon-sitn-support\u0027 of git://people.freedesktop.org/~airlied/linux\n\nPull radeon southern islands / trinity support from Dave Airlie:\n \"This is support from AMD for their newest GPU and APUs. The products\n called RadeonHD 7xxx, and the Trinity APU series.\n\n This did come in a bit late, due to some over-complicated AMD internal\n review process, which from the outside seems unnecessary once the\n company has decided it wants to support open source. However as I\n said previously I\u0027d rather not put the people who\u0027ve got this hw for 3\n months now being forced to use fglrx on it if there is open code.\n\n Its pretty well self contained and just plugs into the driver in\n various places.\"\n\n* \u0027drm-radeon-sitn-support\u0027 of git://people.freedesktop.org/~airlied/linux: (48 commits)\n drm/radeon/kms: update duallink checks for DCE6\n drm/radeon/kms: add trinity pci ids\n drm/radeon/kms: add radeon_asic struct for trinity\n drm/radeon/kms: add support for ucode loading on trinity (v2)\n drm/radeon/kms/vm: set vram base offset properly for TN\n drm/radeon/kms: Update evergreen functions for trinity\n drm/radeon/kms: cayman gpu init updates for trinity\n drm/radeon/kms: Add checks for TN in the DP bridge code\n drm/radeon/kms/DCE6.1: ss is not supported on the internal pplls\n drm/radeon/kms: disable PPLL0 on DCE6.1 when not in use\n drm/radeon/kms: Adjust pll picker for DCE6.1\n drm/radeon/kms: DCE6.1 disp eng pll updates\n drm/radeon/kms: DCE6.1 watermark updates for TN\n drm/radeon/kms: no support for internal thermal sensor on TN yet\n drm/radeon/kms: add trinity (TN) chip family\n drm/radeon/kms: Add SI pci ids\n drm/radeon: Update radeon_info_ioctl for SI. (v2)\n drm/radeon/kms: add radeon_asic struct for SI\n drm/radeon/kms: add support for compute rings in CS ioctl on SI\n drm/radeon/kms: fill in startup/shutdown callbacks for SI\n ...\n" }, { "commit": "be53bfdb8088e9d1924199cc1a96e113756b1075", "tree": "8c65eb9d82ca4c0f11c17cfdc44d5263820b415b", "parents": [ "b2094ef840697bc8ca5d17a83b7e30fad5f1e9fa", "5466c7b1683a23dbbcfb7ee4a71c4f23886001c7" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Mar 22 13:08:22 2012 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Mar 22 13:08:22 2012 -0700" }, "message": "Merge branch \u0027drm-next\u0027 of git://people.freedesktop.org/~airlied/linux\n\nPull drm main changes from Dave Airlie:\n \"This is the main drm pull request, I\u0027m probably going to send two more\n smaller ones, will explain below.\n\n This contains a patch that is also in the fbdev tree, but it should be\n the same patch, it added an API for hot unplugging framebuffer\n devices, and I need that API for a new driver.\n\n It also contains some changes to the i2c tree which Jean has acked,\n and one change to moorestown platform stuff in x86.\n\n Highlights:\n - new drivers: UDL driver for USB displaylink devices, kms only,\n should support correct hotplug operations.\n - core: i2c speedups + better hotplug support, EDID overriding via\n firmware interface - allows user to load a firmware for a broken\n monitor/kvm from userspace, it even has documentation for it.\n - exynos: new HDMI audio + hdmi 1.4 + virtual output driver\n - gma500: code cleanup\n - radeon: cleanups, CS optimisations, streamout support and pageflip\n fix\n - nouveau: NVD9 displayport support + more reclocking work\n - i915: re-enabling GMBUS, finish gpu patch (might help hibernation\n who knows), missed irq fixes, stencil tiling fixes, interlaced\n support, aliasesd PPGTT support for SNB/IVB, swizzling for SNB/IVB,\n semaphore fixes\n\n As well as the usual bunch of cleanups and fixes all over the place.\n\n I\u0027ve got two things I\u0027d like to merge a bit later:\n\n a) AMD support for all their new radeonhd 7000 series GPU and APUs.\n AMD dropped this a bit late due to insane internal review\n processes, (please AMD just follow Intel and let open source guys\n ship stuff early) however I don\u0027t want to penalise people who own\n this hardware (since its been on sale for 3-4 months and GPU hw\n doesn\u0027t exactly have a lifetime in years) and consign them to\n using closed drivers for longer than necessary. The changes are\n well contained and just plug into the driver new gpu functionality\n so they should be fairly regression proof. I just want to give\n them a bit of a run on the hw AMD kindly sent me.\n\n b) drm prime/dma-buf interface code. This is just infrastructure\n code to expose the dma-buf stuff to drm drivers and to userspace.\n I\u0027m not planning on pushing any driver support in this cycle\n (except maybe exynos), but I\u0027d like to get the infrastructure code\n in so for the next cycle I can start getting the driver support\n into the individual drivers. We have started driver support for\n i915, nouveau and udl along with I think exynos and omap in\n staging. However this code relies on the dma-buf tree being\n pulled into your tree first since it needs the latest interfaces\n from that tree. I\u0027ll push to get that tree sent asap.\n\n (oh and any warnings you see in i915 are gcc\u0027s fault from what anyone\n can see).\"\n\nFix up trivial conflicts in arch/x86/platform/mrst/mrst.c due to the new\nmsic_thermal_platform_data() thermal function being added next to the\ntc35876x_platform_data() i2c device function..\n\n* \u0027drm-next\u0027 of git://people.freedesktop.org/~airlied/linux: (326 commits)\n drm/i915: use DDC_ADDR instead of hard-coding it\n drm/radeon: use DDC_ADDR instead of hard-coding it\n drm: remove unneeded redefinition of DDC_ADDR\n drm/exynos: added virtual display driver.\n drm: allow loading an EDID as firmware to override broken monitor\n drm/exynos: enable hdmi audio feature\n drm/exynos: add default pixel format for plane\n drm/exynos: cleanup exynos_hdmi.h\n drm/exynos: add is_local member in exynos_drm_subdrv struct\n drm/exynos: add subdrv open/close functions\n drm/exynos: remove module of exynos drm subdrv\n drm/exynos: release pending pageflip events when closed\n drm/exynos: added new funtion to get/put dma address.\n drm/exynos: update gem and buffer framework.\n drm/exynos: added mode_fixup feature and code clean.\n drm/exynos: add HDMI version 1.4 support\n drm/exynos: remove exynos_mixer.h\n gma500: Fix mmap frambuffer\n drm/radeon: Drop radeon_gem_object_(un)pin.\n drm/radeon: Restrict offset for legacy display engine.\n ...\n" }, { "commit": "1898f4426b3863216a9041389b34a3b995883027", "tree": "1f1fa81d13ab229c3efea589e79135912b5260e6", "parents": [ "5466c7b1683a23dbbcfb7ee4a71c4f23886001c7", "6544599249086ce50f216a6cedbea56514ffefc6" ], "author": { "name": "Dave Airlie", "email": "airlied@redhat.com", "time": "Thu Mar 22 14:44:06 2012 +0000" }, "committer": { "name": "Dave Airlie", "email": "airlied@redhat.com", "time": "Thu Mar 22 14:44:06 2012 +0000" }, "message": "Merge branch \u0027drm-nouveau-next\u0027 of git://git.freedesktop.org/git/nouveau/linux-2.6 into drm-next\n\n* \u0027drm-nouveau-next\u0027 of git://git.freedesktop.org/git/nouveau/linux-2.6:\n drm/nouveau/dp: support version 4.0 of DP table\n drm/nve0/disp: nvidia randomly decided to move the dithering method\n drm/nve0: initial modesetting support for kepler chipsets\n drm/nouveau: add bios connector type for dms59\n drm/nouveau: move out of staging drivers\n drm/nouveau: bump version to 1.0.0\n drm/nvd0/disp: ignore clock set if no pclk\n drm/nouveau: oops, increase channel dispc_vma to 4\n drm/nouveau: inform userspace of new kernel subchannel requirements\n drm/nouveau: remove m2mf creation on userspace channels\n drm/nvc0-/disp: reimplement flip completion method as fifo method\n drm/nouveau: move fence sequence check to start of loop\n drm/nouveau: remove subchannel names from places where it doesn\u0027t matter\n drm/nouveau/ttm: always do buffer moves on kernel channel\n" }, { "commit": "6544599249086ce50f216a6cedbea56514ffefc6", "tree": "7b4fb0b9ada08c8a9b6530f08eeee93459f3fbf8", "parents": [ "e592c73b91e9dfc7403fe41f649dd18593805ccd" ], "author": { "name": "Ben Skeggs", "email": "bskeggs@redhat.com", "time": "Sun Mar 11 16:08:05 2012 +1000" }, "committer": { "name": "Ben Skeggs", "email": "bskeggs@redhat.com", "time": "Fri Mar 23 00:21:18 2012 +1000" }, "message": "drm/nouveau/dp: support version 4.0 of DP table\n\nSigned-off-by: Ben Skeggs \u003cbskeggs@redhat.com\u003e\n" }, { "commit": "e592c73b91e9dfc7403fe41f649dd18593805ccd", "tree": "7d9db6cd6b8264f7daf5b0fce941003ef53660e8", "parents": [ "68455a43debe26dd1d2a42c0b67dd5697c201420" ], "author": { "name": "Ben Skeggs", "email": "bskeggs@redhat.com", "time": "Mon Mar 05 10:05:45 2012 +1000" }, "committer": { "name": "Ben Skeggs", "email": "bskeggs@redhat.com", "time": "Fri Mar 23 00:21:14 2012 +1000" }, "message": "drm/nve0/disp: nvidia randomly decided to move the dithering method\n\nSigned-off-by: Ben Skeggs \u003cbskeggs@redhat.com\u003e\n" }, { "commit": "68455a43debe26dd1d2a42c0b67dd5697c201420", "tree": "692eeca94a4fee9a64dfed910b4a3b1dbd5c1c99", "parents": [ "fa2c113ac1da39f922ab287b75c8d3f21a4b16dd" ], "author": { "name": "Ben Skeggs", "email": "bskeggs@redhat.com", "time": "Sun Mar 04 14:47:55 2012 +1000" }, "committer": { "name": "Ben Skeggs", "email": "bskeggs@redhat.com", "time": "Fri Mar 23 00:21:12 2012 +1000" }, "message": "drm/nve0: initial modesetting support for kepler chipsets\n\nSigned-off-by: Ben Skeggs \u003cbskeggs@redhat.com\u003e\n" }, { "commit": "fa2c113ac1da39f922ab287b75c8d3f21a4b16dd", "tree": "9d1097d6061b68fc137401d5b439b648686bce27", "parents": [ "f3c93cbde7eab38671ae085cb1027b08f5f36757" ], "author": { "name": "Ben Skeggs", "email": "bskeggs@redhat.com", "time": "Thu Mar 22 11:27:15 2012 +1000" }, "committer": { "name": "Ben Skeggs", "email": "bskeggs@redhat.com", "time": "Thu Mar 22 17:18:16 2012 +1000" }, "message": "drm/nouveau: add bios connector type for dms59\n\nSigned-off-by: Ben Skeggs \u003cbskeggs@redhat.com\u003e\n" }, { "commit": "f3c93cbde7eab38671ae085cb1027b08f5f36757", "tree": "e08adf2d7d8c7f82257b9f15dd80c6da542169b9", "parents": [ "f887c425f9eeed8ffbca64c8be45da62b07096c0" ], "author": { "name": "Ben Skeggs", "email": "bskeggs@redhat.com", "time": "Fri Mar 16 18:19:14 2012 +1000" }, "committer": { "name": "Ben Skeggs", "email": "bskeggs@redhat.com", "time": "Thu Mar 22 17:18:12 2012 +1000" }, "message": "drm/nouveau: move out of staging drivers\n\nThere\u0027s really no good reason for us to be in here anymore, we have to\nmaintain this ABI anyway to avoid angering people.\n\nSigned-off-by: Ben Skeggs \u003cbskeggs@redhat.com\u003e\n" }, { "commit": "f887c425f9eeed8ffbca64c8be45da62b07096c0", "tree": "37947b9c6ccfbbae8dc4943ff41187c2982f4af7", "parents": [ "dd62608bcc8a629c4c583fb50b90003fd5213516" ], "author": { "name": "Ben Skeggs", "email": "bskeggs@redhat.com", "time": "Fri Mar 16 12:44:34 2012 +1000" }, "committer": { "name": "Ben Skeggs", "email": "bskeggs@redhat.com", "time": "Thu Mar 22 17:18:06 2012 +1000" }, "message": "drm/nouveau: bump version to 1.0.0\n\nThe time has come to get a proper version number that we can change to\nindicate new features etc, rather than the lock-step 0.0.XX that we\npreviously had.\n\nlibdrm has recognised this version as compatible with 0.0.16 since 2.4.22,\nso hopefully any breakage people see should be very minimal.\n\nSigned-off-by: Ben Skeggs \u003cbskeggs@redhat.com\u003e\n" }, { "commit": "dd62608bcc8a629c4c583fb50b90003fd5213516", "tree": "81a52947d3f7a0522353828340eb6e8d4fa04eed", "parents": [ "27100ac95a8eee0b083e46bfa67b229ac641d28c" ], "author": { "name": "Ben Skeggs", "email": "bskeggs@redhat.com", "time": "Fri Mar 16 15:32:16 2012 +1000" }, "committer": { "name": "Ben Skeggs", "email": "bskeggs@redhat.com", "time": "Thu Mar 22 17:18:00 2012 +1000" }, "message": "drm/nvd0/disp: ignore clock set if no pclk\n\nThis happens somehow during init on a machine I have, and leads to a\ndivide-by-zero.\n\nLets avoid that...\n\nSigned-off-by: Ben Skeggs \u003cbskeggs@redhat.com\u003e\n" }, { "commit": "27100ac95a8eee0b083e46bfa67b229ac641d28c", "tree": "06c8fb050c4e65fbe08821d1cf6f7693dc7276f4", "parents": [ "664695ae6f8b2b72aa5820aa20f4d65016cb3fd0" ], "author": { "name": "Ben Skeggs", "email": "bskeggs@redhat.com", "time": "Fri Mar 16 13:45:09 2012 +1000" }, "committer": { "name": "Ben Skeggs", "email": "bskeggs@redhat.com", "time": "Thu Mar 22 17:17:56 2012 +1000" }, "message": "drm/nouveau: oops, increase channel dispc_vma to 4\n\nSigned-off-by: Ben Skeggs \u003cbskeggs@redhat.com\u003e\n" }, { "commit": "664695ae6f8b2b72aa5820aa20f4d65016cb3fd0", "tree": "38d731bc4028424e65844160ff87571776208d5e", "parents": [ "48aca13f0167ae78c28c6b48d82a157a6692eecb" ], "author": { "name": "Ben Skeggs", "email": "bskeggs@redhat.com", "time": "Wed Mar 21 13:57:40 2012 +1000" }, "committer": { "name": "Ben Skeggs", "email": "bskeggs@redhat.com", "time": "Thu Mar 22 17:17:50 2012 +1000" }, "message": "drm/nouveau: inform userspace of new kernel subchannel requirements\n\nAll available subchannels are now available for userspace to do with as it\npleases on NVC0+.\n\nOn all earlier chipsets, the kernel still uses a software object on subc 0\nto implement the page flip completion method. I hope to find some decent\nway of addressing this too, but it\u0027s a tad tricker prior to fermi.\n\nSigned-off-by: Ben Skeggs \u003cbskeggs@redhat.com\u003e\n" }, { "commit": "48aca13f0167ae78c28c6b48d82a157a6692eecb", "tree": "54937c4fc0e8f19fcf2d8abfb35a82798f85ce96", "parents": [ "d5316e251230c4e54a157349a362229c3d4daa32" ], "author": { "name": "Ben Skeggs", "email": "bskeggs@redhat.com", "time": "Sun Mar 18 00:40:41 2012 +1000" }, "committer": { "name": "Ben Skeggs", "email": "bskeggs@redhat.com", "time": "Thu Mar 22 17:17:46 2012 +1000" }, "message": "drm/nouveau: remove m2mf creation on userspace channels\n\nSigned-off-by: Ben Skeggs \u003cbskeggs@redhat.com\u003e\n" }, { "commit": "d5316e251230c4e54a157349a362229c3d4daa32", "tree": "a5371432d01ac0ef54c4c402c901a0fc1f2d2323", "parents": [ "b08abd4e9a11d637d3c2ff52b2ebbc1b3f686d06" ], "author": { "name": "Ben Skeggs", "email": "bskeggs@redhat.com", "time": "Wed Mar 21 13:53:49 2012 +1000" }, "committer": { "name": "Ben Skeggs", "email": "bskeggs@redhat.com", "time": "Thu Mar 22 17:17:40 2012 +1000" }, "message": "drm/nvc0-/disp: reimplement flip completion method as fifo method\n\nRemoves need for M2MF subchannel usage on NVC0+.\n\nSigned-off-by: Ben Skeggs \u003cbskeggs@redhat.com\u003e\n" }, { "commit": "b08abd4e9a11d637d3c2ff52b2ebbc1b3f686d06", "tree": "b965122d55743e4094cccdb1c3884299693ee7b7", "parents": [ "b5b2e5988bd18a2f6e3f192adf7439599de00d3f" ], "author": { "name": "Ben Skeggs", "email": "bskeggs@redhat.com", "time": "Wed Mar 21 13:51:03 2012 +1000" }, "committer": { "name": "Ben Skeggs", "email": "bskeggs@redhat.com", "time": "Thu Mar 22 17:17:36 2012 +1000" }, "message": "drm/nouveau: move fence sequence check to start of loop\n\nI want to be able to use REF_CNT from other places in the kernel without\npushing a fence object onto the list of emitted fences.\n\nThe current code makes an assumption that every time the acked sequence is\nbumped that there\u0027s at least one fence on the list that\u0027ll be signalled.\n\nThis will no longer be true in the near future.\n\nSigned-off-by: Ben Skeggs \u003cbskeggs@redhat.com\u003e\n" }, { "commit": "b5b2e5988bd18a2f6e3f192adf7439599de00d3f", "tree": "802c2ff81977b982c1ec0ca0f5dc8ae67b98a469", "parents": [ "accf94969f226ddfe7dd3a6a76ce093ace839b26" ], "author": { "name": "Ben Skeggs", "email": "bskeggs@redhat.com", "time": "Fri Mar 16 00:09:54 2012 +1000" }, "committer": { "name": "Ben Skeggs", "email": "bskeggs@redhat.com", "time": "Thu Mar 22 17:17:30 2012 +1000" }, "message": "drm/nouveau: remove subchannel names from places where it doesn\u0027t matter\n\nThese are FIFO methods, it doesn\u0027t matter what subchannel is being used.\n\nSigned-off-by: Ben Skeggs \u003cbskeggs@redhat.com\u003e\n" }, { "commit": "accf94969f226ddfe7dd3a6a76ce093ace839b26", "tree": "d376e4f4240ed414388d19aaa1fd1df3d1a2e54e", "parents": [ "2f5394c3ed573de2ab18cdac503b8045cd16ac5e" ], "author": { "name": "Ben Skeggs", "email": "bskeggs@redhat.com", "time": "Fri Mar 16 12:40:17 2012 +1000" }, "committer": { "name": "Ben Skeggs", "email": "bskeggs@redhat.com", "time": "Thu Mar 22 17:17:26 2012 +1000" }, "message": "drm/nouveau/ttm: always do buffer moves on kernel channel\n\nThere was once good reasons for wanting the drm to be able to use M2MF etc\non user channels, but they\u0027re not relevant anymore. For the general\nbuffer move case, we\u0027ve already lost by transferring between vram/sysmem\nalready so the context switching overhead is minimal in comparison.\n\nSigned-off-by: Ben Skeggs \u003cbskeggs@redhat.com\u003e\n" }, { "commit": "9f3938346a5c1fa504647670edb5fea5756cfb00", "tree": "7cf6d24d6b076c8db8571494984924cac03703a2", "parents": [ "69a7aebcf019ab3ff5764525ad6858fbe23bb86d", "317b6e128247f75976b0fc2b9fd8d2c20ef13b3a" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Mar 21 09:40:26 2012 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Mar 21 09:40:26 2012 -0700" }, "message": "Merge branch \u0027kmap_atomic\u0027 of git://github.com/congwang/linux\n\nPull kmap_atomic cleanup from Cong Wang.\n\nIt\u0027s been in -next for a long time, and it gets rid of the (no longer\nused) second argument to k[un]map_atomic().\n\nFix up a few trivial conflicts in various drivers, and do an \"evil\nmerge\" to catch some new uses that have come in since Cong\u0027s tree.\n\n* \u0027kmap_atomic\u0027 of git://github.com/congwang/linux: (59 commits)\n feature-removal-schedule.txt: schedule the deprecated form of kmap_atomic() for removal\n highmem: kill all __kmap_atomic() [swarren@nvidia.com: highmem: Fix ARM build break due to __kmap_atomic rename]\n drbd: remove the second argument of k[un]map_atomic()\n zcache: remove the second argument of k[un]map_atomic()\n gma500: remove the second argument of k[un]map_atomic()\n dm: remove the second argument of k[un]map_atomic()\n tomoyo: remove the second argument of k[un]map_atomic()\n sunrpc: remove the second argument of k[un]map_atomic()\n rds: remove the second argument of k[un]map_atomic()\n net: remove the second argument of k[un]map_atomic()\n mm: remove the second argument of k[un]map_atomic()\n lib: remove the second argument of k[un]map_atomic()\n power: remove the second argument of k[un]map_atomic()\n kdb: remove the second argument of k[un]map_atomic()\n udf: remove the second argument of k[un]map_atomic()\n ubifs: remove the second argument of k[un]map_atomic()\n squashfs: remove the second argument of k[un]map_atomic()\n reiserfs: remove the second argument of k[un]map_atomic()\n ocfs2: remove the second argument of k[un]map_atomic()\n ntfs: remove the second argument of k[un]map_atomic()\n ...\n" }, { "commit": "5466c7b1683a23dbbcfb7ee4a71c4f23886001c7", "tree": "985c7779804bf05e0993ae035729ff98b05f62af", "parents": [ "370a53f943c2efa08d1e145454571eccaecdcc19" ], "author": { "name": "Matt Turner", "email": "mattst88@gmail.com", "time": "Fri Sep 23 13:18:40 2011 -0400" }, "committer": { "name": "Dave Airlie", "email": "airlied@redhat.com", "time": "Wed Mar 21 10:20:38 2012 +0000" }, "message": "drm/i915: use DDC_ADDR instead of hard-coding it\n\nSigned-off-by: Matt Turner \u003cmattst88@gmail.com\u003e\nSigned-off-by: Dave Airlie \u003cairlied@redhat.com\u003e\n" } ], "next": "370a53f943c2efa08d1e145454571eccaecdcc19" }