)]}' { "log": [ { "commit": "8595aaff18f962ea41fb8c99bc5654b48d7a78e1", "tree": "9146428e0f14b6539fd840dbb1eb7ac6c4189617", "parents": [ "5d9df02611a53ddaabf3932fa4862e5440d6189e", "a4bdf8425a951b6d4db3942cf66c386164628ae2" ], "author": { "name": "Linux Build Service Account", "email": "lnxbuild@localhost", "time": "Tue Jun 26 02:18:59 2012 -0700" }, "committer": { "name": "QuIC Gerrit Code Review", "email": "code-review@localhost", "time": "Tue Jun 26 02:18:59 2012 -0700" }, "message": "Merge \"msm: kgsl: Remove A3XX soft reset\" into msm-3.4" }, { "commit": "a4bdf8425a951b6d4db3942cf66c386164628ae2", "tree": "8ff2a9f6a96358b4765e563d9324c521faa2f7dd", "parents": [ "de27731b5b7e7a07a8b139a0449087160ff7e60c" ], "author": { "name": "Jordan Crouse", "email": "jcrouse@codeaurora.org", "time": "Tue Jun 12 08:33:03 2012 -0600" }, "committer": { "name": "Linux Build Service Account", "email": "lnxbuild@localhost", "time": "Mon Jun 25 15:36:57 2012 -0600" }, "message": "msm: kgsl: Remove A3XX soft reset\n\nWe do not need to do a soft reset of the A3XX GPUs after power on\nas all the interesting registers appear to be in a reasonable power\non state. This saves 20ms during suspend/resume.\n\nCRs-Fixed: 369927\nChange-Id: Ic0dedbad367e8b402aefbf6e7746ae5b17120ac8\nSigned-off-by: Jordan Crouse \u003cjcrouse@codeaurora.org\u003e\n" }, { "commit": "19ca4a6cec18c35d8e2dc1cbde68f636341b5f5e", "tree": "4213260adbe84cf3b808743fcce1c7752fb3178b", "parents": [ "b4ad112b4006e5bd266f31d0b7d6db22f7347126" ], "author": { "name": "Shubhraprakash Das", "email": "sadas@codeaurora.org", "time": "Fri May 18 12:11:20 2012 -0600" }, "committer": { "name": "Jordan Crouse", "email": "jcrouse@codeaurora.org", "time": "Mon Jun 25 08:51:50 2012 -0600" }, "message": "msm: kgsl: Create a separate pagetable for priv bank of IOMMU\n\nThe IOMMU registers should only be accessed by priv bank. Create a separate\npagetable for priv bank and map the IOMMU registers to only this pagetable.\nThis is only supported for devices which can use the priv bank for\nperforming in stream pagetable switches.\n\nChange-Id: If9edada5d3a05e9a660c126139e18091b1ab43cc\nSigned-off-by: Shubhraprakash Das \u003csadas@codeaurora.org\u003e\n" }, { "commit": "8131ab9b590c475683a36683962e5ac40d4be2c9", "tree": "26ee986f8f368b3360a85a8b4359fddc7b68441d", "parents": [ "40c18f4139199c066bf3b9acd74814912803b237", "7e4464817409aee5e3cb0aec4612f1b0352c28e4" ], "author": { "name": "Linux Build Service Account", "email": "lnxbuild@localhost", "time": "Sat Jun 23 13:49:34 2012 -0700" }, "committer": { "name": "QuIC Gerrit Code Review", "email": "code-review@localhost", "time": "Sat Jun 23 13:49:34 2012 -0700" }, "message": "Merge \"gpu: ion: Add support for content protection 2.0 in CP heap\" into msm-3.4" }, { "commit": "43e3998862b97dc969e7a43af69fb1e349da5d7e", "tree": "861fe875ab4d64a4a16a28a4b2bb7a8409000754", "parents": [ "1f390a5641405fa96f2ddb952e0b414c06375993", "fb3012f6fde4ee5c676b8d6ec4c4d3df07033032" ], "author": { "name": "Linux Build Service Account", "email": "lnxbuild@localhost", "time": "Sat Jun 23 12:07:40 2012 -0700" }, "committer": { "name": "QuIC Gerrit Code Review", "email": "code-review@localhost", "time": "Sat Jun 23 12:07:40 2012 -0700" }, "message": "Merge \"msm: kgsl: Restore default clock control during A3XX GMEM restore\" into msm-3.4" }, { "commit": "4c6156de694acdae845d85a66fc5482b7397e591", "tree": "1db7a13b2c59ed2df9d49bd191c8f260b88a7250", "parents": [ "2358887549f15c95e2f12abd9d4d82de54c2ff9d", "64a745c081148f562294b805d64379363ad30c5d" ], "author": { "name": "Linux Build Service Account", "email": "lnxbuild@localhost", "time": "Sat Jun 23 10:37:27 2012 -0700" }, "committer": { "name": "QuIC Gerrit Code Review", "email": "code-review@localhost", "time": "Sat Jun 23 10:37:27 2012 -0700" }, "message": "Merge \"msm: kgsl Fix stack exception occurring during axi error\" into msm-3.4" }, { "commit": "2358887549f15c95e2f12abd9d4d82de54c2ff9d", "tree": "ef6e3959e4701df1d53e0942290f0705d580cf3e", "parents": [ "7e7a4b108ae3b1cab9b3e6f79cfb5f2440bd3563", "e27cdcd4cfc99af02037563abd4406fdba742b75" ], "author": { "name": "Linux Build Service Account", "email": "lnxbuild@localhost", "time": "Sat Jun 23 10:37:24 2012 -0700" }, "committer": { "name": "QuIC Gerrit Code Review", "email": "code-review@localhost", "time": "Sat Jun 23 10:37:24 2012 -0700" }, "message": "Merge \"gpu: ion: Check return code of msm_allocate_iova_address\" into msm-3.4" }, { "commit": "ffc2c40efd729698a9d17347a2a19916606462e8", "tree": "3e963be1ad3480771590d0d51f682e09dc7d4453", "parents": [ "94ec74c1bb6aa7d1e6fff088aa80e30a2e5f4e75", "d71cfd6ee15626dfd66e2b94ed524fbd2488fe91" ], "author": { "name": "Linux Build Service Account", "email": "lnxbuild@localhost", "time": "Sat Jun 23 10:37:18 2012 -0700" }, "committer": { "name": "QuIC Gerrit Code Review", "email": "code-review@localhost", "time": "Sat Jun 23 10:37:18 2012 -0700" }, "message": "Merge \"msm: kgsl: Issue packet to set shader bases on A20x/220 GPU\" into msm-3.4" }, { "commit": "1dfdfe861c38b90255c919684a3f40cd8cd4996b", "tree": "2bcc7ac6d762439729114d5da2e256c581755dae", "parents": [ "414c4f927a0b360394e1f2485a6fc28ac059e14f", "f68983eaa0b7b9eb2bb35937e799a43fab5442d5" ], "author": { "name": "Linux Build Service Account", "email": "lnxbuild@localhost", "time": "Sat Jun 23 00:39:44 2012 -0700" }, "committer": { "name": "QuIC Gerrit Code Review", "email": "code-review@localhost", "time": "Sat Jun 23 00:39:44 2012 -0700" }, "message": "Merge \"gpu: ion: Reference count protect/unprotect calls\" into msm-3.4" }, { "commit": "414c4f927a0b360394e1f2485a6fc28ac059e14f", "tree": "daf71ff46aaa5d1d6ac5854323f0ca200659b3e6", "parents": [ "410a22f4a41e35bf443732776c2772fa84f98e49", "d0c83de621851b87789fdcd46f72628d11dccbe4" ], "author": { "name": "Linux Build Service Account", "email": "lnxbuild@localhost", "time": "Sat Jun 23 00:39:40 2012 -0700" }, "committer": { "name": "QuIC Gerrit Code Review", "email": "code-review@localhost", "time": "Sat Jun 23 00:39:40 2012 -0700" }, "message": "Merge \"gpu: ion: Add scm calls for content protection 2.0\" into msm-3.4" }, { "commit": "410a22f4a41e35bf443732776c2772fa84f98e49", "tree": "b1595f28af1fb62de6a0c11ac6f944ec28a4a41a", "parents": [ "c07e3e96af0bda73a3182395876340684dadcdda", "efa6b01d464fd58a85ebc5fc2d10c3b2128185c6" ], "author": { "name": "Linux Build Service Account", "email": "lnxbuild@localhost", "time": "Sat Jun 23 00:39:39 2012 -0700" }, "committer": { "name": "QuIC Gerrit Code Review", "email": "code-review@localhost", "time": "Sat Jun 23 00:39:39 2012 -0700" }, "message": "Merge \"msm: kgsl: Modify kgsl_core_exit to release resources carefully.\" into msm-3.4" }, { "commit": "10453331c959d1457daf27ff5957759a0155c844", "tree": "6fea0030609f6b96f16a16754d86e84227aa7799", "parents": [ "993fb108d3403f979d71d70fe02ac4b4afe55610", "013c731716047c5888d81e8bd378d669d53ac8af" ], "author": { "name": "Linux Build Service Account", "email": "lnxbuild@localhost", "time": "Fri Jun 22 23:11:31 2012 -0700" }, "committer": { "name": "QuIC Gerrit Code Review", "email": "code-review@localhost", "time": "Fri Jun 22 23:11:31 2012 -0700" }, "message": "Merge changes Ic0dedbad,Ic0dedbad,Ic0dedbad into msm-3.4\n\n* changes:\n msm: kgsl: Dump A3XX shader memory in the snapshot\n msm: kgsl: Move to snapshot header version 2\n msm: kgsl: Return the raw chipid in kgsl_gpuid\n" }, { "commit": "2e9ec48a2ceeb59e656a2b2a97ed79a97407b814", "tree": "e3bca23f30b1f86a95c8d57d541257cdd6e1b523", "parents": [ "7d697935cc87b7d2b60005c2174de8a2c59ad990", "6c214ba626f37e8f4902cd04fec3febae6295444" ], "author": { "name": "Linux Build Service Account", "email": "lnxbuild@localhost", "time": "Fri Jun 22 23:11:20 2012 -0700" }, "committer": { "name": "QuIC Gerrit Code Review", "email": "code-review@localhost", "time": "Fri Jun 22 23:11:20 2012 -0700" }, "message": "Merge \"msm: kgsl: Properly handle an empty ringbuffer\" into msm-3.4" }, { "commit": "e8d64003ca2365938ba4442f012e97e1e7cfb225", "tree": "7863b0955282744f84e385b1f6f852e45adaf978", "parents": [ "c7f7d124aff5c8c07397d1aa7e668ffe6049fbaa", "7c32570079e5343b79160f86e54c99ec5745ebed" ], "author": { "name": "Linux Build Service Account", "email": "lnxbuild@localhost", "time": "Fri Jun 22 23:11:10 2012 -0700" }, "committer": { "name": "QuIC Gerrit Code Review", "email": "code-review@localhost", "time": "Fri Jun 22 23:11:10 2012 -0700" }, "message": "Merge changes Ic0dedbad,Ic0dedbad,Ic0dedbad,Ic0dedbad into msm-3.4\n\n* changes:\n msm: kgsl: Clean up snapshot GPU object output\n msm: kgsl: Make the snapshot better at detecting packet boundaries\n msm: kgsl: Improve detection of a type3 CP packet\n msm: kgsl: snapshot: Support loading more indirect buffers\n" }, { "commit": "a060f668ce1204a3f9fc070c45e481f2032ae971", "tree": "c19dd8f379c213ce3e256ac136a28578870175e1", "parents": [ "742f33e447a2824301fee2818ac59a2adc288a11", "8723968ce356502fc08120b17844852e0be4b635" ], "author": { "name": "Linux Build Service Account", "email": "lnxbuild@localhost", "time": "Fri Jun 22 16:11:18 2012 -0700" }, "committer": { "name": "QuIC Gerrit Code Review", "email": "code-review@localhost", "time": "Fri Jun 22 16:11:18 2012 -0700" }, "message": "Merge \"msm: kgsl: Check that the adreno drawctxt is valid before destroying it\" into msm-3.4" }, { "commit": "fb3012f6fde4ee5c676b8d6ec4c4d3df07033032", "tree": "1f337447624a5500199b41998d1d25d20f07b671", "parents": [ "3642ec172eea4c4f1f7873a1eac60b05b3914ae3" ], "author": { "name": "Jordan Crouse", "email": "jcrouse@codeaurora.org", "time": "Fri Jun 22 13:11:05 2012 -0600" }, "committer": { "name": "Jordan Crouse", "email": "jcrouse@codeaurora.org", "time": "Fri Jun 22 13:11:20 2012 -0600" }, "message": "msm: kgsl: Restore default clock control during A3XX GMEM restore\n\nCL contexts turn off the VPC block while running to avoid a hang. The\nVPC block needs to be turned back on before any GL calls. This includes\nGMEM restore, so set the clock control value back to the original default\nbefore doing any other operations.\n\nCRs-fixed: 363922\nChange-Id: Ic0dedbad6b031ccd9c0816013b75ba9effb18fcb\nSigned-off-by: Jordan Crouse \u003cjcrouse@codeaurora.org\u003e\n" }, { "commit": "64a745c081148f562294b805d64379363ad30c5d", "tree": "257b86960b83f72b3955f8a0ce66a286f7531eeb", "parents": [ "f2bd41381a2982d0c787f57ab9a9240e023fb5ce" ], "author": { "name": "Shubhraprakash Das", "email": "sadas@codeaurora.org", "time": "Mon Jun 11 16:44:16 2012 -0600" }, "committer": { "name": "Jordan Crouse", "email": "jcrouse@codeaurora.org", "time": "Fri Jun 22 11:42:26 2012 -0600" }, "message": "msm: kgsl Fix stack exception occurring during axi error\n\nWhen an axi error happens and the GPU is using IOMMU then a warning stack\ntrace was being reported. This is because during axi error interrupt\nhandling the IOMMU clocks were being turned on to read the current\npagetable base address. Switching the IOMMU clocks from interrupt context\nis not allowed. Fix this by reporting the axi error and displaying 0\nas the pagetable base address since we cannot read its value from\nthe axi error interrupt code.\n\nChange-Id: If98538bc1b2df51a1b3632faf449d5d332bccc3e\nSigned-off-by: Shubhraprakash Das \u003csadas@codeaurora.org\u003e\n" }, { "commit": "efa6b01d464fd58a85ebc5fc2d10c3b2128185c6", "tree": "0bbda6f7928421293362962f647af2f3ba03ac3f", "parents": [ "17199b88ce6a325328768d4a6d9d009a87fdd894" ], "author": { "name": "Harsh Vardhan Dwivedi", "email": "hdwivedi@codeaurora.org", "time": "Fri Jun 15 13:02:27 2012 -0600" }, "committer": { "name": "Harsh Vardhan Dwivedi", "email": "hdwivedi@codeaurora.org", "time": "Fri Jun 22 10:20:25 2012 -0600" }, "message": "msm: kgsl: Modify kgsl_core_exit to release resources carefully.\n\nkgsl_core_exit() should not call kgsl_sharedmem_uninit_sysfs() and\ndevice_unregister() if those resources have not been allocated.\nWe check this by seeing if kgsl_driver.virtdev has been\npopulated or not.\n\nCRs-fixed: 359477\nChange-Id: Ic040667b29bd4e006e6f29a50809d94a2bb4b469\nSigned-off-by: Harsh Vardhan Dwivedi \u003chdwivedi@codeaurora.org\u003e\n" }, { "commit": "d71cfd6ee15626dfd66e2b94ed524fbd2488fe91", "tree": "ed32dce484badd77f27047400983022877293916", "parents": [ "49c347c4cca036cd6a66aa5c79c379fa5ba5c89a" ], "author": { "name": "Ranjhith Kalisamy", "email": "ranjhith@codeaurora.org", "time": "Fri Jun 22 19:37:51 2012 +0530" }, "committer": { "name": "Ranjhith Kalisamy", "email": "ranjhith@codeaurora.org", "time": "Fri Jun 22 20:05:54 2012 +0530" }, "message": "msm: kgsl: Issue packet to set shader bases on A20x/220 GPU\n\nWhen GMEM save is not performed, the events to reuse shader space\ncan get dropped. This make the CP block to wait indefinitely\ncausing a hang. To unblock this, issue a packet to set shader bases.\nThis applies only to A20x/220 GPU.\n\nCRs-fixed: 365465\nChange-Id: I3ea6a58821b238706f167845380370d5bd19c4b3\nSigned-off-by: Ranjhith Kalisamy \u003cranjhith@codeaurora.org\u003e\n" }, { "commit": "013c731716047c5888d81e8bd378d669d53ac8af", "tree": "8cc8bb8a25c15a27a5331a50dce1f49b4fd786a4", "parents": [ "70829d3149bec4605e90d7b177c2fb7528d4c431" ], "author": { "name": "Jordan Crouse", "email": "jcrouse@codeaurora.org", "time": "Wed Jun 20 08:22:17 2012 -0600" }, "committer": { "name": "Jordan Crouse", "email": "jcrouse@codeaurora.org", "time": "Fri Jun 22 08:28:19 2012 -0600" }, "message": "msm: kgsl: Dump A3XX shader memory in the snapshot\n\nDump the shader memory (working memory and shadow memory) for A3XX GPUs\nin the snapshot.\n\nChange-Id: Ic0dedbadf28733b96323a680b014dbea10b1ceda\nSigned-off-by: Jordan Crouse \u003cjcrouse@codeaurora.org\u003e\n" }, { "commit": "6c214ba626f37e8f4902cd04fec3febae6295444", "tree": "c671b40df063479d8e5e6a89a7f4384ed3d6c73f", "parents": [ "7c32570079e5343b79160f86e54c99ec5745ebed" ], "author": { "name": "Jordan Crouse", "email": "jcrouse@codeaurora.org", "time": "Wed Jun 20 08:22:16 2012 -0600" }, "committer": { "name": "Jordan Crouse", "email": "jcrouse@codeaurora.org", "time": "Fri Jun 22 08:28:19 2012 -0600" }, "message": "msm: kgsl: Properly handle an empty ringbuffer\n\nThe code seeking out the failing frame for a hang got confused if\nthe CP read and write pointers were equal resulting in missing\nIBs.\n\nChange-Id: Ic0dedbadb32e4a708d0f8ee9e8a853fdfaff10b0\nSigned-off-by: Jordan Crouse \u003cjcrouse@codeaurora.org\u003e\n" }, { "commit": "70829d3149bec4605e90d7b177c2fb7528d4c431", "tree": "a2501fa5d1e2ba31b9ebe890bbcd0df2f888f13d", "parents": [ "d653588c0076abb363f48a0d0704a6c7ba2c8667" ], "author": { "name": "Jordan Crouse", "email": "jcrouse@codeaurora.org", "time": "Wed Jun 20 08:22:17 2012 -0600" }, "committer": { "name": "Jordan Crouse", "email": "jcrouse@codeaurora.org", "time": "Fri Jun 22 08:28:19 2012 -0600" }, "message": "msm: kgsl: Move to snapshot header version 2\n\nUpdate the snapshot header to version 2 to return the raw chipid\nin the dump.\n\nChange-Id: Ic0dedbad82bbe61395924bf49cb0144e5e2e10e3\nSigned-off-by: Jordan Crouse \u003cjcrouse@codeaurora.org\u003e\n" }, { "commit": "d653588c0076abb363f48a0d0704a6c7ba2c8667", "tree": "7b56322f1ff057ea48f1d95bf06b187f54799b01", "parents": [ "6c214ba626f37e8f4902cd04fec3febae6295444" ], "author": { "name": "Jordan Crouse", "email": "jcrouse@codeaurora.org", "time": "Wed Jun 20 08:22:16 2012 -0600" }, "committer": { "name": "Jordan Crouse", "email": "jcrouse@codeaurora.org", "time": "Fri Jun 22 08:28:19 2012 -0600" }, "message": "msm: kgsl: Return the raw chipid in kgsl_gpuid\n\nThere are some subtle differences between revisions of GPUs\nthat are not reflected in the GPU ID value. Return the raw\nchipid (derived from the hardware) along with the GPU ID\nwhen queried.\n\nChange-Id: Ic0dedbad035a80726e6fedc066ec11b78b79da2b\nSigned-off-by: Jordan Crouse \u003cjcrouse@codeaurora.org\u003e\n" }, { "commit": "7c32570079e5343b79160f86e54c99ec5745ebed", "tree": "f2123beec6a63907ae37200c14f70ba03f1a7390", "parents": [ "f7be4038aa9da7274a3d2736188a325a0812aad0" ], "author": { "name": "Jordan Crouse", "email": "jcrouse@codeaurora.org", "time": "Wed Jun 20 08:22:16 2012 -0600" }, "committer": { "name": "Jordan Crouse", "email": "jcrouse@codeaurora.org", "time": "Fri Jun 22 08:28:18 2012 -0600" }, "message": "msm: kgsl: Clean up snapshot GPU object output\n\nUse a iterator to cleanup how snapshot GPU objects are printed.\nThis removes a ton of ugly math, and allows us to do subtle\nsilly things like add padding at the end of a non dword\naligned object.\n\nChange-Id: Ic0dedbadabeee50f42fe9be62ea0b7dfc1f333da\nSigned-off-by: Jordan Crouse \u003cjcrouse@codeaurora.org\u003e\n" }, { "commit": "f7be4038aa9da7274a3d2736188a325a0812aad0", "tree": "d0a63b60a67cdf90f98f0718f881050b8ee015d1", "parents": [ "2012c8d705b7ae6ddacc2a4dc0eb6d195f0c1469" ], "author": { "name": "Jordan Crouse", "email": "jcrouse@codeaurora.org", "time": "Wed Jun 20 08:22:15 2012 -0600" }, "committer": { "name": "Jordan Crouse", "email": "jcrouse@codeaurora.org", "time": "Fri Jun 22 08:28:18 2012 -0600" }, "message": "msm: kgsl: Make the snapshot better at detecting packet boundaries\n\nEnhance the logic that checks to see if the CP_RPTR is stuck\nmid packet. Ensure that when we do packet counting that we\nuse real type3 packets instead of regular data pretending to\nbe a type3 packet.\n\nChange-Id: Ic0dedbadb502fa2790df0c6752309da300d6d1ae\nSigned-off-by: Jordan Crouse \u003cjcrouse@codeaurora.org\u003e\n" }, { "commit": "2012c8d705b7ae6ddacc2a4dc0eb6d195f0c1469", "tree": "18ff6b3101945605242f065020ad06d0c4b8e7d1", "parents": [ "361cc3daeef4c6e7300047945ac2fb1aec8a6a8a" ], "author": { "name": "Jordan Crouse", "email": "jcrouse@codeaurora.org", "time": "Wed Jun 20 08:22:14 2012 -0600" }, "committer": { "name": "Jordan Crouse", "email": "jcrouse@codeaurora.org", "time": "Fri Jun 22 08:28:18 2012 -0600" }, "message": "msm: kgsl: Improve detection of a type3 CP packet\n\nCurrently we just check the most significant two bits of a dword\nin the ringbuffer or IB are set to decide if the data is a type3\npacket header. This has proven to be problematic, as it turns out\nthat the top two bits are often set in nominal data. Enhance\nthe type3 packet check to verify that various reserved bits in\nthe dword are 0 as expected.\n\nChange-Id: Ic0dedbada5eff8353bc64da9eefd9919de127fa4\nSigned-off-by: Jordan Crouse \u003cjcrouse@codeaurora.org\u003e\n" }, { "commit": "361cc3daeef4c6e7300047945ac2fb1aec8a6a8a", "tree": "f6e0f196f12bd1aaf7d7e98b23ec5af7318e7697", "parents": [ "49c347c4cca036cd6a66aa5c79c379fa5ba5c89a" ], "author": { "name": "Jordan Crouse", "email": "jcrouse@codeaurora.org", "time": "Wed Jun 20 08:22:14 2012 -0600" }, "committer": { "name": "Jordan Crouse", "email": "jcrouse@codeaurora.org", "time": "Fri Jun 22 08:28:18 2012 -0600" }, "message": "msm: kgsl: snapshot: Support loading more indirect buffers\n\nUser side drivers are starting to use more indirect buffers\nfor CP_LOAD_STATE, so expand the snapshot to support grabbing\nall of the possible combinations.\n\nChange-Id: Ic0dedbadff743d03b5accb2a0299ab5dc0bc1a61\nSigned-off-by: Jordan Crouse \u003cjcrouse@codeaurora.org\u003e\n" }, { "commit": "552905e18461815f2c7e6aa963f7d00f96be2e3f", "tree": "8788c9154158f61edd88a94be9dc07c3483b33c7", "parents": [ "cdb31565a7ea6f5792c25b6d2152a87e7e8e60e5" ], "author": { "name": "Zhoulu Luo", "email": "zluo@codeaurora.org", "time": "Thu Jun 21 15:21:52 2012 -0700" }, "committer": { "name": "Zhoulu Luo", "email": "zluo@codeaurora.org", "time": "Thu Jun 21 15:22:02 2012 -0700" }, "message": "Revert \"msm: kgsl: Fix conditional GPU interrupts to fire only for waiting context\"\n\nThis reverts commit 609467077ae6b794af47613e05949e8b2fb3a842.\n\nChange-Id: I457634982603c957788b749198219d0974bd1de5\nSigned-off-by: Zhoulu Luo \u003czluo@codeaurora.org\u003e\n" }, { "commit": "7e4464817409aee5e3cb0aec4612f1b0352c28e4", "tree": "2ec1a162658ff1a73d2f6bc04b92fb5e2d27086a", "parents": [ "f68983eaa0b7b9eb2bb35937e799a43fab5442d5" ], "author": { "name": "Laura Abbott", "email": "lauraa@codeaurora.org", "time": "Wed Jun 13 15:59:39 2012 -0700" }, "committer": { "name": "Laura Abbott", "email": "lauraa@codeaurora.org", "time": "Thu Jun 21 13:55:36 2012 -0700" }, "message": "gpu: ion: Add support for content protection 2.0 in CP heap\n\nAdd support to allow ion_cp_heap.c to secure according to new\nrequirements. This includes adding versioning to the secure\ncalls to allow other types of securing to take place.\n\nChange-Id: I65e07ebaeefa1d0572b6531753a707a28284aa0d\nSigned-off-by: Laura Abbott \u003clauraa@codeaurora.org\u003e\n" }, { "commit": "e27cdcd4cfc99af02037563abd4406fdba742b75", "tree": "12544bf836c06a326d79f933e256728758d3a458", "parents": [ "334889ea8c126fd465f0d86ac680630613e9fa31" ], "author": { "name": "Laura Abbott", "email": "lauraa@codeaurora.org", "time": "Thu Jun 21 07:58:41 2012 -0700" }, "committer": { "name": "Laura Abbott", "email": "lauraa@codeaurora.org", "time": "Thu Jun 21 07:58:41 2012 -0700" }, "message": "gpu: ion: Check return code of msm_allocate_iova_address\n\nIn the IOMMU heap, the return value of msm_allocate_iova_address\nneeds to be checked instead of the value of the iova address.\nCheck the return value instead.\n\nChange-Id: I4554515d17c926a7dd738824aff21eb65d2ba56a\nSigned-off-by: Laura Abbott \u003clauraa@codeaurora.org\u003e\n" }, { "commit": "8214b462a0ec0061afc53c4e883781bdeb410247", "tree": "0278ea16d2af36f23b4b9e8eb71f11c6cb7140ad", "parents": [ "74649f88faf2d3e81fd2b8dc6ef8e1dc56684b37", "609467077ae6b794af47613e05949e8b2fb3a842" ], "author": { "name": "Linux Build Service Account", "email": "lnxbuild@localhost", "time": "Wed Jun 20 07:24:04 2012 -0700" }, "committer": { "name": "QuIC Gerrit Code Review", "email": "code-review@localhost", "time": "Wed Jun 20 07:24:04 2012 -0700" }, "message": "Merge \"msm: kgsl: Fix conditional GPU interrupts to fire only for waiting context\" into msm-3.4" }, { "commit": "7bc2855a052491a5d1a84fd0b7396a408ee16d6f", "tree": "f5c473990d1c4ee767953fff5d204004c3b0b3d0", "parents": [ "248853185d8b62dc9c813d8172d140e6d852144d", "2ad5e9d4e409fc038fff4f4238fb44617784bd49" ], "author": { "name": "Linux Build Service Account", "email": "lnxbuild@localhost", "time": "Wed Jun 20 05:19:12 2012 -0700" }, "committer": { "name": "QuIC Gerrit Code Review", "email": "code-review@localhost", "time": "Wed Jun 20 05:19:12 2012 -0700" }, "message": "Merge \"msm: kgsl: Fix size for device memstore allocation\" into msm-3.4" }, { "commit": "8723968ce356502fc08120b17844852e0be4b635", "tree": "70c6d45aeebe6d8d9d3b026b0614e7afbdc84c8c", "parents": [ "26d45460e9699e041a399713f1524ceecf3df200" ], "author": { "name": "Jordan Crouse", "email": "jcrouse@codeaurora.org", "time": "Tue Jun 19 13:08:22 2012 -0600" }, "committer": { "name": "Jordan Crouse", "email": "jcrouse@codeaurora.org", "time": "Tue Jun 19 16:15:35 2012 -0600" }, "message": "msm: kgsl: Check that the adreno drawctxt is valid before destroying it\n\nIf there is a failure in drawctxt create, then the KGSL core will call\ndrawctxt destroy to free the memory. If the failure happened soon\nenough, there might not a drawctxt to free.\n\nCRs-Fixed: 371852\nChange-Id: Ic0dedbad629090ae1827e354b9b94bbd3c5efcdd\nSigned-off-by: Jordan Crouse \u003cjcrouse@codeaurora.org\u003e\n" }, { "commit": "609467077ae6b794af47613e05949e8b2fb3a842", "tree": "44e58700597fc888319618806b0b08076c6053c7", "parents": [ "dd8910e8e5abe7611298507f93421baaca3130b6" ], "author": { "name": "Carter Cooper", "email": "ccooper@codeaurora.org", "time": "Thu May 24 13:59:53 2012 -0600" }, "committer": { "name": "Jordan Crouse", "email": "jcrouse@codeaurora.org", "time": "Tue Jun 19 09:18:59 2012 -0600" }, "message": "msm: kgsl: Fix conditional GPU interrupts to fire only for waiting context\n\nConditional interrupts were not getting fired at the correct time when\nusing per context timestamps. When a context was waiting on a timestamp,\nthe interrupt was being fired on the global timestamp rather than the per\ncontext timestamp. Now the interrupt is fired on the per context\ntimestamp.\n\nCRs-Fixed: 340620\nChange-Id: I8393ca74aabfe4b711b61efb023d38d6ab852eec\nSigned-off-by: Carter Cooper \u003cccooper@codeaurora.org\u003e\n" }, { "commit": "2ad5e9d4e409fc038fff4f4238fb44617784bd49", "tree": "fc63b61141c4576f0177c1eb8f64826c6101f44b", "parents": [ "b6f8c78d44a7a155fdd00add89d73e1e6bae3cab" ], "author": { "name": "Richard Ruigrok", "email": "rruigrok@codeaurora.org", "time": "Thu Jun 14 14:22:05 2012 -0700" }, "committer": { "name": "Richard Ruigrok", "email": "rruigrok@codeaurora.org", "time": "Mon Jun 18 11:48:40 2012 -0700" }, "message": "msm: kgsl: Fix size for device memstore allocation\n\nChange prevents IOMMU pagefaults which may occur when\nindexing reaches 4096/sizeof(kgsl_devmemstore) number\nof contexts\n\nCRs-Fixed: 370594\nChange-Id: If726c2a1fcf7667b062e890453a71e95f5417c60\nSigned-off-by: Richard Ruigrok \u003crruigrok@codeaurora.org\u003e\n" }, { "commit": "f68983eaa0b7b9eb2bb35937e799a43fab5442d5", "tree": "45fba507da26edbf75b1c2c7ecbcf3c764448e3b", "parents": [ "d0c83de621851b87789fdcd46f72628d11dccbe4" ], "author": { "name": "Laura Abbott", "email": "lauraa@codeaurora.org", "time": "Wed Jun 13 16:23:23 2012 -0700" }, "committer": { "name": "Laura Abbott", "email": "lauraa@codeaurora.org", "time": "Mon Jun 18 10:42:44 2012 -0700" }, "message": "gpu: ion: Reference count protect/unprotect calls\n\nReference count the calls to ion_{un}secure_heap. The secure SCM\ncall will only be made when the count goes from 0 -\u003e 1 and the\nunsecure call will only be made when the count goes from 1 -\u003e 0.\n\nChange-Id: Ia221b79782c9223d9853ef00c2848e1ab7a73091\nSigned-off-by: Laura Abbott \u003clauraa@codeaurora.org\u003e\n" }, { "commit": "d0c83de621851b87789fdcd46f72628d11dccbe4", "tree": "5c4848c4ed22731d9299b621fe36197e756b0e66", "parents": [ "e2ecb58a6c5011549aac3e86fb1c13e7b7c65104" ], "author": { "name": "Laura Abbott", "email": "lauraa@codeaurora.org", "time": "Tue Jun 12 18:49:57 2012 -0700" }, "committer": { "name": "Laura Abbott", "email": "lauraa@codeaurora.org", "time": "Mon Jun 18 10:42:44 2012 -0700" }, "message": "gpu: ion: Add scm calls for content protection 2.0\n\nThe next generation of content protection has separate SCM\ncalls into TZ. Add these functions in a dedicated file so they\ncan be used by any Ion heap.\n\nChange-Id: I197130f6a5fc33efcd6871b0f7c362fa99f18d20\nSigned-off-by: Laura Abbott \u003clauraa@codeaurora.org\u003e\n" }, { "commit": "d7b1abab7dc5ceb63c84e462ad9ea52ad6c33160", "tree": "45276ac88ffd36d7873be86a7725e6e180bf1d03", "parents": [ "c6a4ccdbeb4184b79e5f1ca3f68a19cacdcf8d59" ], "author": { "name": "Carter Cooper", "email": "ccooper@codeaurora.org", "time": "Tue Jun 05 11:59:23 2012 -0600" }, "committer": { "name": "Carter Cooper", "email": "ccooper@codeaurora.org", "time": "Fri Jun 15 14:50:32 2012 -0600" }, "message": "msm: kgsl: Clean up a3xx irq handler to keep consistent\n\nUse one code path to dereference shared variables. Simplify code\nfor readability.\n\nChange-Id: Ifcfe948b7c04a6594c3fa9eac4afea81f65e59af\nSigned-off-by: Carter Cooper \u003cccooper@codeaurora.org\u003e\n" }, { "commit": "e3adcdc5d3e426e2031bf548a25782707e8e6844", "tree": "9dcf60d74b1727c3ca9612195c38f518583c64c5", "parents": [ "821955f62e65454db7d6262f2b9e257d862382fb", "07e2c891eba4ad2f1a3f98d79abf4be326da54b8" ], "author": { "name": "Linux Build Service Account", "email": "lnxbuild@localhost", "time": "Fri Jun 15 02:16:49 2012 -0700" }, "committer": { "name": "QuIC Gerrit Code Review", "email": "code-review@localhost", "time": "Fri Jun 15 02:16:49 2012 -0700" }, "message": "Merge \"msm: kgsl: Cleanup a3xx ftrace timestamps\" into msm-3.4" }, { "commit": "cd7ad0dd33398a2dea1ff70fca6cf83423c3723d", "tree": "608570776544cd71439d0cf4e3c23a0a77bcff3d", "parents": [ "a0447dcd66c76b831e268e22782ac23a9da2a803", "4624b553ad10ed9ccc16dad2f3271545aefcd8c4" ], "author": { "name": "Linux Build Service Account", "email": "lnxbuild@localhost", "time": "Thu Jun 14 18:13:40 2012 -0700" }, "committer": { "name": "QuIC Gerrit Code Review", "email": "code-review@localhost", "time": "Thu Jun 14 18:13:40 2012 -0700" }, "message": "Merge \"msm: kgsl: Add draw workaround commands after every 50 context switches\" into msm-3.4" }, { "commit": "07e2c891eba4ad2f1a3f98d79abf4be326da54b8", "tree": "ebc69b8ceba4437b6ae876f0899a270b46a26b99", "parents": [ "75c34ca1b4e69e96921e4153dfa9d399e5b9d2e8" ], "author": { "name": "Carter Cooper", "email": "ccooper@codeaurora.org", "time": "Thu Jun 14 10:48:42 2012 -0600" }, "committer": { "name": "Carter Cooper", "email": "ccooper@codeaurora.org", "time": "Thu Jun 14 10:48:42 2012 -0600" }, "message": "msm: kgsl: Cleanup a3xx ftrace timestamps\n\nMake a3xx ftrace always print timestamps in hex rather than\nsometimes in hex and sometimes in decimal.\n\nChange-Id: I6b1709458afd9361fd04bab06c1a4b22aaadd082\nSigned-off-by: Carter Cooper \u003cccooper@codeaurora.org\u003e\n" }, { "commit": "7c611dd96e33ac2a629fe477d6d841f74b3d9edd", "tree": "b033c98fe5526cce783cbfcf5e9860650c3b304d", "parents": [ "278ccef8ecedf0345a8cad627bbec010cf2c08e0", "e13766dbf6eaef6811984fffe69aec3a3a510c5e" ], "author": { "name": "Linux Build Service Account", "email": "lnxbuild@localhost", "time": "Thu Jun 14 08:13:53 2012 -0700" }, "committer": { "name": "QuIC Gerrit Code Review", "email": "code-review@localhost", "time": "Thu Jun 14 08:13:53 2012 -0700" }, "message": "Merge \"msm: kgsl: Add A305 GPU identification for msm8930 V1.2\" into msm-3.4" }, { "commit": "4624b553ad10ed9ccc16dad2f3271545aefcd8c4", "tree": "cca5030748e93acfcbfe92baed65d03fb6a0fe6d", "parents": [ "75c34ca1b4e69e96921e4153dfa9d399e5b9d2e8" ], "author": { "name": "Shubhraprakash Das", "email": "sadas@codeaurora.org", "time": "Fri Jun 01 14:08:03 2012 -0600" }, "committer": { "name": "Shubhraprakash Das", "email": "sadas@codeaurora.org", "time": "Wed Jun 13 11:37:33 2012 -0600" }, "message": "msm: kgsl: Add draw workaround commands after every 50 context switches\n\nWe need to add a draw workaround command sequence after every 50 context\nswitches if the gmem has not been saved in those 50 switches. This\nworkaround is required to prevent the GPU from deadlocking. Since gmem\nsave commands have draw calls in them we only need to execute this\nworkaround if the gmem has not been saved. The number 50 was chosen\nempirically.\n\nCRs-fixed: 362302\nChange-Id: I1a659c85736c47fe6f45030b20ce7a12851b0815\nSigned-off-by: Shubhraprakash Das \u003csadas@codeaurora.org\u003e\n" }, { "commit": "e13766dbf6eaef6811984fffe69aec3a3a510c5e", "tree": "230cc485662473d12dc8f538693d97d73b12b2cb", "parents": [ "75c34ca1b4e69e96921e4153dfa9d399e5b9d2e8" ], "author": { "name": "Sudhakara Rao Tentu", "email": "srtentu@codeaurora.org", "time": "Tue Jun 12 06:00:26 2012 +0530" }, "committer": { "name": "Sudhakara Rao Tentu", "email": "srtentu@codeaurora.org", "time": "Wed Jun 13 21:37:27 2012 +0530" }, "message": "msm: kgsl: Add A305 GPU identification for msm8930 V1.2\n\nIn msm8930 V1.2, there are few HW fixes added for A305 GPU,\ncommunicate new chipid to userspace driver to remove SW workarounds.\n\nChange-Id: I51f272a39cb2cc60541607af9fa9be70cc838cb3\nSigned-off-by: Sudhakara Rao Tentu \u003csrtentu@codeaurora.org\u003e\n" }, { "commit": "190553a6ebf0328618b7755deb64c93610bec874", "tree": "948405a007b7fc2e2a8a45a40109b28c3d99cb4d", "parents": [ "75c34ca1b4e69e96921e4153dfa9d399e5b9d2e8" ], "author": { "name": "Shubhraprakash Das", "email": "sadas@codeaurora.org", "time": "Mon Jun 11 15:17:59 2012 -0600" }, "committer": { "name": "Shubhraprakash Das", "email": "sadas@codeaurora.org", "time": "Tue Jun 12 22:18:30 2012 -0600" }, "message": "msm: kgsl: Print the correct pid during iommu pagefault\n\nGet the current pagetable being used by the GPU by reading the\npagetable register during iommu pagefault and use that base\naddress to get the pid of the process corresponding to the\npagetable. Earlier we were using the pagetable address that the\nIOMMU driver thinks is presently set for the GPU which may not\nalways be the case because we change the pagetable used by the\nGPU without informing the IOMMU driver.\n\nChange-Id: I7cf788f5d0f9454deb139ed3ad75bb4e750f4772\nSigned-off-by: Shubhraprakash Das \u003csadas@codeaurora.org\u003e\n" }, { "commit": "75c34ca1b4e69e96921e4153dfa9d399e5b9d2e8", "tree": "c60ce27bf268851b5d22ae40dddd83462c532b83", "parents": [ "fef39d45c2c879b3104436573bef1eaa963adc08", "25dad72ab532f1ed4466b6684012f1c55acddb93" ], "author": { "name": "Steve Muckle", "email": "smuckle@codeaurora.org", "time": "Tue Jun 12 14:27:40 2012 -0700" }, "committer": { "name": "Steve Muckle", "email": "smuckle@codeaurora.org", "time": "Tue Jun 12 14:28:21 2012 -0700" }, "message": "Merge remote branch \u0027origin/msm-3.0\u0027 into msm-3.4\n\n* origin/msm-3.0: (87 commits)\n Revert \"msm: kgsl: Add VBIF error detection\"\n tspp: 8960: adding TSPP driver for 8960\n board-8960: Merge secure and non secure firmware heaps.\n msm: msm_dsps: Move to the new clk_prepare/unprepare API.\n diag: Protect SMD channel from getting NULL value\n camera: Mercury hardware JPEG decoder driver support.\n msm: 8064-regulator: Remove 5V FRC gpio external regulator\n diag: Respond to Get Subsystem Mask request\n Revert \"msm_fb: display: Attach and detach MDP IOMMU on suspend/resume\"\n Revert \"msm_fb: display: Add MDP IOMMU detach support for DTV\"\n msm: rpm-8930: Fix incorrect RPM enumeration and DMM\n msm: board-8930: Configure GPU turbo clock to 400MHz\n usb: mdm_bridge: Fix bug in handling error condition\n msm: vidc: Invalidate the cache before processing metadata.\n video: msm: wfd: Add turbo mode support\n tty: n_smux: Add Dedicated Power Control Queue\n defconfig: msm-copper: Enable SPI ethernet support\n msm: acpuclock-8960: Add PVS support on 8064\n ASoC: mdm9615: Set correct GPIOs for AUX PCM\n msm: 9615: Add auxpcm support over secondary audio interface\n ...\n\nConflicts:\n\tarch/arm/configs/msm-copper_defconfig\n\tdrivers/char/diag/diagchar_core.c\n\tdrivers/char/diag/diagfwd_hsic.h\n\tdrivers/media/video/msm/msm_camera.c\n\tdrivers/media/video/msm/msm_mctl.c\n\tdrivers/mfd/Kconfig\n\tdrivers/mfd/Makefile\n\tdrivers/mfd/wcd9xxx-slimslave.c\n\tdrivers/spmi/spmi.c\n\tdrivers/tty/n_smux.c\n\tdrivers/usb/otg/msm_otg.c\n\tsound/soc/msm/msm-pcm-routing.h\n\nSigned-off-by: Steve Muckle \u003csmuckle@codeaurora.org\u003e\nChange-Id: I49d4ceff17714a7ba51243de63f27b7e78647bda\n" }, { "commit": "08a7e57530cb07a50eb5d665db7330deb622b6a9", "tree": "55e92c8f9dd0a3a127af996883a94e1522f559f4", "parents": [ "266a2648d9828258108c16545e62459149c50323" ], "author": { "name": "Wei Zou", "email": "wzou@codeaurora.org", "time": "Sun Jun 03 22:05:46 2012 -0700" }, "committer": { "name": "Linux Build Service Account", "email": "lnxbuild@localhost", "time": "Sun Jun 10 14:16:22 2012 -0600" }, "message": "Revert \"msm: kgsl: Add VBIF error detection\"\n\nThis reverts commit dc9323028b68e69b8ac0bbc2eb334ec9a59c5670.\n\nEnable VBIF error interrupt is causing GPU hang in Camera Monkey test.\nNeed to revert it first and re-enable after the issue is resolved.\n\nChange-Id: I6f2e4b8d4002e01e70a75382203c6936e0c55a22\nSigned-off-by: Wei Zou \u003cwzou@codeaurora.org\u003e\n" }, { "commit": "17e828f381a1bac852501c05bb6aea59550473f1", "tree": "a323f76247f67c40110626b48e3867aa5255c4a7", "parents": [ "4f3eadbbc8e67f41a4f5e200aaa1f70ae0dae92e", "ed8cbb51e4eff353d41b1cacb95d7769e1642e85" ], "author": { "name": "Linux Build Service Account", "email": "lnxbuild@localhost", "time": "Sun Jun 10 01:41:30 2012 -0700" }, "committer": { "name": "QuIC Gerrit Code Review", "email": "code-review@localhost", "time": "Sun Jun 10 01:41:30 2012 -0700" }, "message": "Merge \"msm: kgsl: Fix a compiler warning.\" into msm-3.0" }, { "commit": "dd246669f13610eae24d21297f622c2b06820e81", "tree": "6409aa1c31ad0dffe059f5dd1a10f459d7b96eb6", "parents": [ "f612b3b059551a715e9b7a1ba70aedec85ba6544", "f86e3f216da96d6841c89cf86afeb65891b3239a" ], "author": { "name": "Linux Build Service Account", "email": "lnxbuild@localhost", "time": "Sat Jun 09 04:48:23 2012 -0700" }, "committer": { "name": "QuIC Gerrit Code Review", "email": "code-review@localhost", "time": "Sat Jun 09 04:48:23 2012 -0700" }, "message": "Merge \"msm: kgsl: Disable AHB register timeout interrupt for A3XX GPU\" into msm-3.0" }, { "commit": "f86e3f216da96d6841c89cf86afeb65891b3239a", "tree": "dd616d4cf5eac100c25b6fcb68f4863d70bc1f06", "parents": [ "75be1fde38a39d9198695b0aa1578ac89e43d58b" ], "author": { "name": "Rajeev Kulkarni", "email": "krajeev@codeaurora.org", "time": "Wed Jun 06 12:03:43 2012 -0700" }, "committer": { "name": "Rajeev Kulkarni", "email": "krajeev@codeaurora.org", "time": "Thu Jun 07 12:43:06 2012 -0700" }, "message": "msm: kgsl: Disable AHB register timeout interrupt for A3XX GPU\n\nRegister transfers were taking more time than the maximum value\nprogrammed in the transfer timeout counter to complete the\ntransfer. Because of it we were seeing AHB register timeout\nmessages. We can mask this interrupt in the interrupt mask\nregister to avoid timeout messages, since these messages are\nfalse positive.\n\nChange-Id: I7d5ba052b7396b29b7d15efe006e7bf3347a3d8c\nSigned-off-by: Rajeev Kulkarni \u003ckrajeev@codeaurora.org\u003e\n" }, { "commit": "3d784f50cfbb6c7017a70d0b74b3589d549e2022", "tree": "a9b3b5e3df7543746e2274060e540dc53e32e741", "parents": [ "97828ae3a376fd17918caa0a74740393b485bace" ], "author": { "name": "Shubhraprakash Das", "email": "sadas@codeaurora.org", "time": "Wed Jun 06 23:12:11 2012 -0600" }, "committer": { "name": "Shubhraprakash Das", "email": "sadas@codeaurora.org", "time": "Wed Jun 06 23:12:11 2012 -0600" }, "message": "msm: kgsl: Check whether setstate memory address is used as IB\n\nDuring snapshot check whether setstate memory address is used as\nan IB in the ringbuffer. The snapshot code was unable to find\nthe memory for an IB in the ringbuffer which belongs to the\nsetstate memory\n\nChange-Id: Ief4bd45fd44c3db29292126ce8d7c05c337c63b3\nSigned-off-by: Shubhraprakash Das \u003csadas@codeaurora.org\u003e\n" }, { "commit": "97828ae3a376fd17918caa0a74740393b485bace", "tree": "f14b01aa8251d52b0c6cf51220f31770321c455a", "parents": [ "726ec1b045c476d95e34e7775bf3567053df38fa" ], "author": { "name": "Shubhraprakash Das", "email": "sadas@codeaurora.org", "time": "Wed Jun 06 22:46:37 2012 -0600" }, "committer": { "name": "Shubhraprakash Das", "email": "sadas@codeaurora.org", "time": "Wed Jun 06 22:46:37 2012 -0600" }, "message": "msm: kgsl: Only return tlb flush flag if bit is set for given device\n\nWe should only return the tlb flush flag if the bit corresponding\nto the given device is set in the tlb flags. Earlier we were returning\nthe flush flag always if the tlb flags had the flush bit set for any\ndevice.\n\nChange-Id: Iedae82a5f54a17396bd12b3dd704ade0eb4a07f0\nSigned-off-by: Shubhraprakash Das \u003csadas@codeaurora.org\u003e\n" }, { "commit": "5a586c1b4d5150af7992a2cdb385c97d392112f7", "tree": "5f2b1c88066726afdb97aa7a526ebbaf73dc75a7", "parents": [ "dc0eed4422dad92d3dd5afd468876d3d5b241ce1" ], "author": { "name": "Lucille Sylvester", "email": "lsylvest@codeaurora.org", "time": "Tue May 22 09:59:06 2012 -0600" }, "committer": { "name": "Steve Muckle", "email": "smuckle@codeaurora.org", "time": "Wed Jun 06 18:52:45 2012 -0700" }, "message": "msm: kgsl: Remove wakelocks for 3.4 kernel\n\npm_qos calls cover the same functionality.\n\nSigned-off-by: Lucille Sylvester \u003clsylvest@codeaurora.org\u003e\n\nConflicts:\n\tdrivers/gpu/msm/kgsl_device.h\n\nChange-Id: I582cd67de4bc140fa5f25fd361f9b7e70e525386\nSigned-off-by: Stephen Boyd \u003csboyd@codeaurora.org\u003e\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": "ed8cbb51e4eff353d41b1cacb95d7769e1642e85", "tree": "e60f6eedb58ab9f99555406a3abff282a29c7096", "parents": [ "867013766fbd8a08ecec9405d0993757cecfa4c0" ], "author": { "name": "Pu Chen", "email": "puchen@codeaurora.org", "time": "Mon Jun 04 18:18:48 2012 -0700" }, "committer": { "name": "Pu Chen", "email": "puchen@codeaurora.org", "time": "Wed Jun 06 10:29:03 2012 -0700" }, "message": "msm: kgsl: Fix a compiler warning.\n\nFix compiler warning for a variable not\ninitialized.\n\nChange-Id: I0616306c02ac8bb1c101d615879d831a022aaaea\nSigned-off-by: Pu Chen \u003cpuchen@codeaurora.org\u003e\n" }, { "commit": "eadb7505134a23b8de3cd74c924fd31324978a7e", "tree": "b2a8b19c60d284b34d1047eb26d3165350151bbf", "parents": [ "b147203100ad731304d37e59c7448706eabaf8f5" ], "author": { "name": "Hanumant Singh", "email": "hanumant@codeaurora.org", "time": "Tue May 15 18:14:04 2012 -0700" }, "committer": { "name": "Deepak Kotur", "email": "dkotur@codeaurora.org", "time": "Mon Jun 04 16:12:36 2012 -0700" }, "message": "board-8064 msm: Overlap secure and non secure video firmware heaps.\n\nMoves fixed area start address down, so that non secure\nvideo firmware heap and secure video firmware area overlap.\nBoth use the region in a mutually exclusive manner.\nALso introduce a hole, that can be used by MM heap\nlock down for content protection.\n\nChange-Id: Ic240377da25e00423742ccb73dbb60a1ff037e37\nSigned-off-by: Deepak Kotur \u003cdkotur@codeaurora.org\u003e\n" }, { "commit": "b8a8bacff3d69c62031648207c1a341ad393bba3", "tree": "65b252fe943e1da44527ad301d33a4ee0ff39c42", "parents": [ "d66a6505a68a2a205d58d55c1539f3814c084206", "dad9df5f82856197bfc921eb71e4515f57441145" ], "author": { "name": "Linux Build Service Account", "email": "lnxbuild@localhost", "time": "Fri Jun 01 19:09:30 2012 -0700" }, "committer": { "name": "QuIC Gerrit Code Review", "email": "code-review@localhost", "time": "Fri Jun 01 19:09:30 2012 -0700" }, "message": "Merge changes I6caaaff9,I7ea74057 into msm-3.0\n\n* changes:\n msm: kgsl: Follow reverse sequence of init procedure during exit\n msm: kgsl: Pass correct datatype to kgsl_mmu_ptpool_destroy()\n" }, { "commit": "dad9df5f82856197bfc921eb71e4515f57441145", "tree": "787bdef2a5275aa12ade15e9c02b18a27f497155", "parents": [ "4ad59e993c966bfaefba5343578095d9a0332a9e" ], "author": { "name": "Ranjhith Kalisamy", "email": "ranjhith@codeaurora.org", "time": "Fri Jun 01 17:05:13 2012 +0530" }, "committer": { "name": "Ranjhith Kalisamy", "email": "ranjhith@codeaurora.org", "time": "Fri Jun 01 17:34:13 2012 +0530" }, "message": "msm: kgsl: Follow reverse sequence of init procedure during exit\n\nFixes kernel warnings about sysfs entries being unavailable when they\nare removed during exit.\n\nChange-Id: I6caaaff935b31d3f39a3610cdd2b048baf2f1a97\nSigned-off-by: Ranjhith Kalisamy \u003cranjhith@codeaurora.org\u003e\n" }, { "commit": "36dfbd85692744de74d981d886668b788315e879", "tree": "f03e6ded81ece1d1e551ec96e928a96f1571324c", "parents": [ "7ad23c5ee3eb9a4ee60980fe001c9d2a8d7840a0", "e86ba5ca2814cbbcb803c154bda0c14851d33d37" ], "author": { "name": "Linux Build Service Account", "email": "lnxbuild@localhost", "time": "Thu May 31 11:21:50 2012 -0700" }, "committer": { "name": "QuIC Gerrit Code Review", "email": "code-review@localhost", "time": "Thu May 31 11:21:50 2012 -0700" }, "message": "Merge \"msm: kgsl: Report error if regulator enable fails\" into msm-3.0" }, { "commit": "4ad59e993c966bfaefba5343578095d9a0332a9e", "tree": "328f4318d60e1908d25bff199bd1f571c43c87ab", "parents": [ "da3c70545bdca4bf8ba18202df4083255621da4f" ], "author": { "name": "Ranjhith Kalisamy", "email": "ranjhith@codeaurora.org", "time": "Thu May 31 19:15:11 2012 +0530" }, "committer": { "name": "Ranjhith Kalisamy", "email": "ranjhith@codeaurora.org", "time": "Thu May 31 19:15:11 2012 +0530" }, "message": "msm: kgsl: Pass correct datatype to kgsl_mmu_ptpool_destroy()\n\nThis fixes a crash due to NULL pointer access when allocation of DMA\nCoherent memory fails.\n\nChange-Id: I7ea7405713682aaa7cd660ef341a968342dc0880\nSigned-off-by: Ranjhith Kalisamy \u003cranjhith@codeaurora.org\u003e\n" }, { "commit": "85c95406680ce1a959a9b8cdb5aff7afcd699038", "tree": "a0b137365fc1006b4c2a44809bd5a501ca8c4187", "parents": [ "29bb4d5fa7a285c8fb5d5db55225dab700b80419" ], "author": { "name": "Olav Haugan", "email": "ohaugan@codeaurora.org", "time": "Wed May 30 17:32:37 2012 -0700" }, "committer": { "name": "Olav Haugan", "email": "ohaugan@codeaurora.org", "time": "Wed May 30 17:33:36 2012 -0700" }, "message": "gpu: ion: Use standard cache routines\n\nInstead of using custom routines for cache operations use the\nstandard operations for cache flush, cache clean, and cache\ninvalidate. In addition only call outer cache routines if\nouter cache is available.\n\nChange-Id: Idb51bf7348fd526ebdea1e6ff2e366b8a3b4de33\nSigned-off-by: Olav Haugan \u003cohaugan@codeaurora.org\u003e\n" }, { "commit": "f5f3358e0bb8c6b024469c298c46c03cceb53a68", "tree": "9aab18dab40f4094dc4a62ce804eeb8e9bb5fe4a", "parents": [ "2cc13f08cde4f2bc54f671ef0d4f07a86112bbf2", "dc9323028b68e69b8ac0bbc2eb334ec9a59c5670" ], "author": { "name": "Linux Build Service Account", "email": "lnxbuild@localhost", "time": "Mon May 28 00:04:38 2012 -0700" }, "committer": { "name": "QuIC Gerrit Code Review", "email": "code-review@localhost", "time": "Mon May 28 00:04:38 2012 -0700" }, "message": "Merge \"msm: kgsl: Add VBIF error detection\" into msm-3.0" }, { "commit": "5b524160f5cb1e6f68cd906328480c833f75b2a6", "tree": "391467189a55fde78c80eaa4f1d8362e37278323", "parents": [ "fd21d268104d7f74082a1af406b3e08887db11db", "95b6847e8335dff39428f711db7d6b6f497d4015" ], "author": { "name": "Linux Build Service Account", "email": "lnxbuild@localhost", "time": "Sun May 27 05:58:27 2012 -0700" }, "committer": { "name": "QuIC Gerrit Code Review", "email": "code-review@localhost", "time": "Sun May 27 05:58:27 2012 -0700" }, "message": "Merge changes Ic0dedbad,I13afb1e8,Ib9d75b31,I846cb588 into msm-3.0\n\n* changes:\n msm: kgsl: Add IOMMU fault handler\n msm: kgsl: improve context and timestamp trace\n msm: kgsl: add a kgsl_readtimestamp() wrapper\n msm: kgsl: add a trace event for MMU pagefaults\n" }, { "commit": "d01221b66152d7ad618668f250a87fdfb0ea9284", "tree": "0761ea1294c76ac830a898992d9f7cb75f779980", "parents": [ "bd7a61c894b20715de40f4a288bd74e2c5027944" ], "author": { "name": "Laura Abbott", "email": "lauraa@codeaurora.org", "time": "Wed May 16 17:52:49 2012 -0700" }, "committer": { "name": "Linux Build Service Account", "email": "lnxbuild@localhost", "time": "Sat May 26 03:20:54 2012 -0600" }, "message": "msm: Add api to register virtual domain space\n\nGoing forward, clients may want to have more control over the\nvirtual address space for iommu domains. Add API to support\nclients registering virtual address space information. Current\nclients are internally converted to use the new APIs.\n\nChange-Id: Iaec9f1cd150eefc02ce22c34790494b61f21eb12\nSigned-off-by: Laura Abbott \u003clauraa@codeaurora.org\u003e\n" }, { "commit": "0671b9a9e637073e93ac44acae989bcb8eef9415", "tree": "ed99e04d6ee07ed64af89ecc631a4b892472dfb2", "parents": [ "e4900b502a535ff0d55a9bdf4422cb2e9ec44f8f" ], "author": { "name": "Olav Haugan", "email": "ohaugan@codeaurora.org", "time": "Fri May 25 11:58:56 2012 -0700" }, "committer": { "name": "Olav Haugan", "email": "ohaugan@codeaurora.org", "time": "Fri May 25 13:35:06 2012 -0700" }, "message": "gpu: ion: Add dump of memory map\n\nAdd dump of physical memory map, showing allocated and\nfree areas, to debugfs interface for heaps with carveout memory.\n\nChange-Id: I9bda9f3e555e55570c95e652616ca1fcc25eb0ab\nSigned-off-by: Olav Haugan \u003cohaugan@codeaurora.org\u003e\n" }, { "commit": "e4900b502a535ff0d55a9bdf4422cb2e9ec44f8f", "tree": "e8e928fb543ddd5e84a11efae3bc25e2af53466f", "parents": [ "6123f0d0e3f23f89422afa39d23fb5cc1649930b" ], "author": { "name": "Olav Haugan", "email": "ohaugan@codeaurora.org", "time": "Fri May 25 11:58:03 2012 -0700" }, "committer": { "name": "Olav Haugan", "email": "ohaugan@codeaurora.org", "time": "Fri May 25 13:35:06 2012 -0700" }, "message": "gpu: ion: Add lock around debug routine\n\nAccess to rb tree of user and kernel ION clients\nmust be protected by a mutex.\n\nChange-Id: Ie27eba65f8cab3a7c20c041eb46429ba62c5c00f\nSigned-off-by: Olav Haugan \u003cohaugan@codeaurora.org\u003e\n" }, { "commit": "6607f876540a9f8bab5343035e6b82245d92b32d", "tree": "0d9842a1302a64c66c07ffb9c89ec417f26811f0", "parents": [ "f4ba005032da6aa988da65330a396ae04c658d95", "45543ebb3614ac188ff1e452cdfd9be20f79623d" ], "author": { "name": "Linux Build Service Account", "email": "lnxbuild@localhost", "time": "Fri May 25 12:08:22 2012 -0700" }, "committer": { "name": "QuIC Gerrit Code Review", "email": "code-review@localhost", "time": "Fri May 25 12:08:22 2012 -0700" }, "message": "Merge \"msm: kgsl: Remove deprecated CP_SET_DRAW_INIT_FLAGS function for A22X\" into msm-3.0" }, { "commit": "95b6847e8335dff39428f711db7d6b6f497d4015", "tree": "3877ace038aeb151ce3ae1b5e24253a2a838d17b", "parents": [ "4a3756c8828738bba2aa1c0efaf8eaea87e75cd1" ], "author": { "name": "Jordan Crouse", "email": "jcrouse@codeaurora.org", "time": "Fri May 25 10:25:01 2012 -0600" }, "committer": { "name": "Jordan Crouse", "email": "jcrouse@codeaurora.org", "time": "Fri May 25 10:46:11 2012 -0600" }, "message": "msm: kgsl: Add IOMMU fault handler\n\nAdd a custom fault handler for the IOMMU and trace MMU faults\nlike we do for GPU MMU. In the nominal path, return 0 to the\ncore so it doesn\u0027t print the default IOMMU error message.\n\nChange-Id: Ic0dedbad5112af646c585610a57f7e8841233862\nSigned-off-by: Jordan Crouse \u003cjcrouse@codeaurora.org\u003e\n" }, { "commit": "4a3756c8828738bba2aa1c0efaf8eaea87e75cd1", "tree": "33811fce67e7d283d3aaecf13c5e8f4875fbf427", "parents": [ "731dac5c18619f6db4862554f52fbaf5be69ccc4" ], "author": { "name": "Jeremy Gebben", "email": "jgebben@codeaurora.org", "time": "Tue May 08 16:51:43 2012 -0600" }, "committer": { "name": "Jeremy Gebben", "email": "jgebben@codeaurora.org", "time": "Fri May 25 10:31:30 2012 -0600" }, "message": "msm: kgsl: improve context and timestamp trace\n\nAdd kgsl_context_create and kgsl_context_detach\ntrace events for tracking context lifetime.\nInclude more timestamp information in existing\nevents.\n\nChange-Id: I13afb1e816caa7b668cde31cdcc8a8bd1bf8b4dc\nSigned-off-by: Jeremy Gebben \u003cjgebben@codeaurora.org\u003e\n" }, { "commit": "731dac5c18619f6db4862554f52fbaf5be69ccc4", "tree": "8e3ed4e65cf39734e46510c829dddf224f57f2c9", "parents": [ "5935b7a95680725e62956c967eb524a6aff825c3" ], "author": { "name": "Jeremy Gebben", "email": "jgebben@codeaurora.org", "time": "Thu May 10 11:13:42 2012 -0600" }, "committer": { "name": "Jeremy Gebben", "email": "jgebben@codeaurora.org", "time": "Fri May 25 10:31:30 2012 -0600" }, "message": "msm: kgsl: add a kgsl_readtimestamp() wrapper\n\nCalling this device function directly from the function\ntable is unnecessarily verbose, and done fairly often.\n\nChange-Id: Ib9d75b31dfab8fb4ccced46fe62a08a98da8c94f\nSigned-off-by: Jeremy Gebben \u003cjgebben@codeaurora.org\u003e\n" }, { "commit": "5935b7a95680725e62956c967eb524a6aff825c3", "tree": "325db8dc183ef95f3129d1d9076e577877732ac8", "parents": [ "603161f9ca988a6f9f41d7280c5e4f704a121d7c" ], "author": { "name": "Jeremy Gebben", "email": "jgebben@codeaurora.org", "time": "Wed May 09 14:52:34 2012 -0600" }, "committer": { "name": "Jeremy Gebben", "email": "jgebben@codeaurora.org", "time": "Fri May 25 10:31:29 2012 -0600" }, "message": "msm: kgsl: add a trace event for MMU pagefaults\n\nIt is often very useful to see where a pagefault\noccurs in relation to other trace events such\nas kgsl_mem_free or kgsl_issueibcmds, so that the\nsource of the pagefault can be isolated.\n\nChange-Id: I846cb588e1b09bf12698d014d289b64f35576c7e\nSigned-off-by: Jeremy Gebben \u003cjgebben@codeaurora.org\u003e\n" }, { "commit": "e86ba5ca2814cbbcb803c154bda0c14851d33d37", "tree": "e2e6803bf7e817421fe69c057a162cec08d17611", "parents": [ "c3f3b0321016480b66def830deff50cc21a67910" ], "author": { "name": "Shubhraprakash Das", "email": "sadas@codeaurora.org", "time": "Wed Apr 04 18:03:27 2012 -0600" }, "committer": { "name": "Shubhraprakash Das", "email": "sadas@codeaurora.org", "time": "Thu May 24 17:39:40 2012 -0600" }, "message": "msm: kgsl: Report error if regulator enable fails\n\nIn function kgsl_pwrctrl_pwrrail check if call to enable the\nregulator fails or not and report an error message on failure.\n\nChange-Id: Ib729bbbeb544c572f1d43771e5777a951346e876\nSigned-off-by: Shubhraprakash Das \u003csadas@codeaurora.org\u003e\n" }, { "commit": "903f6c716db3d4e26952aae9717f81dd5bc9e4ba", "tree": "95d43d6f67d853b4b615f56fac0df699579f3508", "parents": [ "af120e1797e3ab6a748abee53e8f9d3cd4a30322" ], "author": { "name": "Rebecca Schultz Zavin", "email": "rebecca@android.com", "time": "Wed May 23 12:55:55 2012 -0700" }, "committer": { "name": "Rebecca Schultz Zavin", "email": "rebecca@android.com", "time": "Wed May 23 13:20:25 2012 -0700" }, "message": "gpu: ion: Get an sg_table from an ion handle\n\nThis patch adds an interface to return and sg_table given a\nvalid ion handle.\n\nChange-Id: Icd948c60c1af0a4279f337bcd591cd39b46325e8\nSigned-off-by: Rebecca Schultz Zavin \u003crebecca@android.com\u003e\n" }, { "commit": "7d3139bbdb688755c9a36831f8f34dfcdf3052b0", "tree": "2f7b1eee9c5b719e94d098499a32f47102bc8ab9", "parents": [ "3c86ca8296dc8d7ec111ff9adceb11b2142086da" ], "author": { "name": "Jordan Crouse", "email": "jcrouse@codeaurora.org", "time": "Fri May 18 10:05:02 2012 -0600" }, "committer": { "name": "Jordan Crouse", "email": "jcrouse@codeaurora.org", "time": "Wed May 23 14:10:30 2012 -0600" }, "message": "msm: kgsl: Map a guard page on the back of GPU MMU regions\n\nAdd a guard page on the backside of page_alloc MMU mappings to protect\nagainst an over zealous GPU pre-fetch engine that sometimes oversteps the\nend of the mapped region. The same phsyical page can be re-used for each\nmapping so we only need to allocate one phsyical page to rule them all\nand in the darkness bind them.\n\nChange-Id: Ic0dedbad01e1eae5832bb79cc1446353656cf0af\nSigned-off-by: Jordan Crouse \u003cjcrouse@codeaurora.org\u003e\n" }, { "commit": "3c86ca8296dc8d7ec111ff9adceb11b2142086da", "tree": "f76d793ea9e14fe30c59f643a3e1dc8b6bb38e9a", "parents": [ "fcef77c48a53b8b9cefa7346046c5b3816dffc79" ], "author": { "name": "Jordan Crouse", "email": "jcrouse@codeaurora.org", "time": "Mon May 21 08:41:52 2012 -0600" }, "committer": { "name": "Jordan Crouse", "email": "jcrouse@codeaurora.org", "time": "Wed May 23 14:10:30 2012 -0600" }, "message": "msm: kgsl: Calculate size of the MMU map region from the scatterlist\n\nThe GPUMMU and IOMMU functions operate on a scatter-gather list of\npages but still use the memdesc-\u003esize to determine the overall size\nof the region. Enforce a single authoratiative source for all the\nmapping data and calculate the size from the sglist.\n\nChange-Id: Ic0dedbad6ffae842b65c5a88e7d56f834501e9d3\nSigned-off-by: Jordan Crouse \u003cjcrouse@codeaurora.org\u003e\n" }, { "commit": "45543ebb3614ac188ff1e452cdfd9be20f79623d", "tree": "f92ab9fbfb5d8f9c93626c344ab9c4a9bf72b8f0", "parents": [ "fcef77c48a53b8b9cefa7346046c5b3816dffc79" ], "author": { "name": "Jordan Crouse", "email": "jcrouse@codeaurora.org", "time": "Wed May 23 13:35:39 2012 -0600" }, "committer": { "name": "Jordan Crouse", "email": "jcrouse@codeaurora.org", "time": "Wed May 23 13:42:51 2012 -0600" }, "message": "msm: kgsl: Remove deprecated CP_SET_DRAW_INIT_FLAGS function for A22X\n\nRemove a deprecated CP opcode previously used on A22X GPUs.\n\nChange-Id: Ic0dedbad4702bd1f795fce8d203e9664ac057e1b\nSigned-off-by: Jordan Crouse \u003cjcrouse@codeaurora.org\u003e\n" }, { "commit": "dc9323028b68e69b8ac0bbc2eb334ec9a59c5670", "tree": "62a35481944208e669ea5ea18f0ed9df5e73b823", "parents": [ "fcef77c48a53b8b9cefa7346046c5b3816dffc79" ], "author": { "name": "Jordan Crouse", "email": "jcrouse@codeaurora.org", "time": "Wed May 23 11:16:18 2012 -0600" }, "committer": { "name": "Jordan Crouse", "email": "jcrouse@codeaurora.org", "time": "Wed May 23 13:23:14 2012 -0600" }, "message": "msm: kgsl: Add VBIF error detection\n\nEnable VBIF error interupts, and dumping the VBIF error\nregisters inside of the A3XX interrupt handler. Because\nof the possiblity of false positive errors, use\nKGSL_DRV_INFO to restrict the output to the info log level.\n\nChange-Id: Ic0dedbad527fc616da709a79419cc2f4f5347001\nSigned-off-by: Jordan Crouse \u003cjcrouse@codeaurora.org\u003e\n" }, { "commit": "aa922557dd70014028c38c5b98d3efbadc48c6dc", "tree": "37a64ba75a271368c64df7b26a8600b0229ba14b", "parents": [ "9ae9555efa2df5881bcef2685038098cf0e7b2ac", "c6e2101712e057e95c1de8643be2764fe972570a" ], "author": { "name": "Linux Build Service Account", "email": "lnxbuild@localhost", "time": "Wed May 23 06:40:21 2012 -0700" }, "committer": { "name": "QuIC Gerrit Code Review", "email": "code-review@localhost", "time": "Wed May 23 06:40:21 2012 -0700" }, "message": "Merge \"msm: kgsl: Switch pagetables in stream for IOMMU\" into msm-3.0" }, { "commit": "1384a6ad21a410c9421b0b1dd9a17680198ce00e", "tree": "5f7da656b200ced88c322877d57923ed971b1c66", "parents": [ "82b335041786c0c1fd51a25100ccf40b733020f9" ], "author": { "name": "Jeremy Gebben", "email": "jgebben@codeaurora.org", "time": "Thu May 17 14:34:17 2012 -0600" }, "committer": { "name": "Ranjhith Kalisamy", "email": "ranjhith@codeaurora.org", "time": "Wed May 23 12:04:55 2012 +0530" }, "message": "msm: kgsl: don\u0027t cancel events too soon during release\n\nCancel per context events after the device specific\nportion of the context is destroyed and cancel\nglobal timestamp events after all the contexts\nare destroyed. This reduces the likelyhood that memory\nwill be freed while the gpu is still using it.\n\nCRs-Fixed: 361864\nChange-Id: If798c5dd0418167e2a091bb58d810dcbd0d59154\nSigned-off-by: Jeremy Gebben \u003cjgebben@codeaurora.org\u003e\nSigned-off-by: Ranjhith Kalisamy \u003cranjhith@codeaurora.org\u003e\n" }, { "commit": "c6e2101712e057e95c1de8643be2764fe972570a", "tree": "96a84b73c99dd2c57ce0b6218f8c8967eec5b0ed", "parents": [ "bb4e8e08f0e086f9b64ca2441b7c77857938be28" ], "author": { "name": "Shubhraprakash Das", "email": "sadas@codeaurora.org", "time": "Fri May 11 17:24:51 2012 -0600" }, "committer": { "name": "Linux Build Service Account", "email": "lnxbuild@localhost", "time": "Tue May 22 21:58:31 2012 -0600" }, "message": "msm: kgsl: Switch pagetables in stream for IOMMU\n\nSwitch IOMMU pagetables by using GPU commands instead of using the CPU.\nThis is better for performance because the synchronization required for\nswitching pagetables instream using GPU commands is less expensive\ncomparedto synchronization required when switching pagetables using the\nCPU\n\nChange-Id: I00e676bbf04a4c9fa944e896a367ba837d3606f5\nSigned-off-by: Shubhraprakash Das \u003csadas@codeaurora.org\u003e\n" }, { "commit": "46d71337f9aa84694e4e6cca7f3beb6b033bbf76", "tree": "b60160368f5fc7ee1ae8226f455ddc86d14ed7d2", "parents": [ "be4a1ee79a89da3ca705aecc2ac92cbeedd032bd" ], "author": { "name": "Rebecca Schultz Zavin", "email": "rebecca@android.com", "time": "Mon May 07 16:06:32 2012 -0700" }, "committer": { "name": "Rebecca Schultz Zavin", "email": "rebecca@android.com", "time": "Tue May 22 14:01:07 2012 -0700" }, "message": "gpu: ion: Allocate the sg_table at creation time rather than dynamically\n\nRather than calling map_dma on the allocations dynamically, this patch\nswitches to creating the sg_table at the time the buffer is created.\nThis is necessary because in future updates the sg_table will be used\nfor cache maintenance.\n\nChange-Id: I49aac7c6d3a5afc440d18b917ae0e73be5d3f56d\nSigned-off-by: Rebecca Schultz Zavin \u003crebecca@android.com\u003e\n" }, { "commit": "be4a1ee79a89da3ca705aecc2ac92cbeedd032bd", "tree": "8fe4e4c40af3fd2177779ae3a189b0bf9fc70bd2", "parents": [ "0d1259b5f84969bd00811ff9faa1c44cdb9fdbb5" ], "author": { "name": "Rebecca Schultz Zavin", "email": "rebecca@android.com", "time": "Thu Apr 26 20:44:10 2012 -0700" }, "committer": { "name": "Rebecca Schultz Zavin", "email": "rebecca@android.com", "time": "Tue May 22 14:01:07 2012 -0700" }, "message": "gpu: ion: support begin/end and kmap/kunmap dma_buf ops\n\nThese ops were added in the 3.4 kernel. This patch adds support\nfor them to ion. Previous ion_map/unmap_kernel api is also\nretained in addition to this new api.\n\nChange-Id: I6d2db284dce12c2d8cc4e540865beee2da43bd0c\nSigned-off-by: Rebecca Schultz Zavin \u003crebecca@android.com\u003e\n" }, { "commit": "0d1259b5f84969bd00811ff9faa1c44cdb9fdbb5", "tree": "ead8d61a8617845176d051878f5f66742dca242a", "parents": [ "043a61468f395dd6d4fc518299726955e9999c59" ], "author": { "name": "Rebecca Schultz Zavin", "email": "rebecca@android.com", "time": "Mon Apr 30 16:45:38 2012 -0700" }, "committer": { "name": "Rebecca Schultz Zavin", "email": "rebecca@android.com", "time": "Tue May 22 14:01:06 2012 -0700" }, "message": "gpu: ion: Use alloc_pages instead of vmalloc from the system heap\n\nWith this change the ion_system_heap will only use kernel address\nspace when the memory is mapped into the kernel (rare case).\n\nChange-Id: I8702cf89ffec0bd5c337bd88d7444013d4d94bc8\nSigned-off-by: Rebecca Schultz Zavin \u003crebecca@android.com\u003e\n" }, { "commit": "043a61468f395dd6d4fc518299726955e9999c59", "tree": "73cf72a37746d0e3bae3bb4a6aa34f1838371683", "parents": [ "d4e8b7193d87d80f3364d7924692988c974780aa" ], "author": { "name": "Rebecca Schultz Zavin", "email": "rebecca@android.com", "time": "Wed Feb 01 11:09:46 2012 -0800" }, "committer": { "name": "Rebecca Schultz Zavin", "email": "rebecca@android.com", "time": "Tue May 22 14:01:06 2012 -0700" }, "message": "ion: Switch ion to use dma-buf\n\nIon now uses dma-buf file descriptors to share\nbuffers with userspace. Ion becomes a dma-buf\nexporter and any driver that can import dma-bufs\ncan now import ion file descriptors.\n\nChange-Id: Ia04d6d72fb301dc088eb8db6576822e9260ff332\nSigned-off-by: Rebecca Schultz Zavin \u003crebecca@android.com\u003e\n" }, { "commit": "9ae7e01de1cf03c77054da44d135a7e85863fcb0", "tree": "c59388ea508e32adcf37da08dd78a6f3a9c29f31", "parents": [ "6f9e56945d4ee3a2621968caa72b135cb07e49c4" ], "author": { "name": "KyongHo Cho", "email": "pullip.cho@samsung.com", "time": "Wed Sep 07 11:27:07 2011 +0900" }, "committer": { "name": "Rebecca Schultz Zavin", "email": "rebecca@android.com", "time": "Tue May 22 14:01:05 2012 -0700" }, "message": "gpu: ion: several bugfixes and enhancements of ION\n\n1. Verifying if the size of memory allocation in ion_alloc() is aligned\nby PAGE_SIZE at least. If it is not, this change makes the size to be\naligned by PAGE_SIZE.\n\n2. Unmaps all mappings to the kernel and DMA address spaces when\ndestroying ion_buffer in ion_buffer_destroy(). This prevents leaks in\nthose virtual address spaces.\n\n3. Makes the return value of ion_alloc() to be explicit Linux error code\nwhen it fails to allocate a buffer.\n\n4. Makes ion_alloc() implementation simpler. Removes \u0027goto\u0027 statement and\nrelavant call to ion_buffer_put().\n\n5. Checks if the task is valid before calling put_task_struct() due\nto failure on creating a ion client in ion_client_create().\n\n6. Returns error when buffer allocation requested by userspace is failed.\n\nChange-Id: I4fa9859f4a0b665fcb44e5c0da43c569732e93ae\nSigned-off-by: KyongHo Cho \u003cpullip.cho@samsung.com\u003e\n" }, { "commit": "6f9e56945d4ee3a2621968caa72b135cb07e49c4", "tree": "412cad8f5b5a792906ec16202d23e9377add3c6f", "parents": [ "7191e9ba2508ca6f1eaab251cf3f0a2318eebe26" ], "author": { "name": "Rebecca Schultz Zavin", "email": "rebecca@android.com", "time": "Tue Jan 31 09:40:30 2012 -0800" }, "committer": { "name": "Rebecca Schultz Zavin", "email": "rebecca@android.com", "time": "Tue May 22 14:01:05 2012 -0700" }, "message": "ion: Add reserve function to ion\n\nRather than requiring each platform call memblock_remove or reserve\nfrom the board file, add this to ion\n\nChange-Id: Ie418a692c13e9e0cfe93ecc83d253d3ce860fc83\nSigned-off-by: Rebecca Schultz Zavin \u003crebecca@android.com\u003e\n" }, { "commit": "7191e9ba2508ca6f1eaab251cf3f0a2318eebe26", "tree": "6f3efbf9b152db406d03cdb6865923578eede85e", "parents": [ "be69452a5d1599b9522d4d7e4cdfb35995b23502" ], "author": { "name": "Rebecca Schultz Zavin", "email": "rebecca@android.com", "time": "Mon Jan 30 14:18:08 2012 -0800" }, "committer": { "name": "Rebecca Schultz Zavin", "email": "rebecca@android.com", "time": "Tue May 22 14:01:05 2012 -0700" }, "message": "ion: Switch map/unmap dma api to sg_tables\n\nSwitch these api\u0027s from scatterlists to sg_tables\n\nChange-Id: I8b99e39633df009d472ce24704fa26af7bb50fa2\nSigned-off-by: Rebecca Schultz Zavin \u003crebecca@android.com\u003e\n" }, { "commit": "9ad8692a016fb971e0cd96966a19d0d9baad7c06", "tree": "18ddb239aa02a8c2e36ea61f68a4f8d597201d6d", "parents": [ "ebdd79ed744d4ea5b32e555eb511ed3b7e6834db" ], "author": { "name": "Jeremy Gebben", "email": "jgebben@codeaurora.org", "time": "Tue May 08 15:33:23 2012 -0600" }, "committer": { "name": "Linux Build Service Account", "email": "lnxbuild@localhost", "time": "Tue May 22 13:17:40 2012 -0600" }, "message": "msm: kgsl: reference count struct kgsl_context\n\nPer-context timestamps introduced a race condition\nbetween the context destroy ioctl and the waittimestamp\nioctl. The waittimestamp ioctl release device-\u003emutex\nwhile it is waiting to prevent deadlock. It also has\na context pointer, which could be freed from a different\nthread while the waiting thread was blocked.\n\nFix this by adding a reference count to the context\nstructure, which must be held by any code that maintains\na pointer to a context while the device mutex is not\nheld. Currently this only happens via waittimestamp.\n\nThe \"main\" reference count removed by userspace\nrequesting the context to be destroyed. When this\nhappens kgsl_context_detach() is called, which does\na partial cleanup of the context so that it can\nno longer be used to issue commands. Once a context\nhas been detached, its id field is set to\nKGSL_CONTEXT_INVALID. Unfortunately this is needed\nby adreno_waittimestamp() so it can correctly stop\nwaiting in this case. Cleaning up adreno_waittimestamp()\nwill need to be handled in a separate patch.\n\nCRs-Fixed: 355155\nChange-Id: Ib934b467cd077b5ee774de5f297660e418d693e5\nSigned-off-by: Jeremy Gebben \u003cjgebben@codeaurora.org\u003e\n" }, { "commit": "c548e4eea688c517ebf9aa2d891ac5650ea52ac2", "tree": "aea93b259a5a3857b1c3f023f60d82d690b75245", "parents": [ "028a45693ed46877a02a6297d8571ac939543024", "bb5ad2a97601cb4465df31e5f3e4dbae4ba243e5" ], "author": { "name": "Linux Build Service Account", "email": "lnxbuild@localhost", "time": "Tue May 22 04:57:02 2012 -0700" }, "committer": { "name": "QuIC Gerrit Code Review", "email": "code-review@localhost", "time": "Tue May 22 04:57:03 2012 -0700" }, "message": "Merge changes I58f8b4f3,I023a6b54,I01758fb2 into msm-3.0\n\n* changes:\n msm: kgsl: Enable GPUMMU protection for IOMMU registers on older chips\n msm: kgsl: Expose some of the internal IOMMU functions\n msm: kgsl: Set a nop command in setstate global memory\n" }, { "commit": "418044d47755a15a340c7d888fa77bd13e0cea24", "tree": "65c4858e44d79796bb947954cffae93db4f82bd7", "parents": [ "a521e97856708ce7d229e61146e0023154c65926", "d2b30d21b559268018f0014eb956a0a880104b8c" ], "author": { "name": "Linux Build Service Account", "email": "lnxbuild@localhost", "time": "Tue May 22 00:02:04 2012 -0700" }, "committer": { "name": "QuIC Gerrit Code Review", "email": "code-review@localhost", "time": "Tue May 22 00:02:04 2012 -0700" }, "message": "Merge \"msm: kgsl: Add GPU identification for A320 V1.1\" into msm-3.0" }, { "commit": "8e1a7ef49609d2682248371e1b7d568c3d4051a7", "tree": "d299072d83f5d2c7e6449fa741a292a55fad78c2", "parents": [ "58c3475ba4eae564b255f62d3e5dad1450ca36a5", "bbb86eaeba1b5269962be7ae5912084565290177" ], "author": { "name": "Linux Build Service Account", "email": "lnxbuild@localhost", "time": "Tue May 22 00:01:38 2012 -0700" }, "committer": { "name": "QuIC Gerrit Code Review", "email": "code-review@localhost", "time": "Tue May 22 00:01:38 2012 -0700" }, "message": "Merge \"gpu: ion: Leave fmem in c-state until unsecured\" into msm-3.0" }, { "commit": "bb5ad2a97601cb4465df31e5f3e4dbae4ba243e5", "tree": "c7189ba1427ecfe059f227801fc586412ecc6f66", "parents": [ "eb6b8542bf8e369362e4d02ebf59762b923057c4" ], "author": { "name": "Shubhraprakash Das", "email": "sadas@codeaurora.org", "time": "Wed May 09 22:58:52 2012 -0600" }, "committer": { "name": "Shubhraprakash Das", "email": "sadas@codeaurora.org", "time": "Mon May 21 11:38:24 2012 -0600" }, "message": "msm: kgsl: Enable GPUMMU protection for IOMMU registers on older chips\n\nFor older chips we protect the IOMMU registers by mapping them\nin a GPUMMU range that is only made visible to the GPU when we\nactually program the IOMMU registers using in stream commands. This\nprotection method is used for older chips because it does not\nsupport IOMMU context bank switching.\n\nChange-Id: I58f8b4f397e2e4c4ec181097257f1ff63683c074\nSigned-off-by: Shubhraprakash Das \u003csadas@codeaurora.org\u003e\n" }, { "commit": "eb6b8542bf8e369362e4d02ebf59762b923057c4", "tree": "e74ab3eb32cef7cfd6d8eeac67d2588d940c7159", "parents": [ "e9541a3e912274eeb46f5e1b4b0eb8290de30342" ], "author": { "name": "Shubhraprakash Das", "email": "sadas@codeaurora.org", "time": "Wed May 09 22:42:24 2012 -0600" }, "committer": { "name": "Shubhraprakash Das", "email": "sadas@codeaurora.org", "time": "Mon May 21 11:38:08 2012 -0600" }, "message": "msm: kgsl: Expose some of the internal IOMMU functions\n\nDefine static inline functions that call some of the internal IOMMU\nfunctions via function pointers. These functions are used when in\nstream pagetable updates will be performed for IOMMU, and need to\nbe called from a file other than kgsl_iommu.c\n\nChange-Id: I023a6b5442742fd9184f66d6f2bb05dc75cea8ea\nSigned-off-by: Shubhraprakash Das \u003csadas@codeaurora.org\u003e\n" }, { "commit": "e9541a3e912274eeb46f5e1b4b0eb8290de30342", "tree": "5ea05192d20c5f4b75f4b09c77398c93873dc65b", "parents": [ "03bb493026b10388b5aea58f723d5c15d7ae77eb" ], "author": { "name": "Shubhraprakash Das", "email": "sadas@codeaurora.org", "time": "Wed May 09 22:25:55 2012 -0600" }, "committer": { "name": "Shubhraprakash Das", "email": "sadas@codeaurora.org", "time": "Mon May 21 11:37:45 2012 -0600" }, "message": "msm: kgsl: Set a nop command in setstate global memory\n\nAdd a nop command in the setstate memory which can be used during\nin stream pagetable switching for synchronization\n\nChange-Id: I01758fb24730a8df7807666320d3a02a1362e9a2\nSigned-off-by: Shubhraprakash Das \u003csadas@codeaurora.org\u003e\n" }, { "commit": "d2b30d21b559268018f0014eb956a0a880104b8c", "tree": "039572b167d4689da92e2ec96a951e93c0e2da20", "parents": [ "2bcbac544862c90705395939f2516b6c78267b16" ], "author": { "name": "Jordan Crouse", "email": "jcrouse@codeaurora.org", "time": "Mon May 21 08:41:51 2012 -0600" }, "committer": { "name": "Jordan Crouse", "email": "jcrouse@codeaurora.org", "time": "Mon May 21 09:07:13 2012 -0600" }, "message": "msm: kgsl: Add GPU identification for A320 V1.1\n\nUnfortunately none of the GPU ID registers got updated for the\nV1.1 spin of the hardware, so we have to turn to the minor\nof the SOC identification to tell if we need to pass up a\ndifferent chip id to userspace.\n\nChange-Id: Ic0dedbad39e2c3003bcb54b1cb09e76add5a8114\nSigned-off-by: Jordan Crouse \u003cjcrouse@codeaurora.org\u003e\n" }, { "commit": "d704fc8ed611f2b1ce13f8c7d157c1b953458087", "tree": "2643ef0079e8a1490f3ea0e3e2637624c4d10ab4", "parents": [ "29b1fd636a98a628d96e09427546cdc6035b7b17", "854c9e11fbca648429dd9dc590adc8451d5f1312" ], "author": { "name": "Linux Build Service Account", "email": "lnxbuild@localhost", "time": "Sun May 20 17:53:48 2012 -0700" }, "committer": { "name": "QuIC Gerrit Code Review", "email": "code-review@localhost", "time": "Sun May 20 17:53:48 2012 -0700" }, "message": "Merge \"gpu: ion: Add more debug info to client debugfs IF\" into msm-3.0" }, { "commit": "aa623ccc57910537300258f109de5ad543940e90", "tree": "91deec10f40c3e7d696b362b0b132e748a945c2e", "parents": [ "54d49d7bc7432b952fa791fac299c4c0bbb73e78", "523800ff12c0bc1db64547fbe55f7e13903f0967" ], "author": { "name": "Linux Build Service Account", "email": "lnxbuild@localhost", "time": "Sat May 19 11:27:45 2012 -0700" }, "committer": { "name": "QuIC Gerrit Code Review", "email": "code-review@localhost", "time": "Sat May 19 11:27:45 2012 -0700" }, "message": "Merge \"msm: kgsl: Enable the shared path for PTE fetch\" into msm-3.0" }, { "commit": "854c9e11fbca648429dd9dc590adc8451d5f1312", "tree": "b02da478ad5f63ae6301c8b65b087918c1316c3c", "parents": [ "fbb7c4e3cda3ff41f4a564dcbe3126d94769309b" ], "author": { "name": "Olav Haugan", "email": "ohaugan@codeaurora.org", "time": "Wed May 16 16:34:28 2012 -0700" }, "committer": { "name": "Olav Haugan", "email": "ohaugan@codeaurora.org", "time": "Fri May 18 14:35:41 2012 -0700" }, "message": "gpu: ion: Add more debug info to client debugfs IF\n\nAdd logging of buffer physical address (if allocation\nis from physically contiguous heap) and iommu mapping\ninformation to the ion client debug interface.\n\nChange-Id: Id3a77c1b5e3c5d15b11b3612f07d10092922cdff\nSigned-off-by: Olav Haugan \u003cohaugan@codeaurora.org\u003e\n" }, { "commit": "4c8147f9aee680b0011d5f65d5a0c43da121b168", "tree": "2f589920ced1b17af9fee1e351e5bd4b61af6b31", "parents": [ "d140ebc9e9332e2389ee1d7ac5e458c9444874df", "1b9b1f14abaa094fa36a25086cbf12b79bde1bc9" ], "author": { "name": "Linux Build Service Account", "email": "lnxbuild@localhost", "time": "Fri May 18 13:45:43 2012 -0700" }, "committer": { "name": "QuIC Gerrit Code Review", "email": "code-review@localhost", "time": "Fri May 18 13:45:43 2012 -0700" }, "message": "Merge \"msm: kgsl: simplify multiple gen_pool support\" into msm-3.0" }, { "commit": "d140ebc9e9332e2389ee1d7ac5e458c9444874df", "tree": "fd541bc48dd6d5e2c157eb771c26c5d3045c9a80", "parents": [ "4027b6496c16afbfe8fe7c7974820ffe83e01009", "c589ccb0b86b9310aa441a8c149b2775e1f22b60" ], "author": { "name": "Linux Build Service Account", "email": "lnxbuild@localhost", "time": "Fri May 18 13:45:40 2012 -0700" }, "committer": { "name": "QuIC Gerrit Code Review", "email": "code-review@localhost", "time": "Fri May 18 13:45:40 2012 -0700" }, "message": "Merge \"msm: kgsl: stop using gen_pool_alloc_aligned\" into msm-3.0" } ], "next": "005b82a7c41f7916acbdc2b4e4783cd1ab646e10" }