)]}' { "log": [ { "commit": "fda73056f62d84376a3d29926708b4a08155da31", "tree": "0080c4eec02c23179f59a50d269f48f7662b61ce", "parents": [ "cf8f2e58d0893f9785b8056b29d9bbcb4758765f", "94f578e6aba14bb2aeb00db2e7f6e5f704fee937" ], "author": { "name": "Ethan Chen", "email": "intervigil@gmail.com", "time": "Tue Jan 14 21:50:44 2014 -0800" }, "committer": { "name": "Ethan Chen", "email": "intervigil@gmail.com", "time": "Tue Jan 14 21:50:44 2014 -0800" }, "message": "Merge tag \u0027v3.4.76\u0027 into cm-11.0\n\nThis is the 3.4.76 stable release\n\nConflicts:\n\tdrivers/gpio/gpio-msm-v2.c\n\nChange-Id: Ic80b29098bdf656b5e5c9b95d98d2ec64bba1f28\n" }, { "commit": "be541ecb66d285c4135c3820113af22ff57d4a0c", "tree": "ddef6ed02dc046771156e87aa03e841c8ed63729", "parents": [ "93fb68c0c53ce4660686cf276320e64fe68578a1" ], "author": { "name": "Alex Deucher", "email": "alexander.deucher@amd.com", "time": "Mon Dec 23 09:31:58 2013 -0500" }, "committer": { "name": "Greg Kroah-Hartman", "email": "gregkh@linuxfoundation.org", "time": "Wed Jan 08 09:42:11 2014 -0800" }, "message": "drm/radeon: 0x9649 is SUMO2 not SUMO\n\ncommit d00adcc8ae9e22eca9d8af5f66c59ad9a74c90ec upstream.\n\nFixes rendering corruption due to incorrect\ngfx configuration.\n\nbug:\nhttps://bugs.freedesktop.org/show_bug.cgi?id\u003d63599\n\nSigned-off-by: Alex Deucher \u003calexander.deucher@amd.com\u003e\nSigned-off-by: Greg Kroah-Hartman \u003cgregkh@linuxfoundation.org\u003e\n\n" }, { "commit": "2a38ada0f1ab9f894eea4428731ebc811b51c3f3", "tree": "759c765808a23a3a35e4ba10d8306c847c0205b7", "parents": [ "19218e895cefdd389c96af12c93c89e7276bbaad", "44d19f5a04ae4e433548ba2f25e4d2ccfcac765e" ], "author": { "name": "Ethan Chen", "email": "intervigil@gmail.com", "time": "Sun Dec 08 12:50:38 2013 -0800" }, "committer": { "name": "Ethan Chen", "email": "intervigil@gmail.com", "time": "Sun Dec 08 12:50:38 2013 -0800" }, "message": "Merge tag \u0027v3.4.72\u0027 into tmp\n\nThis is the 3.4.72 stable release\n\nConflicts:\n\tarch/arm/Kconfig\n\tarch/arm/include/asm/mutex.h\n\tarch/arm/kernel/perf_event.c\n\tarch/arm/kernel/traps.c\n\tarch/arm/mm/dma-mapping.c\n\tdrivers/base/power/main.c\n\tdrivers/bluetooth/ath3k.c\n\tdrivers/bluetooth/btusb.c\n\tdrivers/gpu/drm/radeon/radeon_mode.h\n\tdrivers/mmc/card/block.c\n\tdrivers/mmc/host/sdhci.c\n\tdrivers/usb/core/message.c\n\tdrivers/usb/host/xhci-plat.c\n\tdrivers/usb/host/xhci.h\n\tdrivers/virtio/virtio_ring.c\n\tfs/ubifs/dir.c\n\tinclude/linux/freezer.h\n\tinclude/linux/virtio.h\n\tinclude/media/v4l2-ctrls.h\n\tinclude/net/bluetooth/hci_core.h\n\tinclude/net/bluetooth/mgmt.h\n\tkernel/cgroup.c\n\tkernel/futex.c\n\tkernel/signal.c\n\tnet/bluetooth/hci_conn.c\n\tnet/bluetooth/hci_core.c\n\tnet/bluetooth/hci_event.c\n\tnet/bluetooth/l2cap_core.c\n\tnet/bluetooth/mgmt.c\n\tnet/bluetooth/rfcomm/sock.c\n\tnet/bluetooth/smp.c\n\nChange-Id: I4fb0d5de74ca76f933d95d98e1a9c2c859402f34\n" }, { "commit": "dde448d95d8698ee4c8373bb48fe08a22f41052f", "tree": "7fe87fa93bfa5b81e6f87b147e32512d2e8198e3", "parents": [ "ac4f6190fae02a3dc30133f90488b996f726bf7a", "f95b978981a7d154ba40d14c18e8ed5c694e6124" ], "author": { "name": "Ethan Chen", "email": "intervigil@gmail.com", "time": "Thu Jun 20 11:32:42 2013 -0700" }, "committer": { "name": "Ethan Chen", "email": "intervigil@gmail.com", "time": "Thu Jun 20 11:32:42 2013 -0700" }, "message": "Merge tag \u0027v3.4.10\u0027 into cm-10.1\n\nThis is the 3.4.10 stable release\n\nConflicts:\n\tarch/arm/mm/tlb-v7.S\n\tarch/arm/vfp/entry.S\n\tdrivers/base/power/main.c\n\tdrivers/mmc/host/sdhci.c\n\tdrivers/net/tun.c\n\tdrivers/usb/core/hub.c\n\tdrivers/usb/host/xhci.h\n\tinclude/linux/sched.h\n\tkernel/power/suspend.c\n\nChange-Id: Ia2477ec93ceb64b13dd1a2d8aa646cb233387d14\n" }, { "commit": "0c98574b6a4bdcf84b6b61804cb1f68fb1d390a4", "tree": "8fe74f4a2812813efde1912a879a1227424ff456", "parents": [ "3fe09e770fb1e5007af981a1eef4c3667e3e55f0" ], "author": { "name": "Alex Deucher", "email": "alexander.deucher@amd.com", "time": "Thu Apr 25 14:06:05 2013 -0400" }, "committer": { "name": "Greg Kroah-Hartman", "email": "gregkh@linuxfoundation.org", "time": "Sat May 11 13:48:14 2013 -0700" }, "message": "drm/radeon: add new richland pci ids\n\ncommit 62d1f92e06aef9665d71ca7e986b3047ecf0b3c7 upstream.\n\nSigned-off-by: Alex Deucher \u003calexander.deucher@amd.com\u003e\nSigned-off-by: Greg Kroah-Hartman \u003cgregkh@linuxfoundation.org\u003e\n\n" }, { "commit": "6e98eded75064b5121ce759d1b0fb8568c598b1f", "tree": "155524133c571ea0819ed71d6e4ae3564155072a", "parents": [ "10939f3f94637c3f243ef9f876b545b9839faf2a" ], "author": { "name": "Alex Deucher", "email": "alexander.deucher@amd.com", "time": "Thu Apr 25 13:55:15 2013 -0400" }, "committer": { "name": "Greg Kroah-Hartman", "email": "gregkh@linuxfoundation.org", "time": "Sat May 11 13:48:12 2013 -0700" }, "message": "drm/radeon: add some new SI PCI ids\n\ncommit 18932a28419596bc9403770f5d8a108c5433fe59 upstream.\n\nSigned-off-by: Alex Deucher \u003calexander.deucher@amd.com\u003e\nSigned-off-by: Greg Kroah-Hartman \u003cgregkh@linuxfoundation.org\u003e\n\n" }, { "commit": "2cf470d198f3bf272910dff8f039ee77fc61db0c", "tree": "a066dce503e92cda81afdea687cd2e29e0a19a87", "parents": [ "6e8d94de159e7520e6ff1ecaf8419844b93631e7" ], "author": { "name": "Alex Deucher", "email": "alexander.deucher@amd.com", "time": "Fri Mar 08 13:36:54 2013 -0500" }, "committer": { "name": "Greg Kroah-Hartman", "email": "gregkh@linuxfoundation.org", "time": "Thu Mar 28 12:12:13 2013 -0700" }, "message": "drm/radeon: add Richland pci ids\n\ncommit b75bbaa038ffc426e88ea3df6c4ae11834fc3e4f upstream.\n\nReviewed-by: Jerome Glisse \u003cjglisse@redhat.com\u003e\nSigned-off-by: Alex Deucher \u003calexander.deucher@amd.com\u003e\nSigned-off-by: Greg Kroah-Hartman \u003cgregkh@linuxfoundation.org\u003e\n\n" }, { "commit": "e833acaf2b5cfac0fb53692652a8c39667f1e559", "tree": "f530c2ea75a3d7e52045e1f543ced58757895b9d", "parents": [ "7dfc4b284ca395a035e7da058f86dfb4275dd509" ], "author": { "name": "Duy Truong", "email": "dtruong@codeaurora.org", "time": "Tue Feb 12 13:35:08 2013 -0800" }, "committer": { "name": "Duy Truong", "email": "dtruong@codeaurora.org", "time": "Tue Feb 12 13:35:08 2013 -0800" }, "message": "Update copyright to The Linux Foundation\n\nChange-Id: Ibead64ce2e901dede2ddd1b86088b88f2350ce92\nSigned-off-by: Duy Truong \u003cdtruong@codeaurora.org\u003e\n" }, { "commit": "9cbecb443503ba3dd6a620e8e43a0273e14dc204", "tree": "bb6aa7240a08b3da5c4edbd1e08d3a5151eea7d5", "parents": [ "6417635908e7643800141fc1d6cf7fe43f4fb5e3" ], "author": { "name": "Alex Deucher", "email": "alexander.deucher@amd.com", "time": "Wed Nov 21 18:37:38 2012 -0500" }, "committer": { "name": "Greg Kroah-Hartman", "email": "gregkh@linuxfoundation.org", "time": "Mon Dec 03 11:47:01 2012 -0800" }, "message": "drm/radeon: add new SI pci id\n\ncommit 0181bd5dea2ed0696f84591a92da0b6a1f1a2e62 upstream.\n\nSigned-off-by: Alex Deucher \u003calexander.deucher@amd.com\u003e\nSigned-off-by: Greg Kroah-Hartman \u003cgregkh@linuxfoundation.org\u003e\n\n" }, { "commit": "8357dde8b780b426d398f9e3701fdc16f0856766", "tree": "027378c8e6fb03205da85714bdb6f2095026a761", "parents": [ "f88df5ff96f5ea632aa2d193d2c9019aa4c728d9" ], "author": { "name": "Alex Deucher", "email": "alexander.deucher@amd.com", "time": "Tue Oct 16 12:51:45 2012 -0400" }, "committer": { "name": "Greg Kroah-Hartman", "email": "gregkh@linuxfoundation.org", "time": "Wed Oct 31 10:02:32 2012 -0700" }, "message": "drm/radeon: add some new SI PCI ids\n\ncommit b6aa22db7857ab7ed042d6c56b800bfc727cfdff upstream.\n\nSigned-off-by: Alex Deucher \u003calexander.deucher@amd.com\u003e\nSigned-off-by: Greg Kroah-Hartman \u003cgregkh@linuxfoundation.org\u003e\n\n" }, { "commit": "2607b9407db4cbc16d5a130c8c16702711c3b7be", "tree": "396f6488dd277120460e0c4cd098a1a9e36b47f6", "parents": [ "4368ade3ff2bfff1033f9e5758630b3d4e8f7e71" ], "author": { "name": "Jakob Bornecrantz", "email": "jakob@vmware.com", "time": "Thu Aug 16 08:29:03 2012 +0000" }, "committer": { "name": "Greg Kroah-Hartman", "email": "gregkh@linuxfoundation.org", "time": "Tue Oct 02 10:30:23 2012 -0700" }, "message": "drm: Check for invalid cursor flags\n\ncommit 7c4eaca4162d0b5ad4fb39f974d7ffd71b9daa09 upstream.\n\nSigned-off-by: Jakob Bornecrantz \u003cjakob@vmware.com\u003e\nSigned-off-by: Dave Airlie \u003cairlied@redhat.com\u003e\nSigned-off-by: Greg Kroah-Hartman \u003cgregkh@linuxfoundation.org\u003e\n\n" }, { "commit": "844bebfd9d09f92cdf4fac108e5f0d38cd389fff", "tree": "1231da2a36976b91202784d038c516a51fb59cec", "parents": [ "3407b51859d0e65ed66ccb0080c495a1f03cda6a" ], "author": { "name": "Alex Deucher", "email": "alexander.deucher@amd.com", "time": "Mon Aug 06 10:03:59 2012 -0400" }, "committer": { "name": "Greg Kroah-Hartman", "email": "gregkh@linuxfoundation.org", "time": "Sun Aug 26 15:00:41 2012 -0700" }, "message": "drm/radeon: add some new SI pci ids\n\ncommit 2f292004dd1fb005788dc0a9cdd5559812ed866e upstream.\n\nSigned-off-by: Alex Deucher \u003calexander.deucher@amd.com\u003e\nSigned-off-by: Greg Kroah-Hartman \u003cgregkh@linuxfoundation.org\u003e\n\n" }, { "commit": "fab83a044aa7d4b968f466f4eb3946388528497a", "tree": "a40f9623041c97fdef89682f33d3d64017f7bb8c", "parents": [ "b1840525b3af198ada9f60fc25c980e97e189933" ], "author": { "name": "Alex Deucher", "email": "alexander.deucher@amd.com", "time": "Tue Jun 05 09:50:31 2012 -0400" }, "committer": { "name": "Greg Kroah-Hartman", "email": "gregkh@linuxfoundation.org", "time": "Sun Jun 10 00:36:18 2012 +0900" }, "message": "drm/radeon/kms: add new SI PCI ids\n\ncommit 7aaa61b3476462b69f1ac7669fcca8d608ce3cb5 upstream.\n\nSigned-off-by: Alex Deucher \u003calexander.deucher@amd.com\u003e\nSigned-off-by: Dave Airlie \u003cairlied@redhat.com\u003e\nSigned-off-by: Greg Kroah-Hartman \u003cgregkh@linuxfoundation.org\u003e\n\n" }, { "commit": "b1840525b3af198ada9f60fc25c980e97e189933", "tree": "b759b6c0318df85e56c00695a73d9ca7a2ef6c21", "parents": [ "36fbcdf64a3c15a8a98adb5ea018ce1913215e25" ], "author": { "name": "Alex Deucher", "email": "alexander.deucher@amd.com", "time": "Tue Jun 05 09:50:30 2012 -0400" }, "committer": { "name": "Greg Kroah-Hartman", "email": "gregkh@linuxfoundation.org", "time": "Sun Jun 10 00:36:17 2012 +0900" }, "message": "drm/radeon/kms: add new BTC PCI ids\n\ncommit a2bef8ce826dd1e787fd8ad9b6e0566ba59dab43 upstream.\n\nSigned-off-by: Alex Deucher \u003calexander.deucher@amd.com\u003e\nSigned-off-by: Dave Airlie \u003cairlied@redhat.com\u003e\nSigned-off-by: Greg Kroah-Hartman \u003cgregkh@linuxfoundation.org\u003e\n\n" }, { "commit": "36fbcdf64a3c15a8a98adb5ea018ce1913215e25", "tree": "a5cee55884403660e5900e5a93d19643d69f01eb", "parents": [ "d16ba207028eac4f38b908507d731ca894a91744" ], "author": { "name": "Alex Deucher", "email": "alexander.deucher@amd.com", "time": "Tue Jun 05 09:50:29 2012 -0400" }, "committer": { "name": "Greg Kroah-Hartman", "email": "gregkh@linuxfoundation.org", "time": "Sun Jun 10 00:36:17 2012 +0900" }, "message": "drm/radeon/kms: add new Palm, Sumo PCI ids\n\ncommit 4a6991cc1fad514745b79181df3ace72d561e7aa upstream.\n\nSigned-off-by: Alex Deucher \u003calexander.deucher@amd.com\u003e\nSigned-off-by: Dave Airlie \u003cairlied@redhat.com\u003e\nSigned-off-by: Greg Kroah-Hartman \u003cgregkh@linuxfoundation.org\u003e\n\n" }, { "commit": "d16ba207028eac4f38b908507d731ca894a91744", "tree": "92c33551db2ad1d6c069feb494755feb1ad150a6", "parents": [ "ce58755a4fe65790a2e80559e0c585ba610b5f62" ], "author": { "name": "Alex Deucher", "email": "alexander.deucher@amd.com", "time": "Tue Jun 05 09:50:28 2012 -0400" }, "committer": { "name": "Greg Kroah-Hartman", "email": "gregkh@linuxfoundation.org", "time": "Sun Jun 10 00:36:17 2012 +0900" }, "message": "drm/radeon/kms: add new Trinity PCI ids\n\ncommit d430f7dbf7bd6aaaa40c0660b3204df8cf07b22b upstream.\n\nSigned-off-by: Alex Deucher \u003calexander.deucher@amd.com\u003e\nSigned-off-by: Dave Airlie \u003cairlied@redhat.com\u003e\nSigned-off-by: Greg Kroah-Hartman \u003cgregkh@linuxfoundation.org\u003e\n\n" }, { "commit": "f132c6cf77251e011e1dad0ec88c0b1fda16d5aa", "tree": "f04b469a3547a19b7bdbe110adc571eb71c93328", "parents": [ "23016defd7db701a01dc49f972ad6b1bae9651c2", "3f6240f3e4e2608caf1a70d614ada658cbcbe7be" ], "author": { "name": "Steve Muckle", "email": "smuckle@codeaurora.org", "time": "Wed Jun 06 18:30:57 2012 -0700" }, "committer": { "name": "Steve Muckle", "email": "smuckle@codeaurora.org", "time": "Wed Jun 06 18:45:28 2012 -0700" }, "message": "Merge commit \u0027AU_LINUX_ANDROID_ICS.04.00.04.00.126\u0027 into msm-3.4\n\nAU_LINUX_ANDROID_ICS.04.00.04.00.126 from msm-3.0.\nFirst parent is from google/android-3.4.\n\n* commit \u0027AU_LINUX_ANDROID_ICS.04.00.04.00.126\u0027: (8712 commits)\n PRNG: Device tree entry for qrng device.\n vidc:1080p: Set video core timeout value for Thumbnail mode\n msm: sps: improve the debugging support in SPS driver\n board-8064 msm: Overlap secure and non secure video firmware heaps.\n msm: clock: Add handoff ops for 7x30 and copper XO clocks\n msm_fb: display: Wait for external vsync before DTV IOMMU unmap\n msm: Fix ciruclar dependency in debug UART settings\n msm: gdsc: Add GDSC regulator driver for msm-copper\n defconfig: Enable Mobicore Driver.\n mobicore: Add mobicore driver.\n mobicore: rename variable to lower case.\n mobicore: rename folder.\n mobicore: add makefiles\n mobicore: initial import of kernel driver\n ASoC: msm: Add SLIMBUS_2_RX CPU DAI\n board-8064-gpio: Update FUNC for EPM SPI CS\n msm_fb: display: Remove chicken bit config during video playback\n mmc: msm_sdcc: enable the sanitize capability\n msm-fb: display: lm2 writeback support on mpq platfroms\n msm_fb: display: Disable LVDS phy \u0026 pll during panel off\n ...\n\nSigned-off-by: Steve Muckle \u003csmuckle@codeaurora.org\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": "490aa60ee7e884febf4818234d5c97669665db9a", "tree": "63f7a78e6ec706953ef7005241b97c15b6cb3870", "parents": [ "677e84c1b5c8533ea351a9556308071ca47a1eb2" ], "author": { "name": "Inki Dae", "email": "inki.dae@samsung.com", "time": "Thu Apr 12 16:42:54 2012 +0900" }, "committer": { "name": "Inki Dae", "email": "inki.dae@samsung.com", "time": "Thu Apr 12 16:42:54 2012 +0900" }, "message": "drm/exynos: fixed exynos broken ioctl\n\nthis patch removes the pointer of uint64_t *edid. it should be just\na uint64_t.\n\nSigned-off-by: Inki Dae \u003cinki.dae@samsung.com\u003e\nSigned-off-by: Kyungmin Park \u003ckyungmin.park@samsung.com\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": "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": "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": "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": "a76e99abc558aed633ba28ff61c5328116292bf3", "tree": "60f7677f0baafa00825accc1214839246b3e78dd", "parents": [ "a54734678ff9cb97938b9f7648547174f3b118e4", "1d05f993784973189395051cc711fdd6dd5eb389" ], "author": { "name": "Rohit Vaswani", "email": "rvaswani@codeaurora.org", "time": "Fri Mar 30 00:09:34 2012 -0700" }, "committer": { "name": "Rohit Vaswani", "email": "rvaswani@codeaurora.org", "time": "Fri Mar 30 00:09:34 2012 -0700" }, "message": "Merge branch \u0027Linux 3.0.21\u0027 into msm-3.0\n\nMerge Upstream\u0027s stable 3.0.21 branch into msm-3.0\nThis consists 814 commits and some merge conflicts.\n\nThe merge conflicts are because of some local changes to\nmsm-3.0 as well as some conflicts between google\u0027s tree and\nthe upstream tree.\n\nConflicts:\n\tarch/arm/kernel/head.S\n\tdrivers/bluetooth/ath3k.c\n\tdrivers/bluetooth/btusb.c\n\tdrivers/mmc/core/core.c\n\tdrivers/tty/serial/serial_core.c\n\tdrivers/usb/host/ehci-hub.c\n\tdrivers/usb/serial/qcserial.c\n\tfs/namespace.c\n\tfs/proc/base.c\n\nChange-Id: I62e2edbe213f84915e27f8cd6e4f6ce23db22a21\nSigned-off-by: Rohit Vaswani \u003crvaswani@codeaurora.org\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": "10db4e1e4e9a910a26b94045660e5ba7e7c71419", "tree": "cd28bea676da081ceb76984867ecfb5559bbe70a", "parents": [ "d314d74c695f967e10598467a326f41c78ed1e20" ], "author": { "name": "Bobby Powers", "email": "bobbypowers@gmail.com", "time": "Fri Mar 23 15:01:51 2012 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri Mar 23 16:58:31 2012 -0700" }, "message": "headers: include linux/types.h where appropriate\n\nThis addresses some header check warnings. DRM headers which include\n\"drm.h\" have been excluded, as they indirectly include types.h.\n\nSigned-off-by: Bobby Powers \u003cbobbypowers@gmail.com\u003e\nCc: Chris Ball \u003ccjb@laptop.org\u003e\nCc: Dave Airlie \u003cairlied@linux.ie\u003e\nCc: James Bottomley \u003cJames.Bottomley@HansenPartnership.com\u003e\nCc: Takashi Iwai \u003ctiwai@suse.de\u003e\nSigned-off-by: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\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": "b73d12303ecfc91123363d8900e127da44bf42a6", "tree": "acf71b4c4a932c44cacaf7b69106b872db50dccd", "parents": [ "da0df92b57311aa1b26a2a90599ed16e1e968b90" ], "author": { "name": "Inki Dae", "email": "inki.dae@samsung.com", "time": "Wed Mar 21 10:55:26 2012 +0900" }, "committer": { "name": "Dave Airlie", "email": "airlied@redhat.com", "time": "Wed Mar 21 10:15:49 2012 +0000" }, "message": "drm/exynos: added virtual display driver.\n\nthis driver would be used for wireless display. virtual display\ndriver has independent crtc, encoder and connector and to use\nthis driver, user application should send edid data to this driver\nfrom wireless display.\n\nSigned-off-by: Inki Dae \u003cinki.dae@samsung.com\u003e\nSigned-off-by: Kyungmin Park \u003ckyungmin.park@samsung.com\u003e\n" }, { "commit": "d09b38d4311d5a1d94407a3f65313a51ce96814f", "tree": "e093ceec1a3252399aba69133dbd3dc06e40c64b", "parents": [ "be63fe8c8fd5a44dc5efd77aaaf2cab3a1bdefff" ], "author": { "name": "Alex Deucher", "email": "alexander.deucher@amd.com", "time": "Tue Mar 20 17:18:41 2012 -0400" }, "committer": { "name": "Dave Airlie", "email": "airlied@redhat.com", "time": "Wed Mar 21 06:55:58 2012 +0000" }, "message": "drm/radeon/kms: add trinity pci ids\n\nSigned-off-by: Alex Deucher \u003calexander.deucher@amd.com\u003e\nSigned-off-by: Dave Airlie \u003cairlied@redhat.com\u003e\n" }, { "commit": "fc7dbcc371c2b35d41f4db71aed7c55bb2a1175e", "tree": "4b4c10d2ae3863269f808cf81da59820664d170e", "parents": [ "c1b2f69f816fc5442563a68c4365dbded6450af8" ], "author": { "name": "Alex Deucher", "email": "alexander.deucher@amd.com", "time": "Tue Mar 20 17:18:27 2012 -0400" }, "committer": { "name": "Dave Airlie", "email": "airlied@redhat.com", "time": "Wed Mar 21 06:55:55 2012 +0000" }, "message": "drm/radeon/kms: Add SI pci ids\n\nSigned-off-by: Alex Deucher \u003calexander.deucher@amd.com\u003e\nSigned-off-by: Dave Airlie \u003cairlied@redhat.com\u003e\n" }, { "commit": "dfcf5f36529d69eb35f4fdedfa6f244c5249698c", "tree": "da1fc31a5ef8d53c63786121f16f29fe3b12a92a", "parents": [ "d2800ee59ed28a5eaf3a4a8645feca040eacf7df" ], "author": { "name": "Alex Deucher", "email": "alexander.deucher@amd.com", "time": "Tue Mar 20 17:18:14 2012 -0400" }, "committer": { "name": "Dave Airlie", "email": "airlied@redhat.com", "time": "Wed Mar 21 06:55:53 2012 +0000" }, "message": "drm/radeon/kms: add support for the CONST IB to the CS ioctl\n\nThis adds a new chunk id to the CS ioctl to support the\nINDIRECT_BUFFER_CONST packet.\n\nOn SI, the CP adds a new engine called the CE (Constant Engine)\nwhich runs simulatenously with the DE (Drawing Engine, formerly\ncalled the ME). This allows the CP to process two related IBs\nsimultaneously. The CE is tasked with loading the constant data\n(constant buffers, resource descriptors, samplers, etc.) while\nthe DE loads context register state and issues drawing commands.\nIt\u0027s up to the userspace application to sychronize the CE and the\nDE using special synchronization packets.\n\nSigned-off-by: Alex Deucher \u003calexander.deucher@amd.com\u003e\nSigned-off-by: Dave Airlie \u003cairlied@redhat.com\u003e\n" }, { "commit": "609c1e15a44c25f722fb93e18668da30179a172f", "tree": "4fb8f7faf5d5bb5e7df05b4fd04d4028ba702152", "parents": [ "da0df92b57311aa1b26a2a90599ed16e1e968b90" ], "author": { "name": "Tom Stellard", "email": "tstellar@gmail.com", "time": "Tue Mar 20 17:17:55 2012 -0400" }, "committer": { "name": "Dave Airlie", "email": "airlied@redhat.com", "time": "Wed Mar 21 06:55:49 2012 +0000" }, "message": "drm/radeon/kms: add info query for max pipes\n\nThe maximum number of pipes is needed by the user space compute\ndriver to calculate the number of wavefronts per thread group.\n\nSigned-off-by: Tom Stellard \u003cthomas.stellard@amd.com\u003e\nSigned-off-by: Dave Airlie \u003cairlied@redhat.com\u003e\n" }, { "commit": "da0df92b57311aa1b26a2a90599ed16e1e968b90", "tree": "428ccd98d8c7cb3b1436a649109cdaa70b64b16c", "parents": [ "3e148baf464e5b5690ba68f3c310b06024bb862b" ], "author": { "name": "Carsten Emde", "email": "C.Emde@osadl.org", "time": "Sun Mar 18 22:37:33 2012 +0100" }, "committer": { "name": "Dave Airlie", "email": "airlied@redhat.com", "time": "Tue Mar 20 10:09:28 2012 +0000" }, "message": "drm: allow loading an EDID as firmware to override broken monitor\n\nBroken monitors and/or broken graphic boards may send erroneous or no\nEDID data. This also applies to broken KVM devices that are unable to\ncorrectly forward the EDID data of the connected monitor but invent\ntheir own fantasy data.\n\nThis patch allows to specify an EDID data set to be used instead of\nprobing the monitor for it. It contains built-in data sets of frequently\nused screen resolutions. In addition, a particular EDID data set may be\nprovided in the /lib/firmware directory and loaded via the firmware\ninterface. The name is passed to the kernel as module parameter of the\ndrm_kms_helper module either when loaded\n options drm_kms_helper edid_firmware\u003dedid/1280x1024.bin\nor as kernel commandline parameter\n drm_kms_helper.edid_firmware\u003dedid/1280x1024.bin\n\nIt is also possible to restrict the usage of a specified EDID data set\nto a particular connector. This is done by prepending the name of the\nconnector to the name of the EDID data set using the syntax\n edid_firmware\u003d[\u003cconnector\u003e:]\u003cedid\u003e\nsuch as, for example,\n edid_firmware\u003dDVI-I-1:edid/1920x1080.bin\nin which case no other connector will be affected.\n\nThe built-in data sets are\nResolution Name\n--------------------------------\n1024x768 edid/1024x768.bin\n1280x1024 edid/1280x1024.bin\n1680x1050 edid/1680x1050.bin\n1920x1080 edid/1920x1080.bin\n\nThey are ignored, if a file with the same name is available in the\n/lib/firmware directory.\n\nThe built-in EDID data sets are based on standard timings that may not\napply to a particular monitor and even crash it. Ideally, EDID data of\nthe connected monitor should be used. They may be obtained through the\ndrm/cardX/cardX-\u003cconnector\u003e/edid entry in the /sys/devices PCI directory\nof a correctly working graphics adapter.\n\nIt is even possible to specify the name of an EDID data set on-the-fly\nvia the /sys/module interface, e.g.\necho edid/myedid.bin \u003e/sys/module/drm_kms_helper/parameters/edid_firmware\nThe new screen mode is considered when the related kernel function is\ncalled for the first time after the change. Such calls are made when the\nX server is started or when the display settings dialog is opened in an\nalready running X server.\n\nSigned-off-by: Carsten Emde \u003cC.Emde@osadl.org\u003e\nSigned-off-by: Dave Airlie \u003cairlied@redhat.com\u003e\n" }, { "commit": "2b35892e9da672df40ce890bffc4f9f6119c57e0", "tree": "89c7faa07c4ffd583d08f83c0ddf7f8b7da01f76", "parents": [ "1de425b0bdbc457dbd4a012760da4a3f204d0ab3" ], "author": { "name": "Inki Dae", "email": "inki.dae@samsung.com", "time": "Fri Mar 16 18:47:05 2012 +0900" }, "committer": { "name": "Dave Airlie", "email": "airlied@redhat.com", "time": "Tue Mar 20 09:40:21 2012 +0000" }, "message": "drm/exynos: update gem and buffer framework.\n\nwith this patch, we can allocate physically continuous or non-continuous\nmemory and also it creates scatterlist for iommu support so allocated\nmemory region can be mapped to iommu page table using scatterlist.\n\nSigned-off-by: Inki Dae \u003cinki.dae@samsung.com\u003e\nSigned-off-by: Kyungmin Park \u003ckyungmin.park@samsung.com\u003e\nSigned-off-by: Dave Airlie \u003cairlied@redhat.com\u003e\n" }, { "commit": "3ecd70b18cad5a5e04981f2a1d71e183f5d6ebc0", "tree": "1f933966ea366f6039efe9d77967434c906dceba", "parents": [ "22b21ae6b84f7df62e77f05f58bb4360146c5414" ], "author": { "name": "Joonyoung Shim", "email": "jy0922.shim@samsung.com", "time": "Fri Mar 16 18:47:03 2012 +0900" }, "committer": { "name": "Dave Airlie", "email": "airlied@redhat.com", "time": "Tue Mar 20 09:40:20 2012 +0000" }, "message": "drm/exynos: add HDMI version 1.4 support\n\nLater Exynos series from Exynos4X12 support HDMI version 1.4. We will\ndistinguish to use which version via platform data. This patch supports\nonly default features of HDMI version 1.4(The 3D, sound and etc don\u0027t\nsupport yet)\n\nSigned-off-by: Joonyoung Shim \u003cjy0922.shim@samsung.com\u003e\nSigned-off-by: Inki Dae \u003cinki.dae@samsung.com\u003e\nSigned-off-by: Kyungmin Park \u003ckyungmin.park@samsung.com\u003e\nSigned-off-by: Dave Airlie \u003cairlied@redhat.com\u003e\n" }, { "commit": "2c07a21d6fb0be47fda696a618b726ea258ed1dd", "tree": "8ab0b7541ee4f9f75397d3da190426041dc08c6e", "parents": [ "cbc7e22151d99ed1dd7649d268ad3d81b9e6255a" ], "author": { "name": "Dave Airlie", "email": "airlied@redhat.com", "time": "Mon Feb 20 14:18:07 2012 +0000" }, "committer": { "name": "Dave Airlie", "email": "airlied@redhat.com", "time": "Thu Mar 15 13:35:33 2012 +0000" }, "message": "drm: add core support for unplugging a device (v2)\n\nTwo parts to this, one is simple unplug from sysfs for the device node.\n\nThe second adds an unplugged state, if we have device opens, we\njust set the unplugged state and return, if we have no device\nopens we drop the drm device.\n\nIf after a lastclose we discover we are unplugged we then\ndrop the drm device.\n\nv2: use an atomic for unplugged and wrap it for users,\nadd checks on open + mmap + ioctl entry points.\n\nSigned-off-by: Dave Airlie \u003cairlied@redhat.com\u003e\n" }, { "commit": "cbc7e22151d99ed1dd7649d268ad3d81b9e6255a", "tree": "18ea223883722b1e7b6691f452df640d0775e4d2", "parents": [ "1828fe6c5f593b835197edd30a28d80635238ab3" ], "author": { "name": "Dave Airlie", "email": "airlied@redhat.com", "time": "Mon Feb 20 14:16:40 2012 +0000" }, "committer": { "name": "Dave Airlie", "email": "airlied@redhat.com", "time": "Thu Mar 15 13:35:32 2012 +0000" }, "message": "drm/modeset: add helper to unplug all connectors from sysfs\n\nIn order to get correct ordering at hot-unplug for userspace,\nwe need to tear down all the sysfs bits at the correct time.\n\nThis adds a helper to allow drivers to remove the sysfs nodes\nfor all connectors.\n\nSigned-off-by: Dave Airlie \u003cairlied@redhat.com\u003e\n" }, { "commit": "8229c885fe361e521ac64de36b16011e54a30de0", "tree": "572e5d34b16713ddef9e803308c6f72014aff01b", "parents": [ "c3c50e8b651887bcefcc13beb3739c00b2379b5c", "fde7d9049e55ab85a390be7f415d74c9f62dd0f9" ], "author": { "name": "Dave Airlie", "email": "airlied@redhat.com", "time": "Thu Mar 15 10:24:32 2012 +0000" }, "committer": { "name": "Dave Airlie", "email": "airlied@redhat.com", "time": "Thu Mar 15 10:24:32 2012 +0000" }, "message": "drm: Merge tag \u0027v3.3-rc7\u0027 into drm-core-next\n\nMerge the fixes so far into core-next, needed to test\nintel driver.\n\nConflicts:\n\tdrivers/gpu/drm/i915/intel_ringbuffer.c\n" }, { "commit": "c3c50e8b651887bcefcc13beb3739c00b2379b5c", "tree": "087ae3ec7c437125bee9a40d50a2de79685348ed", "parents": [ "d63f5e6bf6f2a1573ea39c9937cdf5ab0b3a4b77" ], "author": { "name": "Ville Syrjälä", "email": "ville.syrjala@linux.intel.com", "time": "Tue Mar 13 12:35:51 2012 +0200" }, "committer": { "name": "Dave Airlie", "email": "airlied@redhat.com", "time": "Thu Mar 15 09:52:51 2012 +0000" }, "message": "drm: Add drm_mode_copy()\n\nAdd a helper function to copy a display mode. Use it in\ndrm_mode_duplicate() and nouveau mode_fixup hooks.\n\nSigned-off-by: Ville Syrjälä \u003cville.syrjala@linux.intel.com\u003e\nSigned-off-by: Dave Airlie \u003cairlied@redhat.com\u003e\n" }, { "commit": "d63f5e6bf6f2a1573ea39c9937cdf5ab0b3a4b77", "tree": "d396df2e0574c0e4b0d0672f612679ea2d7db091", "parents": [ "6bfc56aa89f963becbafbaeb105b6a84e0eb0db7" ], "author": { "name": "Ville Syrjälä", "email": "ville.syrjala@linux.intel.com", "time": "Tue Mar 13 12:35:49 2012 +0200" }, "committer": { "name": "Dave Airlie", "email": "airlied@redhat.com", "time": "Thu Mar 15 09:52:37 2012 +0000" }, "message": "drm: Use a flexible array member for blob property data\n\nThe blob property data is always allocated immediately after the object\nheader. No need for the extra indirection when accessing it, just use\na flexible array member.\n\nSigned-off-by: Ville Syrjälä \u003cville.syrjala@linux.intel.com\u003e\nReviewed-by: Alex Deucher \u003calexander.deucher@amd.com\u003e\nSigned-off-by: Dave Airlie \u003cairlied@redhat.com\u003e\n" }, { "commit": "6bfc56aa89f963becbafbaeb105b6a84e0eb0db7", "tree": "46798969a078d0e14e34ebaa13d2b24d0a53e58d", "parents": [ "93bbf6dbdadbb47ef5a19aecf45669c01ee8830d" ], "author": { "name": "Ville Syrjälä", "email": "ville.syrjala@linux.intel.com", "time": "Tue Mar 13 12:35:48 2012 +0200" }, "committer": { "name": "Dave Airlie", "email": "airlied@redhat.com", "time": "Thu Mar 15 09:52:30 2012 +0000" }, "message": "drm: Handle drm_object_get() failures\n\nCheck drm_mode_object_get() return value everywhere.\n\nSigned-off-by: Ville Syrjälä \u003cville.syrjala@linux.intel.com\u003e\nReviewed-by: Alex Deucher \u003calexander.deucher@amd.com\u003e\nSigned-off-by: Dave Airlie \u003cairlied@redhat.com\u003e\n" }, { "commit": "ac235dafb60d3ba4fa4e7341503b16d6e0645ee7", "tree": "a544dc5b4c4677b9627d82f87845d93be4fcb0c2", "parents": [ "5f61bb421f01023986902200b6486978c07176f7" ], "author": { "name": "Ville Syrjälä", "email": "ville.syrjala@linux.intel.com", "time": "Tue Mar 13 12:35:46 2012 +0200" }, "committer": { "name": "Dave Airlie", "email": "airlied@redhat.com", "time": "Thu Mar 15 09:51:42 2012 +0000" }, "message": "drm: Fix drm_mode_attachmode_crtc()\n\nChange drm_mode_attachmode_crtc() to take an \"all or nothing\" approach.\nIf an error is returned, there are no side effects visible.\n\nAlso change the function to always duplicate the mode passed in.\n\nAlso change the function to not give up when it finds the first\nconnector without and encoder.\n\nA simpler approach would be to just remove the function completely as\nit\u0027s unused currently.\n\nSigned-off-by: Ville Syrjälä \u003cville.syrjala@linux.intel.com\u003e\nReviewed-by: Alex Deucher \u003calexander.deucher@amd.com\u003e\nSigned-off-by: Dave Airlie \u003cairlied@redhat.com\u003e\n" }, { "commit": "2fcfc75b112e897609faed30bcf80565fb005087", "tree": "00415fef7256c8cee6f58ef190f4edf2e339721f", "parents": [ "6653cc8d3b8d1c685fbf01cc8a536957045f4609" ], "author": { "name": "Ville Syrjälä", "email": "ville.syrjala@linux.intel.com", "time": "Tue Mar 13 12:35:39 2012 +0200" }, "committer": { "name": "Dave Airlie", "email": "airlied@redhat.com", "time": "Thu Mar 15 09:49:09 2012 +0000" }, "message": "drm: Change drm_display_mode::type to unsigned\n\nThe drm_display_mode type is a bitmask so it should be unsigned.\n\nSigned-off-by: Ville Syrjälä \u003cville.syrjala@linux.intel.com\u003e\nReviewed-by: Alex Deucher \u003calexander.deucher@amd.com\u003e\nSigned-off-by: Dave Airlie \u003cairlied@redhat.com\u003e\n" }, { "commit": "699f0b45cef8259790ca7a8811d4e6bccc4b54a9", "tree": "50ad899e896efe780a39438162e867648fb2c2c9", "parents": [ "670c044454a33ab679628518d5284fac6246b259" ], "author": { "name": "Kirill A. Shutemov", "email": "kirill.shutemov@linux.intel.com", "time": "Thu Mar 08 16:04:47 2012 +0000" }, "committer": { "name": "Dave Airlie", "email": "airlied@redhat.com", "time": "Sat Mar 10 13:06:04 2012 +0000" }, "message": "gma500: fix ioctl confict\n\nMove DRM_GMA_GET_PIPE_FROM_CRTC_ID to 0x08 to avoid confict with\nDRM_GMA_GEM_MMAP.\n\nSigned-off-by: Kirill A. Shutemov \u003ckirill.shutemov@linux.intel.com\u003e\nSigned-off-by: Alan Cox \u003calan@linux.intel.com\u003e\nSigned-off-by: Dave Airlie \u003cairlied@redhat.com\u003e\n" }, { "commit": "187f1882b5b0748b3c4c22274663fdb372ac0452", "tree": "36283f258cf65f03599a045d48bb05d0ec27f3f9", "parents": [ "50af5ead3b44ccf8bd2b4d2a50c1b610f557c480" ], "author": { "name": "Paul Gortmaker", "email": "paul.gortmaker@windriver.com", "time": "Wed Nov 23 20:12:59 2011 -0500" }, "committer": { "name": "Paul Gortmaker", "email": "paul.gortmaker@windriver.com", "time": "Sun Mar 04 17:54:34 2012 -0500" }, "message": "BUG: headers with BUG/BUG_ON etc. need linux/bug.h\n\nIf a header file is making use of BUG, BUG_ON, BUILD_BUG_ON, or any\nother BUG variant in a static inline (i.e. not in a #define) then\nthat header really should be including \u003clinux/bug.h\u003e and not just\nexpecting it to be implicitly present.\n\nWe can make this change risk-free, since if the files using these\nheaders didn\u0027t have exposure to linux/bug.h already, they would have\nbeen causing compile failures/warnings.\n\nSigned-off-by: Paul Gortmaker \u003cpaul.gortmaker@windriver.com\u003e\n" }, { "commit": "884a53ef43eb69dfd48408659b9606e581aee7ba", "tree": "7a881927509ba03381afa26e96496354d739438e", "parents": [ "54e88e065ef5e89de797de0c98e50f2ed1c174db" ], "author": { "name": "Sascha Hauer", "email": "s.hauer@pengutronix.de", "time": "Wed Feb 29 09:06:21 2012 +0100" }, "committer": { "name": "Dave Airlie", "email": "airlied@redhat.com", "time": "Wed Feb 29 10:18:29 2012 +0000" }, "message": "drm: remove unused code\n\nremove declared but unused functions from drmP.h, fix the comments\nwhere necessary. Also, remove drm_mem_info which is unused.\n\nSigned-off-by: Sascha Hauer \u003cs.hauer@pengutronix.de\u003e\nSigned-off-by: Dave Airlie \u003cairlied@redhat.com\u003e\n" }, { "commit": "ff5f4b0585620e5c158ecaad84d91c5bf3c5d0a1", "tree": "18867fdd805f1beefd3592bca76f4794bdc094b8", "parents": [ "de67cba65944f26c0f147035bd62e30c5f456b96", "019d96cb55ade38a4b4a52bba0304e8cd681f30a" ], "author": { "name": "Daniel Vetter", "email": "daniel.vetter@ffwll.ch", "time": "Thu Feb 23 14:54:20 2012 +0100" }, "committer": { "name": "Daniel Vetter", "email": "daniel.vetter@ffwll.ch", "time": "Thu Feb 23 14:56:11 2012 +0100" }, "message": "Merge remote-tracking branch \u0027airlied/drm-next\u0027 into for-airlied\n\nManually resolve the conflict between the new enum drm property\nhelpers in drm-next and the new \"force-dvi\" option that the \"audio\" output\nproperty gained in drm-intel-next.\n\nWhile resolving this conflict, switch the new drm_prop_enum_list to\nuse the newly introduced enum defines instead of magic values.\n\nConflicts:\n\tdrivers/gpu/drm/i915/intel_modes.c\n\nSigned-Off-by: Daniel Vetter \u003cdaniel.vetter@ffwll.ch\u003e\n" }, { "commit": "019d96cb55ade38a4b4a52bba0304e8cd681f30a", "tree": "f3d43aff33a8a897d4992f045257108a5a243bf4", "parents": [ "466e69b8b03b8c1987367912782bc12988ad8794" ], "author": { "name": "Dave Airlie", "email": "airlied@redhat.com", "time": "Thu Sep 29 16:20:42 2011 +0100" }, "committer": { "name": "Dave Airlie", "email": "airlied@redhat.com", "time": "Thu Feb 16 18:35:11 2012 +0000" }, "message": "drm: add some caps for userspace to discover more info for dumb KMS driver (v2)\n\nFor the simple KMS driver case we need some more info about what the preferred\ndepth and if a shadow framebuffer is preferred.\n\nI\u0027ve only added this for intel/radeon which support the dumb ioctls so far.\n\nIf you need something really fancy you should be writing a real X.org driver.\n\nv2: drop cursor information, just return an error from the cursor ioctls\nand we can make userspace fallback to sw cursor in that case, cursor\ninfo was getting too messy, best to start smaller.\n\nSigned-off-by: Dave Airlie \u003cairlied@redhat.com\u003e\n" }, { "commit": "265da78afd52b9a01d76d99556e828a6c30f1ac9", "tree": "347bc680d48c7e877e8d51dda5825e75365c7390", "parents": [ "607c50d429371797f198ffc34afb239eadd1c655" ], "author": { "name": "Kamil Debski", "email": "k.debski@samsung.com", "time": "Wed Feb 15 10:23:33 2012 +0900" }, "committer": { "name": "Inki Dae", "email": "inki.dae@samsung.com", "time": "Wed Feb 15 10:29:12 2012 +0900" }, "message": "drm/exynos: exynos_drm.h header file fixes\n\nFirst of all #ifdef __KERNEL__ was added to exynos_drm.h to\nmark the part that should be left out of userspace.\nSecondly exynos_drm.h was added to include/drm/Kbuild, so it\nwill be included when doing make headers_install.\n\nSigned-off-by: Kamil Debski \u003ck.debski@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": "607c50d429371797f198ffc34afb239eadd1c655", "tree": "15181419de7494dcd94f3173e18ca29cee58e33f", "parents": [ "1f72dde1455b6c0082d3d57223b7545ea6916eb3" ], "author": { "name": "Eun-Chul Kim", "email": "chulspro.kim@samsung.com", "time": "Tue Feb 14 15:59:46 2012 +0900" }, "committer": { "name": "Inki Dae", "email": "inki.dae@samsung.com", "time": "Wed Feb 15 10:29:12 2012 +0900" }, "message": "drm/exynos: added panel physical size.\n\nSigned-off-by: Eun-Chul Kim \u003cchulspro.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": "285484e2d55e76031b45926720c10b1aec8b782a", "tree": "ca2ddf80717feeafa5219485d3bfe32ab837666c", "parents": [ "dd220a00e8bd5ad7f98ecdc3eed699a7cfabdc27" ], "author": { "name": "Jerome Glisse", "email": "jglisse@redhat.com", "time": "Fri Dec 16 17:03:42 2011 -0500" }, "committer": { "name": "Dave Airlie", "email": "airlied@redhat.com", "time": "Mon Feb 13 12:28:13 2012 +0000" }, "message": "drm/radeon: add support for evergreen/ni tiling informations v11\n\nevergreen and northern island gpu needs more informations for 2D tiling\nthan previous r6xx/r7xx. Add field to tiling ioctl to allow userspace\nto provide those.\n\nThe v8 cs checking change to track color view on r6xx/r7xx doesn\u0027t\naffect old userspace as old userspace always emited 0 for this register.\n\nv2 fix r6xx/r7xx 2D tiling computation\nv3 fix r6xx/r7xx height align for untiled surface \u0026 add support for\n tile split on evergreen and newer\nv4 improve tiling debugging output\nv5 fix tile split code for evergreen and newer\nv6 set proper tile split for crtc register\nv7 fix tile split limit value\nv8 add COLOR_VIEW checking to r6xx/r7xx checker, add evergreen cs\n checking, update safe reg for r600, evergreen and cayman.\n Evergreen checking need some work around for stencil alignment\n issues\nv9 fix tile split value range, fix compressed texture handling and\n mipmap calculation, allow evergreen check to be silencious in\n front of current broken userspace (depth/stencil alignment issue)\nv10 fix eg 3d texture and compressed texture, fix r600 depth array,\n fix r600 color view computation, add support for evergreen stencil\n split\nv11 more verbose debugging in some case\n\nSigned-off-by: Jerome Glisse \u003cjglisse@redhat.com\u003e\nSigned-off-by: Dave Airlie \u003cairlied@redhat.com\u003e\n" }, { "commit": "9edd576d89a5b6d3e136d7dcab654d887c0d25b7", "tree": "d19670de2256f8187321de3a41fa4a10d3c8e402", "parents": [ "e21af88d39796c907c38648c824be3d646ffbe35", "28a4d5675857f6386930a324317281cb8ed1e5d0" ], "author": { "name": "Daniel Vetter", "email": "daniel.vetter@ffwll.ch", "time": "Fri Feb 10 16:52:55 2012 +0100" }, "committer": { "name": "Daniel Vetter", "email": "daniel.vetter@ffwll.ch", "time": "Fri Feb 10 17:14:49 2012 +0100" }, "message": "Merge remote-tracking branch \u0027airlied/drm-fixes\u0027 into drm-intel-next-queued\n\nBack-merge from drm-fixes into drm-intel-next to sort out two things:\n\n- interlaced support: -fixes contains a bugfix to correctly clear\n interlaced configuration bits in case the bios sets up an interlaced\n mode and we want to set up the progressive mode (current kernels\n don\u0027t support interlaced). The actual feature work to support\n interlaced depends upon (and conflicts with) this bugfix.\n\n- forcewake voodoo to workaround missed IRQ issues: -fixes only enabled\n this for ivybridge, but some recent bug reports indicate that we\n need this on Sandybridge, too. But in a slightly different flavour\n and with other fixes and reworks on top. Additionally there are some\n forcewake cleanup patches heading to -next that would conflict with\n currrent -fixes.\n\nSigned-Off-by: Daniel Vetter \u003cdaniel.vetter@ffwll.ch\u003e\n" }, { "commit": "428ccb21b740f603a6a1f08cbe6d935fb3177620", "tree": "397bab4ab8906e62430be6b3c02c75e9ff6bec90", "parents": [ "50a4c4a94d24fe13167e3ab1dc1486623369c31a" ], "author": { "name": "Daniel Vetter", "email": "daniel.vetter@ffwll.ch", "time": "Thu Feb 09 17:15:45 2012 +0100" }, "committer": { "name": "Daniel Vetter", "email": "daniel.vetter@ffwll.ch", "time": "Thu Feb 09 21:24:18 2012 +0100" }, "message": "agp/intel-gtt: export the gtt pagetable iomapping\n\nWe need this because ppgtt page directory entries need to be in the\nglobal gtt pagetable.\n\nReviewed-by: Ben Widawsky \u003cben@bwidawsk.net\u003e\nTested-by: Chris Wilson \u003cchris@chris-wilson.co.uk\u003e\nTested-by: Eugeni Dodonov \u003ceugeni.dodonov@intel.com\u003e\nReviewed-by: Eugeni Dodonov \u003ceugeni.dodonov@intel.com\u003e\nSigned-Off-by: Daniel Vetter \u003cdaniel.vetter@ffwll.ch\u003e\n" }, { "commit": "50a4c4a94d24fe13167e3ab1dc1486623369c31a", "tree": "6499c1453002d9b61dd5ab9d9d33ab2cb648111f", "parents": [ "7e3b8737e719c4de7dd79b096b80ece444b2f0ba" ], "author": { "name": "Daniel Vetter", "email": "daniel.vetter@ffwll.ch", "time": "Thu Feb 09 17:15:44 2012 +0100" }, "committer": { "name": "Daniel Vetter", "email": "daniel.vetter@ffwll.ch", "time": "Thu Feb 09 21:23:18 2012 +0100" }, "message": "agp/intel-gtt: export the scratch page dma address\n\nTo implement a PPGTT for drm/i915 that fully aliases the GTT, we also\nneed to properly alias the scratch page.\n\nReviewed-by: Ben Widawsky \u003cben@bwidawsk.net\u003e\nTested-by: Chris Wilson \u003cchris@chris-wilson.co.uk\u003e\nTested-by: Eugeni Dodonov \u003ceugeni.dodonov@intel.com\u003e\nReviewed-by: Eugeni Dodonov \u003ceugeni.dodonov@intel.com\u003e\nSigned-Off-by: Daniel Vetter \u003cdaniel.vetter@ffwll.ch\u003e\n" }, { "commit": "d9bc3c02e36d844c2d980e65ddda5c7699e073f8", "tree": "95de33796245ca8c4e7629ddf22629bcc89f1403", "parents": [ "4a67d39190315558631d944b1cea4466ed4c86d8" ], "author": { "name": "Sascha Hauer", "email": "s.hauer@pengutronix.de", "time": "Mon Feb 06 10:58:18 2012 +0100" }, "committer": { "name": "Dave Airlie", "email": "airlied@redhat.com", "time": "Thu Feb 09 10:15:25 2012 +0000" }, "message": "drm: add convenience function to create an range property\n\nCreating a range property is a common pattern, so create\na convenience function for this and use it where appropriate.\n\nSigned-off-by: Sascha Hauer \u003cs.hauer@pengutronix.de\u003e\nSigned-off-by: Dave Airlie \u003cairlied@redhat.com\u003e\n" }, { "commit": "4a67d39190315558631d944b1cea4466ed4c86d8", "tree": "1d90ec7e35c2f6048bf38ba3dfcb838d9df52a16", "parents": [ "198ceac091049003ffcc4b7cda76785510fc3b59" ], "author": { "name": "Sascha Hauer", "email": "s.hauer@pengutronix.de", "time": "Mon Feb 06 10:58:17 2012 +0100" }, "committer": { "name": "Dave Airlie", "email": "airlied@redhat.com", "time": "Thu Feb 09 10:15:18 2012 +0000" }, "message": "drm: add convenience function to create an enum property\n\nCreating an enum property is a common pattern, so create\na convenience function for this and use it where appropriate.\n\nSigned-off-by: Sascha Hauer \u003cs.hauer@pengutronix.de\u003e\nSigned-off-by: Dave Airlie \u003cairlied@redhat.com\u003e\n" }, { "commit": "198ceac091049003ffcc4b7cda76785510fc3b59", "tree": "c38ebdd90a52bae47a1811ab879f2108ad728670", "parents": [ "83b316fdafcc37e3e65b4a650afb7aab5cc2d271", "3d29b842e58fbca2c13a9f458fddbaa535c6e578" ], "author": { "name": "Dave Airlie", "email": "airlied@redhat.com", "time": "Tue Feb 07 15:29:04 2012 +0000" }, "committer": { "name": "Dave Airlie", "email": "airlied@redhat.com", "time": "Tue Feb 07 15:29:04 2012 +0000" }, "message": "Merge branch \u0027for-airlied\u0027 of git://people.freedesktop.org/~danvet/drm-intel into drm-core-next\n\n* \u0027for-airlied\u0027 of git://people.freedesktop.org/~danvet/drm-intel:\n drm/i915: add a LLC feature flag in device description\n drm/i915: kill i915_mem.c\n drm/i915: Use kcalloc instead of kzalloc to allocate array\n drm/i915/dp: Check for AUXCH error before checking for success\n drm/i915/dp: Use auxch precharge value of 5 everywhere\n drm/i915/dp: Tweak auxch clock divider for PCH\n drm/i915: Remove a comment about PCH from the non-PCH path\n drm/i915: Fix assert_pch_hdmi_disabled to mention HDMI (not DP)\n drm/i915: Implement plane-disabled assertion for PCH too\n drivers: i915: Fix BLC PWM register setup\n drm/i915: Check that plane/pipe is disabled before removing the fb\n drm/i915: fix typo in function name\n drm/i915: split out pll divider code\n drm/i915: split 9xx refclk \u0026 sdvo tv code out\n agp/intel: Add pci id for hostbridge from has/qemu\n drm/i915: there is no pipe CxSR on ironlake\n drm/i915: Only look for matching clocks for LVDS downclock\n drm/i915: Silence _DSM errors\n" }, { "commit": "90af660bec3b2d47e17cb3caae742810656e2d4f", "tree": "e8f4d93c7386c19dd9b50156696b4447ba7877d6", "parents": [ "c196878589eb5f88e244a557a55b229a3c285b3b" ], "author": { "name": "Thomas Hellstrom", "email": "thellstrom@vmware.com", "time": "Tue Jan 24 18:54:21 2012 +0100" }, "committer": { "name": "Greg Kroah-Hartman", "email": "gregkh@linuxfoundation.org", "time": "Fri Feb 03 09:18:52 2012 -0800" }, "message": "drm: Fix authentication kernel crash\n\ncommit 598781d71119827b454fd75d46f84755bca6f0c6 upstream.\n\nIf the master tries to authenticate a client using drm_authmagic and\nthat client has already closed its drm file descriptor,\neither wilfully or because it was terminated, the\ncall to drm_authmagic will dereference a stale pointer into kmalloc\u0027ed memory\nand corrupt it.\n\nTypically this results in a hard system hang.\n\nThis patch fixes that problem by removing any authentication tokens\n(struct drm_magic_entry) open for a file descriptor when that file\ndescriptor is closed.\n\nSigned-off-by: Thomas Hellstrom \u003cthellstrom@vmware.com\u003e\nReviewed-by: Daniel Vetter \u003cdaniel.vetter@ffwll.ch\u003e\nSigned-off-by: Dave Airlie \u003cairlied@redhat.com\u003e\nSigned-off-by: Greg Kroah-Hartman \u003cgregkh@linuxfoundation.org\u003e\n\n" }, { "commit": "4f988d132d2668b4f3b42bfc70daa531115ccca1", "tree": "2995c057a92f11cc0a605987e7801c1ccfe0dedf", "parents": [ "e9ad318128aa858f713d6f2c4623f7583ca53a71" ], "author": { "name": "Sascha Hauer", "email": "s.hauer@pengutronix.de", "time": "Wed Feb 01 11:38:26 2012 +0100" }, "committer": { "name": "Dave Airlie", "email": "airlied@redhat.com", "time": "Fri Feb 03 09:55:52 2012 +0000" }, "message": "drm fb helper: remove unused variable crtc_id\n\ncrtc_id is set but never used, so remove it from struct\ndrm_fb_helper_crtc.\n\nSigned-off-by: Sascha Hauer \u003cs.hauer@pengutronix.de\u003e\nSigned-off-by: Dave Airlie \u003cairlied@redhat.com\u003e\n" }, { "commit": "e9ad318128aa858f713d6f2c4623f7583ca53a71", "tree": "9cbdfe13ab3832423734a024cb9022adc6bfacc5", "parents": [ "3a8148c514b45672f876c4d7c23ed1f54e7c48e7" ], "author": { "name": "Sascha Hauer", "email": "s.hauer@pengutronix.de", "time": "Wed Feb 01 11:38:25 2012 +0100" }, "committer": { "name": "Dave Airlie", "email": "airlied@redhat.com", "time": "Fri Feb 03 09:55:05 2012 +0000" }, "message": "drm fb helper: remove unused variable conn_limit\n\nconn_limit is set but never used. Remove it from struct\ndrm_fb_helper.\n\nSigned-off-by: Sascha Hauer \u003cs.hauer@pengutronix.de\u003e\nSigned-off-by: Dave Airlie \u003cairlied@redhat.com\u003e\n" }, { "commit": "4cae5b84628d5df76247d494e51b89d07e28e6aa", "tree": "e68bd5e5da920e4f1bae8d15c91332702c06d8d7", "parents": [ "a1b7736dac5f2d5876e68c47a0fce3f423840070" ], "author": { "name": "Sascha Hauer", "email": "s.hauer@pengutronix.de", "time": "Wed Feb 01 11:38:23 2012 +0100" }, "committer": { "name": "Dave Airlie", "email": "airlied@redhat.com", "time": "Fri Feb 03 09:51:47 2012 +0000" }, "message": "drm: add proper return value for drm_mode_crtc_set_gamma_size\n\ndrm_mode_crtc_set_gamma_size returns boolean true for success\nand false for failure. This is not very kernel conform, so\nchange it to return 0 for success and a propert error code\notherwise. Noone checks the return value, so no users have to\nbe fixed.\n\nSigned-off-by: Sascha Hauer \u003cs.hauer@pengutronix.de\u003e\nSigned-off-by: Dave Airlie \u003cairlied@redhat.com\u003e\n" }, { "commit": "598781d71119827b454fd75d46f84755bca6f0c6", "tree": "51ccb65b8e26b3347099af3f466ad0fedc6e1cb6", "parents": [ "15b63d35261ba3351d07e7937252f18bb6cbf814" ], "author": { "name": "Thomas Hellstrom", "email": "thellstrom@vmware.com", "time": "Tue Jan 24 18:54:21 2012 +0100" }, "committer": { "name": "Dave Airlie", "email": "airlied@redhat.com", "time": "Wed Jan 25 09:27:45 2012 +0000" }, "message": "drm: Fix authentication kernel crash\n\nIf the master tries to authenticate a client using drm_authmagic and\nthat client has already closed its drm file descriptor,\neither wilfully or because it was terminated, the\ncall to drm_authmagic will dereference a stale pointer into kmalloc\u0027ed memory\nand corrupt it.\n\nTypically this results in a hard system hang.\n\nThis patch fixes that problem by removing any authentication tokens\n(struct drm_magic_entry) open for a file descriptor when that file\ndescriptor is closed.\n\nSigned-off-by: Thomas Hellstrom \u003cthellstrom@vmware.com\u003e\nReviewed-by: Daniel Vetter \u003cdaniel.vetter@ffwll.ch\u003e\nCc: stable@vger.kernel.org\nSigned-off-by: Dave Airlie \u003cairlied@redhat.com\u003e\n" }, { "commit": "3d29b842e58fbca2c13a9f458fddbaa535c6e578", "tree": "700e9902593f4bb31561ced7890a3acc4d7c618d", "parents": [ "b2c606fe1defd1fb79612b48b528b2568c97def7" ], "author": { "name": "Eugeni Dodonov", "email": "eugeni.dodonov@intel.com", "time": "Tue Jan 17 14:43:53 2012 -0200" }, "committer": { "name": "Daniel Vetter", "email": "daniel.vetter@ffwll.ch", "time": "Tue Jan 17 20:01:45 2012 +0100" }, "message": "drm/i915: add a LLC feature flag in device description\n\nLLC is not SNB/IVB-specific, so we should check for it in a more generic\nway.\n\nReviewed-by: Chris Wilson \u003cchris@chris-wilson.co.uk\u003e\nReviewed-by: Eric Anholt \u003ceric@anholt.net\u003e\nReviewed-by: Kenneth Graunke \u003ckenneth@whitecape.org\u003e\nSigned-off-by: Eugeni Dodonov \u003ceugeni.dodonov@intel.com\u003e\nSigned-off-by: Daniel Vetter \u003cdaniel.vetter@ffwll.ch\u003e\n" }, { "commit": "afe887df1c3806da98d4edfeef7794d11eb0fe16", "tree": "dc5a672dc9e896e301382ac662e93a04ae609759", "parents": [ "27d4d05220f84c2f83fe4c410fda0da479905813" ], "author": { "name": "Ben Skeggs", "email": "bskeggs@redhat.com", "time": "Thu Jan 12 16:00:57 2012 +1000" }, "committer": { "name": "Dave Airlie", "email": "airlied@redhat.com", "time": "Fri Jan 13 09:01:09 2012 +0000" }, "message": "drm: bump DRM_CONNECTOR_MAX_ENCODER from 2 to 3\n\nThere exists at least one NVIDIA GPU (Quadro NVS 300) that has a DMS-59\nconnector which is capable of supporting DisplayPort, TMDS and VGA on\na single connector.\n\nWe need to bump the allowed encoder limit to support all three configs.\n\nSigned-off-by: Ben Skeggs \u003cbskeggs@redhat.com\u003e\nSigned-off-by: Dave Airlie \u003cairlied@redhat.com\u003e\n" }, { "commit": "1a464cbb3d483f2f195b614cffa4aa1b910a0440", "tree": "af57dee6436532dbb546b8670e9e1f6910d489b5", "parents": [ "dbe950f201a8edd353b0bd9079e8d536ee4ce37c", "095f979a539245a46b9e5d600ec9c720b4d928e5" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Jan 10 11:04:36 2012 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Jan 10 11:04:36 2012 -0800" }, "message": "Merge branch \u0027drm-core-next\u0027 of git://people.freedesktop.org/~airlied/linux\n\n* \u0027drm-core-next\u0027 of git://people.freedesktop.org/~airlied/linux: (307 commits)\n drm/nouveau/pm: fix build with HWMON off\n gma500: silence gcc warnings in mid_get_vbt_data()\n drm/ttm: fix condition (and vs or)\n drm/radeon: double lock typo in radeon_vm_bo_rmv()\n drm/radeon: use after free in radeon_vm_bo_add()\n drm/sis|via: don\u0027t return stack garbage from free_mem ioctl\n drm/radeon/kms: remove pointless CS flags priority struct\n drm/radeon/kms: check if vm is supported in VA ioctl\n drm: introduce drm_can_sleep and use in intel/radeon drivers. (v2)\n radeon: Fix disabling PCI bus mastering on big endian hosts.\n ttm: fix agp since ttm tt rework\n agp: Fix multi-line warning message whitespace\n drm/ttm/dma: Fix accounting error when calling ttm_mem_global_free_page and don\u0027t try to free freed pages.\n drm/ttm/dma: Only call set_pages_array_wb when the page is not in WB pool.\n drm/radeon/kms: sync across multiple rings when doing bo moves v3\n drm/radeon/kms: Add support for multi-ring sync in CS ioctl (v2)\n drm/radeon: GPU virtual memory support v22\n drm: make DRM_UNLOCKED ioctls with their own mutex\n drm: no need to hold global mutex for static data\n drm/radeon/benchmark: common modes sweep ignores 640x480@32\n ...\n\nFix up trivial conflicts in radeon/evergreen.c and vmwgfx/vmwgfx_kms.c\n" }, { "commit": "f0afb5d443748ee91a34e3a13cb454b0047be9ec", "tree": "0ae6150b0615fef085edb5ae4e9d4a517f40ef2f", "parents": [ "67e915e49a12ee08c22cb1db746bafd909988f85" ], "author": { "name": "Alex Deucher", "email": "alexander.deucher@amd.com", "time": "Fri Jan 06 09:38:16 2012 -0500" }, "committer": { "name": "Dave Airlie", "email": "airlied@redhat.com", "time": "Mon Jan 09 12:10:13 2012 +0000" }, "message": "drm/radeon/kms: remove pointless CS flags priority struct\n\nSigned-off-by: Alex Deucher \u003calexander.deucher@amd.com\u003e\nCc: Christian König \u003cdeathsimple@vodafone.de\u003e\nSigned-off-by: Dave Airlie \u003cairlied@redhat.com\u003e\n" }, { "commit": "98793265b429a3f0b3f1750e74d67cd4d740d162", "tree": "b0bd717673f0c21845cf053f3fb6b75d42530af5", "parents": [ "b4a133da2eaccb844a7beaef16ffd9c76a0d21d3", "bd1b2a555952d959f47169056fca05acf7eff81f" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sun Jan 08 13:21:22 2012 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sun Jan 08 13:21:22 2012 -0800" }, "message": "Merge branch \u0027for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial\n\n* \u0027for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial: (53 commits)\n Kconfig: acpi: Fix typo in comment.\n misc latin1 to utf8 conversions\n devres: Fix a typo in devm_kfree comment\n btrfs: free-space-cache.c: remove extra semicolon.\n fat: Spelling s/obsolate/obsolete/g\n SCSI, pmcraid: Fix spelling error in a pmcraid_err() call\n tools/power turbostat: update fields in manpage\n mac80211: drop spelling fix\n types.h: fix comment spelling for \u0027architectures\u0027\n typo fixes: aera -\u003e area, exntension -\u003e extension\n devices.txt: Fix typo of \u0027VMware\u0027.\n sis900: Fix enum typo \u0027sis900_rx_bufer_status\u0027\n decompress_bunzip2: remove invalid vi modeline\n treewide: Fix comment and string typo \u0027bufer\u0027\n hyper-v: Update MAINTAINERS\n treewide: Fix typos in various parts of the kernel, and fix some comments.\n clockevents: drop unknown Kconfig symbol GENERIC_CLOCKEVENTS_MIGR\n gpio: Kconfig: drop unknown symbol \u0027CS5535_GPIO\u0027\n leds: Kconfig: Fix typo \u0027D2NET_V2\u0027\n sound: Kconfig: drop unknown symbol ARCH_CLPS7500\n ...\n\nFix up trivial conflicts in arch/powerpc/platforms/40x/Kconfig (some new\nkconfig additions, close to removed commented-out old ones)\n" }, { "commit": "cc1f71942944890c7e05fc55dc4427c94b63d4f1", "tree": "2e9e1b347adb6e4457a02da6e5c2fcbdda851a28", "parents": [ "3df96909b75835d487a9178761622b0cbd7310d4" ], "author": { "name": "Dave Airlie", "email": "airlied@redhat.com", "time": "Thu Jan 05 09:55:22 2012 +0000" }, "committer": { "name": "Dave Airlie", "email": "airlied@redhat.com", "time": "Fri Jan 06 10:01:35 2012 +0000" }, "message": "drm: introduce drm_can_sleep and use in intel/radeon drivers. (v2)\n\nSo we have a few places where the drm drivers would like to sleep to\nbe nice to the system, mainly in the modesetting paths, but we also\nhave two cases were atomic modesetting must take place, panic writing\nand kernel debugger. So provide a central inline to determine if a\nsleep or delay should be used and use this in the intel and radeon drivers.\n\nv2: drop intel_drv.h MSLEEP macro, nobody uses it.\n\nBased on patch from Michel Dänzer \u003cmichel.daenzer@amd.com\u003e\n\nBugzilla: https://bugs.freedesktop.org/show_bug.cgi?id\u003d43941\n\nReviewed-by: Daniel Vetter \u003cdaniel.vetter@ffwll.ch\u003e\nSigned-off-by: Dave Airlie \u003cairlied@redhat.com\u003e\n" }, { "commit": "dea7e0ac45fd28f90bbc38ff226d36a9f788efbf", "tree": "1130a3d51f0f8aa8ab462f1735423e3dc37835b6", "parents": [ "e11d0b87cde80745afe4712a19cd37bca9924a5b" ], "author": { "name": "Jerome Glisse", "email": "jglisse@redhat.com", "time": "Tue Jan 03 17:37:37 2012 -0500" }, "committer": { "name": "Dave Airlie", "email": "airlied@redhat.com", "time": "Fri Jan 06 09:34:03 2012 +0000" }, "message": "ttm: fix agp since ttm tt rework\n\nttm tt rework modified the way we allocate and populate the\nttm_tt structure, the AGP side was missing some bit to properly\nwork. Fix those and fix radeon and nouveau AGP support.\n\nTested on radeon only so far.\n\nSigned-off-by: Jerome Glisse \u003cjglisse@redhat.com\u003e\nReviewed-by: Konrad Rzeszutek Wilk \u003ckonrad.wilk@oracle.com\u003e\nSigned-off-by: Dave Airlie \u003cairlied@redhat.com\u003e\n" }, { "commit": "93504fce28b1a387ec01f81b26637d237dca2b36", "tree": "7544b4fd960cbcbbfc17dea87aadd129eecf7b45", "parents": [ "721604a15b934f0a8d1909acb8017f029128be2f" ], "author": { "name": "Christian König", "email": "deathsimple@vodafone.de", "time": "Thu Jan 05 22:11:06 2012 -0500" }, "committer": { "name": "Dave Airlie", "email": "airlied@redhat.com", "time": "Fri Jan 06 09:16:09 2012 +0000" }, "message": "drm/radeon/kms: Add support for multi-ring sync in CS ioctl (v2)\n\nUse semaphores to sync buffers across rings in the CS\nioctl. Add a reloc flag to allow userspace to skip\nsync for buffers.\n\nagd5f: port to latest CS ioctl changes.\n\nv2: add ring lock/unlock to make sure changes hit the ring.\n\nSigned-off-by: Christian König \u003cdeathsimple@vodafone.de\u003e\nSigned-off-by: Alex Deucher \u003calexander.deucher@amd.com\u003e\nSigned-off-by: Dave Airlie \u003cairlied@redhat.com\u003e\n" }, { "commit": "721604a15b934f0a8d1909acb8017f029128be2f", "tree": "ac1dc0f837d70616b36c9b57d22eb9678c5e68fc", "parents": [ "09b4ea47d1041612b101c369969db123ac2c1511" ], "author": { "name": "Jerome Glisse", "email": "jglisse@redhat.com", "time": "Thu Jan 05 22:11:05 2012 -0500" }, "committer": { "name": "Dave Airlie", "email": "airlied@redhat.com", "time": "Fri Jan 06 09:15:42 2012 +0000" }, "message": "drm/radeon: GPU virtual memory support v22\n\nVirtual address space are per drm client (opener of /dev/drm).\nClient are in charge of virtual address space, they need to\nmap bo into it by calling DRM_RADEON_GEM_VA ioctl.\n\nFirst 16M of virtual address space is reserved by the kernel.\n\nOnce using 2 level page table we should be able to have a small\nvram memory footprint for each pt (there would be one pt for all\ngart, one for all vram and then one first level for each virtual\naddress space).\n\nPlan include using the sub allocator for a common vm page table\narea and using memcpy to copy vm page table in \u0026 out. Or use\na gart object and copy things in \u0026 out using dma.\n\nv2: agd5f fixes:\n- Add vram base offset for vram pages. The GPU physical address of a\nvram page is FB_OFFSET + page offset. FB_OFFSET is 0 on discrete\ncards and the physical bus address of the stolen memory on\nintegrated chips.\n- VM_CONTEXT1_PROTECTION_FAULT_DEFAULT_ADDR covers all vmid\u0027s \u003e\u003d 1\n\nv3: agd5f:\n- integrate with the semaphore/multi-ring stuff\n\nv4:\n- rebase on top ttm dma \u0026 multi-ring stuff\n- userspace is now in charge of the address space\n- no more specific cs vm ioctl, instead cs ioctl has a new\n chunk\n\nv5:\n- properly handle mem \u003d\u003d NULL case from move_notify callback\n- fix the vm cleanup path\n\nv6:\n- fix update of page table to only happen on valid mem placement\n\nv7:\n- add tlb flush for each vm context\n- add flags to define mapping property (readable, writeable, snooped)\n- make ring id implicit from ib-\u003efence-\u003ering, up to each asic callback\n to then do ring specific scheduling if vm ib scheduling function\n\nv8:\n- add query for ib limit and kernel reserved virtual space\n- rename vm-\u003esize to max_pfn (maximum number of page)\n- update gem_va ioctl to also allow unmap operation\n- bump kernel version to allow userspace to query for vm support\n\nv9:\n- rebuild page table only when bind and incrementaly depending\n on bo referenced by cs and that have been moved\n- allow virtual address space to grow\n- use sa allocator for vram page table\n- return invalid when querying vm limit on non cayman GPU\n- dump vm fault register on lockup\n\nv10: agd5f:\n- Move the vm schedule_ib callback to a standalone function, remove\n the callback and use the existing ib_execute callback for VM IBs.\n\nv11:\n- rebase on top of lastest Linus\n\nv12: agd5f:\n- remove spurious backslash\n- set IB vm_id to 0 in radeon_ib_get()\n\nv13: agd5f:\n- fix handling of RADEON_CHUNK_ID_FLAGS\n\nv14:\n- fix va destruction\n- fix suspend resume\n- forbid bo to have several different va in same vm\n\nv15:\n- rebase\n\nv16:\n- cleanup left over of vm init/fini\n\nv17: agd5f:\n- cs checker\n\nv18: agd5f:\n- reworks the CS ioctl to better support multiple rings and\nVM. Rather than adding a new chunk id for VM, just re-use the\nIB chunk id and add a new flags for VM mode. Also define additional\ndwords for the flags chunk id to define the what ring we want to use\n(gfx, compute, uvd, etc.) and the priority.\n\nv19:\n- fix cs fini in weird case of no ib\n- semi working flush fix for ni\n- rebase on top of sa allocator changes\n\nv20: agd5f:\n- further CS ioctl cleanups from Christian\u0027s comments\n\nv21: agd5f:\n- integrate CS checker improvements\n\nv22: agd5f:\n- final cleanups for release, only allow VM CS on cayman\n\nSigned-off-by: Jerome Glisse \u003cjglisse@redhat.com\u003e\nSigned-off-by: Alex Deucher \u003calexander.deucher@amd.com\u003e\nSigned-off-by: Dave Airlie \u003cairlied@redhat.com\u003e\n" }, { "commit": "0a7eb243db7864640134f8c57e6856f8eb3ed7c6", "tree": "93580b87b27d341801f9724d0daba75e933d9412", "parents": [ "a9971157b6c550644fe19551c21f4b05f7e9475a" ], "author": { "name": "Rob Clark", "email": "rob@ti.com", "time": "Tue Dec 13 20:19:36 2011 -0600" }, "committer": { "name": "Dave Airlie", "email": "airlied@redhat.com", "time": "Thu Jan 05 10:00:16 2012 +0000" }, "message": "drm: add support for private planes\n\nIn cases where the scanout hw is sufficiently similar between \"overlay\"\nand traditional crtc layers, it might be convenient to allow the driver\nto create internal drm_plane helper objects used by the drm_crtc\nimplementation, rather than duplicate code between the plane and crtc.\nA private plane is not exposed to userspace.\n\nSigned-off-by: Rob Clark \u003crob@ti.com\u003e\nSigned-off-by: Dave Airlie \u003cairlied@redhat.com\u003e\n" }, { "commit": "ae662d31264979e52581bd2573bf0b82812f52ab", "tree": "678d7f4483b6fe9a78e1ece0cb8bdefe1582dcf0", "parents": [ "e959b5db4aacc27bcf92889e658445326ebc4bfb" ], "author": { "name": "Eric Anholt", "email": "eric@anholt.net", "time": "Tue Jan 03 09:23:29 2012 -0800" }, "committer": { "name": "Keith Packard", "email": "keithp@keithp.com", "time": "Tue Jan 03 09:31:18 2012 -0800" }, "message": "drm/i915: Add support for resetting the SO write pointers on gen7.\n\nThese registers are automatically incremented by the hardware during\ntransform feedback to track where the next streamed vertex output\nshould go. Unlike the previous generation, which had a packet for\nsetting the corresponding registers to a defined value, gen7 only has\nMI_LOAD_REGISTER_IMM to do so. That\u0027s a secure packet (since it loads\nan arbitrary register), so we need to do it from the kernel, and it\nneeds to be settable atomically with the batchbuffer execution so that\ntwo clients doing transform feedback don\u0027t stomp on each others\u0027\nstate.\n\nInstead of building a more complicated interface involcing setting the\nregisters to a specific value, just set them to 0 when asked and\nuserland can tweak its pointers accordingly.\n\nSigned-off-by: Eric Anholt \u003ceric@anholt.net\u003e\nReviewed-by: Eugeni Dodonov \u003ceugeni.dodonov@intel.com\u003e\nReviewed-by: Kenneth Graunke \u003ckenneth@whitecape.org\u003e\nSigned-off-by: Keith Packard \u003ckeithp@keithp.com\u003e\n" }, { "commit": "8ea30864229e54b01ac0e9fe88c4b733a940ec4e", "tree": "45d7912ad57216d9e18bef23698d0d099b51cbf2", "parents": [ "175bd4204e069f8bd855ca3dcf70a78db4410936" ], "author": { "name": "Jesse Barnes", "email": "jbarnes@virtuousgeek.org", "time": "Tue Jan 03 08:05:39 2012 -0800" }, "committer": { "name": "Keith Packard", "email": "keithp@keithp.com", "time": "Tue Jan 03 09:31:12 2012 -0800" }, "message": "drm/i915: add color key support v4\n\nAdd new ioctls for getting and setting the current destination color\nkey. This allows for simple overlay display control by matching a color\nkey value in the primary plane before blending the overlay on top.\n\nv2: remove unnecessary mutex acquire/release around reg accesses\nv3: add support for full color key management\nv4: fix copy \u0026 paste bug in snb_get_colorkey\n don\u0027t bother checking min/max values against docs as the docs are likely\n wrong (how could we handle 10bpc surface formats?)\n\nReviewed-by: Daniel Vetter \u003cdaniel.vetter@ffwll.ch\u003e\nSigned-off-by: Jesse Barnes \u003cjbarnes@virtuousgeek.org\u003e\n" }, { "commit": "d84083268bd707ebb8ed2f4fc26ebc7a0c453a83", "tree": "864dbd5eb72fb7ac1865a7aa72dce3dd5f7a4c73", "parents": [ "c32b06ef7dd63a5e0b14a02c96ef308796c157cc" ], "author": { "name": "Seung-Woo Kim", "email": "sw0312.kim@samsung.com", "time": "Wed Dec 21 17:39:39 2011 +0900" }, "committer": { "name": "Inki Dae", "email": "inki.dae@samsung.com", "time": "Thu Dec 29 11:21:42 2011 +0900" }, "message": "drm/exynos: added hdmi display support\n\nThis patch is hdmi display support for exynos drm driver.\n\nThere is already v4l2 based exynos hdmi driver in drivers/media/video/s5p-tv\nand some low level code is already in s5p-tv and even headers for register\ndefine are almost same. but in this patch, we decide not to consider separated\ncommon code with s5p-tv.\n\nExynos HDMI is composed of 5 blocks, mixer, vp, hdmi, hdmiphy and ddc.\n\n1. mixer. The piece of hardware responsible for mixing and blending multiple\ndata inputs before passing it to an output device. The mixer is capable of\nhandling up to three image layers. One is the output of VP. Other two are\nimages in RGB format. The blending factor, and layers\u0027 priority are controlled\nby mixer\u0027s registers. The output is passed to HDMI.\n\n2. vp (video processor). It is used for processing of NV12/NV21 data. An image\nstored in RAM is accessed by DMA. The output in YCbCr444 format is send to\nmixer.\n\n3. hdmi. The piece of HW responsible for generation of HDMI packets. It takes\npixel data from mixer and transforms it into data frames. The output is send\nto HDMIPHY interface.\n\n4. hdmiphy. Physical interface for HDMI. Its duties are sending HDMI packets to\nHDMI connector. Basically, it contains a PLL that produces source clock for\nmixer, vp and hdmi.\n\n5. ddc (display data channel). It is dedicated i2c channel to exchange display\ninformation as edid with display monitor.\n\nWith plane support, exynos hdmi driver fully supports two mixer layes and vp\nlayer. Also vp layer supports multi buffer plane pixel formats having non\ncontigus memory spaces.\n\nIn exynos drm driver, common drm_hdmi driver to interface with drm framework\nhas opertion pointers for mixer and hdmi. this drm_hdmi driver is registered as\nsub driver of exynos_drm. hdmi has hdmiphy and ddc i2c clients and controls\nthem. mixer controls all overlay layers in both mixer and vp.\n\nVblank interrupts for hdmi are handled by mixer internally because drm\nframework cannot support multiple irq id. And pipe number is used to check\nwhich display device irq happens.\n\nHistory\nv2: this version\n - drm plane feature support to handle overlay layers.\n - multi buffer plane pixel format support for vp layer.\n - vp layer support\n\nRFCv1: original\n - at https://lkml.org/lkml/2011/11/4/164\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: Joonyoung Shim \u003cjy0922.shim@samsung.com\u003e\nSigned-off-by: Kyungmin Park \u003ckyungmin.park@samsung.com\u003e\n" }, { "commit": "83052d4d5cd518332440bb4ee63d68bb5f744e0f", "tree": "5ea5f7a1551938f799f136f9fd07f65869bedbeb", "parents": [ "e30d4bcf79b6a3e09e435a5f3027ad3ef484226c" ], "author": { "name": "Seung-Woo Kim", "email": "sw0312.kim@samsung.com", "time": "Thu Dec 15 15:40:55 2011 +0900" }, "committer": { "name": "Inki Dae", "email": "inki.dae@samsung.com", "time": "Thu Dec 29 11:21:42 2011 +0900" }, "message": "drm: Add multi buffer plane pixel formats\n\nMulti buffer plane pixel format has seperated memory spaces for each\nplane. For example, NV12M has Y plane and CbCr plane and these are in\nnon contiguous memory region. Compared with NV12, NV12M\u0027s memory shape\nis like following.\nNV12 : ______(Y)(CbCr)_______\nNV12M : __(Y)_ ..... _(CbCr)__\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": "7a6e0daaf4058d1b7dd515bc470ec904454a798c", "tree": "4646ba40836b290dafd47055d6ed485fd6c7bdc7", "parents": [ "be2fb9da32cb88a1311350de3d1db8f9e461ae9f" ], "author": { "name": "Daniel Vetter", "email": "daniel.vetter@ffwll.ch", "time": "Tue Oct 25 23:19:27 2011 +0200" }, "committer": { "name": "Daniel Vetter", "email": "daniel.vetter@ffwll.ch", "time": "Thu Dec 22 00:33:23 2011 +0100" }, "message": "drm: kill drm_sman\n\nNo longer used.\n\nSigned-off-by: Daniel Vetter \u003cdaniel.vetter@ffwll.ch\u003e\n" }, { "commit": "94e895321bade1bafbcb2af1ef1e79b01e018012", "tree": "8e725dcbd475037225e352d5e388f9b3ed8d71e3", "parents": [ "6de8a748881f1cd9d795454da2b6db616d5ca3d7" ], "author": { "name": "Daniel Vetter", "email": "daniel.vetter@ffwll.ch", "time": "Tue Oct 25 22:33:37 2011 +0200" }, "committer": { "name": "Daniel Vetter", "email": "daniel.vetter@ffwll.ch", "time": "Thu Dec 22 00:33:22 2011 +0100" }, "message": "drm/sman: kill user_hash_tab\n\nNo longer used.\n\nSigned-off-by: Daniel Vetter \u003cdaniel.vetter@ffwll.ch\u003e\n" }, { "commit": "763240deb423c477b4d46c23e0b582099d4b8753", "tree": "724f804e38eb00a23f6d1e3ca4b50ec89d1e9208", "parents": [ "aa38e2e01521f88e9b0230c0236d2bd89d0af0ed" ], "author": { "name": "Daniel Vetter", "email": "daniel.vetter@ffwll.ch", "time": "Wed Oct 26 22:28:07 2011 +0200" }, "committer": { "name": "Daniel Vetter", "email": "daniel.vetter@ffwll.ch", "time": "Thu Dec 22 00:33:20 2011 +0100" }, "message": "drm/sman: rip out owner tracking\n\nIn contrast to kms drivers, sis/via _always_ associated a buffer with\na drm fd. So by the time we reach lastclose, all open drm fds are gone\nand with them their associated objects.\n\nSo when sis/via call drm_sman_cleanup in their lastclose funcs, that\nwill free 0 objects.\n\nThe owner tracking now serves no purpose at all, hence rip it ou. We\ncan\u0027t kill the corresponding fields in struct drm_memblock_item yet\nbecause we hijack these in the new driver private owner tracking. But\nnow that drm_sman.c doesn\u0027t touch -\u003eowner_list anymore, we need to\nkill the list_move hack and properly add the item to the file_priv\nlist.\n\nAlso leave the list_del(\u0026obj-\u003eowner_list) in drm_sman_free for the\nmoment, it will move to the drivers when sman disappears completely.\n\nv2: Remove the redundant INIT_LIST_HEAD as noted by Chris Wilson\n\nSigned-off-by: Daniel Vetter \u003cdaniel.vetter@ffwll.ch\u003e\n" }, { "commit": "aa38e2e01521f88e9b0230c0236d2bd89d0af0ed", "tree": "13f5b18608289b06ab053524c130f439c0ac81ca", "parents": [ "c828e20456301b0f5192a1f75e8bf8a6afd15551" ], "author": { "name": "Daniel Vetter", "email": "daniel.vetter@ffwll.ch", "time": "Tue Oct 25 16:39:59 2011 +0200" }, "committer": { "name": "Daniel Vetter", "email": "daniel.vetter@ffwll.ch", "time": "Thu Dec 22 00:33:19 2011 +0100" }, "message": "drm/sman: kill owner tracking interface functions\n\nThese are now unused.\n\nSigned-off-by: Daniel Vetter \u003cdaniel.vetter@ffwll.ch\u003e\n" }, { "commit": "c828e20456301b0f5192a1f75e8bf8a6afd15551", "tree": "ac305d3618dafc1f8c3d9f18011d91badee9aabe", "parents": [ "fdc0b8a63c1124bb025a2846d41531a123845740" ], "author": { "name": "Daniel Vetter", "email": "daniel.vetter@ffwll.ch", "time": "Tue Oct 25 16:32:45 2011 +0200" }, "committer": { "name": "Daniel Vetter", "email": "daniel.vetter@ffwll.ch", "time": "Thu Dec 22 00:33:19 2011 +0100" }, "message": "drm/via: track obj-\u003edrm_fd relations in the driver\n\nExactly like the previous patch for sis.\n\nSigned-off-by: Daniel Vetter \u003cdaniel.vetter@ffwll.ch\u003e\n" }, { "commit": "fdc0b8a63c1124bb025a2846d41531a123845740", "tree": "3913d201022d789970b6d07355864fece7455ff3", "parents": [ "4cf73129cbe001b41be2f8b56f763fbf3acaa4ce" ], "author": { "name": "Daniel Vetter", "email": "daniel.vetter@ffwll.ch", "time": "Tue Oct 25 16:32:34 2011 +0200" }, "committer": { "name": "Daniel Vetter", "email": "daniel.vetter@ffwll.ch", "time": "Thu Dec 22 00:33:15 2011 +0100" }, "message": "drm/sis: track obj-\u003edrm_fd relations in the driver\n\nBy attach a driver private struct to each open drm fd.\n\nBecause we steal the owner_list from drm_sman until things settle,\nuse list_move instead of list_add.\n\nThis requires to export a drm_sman function temporarily before\ndrm_sman will die for real completely.\n\nSigned-off-by: Daniel Vetter \u003cdaniel.vetter@ffwll.ch\u003e\n" }, { "commit": "8cce5e94c35994eab76780648ee8788b0a7a7728", "tree": "7d71af0384c15e8b029818e508d7b366b61fe89b", "parents": [ "fa0bd1d27724944e5c8a93ebfdf70af50bec9972" ], "author": { "name": "Alex Deucher", "email": "alexander.deucher@amd.com", "time": "Mon Dec 12 09:23:48 2011 -0500" }, "committer": { "name": "Greg Kroah-Hartman", "email": "gregkh@suse.de", "time": "Wed Dec 21 12:57:45 2011 -0800" }, "message": "drm/radeon/kms: add some new pci ids\n\ncommit cd5cfce856684e13b9b57d46b78bb827e9c4da3c upstream.\n\nFixes:\nhttps://bugs.freedesktop.org/show_bug.cgi?id\u003d43739\n\nSigned-off-by: Alex Deucher \u003calexander.deucher@amd.com\u003e\nSigned-off-by: Dave Airlie \u003cairlied@redhat.com\u003e\nSigned-off-by: Greg Kroah-Hartman \u003cgregkh@suse.de\u003e\n\n" }, { "commit": "864ee9e6f643b479e0469c9865cae238590d5f6e", "tree": "dcb8ad130f42bac96fe3f03a234ffbcbe0c58bd2", "parents": [ "cb91f6a078097cdfe23bc1bd997e4310b06b87a3" ], "author": { "name": "Joonyoung Shim", "email": "jy0922.shim@samsung.com", "time": "Thu Dec 08 17:54:07 2011 +0900" }, "committer": { "name": "Inki Dae", "email": "inki.dae@samsung.com", "time": "Wed Dec 21 15:14:17 2011 +0900" }, "message": "drm/exynos: Add plane support with fimd\n\nThe exynos fimd supports 5 window overlays. Only one window overlay of\nfimd is used by the crtc, so we need plane feature to use the rest\nwindow overlays.\n\nThis creates one ioctl exynos specific - DRM_EXYNOS_PLANE_SET_ZPOS, it\nis the ioctl to decide for user to assign which window overlay.\n\nSigned-off-by: Joonyoung Shim \u003cjy0922.shim@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": "d0d110e096298d2715aa26b3698e604e0d4a2fb9", "tree": "5ea4b13f7fcb28940a9c1f5d4ffa28188ebc4704", "parents": [ "c75488376a55c207172f78664d600b87df88107f" ], "author": { "name": "Ville Syrjälä", "email": "ville.syrjala@linux.intel.com", "time": "Tue Dec 20 00:33:24 2011 +0200" }, "committer": { "name": "Dave Airlie", "email": "airlied@redhat.com", "time": "Tue Dec 20 20:34:32 2011 +0000" }, "message": "drm: Add drm_format_num_planes() utility function\n\nThis function returns the number of planes used by a specific pixel\nformat.\n\nSigned-off-by: Ville Syrjälä \u003cville.syrjala@linux.intel.com\u003e\nReviewed-by: Rob Clark \u003crob.clark@linaro.org\u003e\nSigned-off-by: Dave Airlie \u003cairlied@redhat.com\u003e\n" }, { "commit": "1fbe6f625f69e48c4001051dc1431afc704acfaa", "tree": "826b741201a2e09a627ed350c6ff36935f5cff79", "parents": [ "0cecdd818cd79d092e36e70dfe3a71f2878d6b96", "384703b8e6cd4c8ef08512e596024e028c91c339" ], "author": { "name": "Dave Airlie", "email": "airlied@redhat.com", "time": "Tue Dec 20 14:43:53 2011 +0000" }, "committer": { "name": "Dave Airlie", "email": "airlied@redhat.com", "time": "Tue Dec 20 14:43:53 2011 +0000" }, "message": "Merge tag \u0027v3.2-rc6\u0027 of /home/airlied/devel/kernel/linux-2.6 into drm-core-next\n\nMerge in the upstream tree to bring in the mainline fixes.\n\nConflicts:\n\tdrivers/gpu/drm/exynos/exynos_drm_fbdev.c\n\tdrivers/gpu/drm/nouveau/nouveau_sgdma.c\n" }, { "commit": "01f2c7730e188077026c5f766f85f329c7000c54", "tree": "1b7ad10bd70c25ccaefa2a03aeedaeb20ac2c336", "parents": [ "935b59774012d11e3012c909cdd0c3cba0adf219" ], "author": { "name": "Ville Syrjälä", "email": "ville.syrjala@linux.intel.com", "time": "Tue Dec 20 00:06:49 2011 +0200" }, "committer": { "name": "Dave Airlie", "email": "airlied@redhat.com", "time": "Tue Dec 20 10:06:27 2011 +0000" }, "message": "drm: Replace pitch with pitches[] in drm_framebuffer\n\nOtherwise each driver would need to keep the information inside\ntheir own framebuffer object structure. Also add offsets[]. BOs\non the other hand are driver specific, so those can be kept in\ndriver specific structures.\n\nSigned-off-by: Ville Syrjälä \u003cville.syrjala@linux.intel.com\u003e\nSigned-off-by: Dave Airlie \u003cairlied@redhat.com\u003e\n" }, { "commit": "22cd7c625837e520c94ffda7bc926396bbc4ba67", "tree": "a331600b8a7f1e7030b05fdce21436478e48ab72", "parents": [ "687a040038fb92c764adbb349ca132226677b417" ], "author": { "name": "Ville Syrjälä", "email": "ville.syrjala@linux.intel.com", "time": "Tue Dec 20 00:06:46 2011 +0200" }, "committer": { "name": "Dave Airlie", "email": "airlied@redhat.com", "time": "Tue Dec 20 10:05:06 2011 +0000" }, "message": "drm: plane: Make \u0027formats\u0027 parameter to drm_plane_init() const\n\nSigned-off-by: Ville Syrjälä \u003cville.syrjala@linux.intel.com\u003e\nSigned-off-by: Dave Airlie \u003cairlied@redhat.com\u003e\n" }, { "commit": "64760a4ee6e0d01c0019495a6513229259d86296", "tree": "6af92b096cca07a7f13ad7b86dc2fb40a490eacc", "parents": [ "b03166ac188ad643a55399f6c6a6a369beb099b1" ], "author": { "name": "Ville Syrjälä", "email": "ville.syrjala@linux.intel.com", "time": "Tue Dec 20 00:06:40 2011 +0200" }, "committer": { "name": "Dave Airlie", "email": "airlied@redhat.com", "time": "Tue Dec 20 10:02:18 2011 +0000" }, "message": "drm: fourcc: Use __u32 instead of u32\n\ndrm_fourcc.h can be included from user space so use the appropriate types.\n\nSigned-off-by: Ville Syrjälä \u003cville.syrjala@linux.intel.com\u003e\nSigned-off-by: Dave Airlie \u003cairlied@redhat.com\u003e\n" }, { "commit": "b03166ac188ad643a55399f6c6a6a369beb099b1", "tree": "1983478970e6f323a7f036f4b4e5be7dc420edd4", "parents": [ "cc5b6f00790da1fd00e6136ba4e4c1c16a581790" ], "author": { "name": "Ville Syrjälä", "email": "ville.syrjala@linux.intel.com", "time": "Tue Dec 20 00:06:39 2011 +0200" }, "committer": { "name": "Dave Airlie", "email": "airlied@redhat.com", "time": "Tue Dec 20 10:02:02 2011 +0000" }, "message": "drm: Install drm_fourcc.h\n\nUserspace needs this header.\n\nSigned-off-by: Ville Syrjälä \u003cville.syrjala@linux.intel.com\u003e\nSigned-off-by: Dave Airlie \u003cairlied@redhat.com\u003e\n" }, { "commit": "cc5b6f00790da1fd00e6136ba4e4c1c16a581790", "tree": "716a20395cfe0d884290d84ad15b29cdbaa54100", "parents": [ "59df7b1771c150163e522f33c638096ab0efbf42" ], "author": { "name": "Ville Syrjälä", "email": "ville.syrjala@linux.intel.com", "time": "Tue Dec 20 00:06:38 2011 +0200" }, "committer": { "name": "Dave Airlie", "email": "airlied@redhat.com", "time": "Tue Dec 20 10:01:42 2011 +0000" }, "message": "drm: Add a missing \u0027)\u0027\n\nThe code happened to compile because the flag wasn\u0027t actually used yet.\n\nSigned-off-by: Ville Syrjälä \u003cville.syrjala@linux.intel.com\u003e\nSigned-off-by: Dave Airlie \u003cairlied@redhat.com\u003e\n" }, { "commit": "cd5cfce856684e13b9b57d46b78bb827e9c4da3c", "tree": "47b033cdc619ce765b7cc2512b6baee51da1cd69", "parents": [ "373da0a2a33018d560afcb2c77f8842985d79594" ], "author": { "name": "Alex Deucher", "email": "alexander.deucher@amd.com", "time": "Mon Dec 12 09:23:48 2011 -0500" }, "committer": { "name": "Dave Airlie", "email": "airlied@redhat.com", "time": "Wed Dec 14 12:29:03 2011 +0000" }, "message": "drm/radeon/kms: add some new pci ids\n\nFixes:\nhttps://bugs.freedesktop.org/show_bug.cgi?id\u003d43739\n\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": "08d618b2080d8b3afac6db1a361c54d827b8d044", "tree": "a52d8d4df968f8dca0ac5e16b994d2a07f089635", "parents": [ "d98627dd4a3e2cd4a7602a845fd1c1c78d372e97" ], "author": { "name": "Alex Deucher", "email": "alexander.deucher@amd.com", "time": "Thu Dec 01 11:02:11 2011 -0500" }, "committer": { "name": "Greg Kroah-Hartman", "email": "gregkh@suse.de", "time": "Fri Dec 09 08:52:37 2011 -0800" }, "message": "drm/radeon/kms: add some new pci ids\n\ncommit 2ed4d9d648cbd4fb1c232a646dbdbdfdd373ca94 upstream.\n\nSigned-off-by: Alex Deucher \u003calexander.deucher@amd.com\u003e\nSigned-off-by: Dave Airlie \u003cairlied@redhat.com\u003e\nSigned-off-by: Greg Kroah-Hartman \u003cgregkh@suse.de\u003e\n\n" }, { "commit": "61aff74833b86c735ee901c1038f0cbfcd606ae7", "tree": "9c05d7c1ca3eaba38dc2264b2181fa07767a62b3", "parents": [ "e84ce11bd0183328e00accb611893b9a819dc0ba" ], "author": { "name": "Xi Wang", "email": "xi.wang@gmail.com", "time": "Wed Nov 23 01:12:01 2011 -0500" }, "committer": { "name": "Greg Kroah-Hartman", "email": "gregkh@suse.de", "time": "Fri Dec 09 08:52:20 2011 -0800" }, "message": "drm: integer overflow in drm_mode_dirtyfb_ioctl()\n\ncommit a5cd335165e31db9dbab636fd29895d41da55dd2 upstream.\n\nThere is a potential integer overflow in drm_mode_dirtyfb_ioctl()\nif userspace passes in a large num_clips. The call to kmalloc would\nallocate a small buffer, and the call to fb-\u003efuncs-\u003edirty may result\nin a memory corruption.\n\nReported-by: Haogang Chen \u003chaogangchen@gmail.com\u003e\nSigned-off-by: Xi Wang \u003cxi.wang@gmail.com\u003e\nSigned-off-by: Dave Airlie \u003cairlied@redhat.com\u003e\nSigned-off-by: Greg Kroah-Hartman \u003cgregkh@suse.de\u003e\n\n" }, { "commit": "57de4ba959b290f0b8cf36ecd5e7f1b29d4b8a12", "tree": "8063f4dfaf1a22bf8cf7a5f0410d4e4929b250ec", "parents": [ "8e7e70522d760c4ccd4cd370ebfa0ba69e006c6e" ], "author": { "name": "Jerome Glisse", "email": "jglisse@redhat.com", "time": "Fri Nov 11 15:42:57 2011 -0500" }, "committer": { "name": "Dave Airlie", "email": "airlied@redhat.com", "time": "Tue Dec 06 10:40:11 2011 +0000" }, "message": "drm/ttm: simplify memory accounting for ttm user v2\n\nProvide helper function to compute the kernel memory size needed\nfor each buffer object. Move all the accounting inside ttm, simplifying\ndriver and avoiding code duplication accross them.\n\nv2 fix accounting of ghost object, one would have thought that i\n would have run into the issue since a longtime but it seems\n ghost object are rare when you have plenty of vram ;)\n\nSigned-off-by: Jerome Glisse \u003cjglisse@redhat.com\u003e\nReviewed-by: Thomas Hellstrom \u003cthellstrom@vmware.com\u003e\n" }, { "commit": "8e7e70522d760c4ccd4cd370ebfa0ba69e006c6e", "tree": "a2b0f931e513f3aeba174b974bd5e869685fe288", "parents": [ "3230cfc34fca9d17c1628cf0e4ac25199592a69a" ], "author": { "name": "Jerome Glisse", "email": "jglisse@redhat.com", "time": "Wed Nov 09 17:15:26 2011 -0500" }, "committer": { "name": "Dave Airlie", "email": "airlied@redhat.com", "time": "Tue Dec 06 10:40:02 2011 +0000" }, "message": "drm/ttm: isolate dma data from ttm_tt V4\n\nMove dma data to a superset ttm_dma_tt structure which herit\nfrom ttm_tt. This allow driver that don\u0027t use dma functionalities\nto not have to waste memory for it.\n\nV2 Rebase on top of no memory account changes (where/when is my\n delorean when i need it ?)\nV3 Make sure page list is initialized empty\nV4 typo/syntax fixes\n\nSigned-off-by: Jerome Glisse \u003cjglisse@redhat.com\u003e\nReviewed-by: Thomas Hellstrom \u003cthellstrom@vmware.com\u003e\n" }, { "commit": "2334b75ffbef6b8932f09ec4418b65ddb764ae99", "tree": "3b1ebfbd1714adf1ac1595ca16303d2303c8c959", "parents": [ "b1e5f172325547270f35e7d1e42416a606e1dbd2" ], "author": { "name": "Konrad Rzeszutek Wilk", "email": "konrad.wilk@oracle.com", "time": "Thu Nov 03 16:46:34 2011 -0400" }, "committer": { "name": "Dave Airlie", "email": "airlied@redhat.com", "time": "Tue Dec 06 10:39:33 2011 +0000" }, "message": "drm/ttm: provide dma aware ttm page pool code V9\n\nIn TTM world the pages for the graphic drivers are kept in three different\npools: write combined, uncached, and cached (write-back). When the pages\nare used by the graphic driver the graphic adapter via its built in MMU\n(or AGP) programs these pages in. The programming requires the virtual address\n(from the graphic adapter perspective) and the physical address (either System RAM\nor the memory on the card) which is obtained using the pci_map_* calls (which does the\nvirtual to physical - or bus address translation). During the graphic application\u0027s\n\"life\" those pages can be shuffled around, swapped out to disk, moved from the\nVRAM to System RAM or vice-versa. This all works with the existing TTM pool code\n- except when we want to use the software IOTLB (SWIOTLB) code to \"map\" the physical\naddresses to the graphic adapter MMU. We end up programming the bounce buffer\u0027s\nphysical address instead of the TTM pool memory\u0027s and get a non-worky driver.\nThere are two solutions:\n1) using the DMA API to allocate pages that are screened by the DMA API, or\n2) using the pci_sync_* calls to copy the pages from the bounce-buffer and back.\n\nThis patch fixes the issue by allocating pages using the DMA API. The second\nis a viable option - but it has performance drawbacks and potential correctness\nissues - think of the write cache page being bounced (SWIOTLB-\u003eTTM), the\nWC is set on the TTM page and the copy from SWIOTLB not making it to the TTM\npage until the page has been recycled in the pool (and used by another application).\n\nThe bounce buffer does not get activated often - only in cases where we have\na 32-bit capable card and we want to use a page that is allocated above the\n4GB limit. The bounce buffer offers the solution of copying the contents\nof that 4GB page to an location below 4GB and then back when the operation has been\ncompleted (or vice-versa). This is done by using the \u0027pci_sync_*\u0027 calls.\nNote: If you look carefully enough in the existing TTM page pool code you will\nnotice the GFP_DMA32 flag is used - which should guarantee that the provided page\nis under 4GB. It certainly is the case, except this gets ignored in two cases:\n - If user specifies \u0027swiotlb\u003dforce\u0027 which bounces _every_ page.\n - If user is using a Xen\u0027s PV Linux guest (which uses the SWIOTLB and the\n underlaying PFN\u0027s aren\u0027t necessarily under 4GB).\n\nTo not have this extra copying done the other option is to allocate the pages\nusing the DMA API so that there is not need to map the page and perform the\nexpensive \u0027pci_sync_*\u0027 calls.\n\nThis DMA API capable TTM pool requires for this the \u0027struct device\u0027 to\nproperly call the DMA API. It also has to track the virtual and bus address of\nthe page being handed out in case it ends up being swapped out or de-allocated -\nto make sure it is de-allocated using the proper\u0027s \u0027struct device\u0027.\n\nImplementation wise the code keeps two lists: one that is attached to the\n\u0027struct device\u0027 (via the dev-\u003edma_pools list) and a global one to be used when\nthe \u0027struct device\u0027 is unavailable (think shrinker code). The global list can\niterate over all of the \u0027struct device\u0027 and its associated dma_pool. The list\nin dev-\u003edma_pools can only iterate the device\u0027s dma_pool.\n /[struct device_pool]\\\n /---------------------------------------------------| dev |\n / +-------| dma_pool |\n /-----+------\\ / \\--------------------/\n |struct device| /--\u003e[struct dma_pool for WC]\u003c/ /[struct device_pool]\\\n | dma_pools +----+ /-| dev |\n | ... | \\---\u003e[struct dma_pool for uncached]\u003c-/--| dma_pool |\n \\-----+------/ / \\--------------------/\n \\----------------------------------------------/\n[Two pools associated with the device (WC and UC), and the parallel list\ncontaining the \u0027struct dev\u0027 and \u0027struct dma_pool\u0027 entries]\n\nThe maximum amount of dma pools a device can have is six: write-combined,\nuncached, and cached; then there are the DMA32 variants which are:\nwrite-combined dma32, uncached dma32, and cached dma32.\n\nCurrently this code only gets activated when any variant of the SWIOTLB IOMMU\ncode is running (Intel without VT-d, AMD without GART, IBM Calgary and Xen PV\nwith PCI devices).\n\nTested-by: Michel Dänzer \u003cmichel@daenzer.net\u003e\n[v1: Using swiotlb_nr_tbl instead of swiotlb_enabled]\n[v2: Major overhaul - added \u0027inuse_list\u0027 to seperate used from inuse and reorder\nthe order of lists to get better performance.]\n[v3: Added comments/and some logic based on review, Added Jerome tag]\n[v4: rebase on top of ttm_tt \u0026 ttm_backend merge]\n[v5: rebase on top of ttm memory accounting overhaul]\n[v6: New rebase on top of more memory accouting changes]\n[v7: well rebase on top of no memory accounting changes]\n[v8: make sure pages list is initialized empty]\n[v9: calll ttm_mem_global_free_page in unpopulate for accurate accountg]\nSigned-off-by: Konrad Rzeszutek Wilk \u003ckonrad.wilk@oracle.com\u003e\nReviewed-by: Jerome Glisse \u003cjglisse@redhat.com\u003e\nAcked-by: Thomas Hellstrom \u003cthellstrom@vmware.com\u003e\n" }, { "commit": "b1e5f172325547270f35e7d1e42416a606e1dbd2", "tree": "03fc21fd5f74add89441308008b45987d09cfbc6", "parents": [ "649bf3ca77343e3be1e0af8e21356fa569b1abd9" ], "author": { "name": "Jerome Glisse", "email": "jglisse@redhat.com", "time": "Wed Nov 02 23:59:28 2011 -0400" }, "committer": { "name": "Dave Airlie", "email": "airlied@redhat.com", "time": "Tue Dec 06 10:39:24 2011 +0000" }, "message": "drm/ttm: introduce callback for ttm_tt populate \u0026 unpopulate V4\n\nMove the page allocation and freeing to driver callback and\nprovide ttm code helper function for those.\n\nMost intrusive change, is the fact that we now only fully\npopulate an object this simplify some of code designed around\nthe page fault design.\n\nV2 Rebase on top of memory accounting overhaul\nV3 New rebase on top of more memory accouting changes\nV4 Rebase on top of no memory account changes (where/when is my\n delorean when i need it ?)\n\nSigned-off-by: Jerome Glisse \u003cjglisse@redhat.com\u003e\nReviewed-by: Konrad Rzeszutek Wilk \u003ckonrad.wilk@oracle.com\u003e\nReviewed-by: Thomas Hellstrom \u003cthellstrom@vmware.com\u003e\n" }, { "commit": "649bf3ca77343e3be1e0af8e21356fa569b1abd9", "tree": "01ad6a5f3f74b087cb791f5965d3190916975789", "parents": [ "822c4d9ae0d55a4fcea9f0a462bc6406a06692e2" ], "author": { "name": "Jerome Glisse", "email": "jglisse@redhat.com", "time": "Tue Nov 01 20:46:13 2011 -0400" }, "committer": { "name": "Dave Airlie", "email": "airlied@redhat.com", "time": "Tue Dec 06 10:39:17 2011 +0000" }, "message": "drm/ttm: merge ttm_backend and ttm_tt V5\n\nttm_backend will only exist with a ttm_tt, and ttm_tt\nwill only be of interest when bound to a backend. Merge them\nto avoid code and data duplication.\n\nV2 Rebase on top of memory accounting overhaul\nV3 Rebase on top of more memory accounting changes\nV4 Rebase on top of no memory account changes (where/when is my\n delorean when i need it ?)\nV5 make sure ttm is unbound before destroying, change commit\n message on suggestion from Tormod Volden\n\nSigned-off-by: Jerome Glisse \u003cjglisse@redhat.com\u003e\nReviewed-by: Konrad Rzeszutek Wilk \u003ckonrad.wilk@oracle.com\u003e\nReviewed-by: Thomas Hellstrom \u003cthellstrom@vmware.com\u003e\n" }, { "commit": "822c4d9ae0d55a4fcea9f0a462bc6406a06692e2", "tree": "023576f530939ff497bb7fe44b62da0ce50221be", "parents": [ "f9517e63ffae6a1062a0a2ac4eea60be49b9dfd4" ], "author": { "name": "Jerome Glisse", "email": "jglisse@redhat.com", "time": "Thu Nov 10 18:24:09 2011 -0500" }, "committer": { "name": "Dave Airlie", "email": "airlied@redhat.com", "time": "Tue Dec 06 10:39:11 2011 +0000" }, "message": "drm/ttm: page allocation use page array instead of list\n\nUse the ttm_tt pages array for pages allocations, move the list\nunwinding into the page allocation functions.\n\nSigned-off-by: Jerome Glisse \u003cjglisse@redhat.com\u003e\n" } ], "next": "a14af87b0b6f5c1d44c1adaa07f1bd347f81dc04" }