)]}' { "log": [ { "commit": "41f8fa330664879217c2fef2dd373446c9c650ca", "tree": "a284daa9b13276f41256e098c62433656a74eb53", "parents": [ "e0b55321970acbdefdeb5d2eff76ffd1b87861af" ], "author": { "name": "Sushmita Susheelendra", "email": "ssusheel@codeaurora.org", "time": "Wed May 11 17:15:58 2011 -0600" }, "committer": { "name": "Bryan Huntsman", "email": "bryanh@codeaurora.org", "time": "Mon Oct 03 16:17:02 2011 -0700" }, "message": "msm: kgsl: Add CFF user event ioctl to write data to cff dumps\n\nAdd the ioctl IOCTL_KGSL_CFF_USER_EVENT to write data to cff dump.\nDefine a new CFF packet cff_op_user_event for this generic user\nevent.\nWrite the surface parameter data packet and verify mem file\npacket to cff dumps\n\nSigned-off-by: Sushmita Susheelendra \u003cssusheel@codeaurora.org\u003e\n" }, { "commit": "2f789d14b806e93137bea9416302029c7dfcc496", "tree": "bb69c76498cffed8ba061f7fd613aad914350772", "parents": [ "fbb46aabd35f4d4940b5e8471c015431b77db9ef" ], "author": { "name": "Jeremy Gebben", "email": "jgebben@codeaurora.org", "time": "Wed Aug 24 12:40:02 2011 -0700" }, "committer": { "name": "Bryan Huntsman", "email": "bryanh@codeaurora.org", "time": "Mon Oct 03 16:16:54 2011 -0700" }, "message": "msm: kgsl: stop forcing hw patchid to 0 for 8x60 and 8960\n\nThis field of the chip_id was forced to 0 because userspace\ngot confused when it was a different value. Userspace has\nbeen corrected to deal with the correct patch ids.\n\nSigned-off-by: Jeremy Gebben \u003cjgebben@codeaurora.org\u003e\n" }, { "commit": "fbb46aabd35f4d4940b5e8471c015431b77db9ef", "tree": "194d949aaf375c7c0f67f4267cfd8e96b1b4f07d", "parents": [ "f058a440785ed1f3e4083b41065997317def8f9a" ], "author": { "name": "Sushmita Susheelendra", "email": "ssusheel@codeaurora.org", "time": "Thu Aug 25 18:05:08 2011 -0600" }, "committer": { "name": "Bryan Huntsman", "email": "bryanh@codeaurora.org", "time": "Mon Oct 03 16:16:53 2011 -0700" }, "message": "msm: kgsl: Fix ringbuffer command names\n\nThe prefix PM4_ was changed to CP_.\n\nSigned-off-by: Sushmita Susheelendra \u003cssusheel@codeaurora.org\u003e\n" }, { "commit": "6061bc76edc2be9f0b0d99d8fe66a2ecf92b4ed1", "tree": "a0e8655d5db606a2fd7e71667bbbce69b84ce828", "parents": [ "a7423e433ea5736234c40e0341d7451af9a8fc15" ], "author": { "name": "Jeremy Gebben", "email": "jgebben@codeaurora.org", "time": "Mon Apr 18 15:23:16 2011 -0600" }, "committer": { "name": "Bryan Huntsman", "email": "bryanh@codeaurora.org", "time": "Mon Oct 03 16:16:26 2011 -0700" }, "message": "msm: kgsl: add MEMORY_BASE and HANG packets\n\nThese are changes to the cffdump output format.\nMEMORY_BASE reports the address range we\u0027re using at the start\nof the dump, which helps the postprocessors validate memory\nwrites.\n\nHANG is emitted at the start of kgsl_postmortem_dump(), and can\nbe used by the postprocessors to stop when the hang occurs.\n\nSigned-off-by: Jeremy Gebben \u003cjgebben@codeaurora.org\u003e\n" }, { "commit": "a7423e433ea5736234c40e0341d7451af9a8fc15", "tree": "9f6b494c60420f55dee8c03c451de4647d03a697", "parents": [ "f23a2316e6ccd335f2559b354812aad3f1b2b25b" ], "author": { "name": "Jeremy Gebben", "email": "jgebben@codeaurora.org", "time": "Mon Apr 18 15:11:21 2011 -0600" }, "committer": { "name": "Bryan Huntsman", "email": "bryanh@codeaurora.org", "time": "Mon Oct 03 16:16:26 2011 -0700" }, "message": "msm: kgsl: cffdump syncmem ioctl\n\nThis ioctl is needed to track memory writes done from userspace\nso that this data is correctly captured in the dump.\n\nSigned-off-by: Jeremy Gebben \u003cjgebben@codeaurora.org\u003e\n" }, { "commit": "7fe62a3d10a22a50a9c82ace1bb7300f1f858e06", "tree": "e33a5d7c2135b57a9bee609a9fe0bd9e35d8956b", "parents": [ "1ea7d8a6ae90c41e0d57268096403f1827055b49" ], "author": { "name": "Suman Tatiraju", "email": "sumant@codeaurora.org", "time": "Thu Jul 14 16:40:37 2011 -0700" }, "committer": { "name": "Bryan Huntsman", "email": "bryanh@codeaurora.org", "time": "Mon Oct 03 16:15:57 2011 -0700" }, "message": "msm: kgsl: add gpu busy stats to sysfs\n\nSigned-off-by: Suman Tatiraju \u003csumant@codeaurora.org\u003e\n" }, { "commit": "9b92ccd290b28ea69b6f5447813b750c99c5f793", "tree": "9b49766154c177adecee993b2b386e1d87a50d08", "parents": [ "24a06d05adbf9470a4d00589ee7acc936ac5a5e3" ], "author": { "name": "Tarun Karra", "email": "tkarra@codeaurora.org", "time": "Fri Aug 19 10:59:57 2011 -0700" }, "committer": { "name": "Bryan Huntsman", "email": "bryanh@codeaurora.org", "time": "Mon Oct 03 16:15:40 2011 -0700" }, "message": "msm: kgsl: Changed variable type from unsigned int to long\n\nChanged variable \"result\" type from unsigned int to long\nto accurately reflect the result of macro wait_event_interruptible_timeout\n\nSigned-off-by: Tarun Karra \u003ctkarra@codeaurora.org\u003e\n" }, { "commit": "44cbeb74acde740965c4e7e38ccecc0d5a66a12f", "tree": "e8479b42b1110e774eb18818c2202d3bc4913757", "parents": [ "28e99c8edbad0d0305381deb1574750e30a1a770" ], "author": { "name": "Tarun Karra", "email": "tkarra@codeaurora.org", "time": "Thu Aug 18 13:30:24 2011 -0700" }, "committer": { "name": "Bryan Huntsman", "email": "bryanh@codeaurora.org", "time": "Mon Oct 03 16:15:32 2011 -0700" }, "message": "msm: kgsl: changed strncat to strlcat\n\nChanged strncat to strlcat to pervent buffer overflow.\n\nSigned-off-by: Tarun Karra \u003ctkarra@codeaurora.org\u003e\n" }, { "commit": "28e99c8edbad0d0305381deb1574750e30a1a770", "tree": "94e175b06556900aafbbe87b07e7c6e91ab5a307", "parents": [ "13b74aba08719655281a769c12484df706e33d5d" ], "author": { "name": "Lucille Sylvester", "email": "lsylvest@codeaurora.org", "time": "Thu Aug 18 17:23:10 2011 -0600" }, "committer": { "name": "Bryan Huntsman", "email": "bryanh@codeaurora.org", "time": "Mon Oct 03 16:15:32 2011 -0700" }, "message": "msm: kgsl: Use the first command to initiate busy\n\nThere may be multiple command submissions per-frame. Start your\nbusy count only on the first one.\n\nSigned-off-by: Lucille Sylvester \u003clsylvest@codeaurora.org\u003e\n" }, { "commit": "622927ad37d8410297e0b39707ae44e6c081ba84", "tree": "14d428df96502e59a248d7f6fde6901af426baab", "parents": [ "ff1c5d173d890665ce2909c58ab321667284588f" ], "author": { "name": "Lucille Sylvester", "email": "lsylvest@codeaurora.org", "time": "Wed Aug 10 14:42:25 2011 -0600" }, "committer": { "name": "Bryan Huntsman", "email": "bryanh@codeaurora.org", "time": "Mon Oct 03 16:14:29 2011 -0700" }, "message": "msm: kgsl: Update pwrlevel_change\n\nPreviously only supported fabric votes, now supporting AXI as well.\n\nSigned-off-by: Lucille Sylvester \u003clsylvest@codeaurora.org\u003e\n" }, { "commit": "22d87177a2c0b35e17271ab588c359536647554f", "tree": "a081f77ac7ac874a73442ae18b3143fcf343b022", "parents": [ "965072ee65bdc9b58d86729479946db5e8e6e332" ], "author": { "name": "Sushmita Susheelendra", "email": "ssusheel@codeaurora.org", "time": "Mon May 09 16:40:02 2011 -0600" }, "committer": { "name": "Bryan Huntsman", "email": "bryanh@codeaurora.org", "time": "Mon Oct 03 16:14:28 2011 -0700" }, "message": "msm: kgsl: Fix build errors when CONFIG_MSM_KGSL_CFF_DUMP is on\n\nSigned-off-by: Sushmita Susheelendra \u003cssusheel@codeaurora.org\u003e\n" }, { "commit": "b1b7b43a642f7031fa5dd971c2fd0af6a9e07322", "tree": "5467e811753381a4bf0f06000f30d09eb2d9ccbb", "parents": [ "0ffb5d65b7783fd60f08272d68362272ed3de88b" ], "author": { "name": "Laura Abbott", "email": "lauraa@codeaurora.org", "time": "Wed Aug 03 13:25:08 2011 -0700" }, "committer": { "name": "Bryan Huntsman", "email": "bryanh@codeaurora.org", "time": "Mon Oct 03 16:14:18 2011 -0700" }, "message": "gpu: ion: check return value from gen_pool_add\n\nCheck the return value from gen_pool_add and handle\nany error gracefully.\n\nSigned-off-by: Laura Abbott \u003clauraa@codeaurora.org\u003e\n" }, { "commit": "79acee6f01de59bad3a0abf59d88715ab3df9591", "tree": "860a31628aac1141f35968d6bfadf98eaa1af0c3", "parents": [ "3c127f589ac1bc48c20e0ff6a2c659502b342777" ], "author": { "name": "Jeremy Gebben", "email": "jgebben@codeaurora.org", "time": "Mon Aug 08 16:44:07 2011 -0600" }, "committer": { "name": "Bryan Huntsman", "email": "bryanh@codeaurora.org", "time": "Mon Oct 03 16:14:14 2011 -0700" }, "message": "msm: kgsl: fix possible memory leak in firmware loading\n\nSigned-off-by: Jeremy Gebben \u003cjgebben@codeaurora.org\u003e\n" }, { "commit": "3c127f589ac1bc48c20e0ff6a2c659502b342777", "tree": "2a0426c057c47478726cb63d4d915158d01c3b4b", "parents": [ "690f9d172f39604d0347d0ce5435371f65a0441c" ], "author": { "name": "Jeremy Gebben", "email": "jgebben@codeaurora.org", "time": "Mon Aug 08 17:04:11 2011 -0600" }, "committer": { "name": "Bryan Huntsman", "email": "bryanh@codeaurora.org", "time": "Mon Oct 03 16:14:14 2011 -0700" }, "message": "msm: kgsl: fix parameter checking in adreno_ringbuffer_issueibcmds\n\nSigned-off-by: Jeremy Gebben \u003cjgebben@codeaurora.org\u003e\n" }, { "commit": "690f9d172f39604d0347d0ce5435371f65a0441c", "tree": "fa2caac0c2317d1a3ded4ec50c6fed3c99676a9e", "parents": [ "6c2992ac90efac6388335c4162a5842a5339b5ae" ], "author": { "name": "Jeremy Gebben", "email": "jgebben@codeaurora.org", "time": "Mon Aug 08 16:33:49 2011 -0600" }, "committer": { "name": "Bryan Huntsman", "email": "bryanh@codeaurora.org", "time": "Mon Oct 03 16:14:13 2011 -0700" }, "message": "msm: kgsl: fix error handling in kgsl_ioct_sharedmem_flush_cache\n\nFor some error conditions it was possible to exit this function\nwithout unlocking the spinlock.\n\nSigned-off-by: Jeremy Gebben \u003cjgebben@codeaurora.org\u003e\n" }, { "commit": "6c2992ac90efac6388335c4162a5842a5339b5ae", "tree": "f7cbba5cb36c79b93842d6b54b9b57e22673bd91", "parents": [ "2db0af97c838234c40ab9ac45aff6479ce36248c" ], "author": { "name": "Jordan Crouse", "email": "jcrouse@codeaurora.org", "time": "Mon Aug 08 17:00:06 2011 -0600" }, "committer": { "name": "Bryan Huntsman", "email": "bryanh@codeaurora.org", "time": "Mon Oct 03 16:14:12 2011 -0700" }, "message": "msm: kgsl: Check for NULL from kgsl_get_device_from_dev\n\nSigned-off-by: Jordan Crouse \u003cjcrouse@codeaurora.org\u003e\n" }, { "commit": "2db0af97c838234c40ab9ac45aff6479ce36248c", "tree": "b4f7e777183e60e6e95e7865a4d7d28e8e0b11e3", "parents": [ "a87bb86117b9c970fb03f5720dc2bf832974230d" ], "author": { "name": "Jordan Crouse", "email": "jcrouse@codeaurora.org", "time": "Mon Aug 08 16:05:09 2011 -0600" }, "committer": { "name": "Bryan Huntsman", "email": "bryanh@codeaurora.org", "time": "Mon Oct 03 16:14:12 2011 -0700" }, "message": "msm: kgsl: Don\u0027t lookup the device with inodep if we don\u0027t have to\n\nkgsl_open does a fine job of setting the private members of\nstruct file so use that in the other fops functions rather then\nlooking up the device via the inode minor every time.\n\nSigned-off-by: Jordan Crouse \u003cjcrouse@codeaurora.org\u003e\n" }, { "commit": "a87bb86117b9c970fb03f5720dc2bf832974230d", "tree": "45970e5529c13acf0632d5319cf79bf00bef3ef3", "parents": [ "031eb94d1edb9f9098fe6879a1a82800e6986768" ], "author": { "name": "Jeremy Gebben", "email": "jgebben@codeaurora.org", "time": "Mon Aug 08 16:09:38 2011 -0600" }, "committer": { "name": "Bryan Huntsman", "email": "bryanh@codeaurora.org", "time": "Mon Oct 03 16:14:11 2011 -0700" }, "message": "msm: kgsl: switch sprintf calls to snprintf\n\nSigned-off-by: Jeremy Gebben \u003cjgebben@codeaurora.org\u003e\n" }, { "commit": "b58e61b2fa9f956c50182d3f6d056b3f00bb2080", "tree": "1b61db6b359de34026f76d6b4c9c312023fc2f34", "parents": [ "12b5d4e4a1015fcbdb16dcc40615321c3a6d7a27" ], "author": { "name": "Jordan Crouse", "email": "jcrouse@codeaurora.org", "time": "Mon Aug 08 13:25:36 2011 -0600" }, "committer": { "name": "Bryan Huntsman", "email": "bryanh@codeaurora.org", "time": "Mon Oct 03 10:28:57 2011 -0700" }, "message": "msm: kgsl: Avoid a deadlock in the IRQ handler\n\nIf a major GPU fault occurs, interrupts should be turned off to\navoid a storm. Calling disable_irq from within the IRQ handler,\nhowever has deadlock problems. Call disable_irq_nosync in an\ninterrupt context instead.\n\nCRs-fixed: 299686\nSigned-off-by: Jordan Crouse \u003cjcrouse@codeaurora.org\u003e\n" }, { "commit": "505df9cb23fa813d9630a044e64b403880c136be", "tree": "e49db5a64526232b7f6b2dc9c1763c7dc960ae98", "parents": [ "084427d2c2558bededa79ee648cb97a0080447b4" ], "author": { "name": "Jordan Crouse", "email": "jcrouse@codeaurora.org", "time": "Thu Jul 28 08:37:59 2011 -0600" }, "committer": { "name": "Bryan Huntsman", "email": "bryanh@codeaurora.org", "time": "Mon Oct 03 10:28:36 2011 -0700" }, "message": "msm: kgsl: Consolidate all GPU information in one spot\n\nWe are starting to accumulate a lot GPU specific information,\nand it is handy to keep it all in one place where new core IDs,\nfirmware and device functions can be easily added.\n\nSigned-off-by: Jordan Crouse \u003cjcrouse@codeaurora.org\u003e\n" }, { "commit": "084427d2c2558bededa79ee648cb97a0080447b4", "tree": "b68e719dc7204cce27da0abe03dee9983ab40d98", "parents": [ "138da0e628a5f10610fc3949d984d513967b017a" ], "author": { "name": "Jordan Crouse", "email": "jcrouse@codeaurora.org", "time": "Thu Jul 28 08:37:58 2011 -0600" }, "committer": { "name": "Bryan Huntsman", "email": "bryanh@codeaurora.org", "time": "Mon Oct 03 10:28:35 2011 -0700" }, "message": "msm: kgsl: Rename PM4 to CP to better align with A3XX code\n\nThe A3XX code likes to use CP_ as a prefix for ringbuffer\ncommands rather then the legacy PM4 prefix. Since it is more\ncorrect, switch the A2XX code over now to make it easier to\nintegrate A3XX into the mix.\n\nSigned-off-by: Jordan Crouse \u003cjcrouse@codeaurora.org\u003e\n" }, { "commit": "2c542b697e3a044fb08adc9c99320882954daceb", "tree": "fd0a0bafab0178fdcae24859a862fc9d95236d41", "parents": [ "1b9b9a4310cfc4eee2afdd3c20ae96a1dfc4e47d" ], "author": { "name": "Jordan Crouse", "email": "jcrouse@codeaurora.org", "time": "Tue Jul 26 08:30:20 2011 -0600" }, "committer": { "name": "Bryan Huntsman", "email": "bryanh@codeaurora.org", "time": "Mon Oct 03 10:28:34 2011 -0700" }, "message": "msm: kgsl: Don\u0027t make assumptions about VMA regions\n\nWe cannot assume that a VMA region created as a result of an mmap\nbelongs exclusively to us. Allow the user to pass the size of\nthe vmalloc region through the \u0027gpuaddr\u0027 member of the ioctl\nstruct and do strict checking on the returned vma to make sure\nit is valid.\n\nSigned-off-by: Jordan Crouse \u003cjcrouse@codeaurora.org\u003e\n" }, { "commit": "0e0486f251b6e21d56298923bc41ed58d25678f7", "tree": "445c8c052ec4c39d73f3c829ebf2c5a18bb959c5", "parents": [ "c8c9fcd258b9c6c7ee1f4ad33fe50215d5f40b16" ], "author": { "name": "Jordan Crouse", "email": "jcrouse@codeaurora.org", "time": "Thu Jul 28 08:37:58 2011 -0600" }, "committer": { "name": "Bryan Huntsman", "email": "bryanh@codeaurora.org", "time": "Mon Oct 03 10:28:29 2011 -0700" }, "message": "msm: kgsl: Rearrange some drawctxt functions\n\nMove some of the drawctxt functions that are common\nto A2XX and A3XX back to the generic drawctxt code\nand headers.\n\nSigned-off-by: Jordan Crouse \u003cjcrouse@codeaurora.org\u003e\n" }, { "commit": "c8c9fcd258b9c6c7ee1f4ad33fe50215d5f40b16", "tree": "5e5809b30cac60a61ce7de9c6b7744455ec4f310", "parents": [ "2370c6462b64936a26b713a55803519da58f3637" ], "author": { "name": "Jordan Crouse", "email": "jcrouse@codeaurora.org", "time": "Thu Jul 28 08:37:58 2011 -0600" }, "committer": { "name": "Bryan Huntsman", "email": "bryanh@codeaurora.org", "time": "Mon Oct 03 10:28:28 2011 -0700" }, "message": "msm: kgsl: Consolidate and cleanup A2XX irq handlers\n\nSigned-off-by: Jordan Crouse \u003cjcrouse@codeaurora.org\u003e\n" }, { "commit": "196c45b391ae2de5836910e4029b047ff4a51f59", "tree": "225aa39f808d7ee8f7ab25a3a509af5ba1fd9bda", "parents": [ "9f73921448fbdc319189a56403f0420408cde78b" ], "author": { "name": "Jordan Crouse", "email": "jcrouse@codeaurora.org", "time": "Thu Jul 28 08:37:57 2011 -0600" }, "committer": { "name": "Bryan Huntsman", "email": "bryanh@codeaurora.org", "time": "Mon Oct 03 10:28:23 2011 -0700" }, "message": "msm: kgsl: Add adreno_is_a2xx() function\n\nAdd a helper function to catch all A2XX devices.\n\nSigned-off-by: Jordan Crouse \u003cjcrouse@codeaurora.org\u003e\n" }, { "commit": "9f73921448fbdc319189a56403f0420408cde78b", "tree": "1f9433a60843f8203f6eac05bb9fee64a54e461e", "parents": [ "cbf9e24334a63df0add761f679eb6d18d35e6211" ], "author": { "name": "Jordan Crouse", "email": "jcrouse@codeaurora.org", "time": "Thu Jul 28 08:37:57 2011 -0600" }, "committer": { "name": "Bryan Huntsman", "email": "bryanh@codeaurora.org", "time": "Mon Oct 03 10:28:22 2011 -0700" }, "message": "msm: kgsl: Various cleanups\n\nRemove some uneeded code and tighten things up in\nanticipation of the A3XX device.\n\nSigned-off-by: Jordan Crouse \u003cjcrouse@codeaurora.org\u003e\n" }, { "commit": "354d9717c5a600fb063a6a83636a7ffc19362e25", "tree": "8ec96729c1206e64fe0ee2eedab7bb86e6e03dcc", "parents": [ "4283a4c56a1e3e77f281f018c841d9db1bbb5350" ], "author": { "name": "Sushmita Susheelendra", "email": "ssusheel@codeaurora.org", "time": "Thu Jul 28 17:16:49 2011 -0600" }, "committer": { "name": "Bryan Huntsman", "email": "bryanh@codeaurora.org", "time": "Mon Oct 03 10:28:21 2011 -0700" }, "message": "msm: kgsl: Use process specific pt_base in postmortem dump\n\nWhen doing a look-up of the IB1 base address, use the pagetable\nbelonging to the respective process rather than the pagetable\nbelonging to the process in whose context the GPU hung.\n\nSigned-off-by: Sushmita Susheelendra \u003cssusheel@codeaurora.org\u003e\n" }, { "commit": "5bb7ece4d4b02ca96330571837117f5e61e52096", "tree": "6bf961efb6205d07f1932a6dbfdc82ff4ce9523d", "parents": [ "492049ec4f59bf04275878a9d16ae20528159636" ], "author": { "name": "Jeremy Gebben", "email": "jgebben@codeaurora.org", "time": "Tue Aug 02 11:04:48 2011 -0600" }, "committer": { "name": "Bryan Huntsman", "email": "bryanh@codeaurora.org", "time": "Mon Oct 03 10:27:50 2011 -0700" }, "message": "msm: kgsl: add adreno225 support\n\nThe adreno220 specific registers and setting are all used\non adreno225. Also there is a a225 specific setting setting\nfor REG_SQ_FLOW_CONTROl at startup to enable the larger\ninstruction store found on this gpu.\n\nSigned-off-by: Jordan Crouse \u003cjcrouse@codeaurora.org\u003e\nSigned-off-by: Jeremy Gebben \u003cjgebben@codeaurora.org\u003e\n" }, { "commit": "57996e3add058436fd4801644106c6fb3c00e489", "tree": "c8bcd71cb3f8db3557354c1dd7deacfba6fcca3f", "parents": [ "60f8007df48104b7b067de307704abb830ef901a" ], "author": { "name": "Lucille Sylvester", "email": "lsylvest@codeaurora.org", "time": "Thu May 26 19:12:22 2011 -0600" }, "committer": { "name": "Bryan Huntsman", "email": "bryanh@codeaurora.org", "time": "Mon Oct 03 10:27:01 2011 -0700" }, "message": "msm: kgsl: Only bind kgsl to CPU0, not CPU1\n\nSigned-off-by: Lucille Sylvester \u003clsylvest@codeaurora.org\u003e\n" }, { "commit": "4e8aada5f34f1a5b92418c0db623785b8a54abfe", "tree": "55e872eba4bef61e9523cd53b3399423dddff024", "parents": [ "831561ea1079dd11c4a0d13cbb4b5b9b4b70ec12" ], "author": { "name": "Jeremy Gebben", "email": "jgebben@codeaurora.org", "time": "Tue Jul 12 10:07:47 2011 -0600" }, "committer": { "name": "Bryan Huntsman", "email": "bryanh@codeaurora.org", "time": "Mon Oct 03 10:26:57 2011 -0700" }, "message": "msm: kgsl: split mh and mmu initialization\n\nThe MH block should be initialized even if the gpu mmu\nis not enabled so that AXI error interrupts will still\nbe generated.\n\nSigned-off-by: Jeremy Gebben \u003cjgebben@codeaurora.org\u003e\n" }, { "commit": "b6900e1671a72a50153f511b020431aaf7821974", "tree": "8a83975f338bd3d36d99e8b38343651c84274b32", "parents": [ "e2016608c6040751c47da1787a49a29fba550a5c" ], "author": { "name": "Stephen Boyd", "email": "sboyd@codeaurora.org", "time": "Mon Jul 18 10:40:04 2011 -0700" }, "committer": { "name": "Bryan Huntsman", "email": "bryanh@codeaurora.org", "time": "Mon Oct 03 10:26:55 2011 -0700" }, "message": "msm: kgsl: Replace open-coded register call with SCM atomic\n\nInstead of open-coding the SCM register calling convention, use\nthe SCM atomic apis.\n\nSigned-off-by: Stephen Boyd \u003csboyd@codeaurora.org\u003e\n" }, { "commit": "16346b0a112adc011ef9604ac4f8335da9fdd109", "tree": "dd4a0600a467291b1700c0bb37386a56752f37a3", "parents": [ "851bdc41e10628bbe6a4986d0f17e9d943f73f6f" ], "author": { "name": "Tarun Karra", "email": "tkarra@codeaurora.org", "time": "Sun Jul 24 15:04:26 2011 -0700" }, "committer": { "name": "Bryan Huntsman", "email": "bryanh@codeaurora.org", "time": "Mon Oct 03 10:26:44 2011 -0700" }, "message": "msm: kgsl: shaders must be repartitioned during gmem save/restore\n\nSigned-off-by: Tarun Karra \u003ctkarra@codeaurora.org\u003e\n" }, { "commit": "848741a5ec938089cdc92feb3748174e336beea2", "tree": "09cccd72fd19423ba11bec5e4ec83cfc4d89e687", "parents": [ "26512dea431f8347a8bbce561982df939225e2c6" ], "author": { "name": "Jason", "email": "jasonv@codeaurora.org", "time": "Tue Jul 12 10:24:25 2011 -0700" }, "committer": { "name": "Bryan Huntsman", "email": "bryanh@codeaurora.org", "time": "Mon Oct 03 09:59:03 2011 -0700" }, "message": "msm: kgsl: make map_user_mem accept sharedmem_from_pmem struct\n\nSigned-off-by: Jason Varbedian \u003cjasonv@codeaurora.org\u003e\n" }, { "commit": "1757a8593f38970019ed40ef4e3bf6e843ed19b4", "tree": "46ec6173dddbfc0cd8b6b32c4a6bd2bb630f3815", "parents": [ "92497af43c8c5f2a090fe61270f5b5294ece3310" ], "author": { "name": "Jeremy Gebben", "email": "jgebben@codeaurora.org", "time": "Mon Jul 11 16:04:38 2011 -0600" }, "committer": { "name": "Bryan Huntsman", "email": "bryanh@codeaurora.org", "time": "Mon Oct 03 09:59:02 2011 -0700" }, "message": "msm: kgsl: use del_timer_sync() to cancel the idle timer\n\nOtherwise there\u0027s a chance the idle timer can fire after\nwe\u0027re suspended/stopped on SMP systems.\n\nSigned-off-by: Jeremy Gebben \u003cjgebben@codeaurora.org\u003e\n" }, { "commit": "4061c0b26af382d18cbbb5f9b09348e5a158e7c7", "tree": "67cb40ac34664c886d57fa6decd5efe8258ee474", "parents": [ "a78c9179a1ccae11b7ccc20ce1921c654955dcea" ], "author": { "name": "Wei Zou", "email": "wzou@codeaurora.org", "time": "Fri Jul 08 10:24:22 2011 -0700" }, "committer": { "name": "Bryan Huntsman", "email": "bryanh@codeaurora.org", "time": "Mon Oct 03 09:59:01 2011 -0700" }, "message": "msm: kgsl: Check for null physical address in PMEM case\n\nCRs-fixed: 294653\nSigned-off-by: Wei Zou \u003cwzou@codeaurora.org\u003e\n" }, { "commit": "a78c9179a1ccae11b7ccc20ce1921c654955dcea", "tree": "e5620a8242a300765e7b6d56f22be595a9055e6a", "parents": [ "ae683e860b6a1b05ca9e9fa936819e697784bfcc" ], "author": { "name": "Jordan Crouse", "email": "jcrouse@codeaurora.org", "time": "Mon Jul 11 13:14:09 2011 -0600" }, "committer": { "name": "Bryan Huntsman", "email": "bryanh@codeaurora.org", "time": "Mon Oct 03 09:59:01 2011 -0700" }, "message": "msm: kgsl: Introduce GPU specific functions\n\nAdd the infrastructure for specific functions based\non the type of 3D GPU core attached to the system.\n\nSigned-off-by: Jordan Crouse \u003cjcrouse@codeaurora.org\u003e\n" }, { "commit": "80ba33d88f07caa74cf90721780f17f26fe9d236", "tree": "8f5514e1630dbcbdb9ce72bdec6d0a0fe8c72ef9", "parents": [ "c5760300500abbf48d54daa86836890da276ea58" ], "author": { "name": "Jason Varbedian", "email": "jasonv@codeaurora.org", "time": "Mon Jul 11 17:29:05 2011 -0700" }, "committer": { "name": "Bryan Huntsman", "email": "bryanh@codeaurora.org", "time": "Mon Oct 03 09:58:23 2011 -0700" }, "message": "msm: kgsl: change readtimestamp from IOR to IOWR and keep legacy\n\nSigned-off-by: Jason Varbedian \u003cjasonv@codeaurora.org\u003e\n" }, { "commit": "3f2bc4d6eb5a4fada842462ba22bb6bbb41d00c7", "tree": "088e0646c8abcbde263d13ee865ba69032ac86dd", "parents": [ "f06154cc47399dfdb3950d3e6b71d67ee186f69d" ], "author": { "name": "Bryan Huntsman", "email": "bryanh@codeaurora.org", "time": "Tue Aug 16 17:27:22 2011 -0700" }, "committer": { "name": "Bryan Huntsman", "email": "bryanh@codeaurora.org", "time": "Mon Oct 03 09:57:10 2011 -0700" }, "message": "Initial Contribution\n\nmsm-2.6.38: tag AU_LINUX_ANDROID_GINGERBREAD.02.03.04.00.142\n\nSigned-off-by: Bryan Huntsman \u003cbryanh@codeaurora.org\u003e\n" }, { "commit": "9abd59b0df155835a970c2b9c8f93367eb793797", "tree": "bcf0868f831d204e2b582113c53b8de3ff015eca", "parents": [ "4e111751cfcb75f26d2725eab934b6eb91a3d115", "94ed5b4788a7cdbe68bc7cb8516972cbebdc8274" ], "author": { "name": "Colin Cross", "email": "ccross@android.com", "time": "Wed Aug 10 18:07:59 2011 -0700" }, "committer": { "name": "Colin Cross", "email": "ccross@android.com", "time": "Wed Aug 10 18:07:59 2011 -0700" }, "message": "Merge commit \u0027v3.0.1\u0027 into android-3.0\n" }, { "commit": "4e111751cfcb75f26d2725eab934b6eb91a3d115", "tree": "b3d63b5b44bd2036db6e0f0b2e81769c84cc5ca3", "parents": [ "ca64b0cd3a12d7704f4e98f4f5d51f41eb5047a2", "02f8c6aee8df3cdc935e9bdd4f2d020306035dbe" ], "author": { "name": "Colin Cross", "email": "ccross@android.com", "time": "Wed Aug 10 18:04:30 2011 -0700" }, "committer": { "name": "Colin Cross", "email": "ccross@android.com", "time": "Wed Aug 10 18:04:30 2011 -0700" }, "message": "Merge commit \u0027v3.0\u0027 into android-3.0\n" }, { "commit": "3fe24366a40147d7c776e1f291193fd3b61f217d", "tree": "35332418ccff1248b80cb7517f16f9439fb5a7dc", "parents": [ "89c65d6d9dd87332d58c853e31938b98f7ac8463" ], "author": { "name": "Iliyan Malchev", "email": "malchev@google.com", "time": "Tue Aug 09 14:42:08 2011 -0700" }, "committer": { "name": "Iliyan Malchev", "email": "malchev@google.com", "time": "Tue Aug 09 14:49:21 2011 -0700" }, "message": "ion: minor clean up\n\n-- init rb nodes in ion_handle_create\n-- in ion_handle_destroy, check that a node belongs to a tree before removing\n it (safety check, does not happen right now)\n-- mark as static functions used only inside ion.c\n-- update comments to ion_share() with a relevant blurb from the implementation\n-- other minor updates/typo fixes to comments\n\nSigned-off-by: Iliyan Malchev \u003cmalchev@google.com\u003e\n" }, { "commit": "eff0f0eb6357e141c1ebf6d3753e2b89177ab6db", "tree": "501c49d25391e9e4df0128f6b79e35d83691a6fc", "parents": [ "803df865c9cae516da0181406716d8cfc1ce854e" ], "author": { "name": "Alex Deucher", "email": "alexander.deucher@amd.com", "time": "Mon Jul 25 18:50:08 2011 -0400" }, "committer": { "name": "Greg Kroah-Hartman", "email": "gregkh@suse.de", "time": "Thu Aug 04 21:58:36 2011 -0700" }, "message": "drm/radeon/kms: add missing vddci setting on NI+\n\ncommit 4639dd21e759e32125adc7171abf6cb8140d54cf upstream.\n\nNeed to add vddci setting to pm init as well as\nresume. Fixes hangs on load on some boards.\n\nFixes:\nhttps://bugs.freedesktop.org/show_bug.cgi?id\u003d38754\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": "803df865c9cae516da0181406716d8cfc1ce854e", "tree": "964224562c26759ee23b01dd3adec054a0fe48db", "parents": [ "eec8f481cc0114fd86b2b3d5258b4933cd731571" ], "author": { "name": "Jerome Glisse", "email": "jglisse@redhat.com", "time": "Mon Jul 25 11:57:43 2011 -0400" }, "committer": { "name": "Greg Kroah-Hartman", "email": "gregkh@suse.de", "time": "Thu Aug 04 21:58:36 2011 -0700" }, "message": "drm/radeon/kms: fix DP training for DPEncoderService revision bigger than 1.1\n\ncommit 5a96a899bbdee86024ab9ea6d02b9e242faacbed upstream.\n\nDPEncoderService newer than 1.1 can\u0027t properly program the DP (display port)\nlink training. When facing such version use the DIGxEncoderControl method\ninstead. Fix DP link training on some R7XX.\n\nSigned-off-by: Jerome Glisse \u003cjglisse@redhat.com\u003e\nReviewed-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": "eec8f481cc0114fd86b2b3d5258b4933cd731571", "tree": "76c8bc94b1b771d67ad66dd61aee4d2747e81433", "parents": [ "fbb04a1c17686592b5e74e45e210f20c40b68d08" ], "author": { "name": "Alex Deucher", "email": "alexander.deucher@amd.com", "time": "Sat Jul 23 18:02:04 2011 +0000" }, "committer": { "name": "Greg Kroah-Hartman", "email": "gregkh@suse.de", "time": "Thu Aug 04 21:58:36 2011 -0700" }, "message": "drm/radeon/kms: fix i2c map for rv250/280\n\ncommit 6dd666333ddee39903d86f870d5c40d9f100e0cc upstream.\n\nThose chips have crt2_ddc bus.\n\nFixes:\nhttps://bugzilla.kernel.org/show_bug.cgi?id\u003d39672\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": "ad21b115772dfa146f19ec5d1db9de25973c483b", "tree": "457b129a39a3babdc2b0bb497e90915bfddcb12b", "parents": [ "b91da88fed84843313a1b6fd1b1c834a24bbcf9e", "e28f87116503f796aba4fb27d81e2c3d81966174" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Jul 21 11:07:18 2011 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Jul 21 11:07:18 2011 -0700" }, "message": "Merge branch \u0027drm-intel-fixes\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/keithp/linux-2.6\n\n* \u0027drm-intel-fixes\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/keithp/linux-2.6:\n drm/i915: Fix unfenced alignment on pre-G33 hardware\n drm/i915: Add quirk to disable SSC on Lenovo U160 LVDS\n" }, { "commit": "e28f87116503f796aba4fb27d81e2c3d81966174", "tree": "9fb1ef4243707e686a3c1a512931942562267e64", "parents": [ "435793dfb8aec7b2e19f72d5bce8a22fd0b57839" ], "author": { "name": "Chris Wilson", "email": "chris@chris-wilson.co.uk", "time": "Mon Jul 18 13:11:49 2011 -0700" }, "committer": { "name": "Keith Packard", "email": "keithp@keithp.com", "time": "Mon Jul 18 14:02:06 2011 -0700" }, "message": "drm/i915: Fix unfenced alignment on pre-G33 hardware\n\nAlign unfenced buffers on older hardware to the power-of-two object\nsize. The docs suggest that it should be possible to align only to a\npower-of-two tile height, but using the already computed fence size is\neasier and always correct. We also have to make sure that we unbind\nmisaligned buffers upon tiling changes.\n\nIn order to prevent a repetition of this bug, we change the interface\nto the alignment computation routines to force the caller to provide\nthe requested alignment and size of the GTT binding rather than assume\nthe current values on the object.\n\nReported-and-tested-by: Sitosfe Wheeler \u003csitsofe@yahoo.com\u003e\nBugzilla: https://bugs.freedesktop.org/show_bug.cgi?id\u003d36326\nSigned-off-by: Chris Wilson \u003cchris@chris-wilson.co.uk\u003e\nCc: stable@kernel.org\nReviewed-by: Daniel Vetter \u003cdaniel.vetter@ffwll.ch\u003e\nSigned-off-by: Keith Packard \u003ckeithp@keithp.com\u003e\n" }, { "commit": "435793dfb8aec7b2e19f72d5bce8a22fd0b57839", "tree": "fde7fd2e71f04c4b871140ba629b4d6f78639738", "parents": [ "d1ca1a004822983e2fc702d5382b4b9a5527cfbe" ], "author": { "name": "Keith Packard", "email": "keithp@keithp.com", "time": "Tue Jul 12 14:56:22 2011 -0700" }, "committer": { "name": "Keith Packard", "email": "keithp@keithp.com", "time": "Wed Jul 13 23:53:41 2011 -0700" }, "message": "drm/i915: Add quirk to disable SSC on Lenovo U160 LVDS\n\nWe\u0027ve tried several times to make this machine \u0027just work\u0027, but every\npatch that does causes many other machines to fail. This adds a quirk\nwhich special cases this hardware and forces ssc to be\ndisabled. There\u0027s no way to override this from the command line; that\nwould be a significantly more invasive change.\n\nThis patch fixes #36656 on fdo bugzilla:\nhttps://bugs.freedesktop.org/show_bug.cgi?id\u003d36656\n\nSigned-off-by: Keith Packard \u003ckeithp@keithp.com\u003e\nReferences: https://bugs.freedesktop.org/show_bug.cgi?id\u003d36656\nReviewed-by: Chris Wilson \u003cchris@chris-wilson.co.uk\u003e\n" }, { "commit": "c835490196c42d9f225ee6873880f436d031df86", "tree": "84ad9113d7733678a7556b6d976f034fc046435f", "parents": [ "5d7d5d933256fc44f68e061ccd103b027fef0fc9", "c61d0af9131976db150c40996a71387ba59edb67" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Jul 13 14:04:26 2011 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Jul 13 14:04:26 2011 -0700" }, "message": "Merge branch \u0027drm-fixes\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/airlied/drm-2.6\n\n* \u0027drm-fixes\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/airlied/drm-2.6:\n drm/radeon/kms/evergreen: emit SQ_LDS_RESOURCE_MGMT for blits\n agp/intel: Fix typo in G4x_GMCH_SIZE_VT_2M\n drm/radeon/kms: fix typo in read_disabled vbios code\n drm/radeon/kms: use correct BUS_CNTL reg on rs600\n drm/radeon/kms: fix backend map typo on juniper\n drm/radeon/kms: fix regression in hotplug\n" }, { "commit": "c61d0af9131976db150c40996a71387ba59edb67", "tree": "df5b8699659928571cd839214f6cee688a943f53", "parents": [ "780d7cc44524cd396a34757127f51ecb8ccaf2da" ], "author": { "name": "Alex Deucher", "email": "alexdeucher@gmail.com", "time": "Tue Jul 12 11:53:23 2011 -0400" }, "committer": { "name": "Dave Airlie", "email": "airlied@redhat.com", "time": "Wed Jul 13 07:47:13 2011 +0100" }, "message": "drm/radeon/kms/evergreen: emit SQ_LDS_RESOURCE_MGMT for blits\n\nCompute drivers may change this, so make sure to emit it to\navoid errors in bo blits.\n\nFixes:\nhttps://bugs.freedesktop.org/show_bug.cgi?id\u003d39119\n\nSigned-off-by: Alex Deucher \u003calexdeucher@gmail.com\u003e\nSigned-off-by: Dave Airlie \u003cairlied@redhat.com\u003e\n" }, { "commit": "75c56a81116e51c5cf15c0641906d0745188cd16", "tree": "c1d8e7def5bbb099a39d5e9ccfb13508ea5ca46a", "parents": [ "b4294d618e8a19bb47826e51ae52b9fb2fe05f80", "620917de59eeb934b9f8cf35cc2d95c1ac8ed0fc" ], "author": { "name": "Colin Cross", "email": "ccross@android.com", "time": "Tue Jul 12 20:10:37 2011 -0700" }, "committer": { "name": "Colin Cross", "email": "ccross@android.com", "time": "Tue Jul 12 20:10:37 2011 -0700" }, "message": "Merge commit \u0027v3.0-rc7\u0027 into android-3.0\n" }, { "commit": "d1ca1a004822983e2fc702d5382b4b9a5527cfbe", "tree": "ced77f6c6a5f98bb8d441030813d5e336dd24fa4", "parents": [ "620917de59eeb934b9f8cf35cc2d95c1ac8ed0fc", "a94919eaddaa3fede1df8563ce4d761a75374645" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Jul 12 14:18:00 2011 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Jul 12 14:18:00 2011 -0700" }, "message": "Merge branch \u0027drm-intel-fixes\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/keithp/linux-2.6\n\n* \u0027drm-intel-fixes\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/keithp/linux-2.6:\n drm/i915/ringbuffer: Idling requires waiting for the ring to be empty\n Revert \"drm/i915: enable rc6 by default\"\n drm/i915: Clean up i915_driver_load failure path\n drm/i915: Enable GPU reset on Ivybridge.\n drm/i915/dp: manage sink power state if possible\n drm/i915/dp: consolidate AUX retry code\n drm/i915/dp: remove DPMS mode tracking from DP\n drm/i915/dp: try to read receiver capabilities 3 times when detecting\n drm/i915/dp: read more receiver capability bits on hotplug\n drm/i915/dp: use DP DPCD defines when looking at DPCD values\n drm/i915/dp: retry link status read 3 times on failure\n" }, { "commit": "a94919eaddaa3fede1df8563ce4d761a75374645", "tree": "ec08ea68ca13871bd3f15526df2e55d0f7a92012", "parents": [ "05bd42688dbc066d4e2689b6f73c0470601f788b" ], "author": { "name": "Chris Wilson", "email": "chris@chris-wilson.co.uk", "time": "Tue Jul 12 18:03:29 2011 +0100" }, "committer": { "name": "Keith Packard", "email": "keithp@keithp.com", "time": "Tue Jul 12 10:35:45 2011 -0700" }, "message": "drm/i915/ringbuffer: Idling requires waiting for the ring to be empty\n\n...which is measured by the size and not the amount of space remaining.\n\nWaiting upon size-8, did one of two things. In the common case with more\nthan 8 bytes available to write into the ring, it would return\nimmediately. Otherwise, it would timeout given the impossible condition\nof waiting for more space than is available in the ring, leading to\nwarnings such as:\n\n[drm:intel_cleanup_ring_buffer] *ERROR* failed to quiesce render ring\nwhilst cleaning up: -16\n\nSigned-off-by: Chris Wilson \u003cchris@chris-wilson.co.uk\u003e\nReviewed-by: Eric Anholt \u003ceric@anholt.net\u003e\nSigned-off-by: Keith Packard \u003ckeithp@keithp.com\u003e\n" }, { "commit": "05bd42688dbc066d4e2689b6f73c0470601f788b", "tree": "afc81fcc95c69ec4f5569034ac2fbe741d465202", "parents": [ "a7b85d2aa63ed09cd5a4a640772b3272f5ac7caa" ], "author": { "name": "Keith Packard", "email": "keithp@keithp.com", "time": "Tue Jul 12 08:49:31 2011 -0700" }, "committer": { "name": "Keith Packard", "email": "keithp@keithp.com", "time": "Tue Jul 12 08:49:31 2011 -0700" }, "message": "Revert \"drm/i915: enable rc6 by default\"\n\nThis reverts commit a51f7a66fb5e4af5ec4286baef940d06594b59d2.\n\nWe still have a few Ironlake and Sandybridge machines which fail when\nRC6 is enabled. Better luck next release?\n\nSigned-off-by: Keith Packard \u003ckeithp@keithp.com\u003e\n" }, { "commit": "a7b85d2aa63ed09cd5a4a640772b3272f5ac7caa", "tree": "ba4b1e9a88c18f13f7148c568e8ac21b1340da0a", "parents": [ "1083694ab052e5ba38a8f9a057c4745448977837" ], "author": { "name": "Keith Packard", "email": "keithp@keithp.com", "time": "Sun Jul 10 13:12:17 2011 -0700" }, "committer": { "name": "Keith Packard", "email": "keithp@keithp.com", "time": "Tue Jul 12 08:47:47 2011 -0700" }, "message": "drm/i915: Clean up i915_driver_load failure path\n\ni915_driver_load adds a write-combining MTRR region for the GTT\naperture to improve memory speeds through the aperture. If\ni915_driver_load fails after this, it would not have cleaned up the\nMTRR. This shouldn\u0027t cause any problems, except for consuming an MTRR\nregister. Still, it\u0027s best to clean up completely in the failure path,\nwhich is easily done by calling mtrr_del if the mtrr was successfully\nallocated.\n\ni915_driver_load calls i915_gem_load which register\ni915_gem_inactive_shrink. If i915_driver_load fails after calling\ni915_gem_load, the shrinker will be left registered. When called, it\nwill access freed memory and crash. The fix is to unregister the shrinker in the\nfailure path using code duplicated from i915_driver_unload.\n\ni915_driver_load also has some incorrect gotos in the error cleanup\npaths:\n\n * After failing to initialize the GTT (which cannot happen, btw,\n intel_gtt_get returns a fixed (non-NULL) value), it tries to\n free the uninitialized WC IO mapping. Fixed this by changing the\n target from out_iomapfree to out_rmmap\n\nSigned-off-by: Keith Packard \u003ckeithp@keithp.com\u003e\nTested-by: Lin Ming \u003cming.m.lin@intel.com\u003e\n" }, { "commit": "4171424e66e5525d7128a2c355215ca5c66f76d5", "tree": "ffd991260c78d78be1e83cbc62fc732f7404b59d", "parents": [ "e22e6d20700328ed0a1801ad71cecf1b63a22555" ], "author": { "name": "Alex Deucher", "email": "alexdeucher@gmail.com", "time": "Mon Jul 11 20:22:33 2011 +0000" }, "committer": { "name": "Dave Airlie", "email": "airlied@redhat.com", "time": "Tue Jul 12 06:58:59 2011 +0100" }, "message": "drm/radeon/kms: fix typo in read_disabled vbios code\n\nBUS_CNTL reg and bits moved between pre-PCIE and PCIE asics.\n\nSigned-off-by: Alex Deucher \u003calexdeucher@gmail.com\u003e\nSigned-off-by: Dave Airlie \u003cairlied@redhat.com\u003e\n" }, { "commit": "e22e6d20700328ed0a1801ad71cecf1b63a22555", "tree": "5796396430630e2db307f31f4a1f6232df310b2f", "parents": [ "9a4a0b9c9fa6ad9902f49801d7b770462b69c4d3" ], "author": { "name": "Alex Deucher", "email": "alexdeucher@gmail.com", "time": "Mon Jul 11 20:27:23 2011 +0000" }, "committer": { "name": "Dave Airlie", "email": "airlied@redhat.com", "time": "Tue Jul 12 06:58:07 2011 +0100" }, "message": "drm/radeon/kms: use correct BUS_CNTL reg on rs600\n\nBUS_CNTL is at 0x30 on rs600, not 0x4c.\n\nSigned-off-by: Alex Deucher \u003calexdeucher@gmail.com\u003e\nSigned-off-by: Dave Airlie \u003cairlied@redhat.com\u003e\n" }, { "commit": "9a4a0b9c9fa6ad9902f49801d7b770462b69c4d3", "tree": "6bbfe17475dcce193bd7ae1e0d2e93acd1460d71", "parents": [ "cbac9543281f8e813f3ca9186c963a9b55136e93" ], "author": { "name": "Alex Deucher", "email": "alexdeucher@gmail.com", "time": "Mon Jul 11 19:45:32 2011 +0000" }, "committer": { "name": "Dave Airlie", "email": "airlied@redhat.com", "time": "Tue Jul 12 06:57:49 2011 +0100" }, "message": "drm/radeon/kms: fix backend map typo on juniper\n\nDon\u0027t enable backends that don\u0027t exist.\n\nSigned-off-by: Alex Deucher \u003calexdeucher@gmail.com\u003e\nCc: stable@kernel.org\nSigned-off-by: Dave Airlie \u003cairlied@redhat.com\u003e\n" }, { "commit": "cbac9543281f8e813f3ca9186c963a9b55136e93", "tree": "9a6aa958fe58429397fffeb0125f60bff4b33e7d", "parents": [ "620917de59eeb934b9f8cf35cc2d95c1ac8ed0fc" ], "author": { "name": "Alex Deucher", "email": "alexdeucher@gmail.com", "time": "Mon Jul 11 14:49:28 2011 +0000" }, "committer": { "name": "Dave Airlie", "email": "airlied@redhat.com", "time": "Tue Jul 12 06:57:13 2011 +0100" }, "message": "drm/radeon/kms: fix regression in hotplug\n\nSkip connectors that do not have an HPD pin.\n\nShould fix:\nhttps://bugs.freedesktop.org/show_bug.cgi?id\u003d39027\n\nSigned-off-by: Alex Deucher \u003calexdeucher@gmail.com\u003e\nTested-by: Rafał Miłecki \u003czajec5@gmail.com\u003e\nSigned-off-by: Dave Airlie \u003cairlied@redhat.com\u003e\n" }, { "commit": "c72866db6b303d3af1f579a0270bc88353dd8458", "tree": "279f251b0726c9f16aefda29ac86011128faf584", "parents": [ "0226f8a76da6bc97c9bb4af3fd2f6eeb03c5b0b0" ], "author": { "name": "Rebecca Schultz Zavin", "email": "rebecca@android.com", "time": "Thu Jul 07 17:07:56 2011 -0700" }, "committer": { "name": "Rebecca Schultz Zavin", "email": "rebecca@android.com", "time": "Fri Jul 08 15:41:32 2011 -0700" }, "message": "gpu: ion: Validate handles passed via the kernel api\n\nBefore freeing or sharing handles, confirm that they\nare valid in the provided client\n\nChange-Id: I06ec599c0b277fcb5417325a12ecbf8b2d248a7b\nSigned-off-by: Rebecca Schultz Zavin \u003crebecca@android.com\u003e\n" }, { "commit": "b7eff394670366a42935bfbaef67a6f7185627d7", "tree": "039d6de6280836458dac24450944f2dcc5ebdd87", "parents": [ "902daf6580cffe04721250fb71b5527a98718b11" ], "author": { "name": "Alex Deucher", "email": "alexdeucher@gmail.com", "time": "Fri Jul 08 11:44:56 2011 -0400" }, "committer": { "name": "Dave Airlie", "email": "airlied@redhat.com", "time": "Sat Jul 09 03:28:52 2011 +1000" }, "message": "drm/radeon/kms: clean up multiple crtc handling for evergreen+ (v2)\n\nevergreen+ asics have 2-6 crtcs. Don\u0027t access crtc registers\nfor crtc regs that don\u0027t exist as they have very high latency\nand may cause problems on some asics. The previous code missed\na few cases and was not fine grained enough (missed the 4 crtc\ncase for example).\n\nFixes:\nhttps://bugs.freedesktop.org/show_bug.cgi?id\u003d38800\n\nv2: fix typo noticed by Chris Bandy \u003ccbandy@jbandy.com\u003e\n\nSigned-off-by: Alex Deucher \u003calexdeucher@gmail.com\u003e\nReviewed-by: Michel Dänzer \u003cmichel@daenzer.net\u003e\nTested-by: Simon Farnsworth \u003csimon.farnsworth@onelan.co.uk\u003e\nSigned-off-by: Dave Airlie \u003cairlied@redhat.com\u003e\n" }, { "commit": "814cdea670616252e4cdf297a07b02ce59698bf1", "tree": "c4a5665995e813c252b07f1e863166059bfb5bcb", "parents": [ "487ffb052891a552fecf865ad4b24bbe7945a413", "fe0d42203cb5616eeff68b14576a0f7e2dd56625" ], "author": { "name": "Dima Zavin", "email": "dima@android.com", "time": "Thu Jul 07 17:55:44 2011 -0700" }, "committer": { "name": "Dima Zavin", "email": "dima@android.com", "time": "Thu Jul 07 17:55:44 2011 -0700" }, "message": "Merge commit \u0027v3.0-rc6\u0027 into android-3.0\n" }, { "commit": "1083694ab052e5ba38a8f9a057c4745448977837", "tree": "09d7da8458444a1cc8870f2aeaf7db4c2e339b93", "parents": [ "c7ad381078ee1b5ce2ab5274bd5f12fee6e1e59a" ], "author": { "name": "Kenneth Graunke", "email": "kenneth@whitecape.org", "time": "Thu Jul 07 15:33:26 2011 -0700" }, "committer": { "name": "Keith Packard", "email": "keithp@keithp.com", "time": "Thu Jul 07 15:39:28 2011 -0700" }, "message": "drm/i915: Enable GPU reset on Ivybridge.\n\nAccording to the hardware documentation, GDRST is exactly the same as on\nSandybridge. So simply enable the existing code.\n\nSigned-off-by: Kenneth Graunke \u003ckenneth@whitecape.org\u003e\nSigned-off-by: Keith Packard \u003ckeithp@keithp.com\u003e\n" }, { "commit": "c7ad381078ee1b5ce2ab5274bd5f12fee6e1e59a", "tree": "c1b06e05573621bfb4ec88a94f35532d88b2e654", "parents": [ "df0c237d124fb8d10b98f7b43d63d962eeed9355" ], "author": { "name": "Jesse Barnes", "email": "jbarnes@virtuousgeek.org", "time": "Thu Jul 07 11:11:03 2011 -0700" }, "committer": { "name": "Keith Packard", "email": "keithp@keithp.com", "time": "Thu Jul 07 13:38:54 2011 -0700" }, "message": "drm/i915/dp: manage sink power state if possible\n\nOn sinks with a DPCD rev of 1.1 or greater, we can send sink power\nmanagement commands to address 0x600 per section 5.1.5 of the\nDisplayPort 1.1a spec.\n\nSigned-off-by: Jesse Barnes \u003cjbarnes@virtuousgeek.org\u003e\nReviewed-by: Keith Packard \u003ckeithp@keithp.com\u003e\nSigned-off-by: Keith Packard \u003ckeithp@keithp.com\u003e\n" }, { "commit": "df0c237d124fb8d10b98f7b43d63d962eeed9355", "tree": "cd95a24a6691601a4c9571297e9b8d3459184498", "parents": [ "885a50147f00a8a80108904bf58a18af357717f3" ], "author": { "name": "Jesse Barnes", "email": "jbarnes@virtuousgeek.org", "time": "Thu Jul 07 11:11:02 2011 -0700" }, "committer": { "name": "Keith Packard", "email": "keithp@keithp.com", "time": "Thu Jul 07 13:38:51 2011 -0700" }, "message": "drm/i915/dp: consolidate AUX retry code\n\nWhen checking link status during a hot plug event or detecting sink\npresence, we need to retry 3 times per the spec (section 9.1 of the 1.1a\nDisplayPort spec). Consolidate the retry code into a\nnative_aux_read_retry function for use by get_link_status and _detect.\n\nSigned-off-by: Jesse Barnes \u003cjbarnes@virtuousgeek.org\u003e\nReviewed-by: Keith Packard \u003ckeithp@keithp.com\u003e\nSigned-off-by: Keith Packard \u003ckeithp@keithp.com\u003e\n" }, { "commit": "885a50147f00a8a80108904bf58a18af357717f3", "tree": "02c2bbe6483c50f5f8e5614b71dc5faad7bafdb2", "parents": [ "899526d9a73fda47516cf11ccb3467ad6702f568" ], "author": { "name": "Jesse Barnes", "email": "jbarnes@virtuousgeek.org", "time": "Thu Jul 07 11:11:01 2011 -0700" }, "committer": { "name": "Keith Packard", "email": "keithp@keithp.com", "time": "Thu Jul 07 13:38:47 2011 -0700" }, "message": "drm/i915/dp: remove DPMS mode tracking from DP\n\nWe currently use this when a hot plug event is received, only checking\nthe link status and re-training if we had previously configured a link.\nHowever if we want to preserve the DP configuration across both hot plug\nand DPMS events (which we do for userspace apps that don\u0027t respond to\nhot plug uevents), we need to unconditionally check the link and try to\nbring it up on hot plug.\n\nSigned-off-by: Jesse Barnes \u003cjbarnes@virtuousgeek.org\u003e\nReviewed-by: Keith Packard \u003ckeithp@keithp.com\u003e\nSigned-off-by: Keith Packard \u003ckeithp@keithp.com\u003e\n" }, { "commit": "899526d9a73fda47516cf11ccb3467ad6702f568", "tree": "d4bdec27956e40aaa9209da438cea6ae3ef8f7f0", "parents": [ "59cd09e1aea3ac6eb15b45e5d2261a63ecb1799c" ], "author": { "name": "Jesse Barnes", "email": "jbarnes@virtuousgeek.org", "time": "Thu Jul 07 11:11:00 2011 -0700" }, "committer": { "name": "Keith Packard", "email": "keithp@keithp.com", "time": "Thu Jul 07 13:38:44 2011 -0700" }, "message": "drm/i915/dp: try to read receiver capabilities 3 times when detecting\n\nIf -\u003edetect is called too soon after a hot plug event, the sink may not\nbe ready yet. So try up to 3 times with 1ms sleeps in between tries to\nget the data (spec dictates that receivers must be ready to respond within\n1ms and that sources should try 3 times).\n\nSee section 9.1 of the 1.1a DisplayPort spec.\n\nSigned-off-by: Jesse Barnes \u003cjbarnes@virtuousgeek.org\u003e\nReviewed-by: Keith Packard \u003ckeithp@keithp.com\u003e\nSigned-off-by: Keith Packard \u003ckeithp@keithp.com\u003e\n" }, { "commit": "59cd09e1aea3ac6eb15b45e5d2261a63ecb1799c", "tree": "89e76b57e1b722d35f84bb3fbe474eb7c1e46d57", "parents": [ "7183dc2912510cf005fcc59239f8d153ef51d3f0" ], "author": { "name": "Jesse Barnes", "email": "jbarnes@virtuousgeek.org", "time": "Thu Jul 07 11:10:59 2011 -0700" }, "committer": { "name": "Keith Packard", "email": "keithp@keithp.com", "time": "Thu Jul 07 13:38:40 2011 -0700" }, "message": "drm/i915/dp: read more receiver capability bits on hotplug\n\nWhen a hotplug event is received, we need to check the receiver cap bits\nin case they\u0027ve changed (as they might with a hub or chain config).\n\nSigned-off-by: Jesse Barnes \u003cjbarnes@virtuousgeek.org\u003e\nReviewed-by: Keith Packard \u003ckeithp@keithp.com\u003e\nSigned-off-by: Keith Packard \u003ckeithp@keithp.com\u003e\n" }, { "commit": "7183dc2912510cf005fcc59239f8d153ef51d3f0", "tree": "a5a648abff6514d14e399b1a1c99ad3ffe6bb5cc", "parents": [ "61da5fab5a9b129cf05b1fe4666c3e45b3103fd4" ], "author": { "name": "Jesse Barnes", "email": "jbarnes@virtuousgeek.org", "time": "Thu Jul 07 11:10:58 2011 -0700" }, "committer": { "name": "Keith Packard", "email": "keithp@keithp.com", "time": "Thu Jul 07 13:38:36 2011 -0700" }, "message": "drm/i915/dp: use DP DPCD defines when looking at DPCD values\n\nMakes it easier to search for DP related constants.\n\nReviewed-by: Keith Packard \u003ckeithp@keithp.com\u003e\nSigned-off-by: Jesse Barnes \u003cjbarnes@virtuousgeek.org\u003e\nSigned-off-by: Keith Packard \u003ckeithp@keithp.com\u003e\n" }, { "commit": "61da5fab5a9b129cf05b1fe4666c3e45b3103fd4", "tree": "d32b39d60881878ae7df4818a9387a884b7fba78", "parents": [ "fe0d42203cb5616eeff68b14576a0f7e2dd56625" ], "author": { "name": "Jesse Barnes", "email": "jbarnes@virtuousgeek.org", "time": "Thu Jul 07 11:10:57 2011 -0700" }, "committer": { "name": "Keith Packard", "email": "keithp@keithp.com", "time": "Thu Jul 07 13:38:27 2011 -0700" }, "message": "drm/i915/dp: retry link status read 3 times on failure\n\nEspecially after a hotplug or power status change, the sink may not\nreply immediately to a link status query. So retry 3 times per the spec\nto really make sure nothing is there.\n\nSee section 9.1 of the 1.1a DisplayPort spec.\n\nSigned-off-by: Jesse Barnes \u003cjbarnes@virtuousgeek.org\u003e\nReviewed-by: Keith Packard \u003ckeithp@keithp.com\u003e\nSigned-off-by: Keith Packard \u003ckeithp@keithp.com\u003e\n" }, { "commit": "d61a06862ba8c14466e1dd718cac460da0465ddd", "tree": "f291208be1768fa870fa373d2c4397f75a84d789", "parents": [ "ccd6895d401efad0c0e41d0e93fba4ef3085e268" ], "author": { "name": "Ben Skeggs", "email": "bskeggs@redhat.com", "time": "Mon Jul 04 03:16:17 2011 +0000" }, "committer": { "name": "Dave Airlie", "email": "airlied@redhat.com", "time": "Thu Jul 07 17:49:00 2011 +1000" }, "message": "drm/kms: allow drm_mode_group with no objects\n\nSometimes we could be controlling a device (such as an NVIDIA Tesla) that\nhas no crtcs/encoders/connectors.\n\nOne could argue that the driver should unset DRIVER_MODESET in this case,\nbut that changes a whole heap of the DRM\u0027s other behaviours, and it\u0027s much\neasier to just be a modesetting driver without any outputs.\n\nSigned-off-by: Ben Skeggs \u003cbskeggs@redhat.com\u003e\nSigned-off-by: Dave Airlie \u003cairlied@redhat.com\u003e\n" }, { "commit": "ccd6895d401efad0c0e41d0e93fba4ef3085e268", "tree": "8781f6e0effad2f6da4ae32e6451e92d8dd12942", "parents": [ "37cba6c6f4687e694ac6e3adcf2c2b2974aa3aae" ], "author": { "name": "Jerome Glisse", "email": "jglisse@redhat.com", "time": "Wed Jul 06 18:30:09 2011 +0000" }, "committer": { "name": "Dave Airlie", "email": "airlied@redhat.com", "time": "Thu Jul 07 17:48:27 2011 +1000" }, "message": "drm/radeon/kms: free ib pool on module unloading\n\nib pool weren\u0027t free for various newer asic on module unload.\nThis doesn\u0027t cause much arm but still could be candidate for\nstable.\n\nSigned-off-by: Jerome Glisse \u003cjglisse@redhat.com\u003e\ncc: stable@kernel.org\nReviewed-by: Alex Deucher \u003calexdeucher@gmail.com\u003e\nSigned-off-by: Dave Airlie \u003cairlied@redhat.com\u003e\n" }, { "commit": "37cba6c6f4687e694ac6e3adcf2c2b2974aa3aae", "tree": "84a4a49a810817137aa90fe0661a1a462599bcb0", "parents": [ "fcb857abc4c0d512e99a08ba0415be9a6d65b4c0" ], "author": { "name": "Alex Deucher", "email": "alexdeucher@gmail.com", "time": "Wed Jul 06 19:37:47 2011 +0000" }, "committer": { "name": "Dave Airlie", "email": "airlied@redhat.com", "time": "Thu Jul 07 17:47:44 2011 +1000" }, "message": "drm/radeon/kms: fix typo in evergreen disp int status register\n\nSigned-off-by: Alex Deucher \u003calexdeucher@gmail.com\u003e\nCc: stable@kernel.org\nSigned-off-by: Dave Airlie \u003cairlied@redhat.com\u003e\n" }, { "commit": "fcb857abc4c0d512e99a08ba0415be9a6d65b4c0", "tree": "b767d158028100b9b5b261d96550b7bd8edf5b80", "parents": [ "4dd1b49c6d215dc41ce50c80b4868388b93f31a3" ], "author": { "name": "Alex Deucher", "email": "alexdeucher@gmail.com", "time": "Wed Jul 06 19:52:27 2011 +0000" }, "committer": { "name": "Dave Airlie", "email": "airlied@redhat.com", "time": "Thu Jul 07 17:47:12 2011 +1000" }, "message": "drm/radeon/kms: fix typo in IH_CNTL swap bitfield\n\nOnly affects BE systems.\n\nSigned-off-by: Alex Deucher \u003calexdeucher@gmail.com\u003e\nCc: stable@kernel.org\nSigned-off-by: Dave Airlie \u003cairlied@redhat.com\u003e\n" }, { "commit": "42c5a0740e5d5646483118bfdf8aab88ab319dc3", "tree": "3bf50f2073dad316b6ef5eeaf896ca002021d931", "parents": [ "5a3e147d52f56b6d10f779e64d5f29dc678160ab" ], "author": { "name": "Choi, Jong-Hwan", "email": "jhbird.choi@samsung.com", "time": "Thu Jul 07 09:07:04 2011 +0900" }, "committer": { "name": "Rebecca Schultz Zavin", "email": "rebecca@android.com", "time": "Wed Jul 06 18:16:57 2011 -0700" }, "message": "gpu: ion: Fix deferencing ERR_PTR\n\nChange-Id: I986c380d75591571890f1a2cba1405e66789b25c\nSigned-off-by: Choi, Jong-Hwan \u003cjhbird.choi@samsung.com\u003e\n" }, { "commit": "5a3e147d52f56b6d10f779e64d5f29dc678160ab", "tree": "eadeb293a3eb67a875f9219d425c0270c590d3cb", "parents": [ "6d3b958d705055bc7b3bbc4e85f2270d5a449a0f" ], "author": { "name": "Choi, Jong-Hwan", "email": "jhbird.choi@samsung.com", "time": "Thu Jul 07 09:06:17 2011 +0900" }, "committer": { "name": "Rebecca Schultz Zavin", "email": "rebecca@android.com", "time": "Wed Jul 06 18:15:04 2011 -0700" }, "message": "gpu: ion: Fix possible memory leak\n\nChange-Id: I66f5ad2c95513dfab9f4fc5ae2fcb1316f486d34\nSigned-off-by: Choi, Jong-Hwan \u003cjhbird.choi@samsung.com\u003e\n" }, { "commit": "6d3b958d705055bc7b3bbc4e85f2270d5a449a0f", "tree": "d1300922a43283d507097db34bc5847f958d32a2", "parents": [ "0b7e8ae7e4c780251482f702f5a2680707c5346e" ], "author": { "name": "Rebecca Schultz Zavin", "email": "rebecca@android.com", "time": "Wed Jul 06 18:07:24 2011 -0700" }, "committer": { "name": "Rebecca Schultz Zavin", "email": "rebecca@android.com", "time": "Wed Jul 06 18:13:19 2011 -0700" }, "message": "gpu: ion: Remove redunant code from ion_open\n\nion_client_create now does a lookup, so this need not\nalso be done from ion_open\n\nChange-Id: Icb101bbf514bf2e40b4b5d9b320130bf185349aa\nSigned-off-by: Rebecca Schultz Zavin \u003crebecca@android.com\u003e\n" }, { "commit": "0b7e8ae7e4c780251482f702f5a2680707c5346e", "tree": "6a52ec92f86f7f81eeac05a937251833a11e557a", "parents": [ "245003348be73131becdaa4a34927b94a15f3041" ], "author": { "name": "Rebecca Schultz Zavin", "email": "rebecca@android.com", "time": "Wed Jul 06 18:07:01 2011 -0700" }, "committer": { "name": "Rebecca Schultz Zavin", "email": "rebecca@android.com", "time": "Wed Jul 06 18:13:17 2011 -0700" }, "message": "gpu: ion: Fix bug in ion client destroy\n\nion_client_destroy kernel api should only delete the client\nif it\u0027s refcount has gone to zero.\n\nChange-Id: Iaa662bd82d67279a9807e01f9a24aebe3d21c17d\nSigned-off-by: Rebecca Schultz Zavin \u003crebecca@android.com\u003e\n" }, { "commit": "6e139047e2eecd0ccf8bc2f1564e82747cb6e56c", "tree": "7a6da9101cb04b918a3c76bfe21abbd2bdeb4d99", "parents": [ "c66a86d0cdce3bad2da794f114cc37377d242c3d", "6002525170df5f72c92ab946b6ebf1656aaec74d" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sat Jul 02 09:08:56 2011 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sat Jul 02 09:08:56 2011 -0700" }, "message": "Merge branch \u0027drm-fixes\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/airlied/drm-2.6\n\n* \u0027drm-fixes\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/airlied/drm-2.6:\n Revert \"drm/nvc0: recognise 0xdX chipsets as NV_C0\"\n drm/radeon/kms: fix typo in cayman reg offset\n drm/radeon/kms: use correct reg on fusion when reading back mem config\n" }, { "commit": "83e3dab069c2b7620e921edcfcaf9922a6945897", "tree": "0ccdc92cb5a8c6961ef84876e768259001e7549b", "parents": [ "b9ea0a971aad8721742ab2a3962350125260b6c0" ], "author": { "name": "Rebecca Schultz Zavin", "email": "rebecca@android.com", "time": "Fri Jul 01 20:41:25 2011 -0700" }, "committer": { "name": "Rebecca Schultz Zavin", "email": "rebecca@android.com", "time": "Fri Jul 01 20:57:27 2011 -0700" }, "message": "gpu: ion: Fix bug in ion_client_create\n\nIf a process already had a client, ion_client_create\nwould loop forever.\n\nChange-Id: I723207b5872dfc11be04ca27d38a3cf39c4a1426\nSigned-off-by: Rebecca Schultz Zavin \u003crebecca@android.com\u003e\n" }, { "commit": "c66a86d0cdce3bad2da794f114cc37377d242c3d", "tree": "4603bb4a464439275c07ebf66ec4a69ebc8fafc3", "parents": [ "c9e0b8454582b413bc64c16693c7979417cad3eb", "2b1ecb7337592a7bf0989efac46a5b52daab769e" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri Jul 01 16:38:59 2011 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri Jul 01 16:38:59 2011 -0700" }, "message": "Merge branch \u0027drm-intel-fixes\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/keithp/linux-2.6\n\n* \u0027drm-intel-fixes\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/keithp/linux-2.6:\n drm/i915: apply HWSTAM writes to Ivy Bridge as well\n drm/i915: move IRQ function table init to i915_irq.c\n drm/i915/overlay: Fix unpinning along init error paths\n drm/i915: Don\u0027t call describe_obj on NULL pointers\n drm/i915: Hold struct_mutex during i915_save_state/i915_restore_state\n" }, { "commit": "6002525170df5f72c92ab946b6ebf1656aaec74d", "tree": "1f0c2e77d56972306070619335c6af268e74d7a1", "parents": [ "2498c41e1b6aaa1929d13cae9ff1cb6226887078" ], "author": { "name": "Ben Skeggs", "email": "bskeggs@redhat.com", "time": "Fri Jul 01 18:00:51 2011 +1000" }, "committer": { "name": "Dave Airlie", "email": "airlied@redhat.com", "time": "Sat Jul 02 07:10:20 2011 +1000" }, "message": "Revert \"drm/nvc0: recognise 0xdX chipsets as NV_C0\"\n\nOh boy. That was a bad gamble. PDISP has changed.\n\nThis reverts commit cdf81a235f11c8a55023c6b181d21d519a8a5967.\n\nSigned-off-by: Dave Airlie \u003cairlied@redhat.com\u003e\n" }, { "commit": "2498c41e1b6aaa1929d13cae9ff1cb6226887078", "tree": "3bc9bd8ff236febbed53b4e4cdbff77801c5d437", "parents": [ "8208441be21eb3df448e171c4e5cf92756f287da" ], "author": { "name": "Alex Deucher", "email": "alexdeucher@gmail.com", "time": "Fri Jul 01 12:58:54 2011 -0400" }, "committer": { "name": "Dave Airlie", "email": "airlied@redhat.com", "time": "Sat Jul 02 07:09:19 2011 +1000" }, "message": "drm/radeon/kms: fix typo in cayman reg offset\n\nSigned-off-by: Alex Deucher \u003calexdeucher@gmail.com\u003e\nSigned-off-by: Dave Airlie \u003cairlied@redhat.com\u003e\n" }, { "commit": "8208441be21eb3df448e171c4e5cf92756f287da", "tree": "b3b0d4b1195fceca989beb48c5482daf411d7cea", "parents": [ "daf54f1f363a61c618662ef66d4bf09d2b090941" ], "author": { "name": "Alex Deucher", "email": "alexdeucher@gmail.com", "time": "Fri Jul 01 13:18:28 2011 -0400" }, "committer": { "name": "Dave Airlie", "email": "airlied@redhat.com", "time": "Sat Jul 02 07:09:08 2011 +1000" }, "message": "drm/radeon/kms: use correct reg on fusion when reading back mem config\n\nSigned-off-by: Alex Deucher \u003calexdeucher@gmail.com\u003e\nSigned-off-by: Dave Airlie \u003cairlied@redhat.com\u003e\n" }, { "commit": "2b1ecb7337592a7bf0989efac46a5b52daab769e", "tree": "4a325133db2ecc2f2e01c8f11b4850a0f11f3faf", "parents": [ "f71d4af4cd475aced6d9ec9730b03885ac80b833" ], "author": { "name": "Jesse Barnes", "email": "jbarnes@virtuousgeek.org", "time": "Fri Jul 01 11:08:56 2011 -0700" }, "committer": { "name": "Keith Packard", "email": "keithp@keithp.com", "time": "Fri Jul 01 13:28:53 2011 -0700" }, "message": "drm/i915: apply HWSTAM writes to Ivy Bridge as well\n\nIn an attempt to fix 38862 and 38863.\n\nSigned-off-by: Jesse Barnes \u003cjbarnes@virtuousgeek.org\u003e\nTested-by: Kenneth Graunke \u003ckenneth@whitecape.org\u003e\nSigned-off-by: Keith Packard \u003ckeithp@keithp.com\u003e\n" }, { "commit": "0db1fec422e22f9c7726f3c3a091bc834121728a", "tree": "1be2f07538c63fce153d38053c893ea6fb665a22", "parents": [ "f9fb95ebc7ba2ff5353a0f5a359ab1803e9bfd7a" ], "author": { "name": "Rebecca Schultz Zavin", "email": "rebecca@android.com", "time": "Thu Jun 30 19:16:59 2011 -0700" }, "committer": { "name": "Rebecca Schultz Zavin", "email": "rebecca@android.com", "time": "Thu Jun 30 19:42:36 2011 -0700" }, "message": "gpu: ion: Remove incorrect error message\n\nThe function name is wrong here, and this function may\nsometimes be called to see if a value passed from userspace\nis an ion handle. Since it\u0027s not really an error when it\nfails, remove the log message.\n\nChange-Id: I7bee0e7ffb72b4c4768774a3586f97e306700c21\nSigned-off-by: Rebecca Schultz Zavin \u003crebecca@android.com\u003e\n" }, { "commit": "f9fb95ebc7ba2ff5353a0f5a359ab1803e9bfd7a", "tree": "fee69f07ac4fb9a3985e386f10fd0b0cac035ba5", "parents": [ "e6ee124528d520d429bf40303340e8be0bcefdaa" ], "author": { "name": "Rebecca Schultz Zavin", "email": "rebecca@android.com", "time": "Thu Jun 30 18:09:05 2011 -0700" }, "committer": { "name": "Rebecca Schultz Zavin", "email": "rebecca@android.com", "time": "Thu Jun 30 18:09:38 2011 -0700" }, "message": "gpu: ion: Fix bug in ion_buffer_add\n\nSigned-off-by: Rebecca Schultz Zavin \u003crebecca@android.com\u003e\n" }, { "commit": "e6ee124528d520d429bf40303340e8be0bcefdaa", "tree": "e2d4fd0c9d9c5c6444e5425310f11cf54b134c2b", "parents": [ "c80005ae9ef788dce825629ea07e658714a2adad" ], "author": { "name": "Rebecca Schultz Zavin", "email": "rebecca@android.com", "time": "Thu Jun 30 12:19:55 2011 -0700" }, "committer": { "name": "Rebecca Schultz Zavin", "email": "rebecca@android.com", "time": "Thu Jun 30 15:15:14 2011 -0700" }, "message": "gpu: ion: Several fixes\n\nFix some cases where locks were not released on error paths\nChange heap-\u003eprio to heap-\u003eid to make meaning clearer\nFix kernel doc to match sources\n" }, { "commit": "daf54f1f363a61c618662ef66d4bf09d2b090941", "tree": "255ddbc906264562445ddee96b22b9f2afdd3f96", "parents": [ "0e90ed0e8b9b1c25040442f1d20c799751b1e727" ], "author": { "name": "Alex Deucher", "email": "alexdeucher@gmail.com", "time": "Thu Jun 30 08:59:55 2011 -0400" }, "committer": { "name": "Dave Airlie", "email": "airlied@redhat.com", "time": "Fri Jul 01 07:29:46 2011 +1000" }, "message": "drm/radeon/kms: Fix chremap setup on RV770 CE\n\nCE variant requires a different chremap setup.\n\nFixes:\nhttps://bugzilla.kernel.org/show_bug.cgi?id\u003d35472\n\nSigned-off-by: Alex Deucher \u003calexdeucher@gmail.com\u003e\nCc: stable@kernel.org\nSigned-off-by: Dave Airlie \u003cairlied@redhat.com\u003e\n" }, { "commit": "f71d4af4cd475aced6d9ec9730b03885ac80b833", "tree": "94cc3ab06f0d8d050cfb29bafac7d1896d5e9003", "parents": [ "79d2427338e8da362678de32a1c8af1dc8a9810a" ], "author": { "name": "Jesse Barnes", "email": "jbarnes@virtuousgeek.org", "time": "Tue Jun 28 13:00:41 2011 -0700" }, "committer": { "name": "Keith Packard", "email": "keithp@keithp.com", "time": "Wed Jun 29 20:37:22 2011 -0700" }, "message": "drm/i915: move IRQ function table init to i915_irq.c\n\nThis lets us make the various IRQ functions static and helps avoid\nproblems like the one fixed in \"drm/i915: Use chipset-specific irq\ninstallers\" where one of the exported functions was called rather than\nthe chipset specific version.\n\nThis also fixes a UMS-mode bug -- the correct irq functions for IRL\nand later chips were only getting loaded in the KMS path.\n\nSigned-off-by: Jesse Barnes \u003cjbarnes@virtuousgeek.org\u003e\nReviewed-by: Ben Widawsky \u003cben@bwidawsk.net\u003e\nSigned-off-by: Keith Packard \u003ckeithp@keithp.com\u003e\n" }, { "commit": "c80005ae9ef788dce825629ea07e658714a2adad", "tree": "2fe6bc7a2b3341fa1465ce5a63a696d7f5e3ad97", "parents": [ "e55d4fa96762fd767a3b6d842c904e994db6bb2e" ], "author": { "name": "Rebecca Schultz Zavin", "email": "rebecca@android.com", "time": "Wed Jun 29 19:44:29 2011 -0700" }, "committer": { "name": "Rebecca Schultz Zavin", "email": "rebecca@android.com", "time": "Wed Jun 29 19:44:29 2011 -0700" }, "message": "gpu: ion: Add ION Memory Manager\n\nSigned-off-by: Rebecca Schultz Zavin \u003crebecca@android.com\u003e\n" }, { "commit": "79d2427338e8da362678de32a1c8af1dc8a9810a", "tree": "5f1018e11a501c24ce9a5bc978a6df49d5adc4dc", "parents": [ "dc501fbc4389f6c15a8da14684b5926e0d9553da" ], "author": { "name": "Chris Wilson", "email": "chris@chris-wilson.co.uk", "time": "Tue Jun 28 11:27:47 2011 +0100" }, "committer": { "name": "Keith Packard", "email": "keithp@keithp.com", "time": "Wed Jun 29 19:09:13 2011 -0700" }, "message": "drm/i915/overlay: Fix unpinning along init error paths\n\nAs pointed out by Dan Carpenter, it was seemingly possible to hit an error\nwhilst mapping the buffer for the regs (except the only likely error\nreturns should not happen during init) and so leak a pin count on the\nbo. To handle this we would need to reacquire the struct mutex, so for\nsimplicity rearrange for the lock to be held for the entire function.\nFor extra pedagogy, test that we only call init once.\n\nSigned-off-by: Chris Wilson \u003cchris@chris-wilson.co.uk\u003e\nReviewed-by: Keith Packard \u003ckeithp@keithp.com\u003e\nSigned-off-by: Keith Packard \u003ckeithp@keithp.com\u003e\n" }, { "commit": "b271a988eb9c3944c50fb62c21ac61860090d3ba", "tree": "2e4dfde9f138bfc2f835fc14e5f38311f531dd98", "parents": [ "c017d0d1351f916c0ced3f358afc491fdcf490b4" ], "author": { "name": "Alex Deucher", "email": "alexdeucher@gmail.com", "time": "Fri Jun 24 13:15:38 2011 +0000" }, "committer": { "name": "Dave Airlie", "email": "airlied@redhat.com", "time": "Thu Jun 30 10:12:17 2011 +1000" }, "message": "drm/radeon/kms: increase rom size for atrm method\n\nThe vbios rom is \u003e64k on a lot of modern asics. Increase\nthe fetch size for atrm to make sure we don\u0027t miss part\nof a larger rom.\n\nSigned-off-by: Alex Deucher \u003calexdeucher@gmail.com\u003e\nSigned-off-by: Dave Airlie \u003cairlied@redhat.com\u003e\n" }, { "commit": "dc501fbc4389f6c15a8da14684b5926e0d9553da", "tree": "93ed1c9bcdf72ee5b6214eaa908b3e37c6d88ad9", "parents": [ "d70bed1947772f34d66ada3bd923bfc12ea2452b" ], "author": { "name": "Ben Widawsky", "email": "ben@bwidawsk.net", "time": "Wed Jun 29 11:41:51 2011 -0700" }, "committer": { "name": "Keith Packard", "email": "keithp@keithp.com", "time": "Wed Jun 29 13:05:52 2011 -0700" }, "message": "drm/i915: Don\u0027t call describe_obj on NULL pointers\n\nReported-by: Pavel Roskin \u003cproski@gnu.org\u003e\nBugzilla: https://bugs.freedesktop.org/show_bug.cgi?id\u003d38777\nCc: Chris Wilson \u003cchris@chris-wilson.co.uk\u003e\nSigned-off-by: Ben Widawsky \u003cben@bwidawsk.net\u003e\nSigned-off-by: Keith Packard \u003ckeithp@keithp.com\u003e\n" }, { "commit": "d70bed1947772f34d66ada3bd923bfc12ea2452b", "tree": "ba0c438e8f2a996bf504923ef2dcf296581ad59a", "parents": [ "0d72c6fcb5cd215eeab824fac216ea42c5b574aa" ], "author": { "name": "Keith Packard", "email": "keithp@keithp.com", "time": "Wed Jun 29 00:30:34 2011 -0700" }, "committer": { "name": "Keith Packard", "email": "keithp@keithp.com", "time": "Wed Jun 29 11:20:45 2011 -0700" }, "message": "drm/i915: Hold struct_mutex during i915_save_state/i915_restore_state\n\nLots of register access in these functions, some of which requires the\nstruct mutex.\n\nThese functions now hold the struct mutex across the calls to\ni915_save_display and i915_restore_display, and so the internal mutex\ncalls in those functions have been removed. To ensure that no-one else\nwas calling them (and hence violating the new required locking\ninvarient), those functions have been made static.\n\ngen6_enable_rps locks the struct mutex, and so i915_restore_state\nunlocks the mutex around calls to that function.\n\nReviewed-by: Ben Widawsky \u003cben@bwidawsk.net\u003e\nSigned-off-by: Keith Packard \u003ckeithp@keithp.com\u003e\n" }, { "commit": "0d72c6fcb5cd215eeab824fac216ea42c5b574aa", "tree": "b2777db7513e14b0341088eea96c869a8071abc4", "parents": [ "c89b857ce6d803905b2c9d71bc9effdd286c45ed", "f01c22fd59aa10a3738ede20fd4b9b6fd1e2eac3" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Jun 28 11:15:57 2011 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Jun 28 11:15:57 2011 -0700" }, "message": "Merge branch \u0027drm-intel-fixes\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/keithp/linux-2.6\n\n* \u0027drm-intel-fixes\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/keithp/linux-2.6:\n drm/i915: Use chipset-specific irq installers\n drm/i915: forcewake fix after reset\n drm/i915: add Ivy Bridge page flip support\n drm/i915: split page flip queueing into per-chipset functions\n" }, { "commit": "f01c22fd59aa10a3738ede20fd4b9b6fd1e2eac3", "tree": "f305fa0368e2c94fc438d5bdf700eb65e1284299", "parents": [ "25732821cb965f00475922ca46e84f78e4bada95" ], "author": { "name": "Chris Wilson", "email": "chris@chris-wilson.co.uk", "time": "Tue Jun 28 11:48:51 2011 +0100" }, "committer": { "name": "Keith Packard", "email": "keithp@keithp.com", "time": "Tue Jun 28 10:20:06 2011 -0700" }, "message": "drm/i915: Use chipset-specific irq installers\n\nKonstantin Belousov pointed out that 4697995b98417 replaced the generic\ni915_driver_irq_*install() functions with chipset specific routines\naccessible only through driver-\u003eirq_*install(). So update the sanity\ncheck in i915_request_wait() to match.\n\nSigned-off-by: Chris Wilson \u003cchris@chris-wilson.co.uk\u003e\nSigned-off-by: Keith Packard \u003ckeithp@keithp.com\u003e\n" }, { "commit": "25732821cb965f00475922ca46e84f78e4bada95", "tree": "e265e7fe4cb531722b2bfe8ddb17e521f6e460b8", "parents": [ "7c9017e5b77118439952fe8dc22809bae4fae4b6" ], "author": { "name": "Ben Widawsky", "email": "ben@bwidawsk.net", "time": "Fri Jun 24 14:31:47 2011 -0700" }, "committer": { "name": "Keith Packard", "email": "keithp@keithp.com", "time": "Tue Jun 28 09:44:55 2011 -0700" }, "message": "drm/i915: forcewake fix after reset\n\nThe failure is as follows:\n\n1. Userspace gets forcewake lock, lock count \u003e\u003d1\n2. GPU hang/reset occurs (forcewake bit is reset)\n3. count is now incorrect\n\nThe failure can only occur when using the forcewake userspace lock.\n\nThis has the unfortunate consequence of messing up the driver as well as\nuserspace, unless userspace closes the debugfs file, the kernel will\nnever end up waking the GT since the refcount will be \u003e 1.\n\nThe solution is to try to recover the correct forcewake state based on\nthe refcount. There is a period of time where userspace reads/writes may\noccur after the reset, before the GT has been forcewaked. The interface\nwas never designed to be a perfect solution for userspace reads/writes,\nand the kernel portion is fixed by this patch.\n\nSuggested-by: Chris Wilson \u003cchris@chris-wilson.co.uk\u003e\nSigned-off-by: Ben Widawsky \u003cben@bwidawsk.net\u003e\nSigned-off-by: Keith Packard \u003ckeithp@keithp.com\u003e\n" }, { "commit": "ecbec53b1d00ba582f71b210ed96cafc05ebd189", "tree": "d03418464a270e05b769413c8a8183c328f26210", "parents": [ "e2377fe0b65e3c7577ff6df1701c56ef477d336f" ], "author": { "name": "Hugh Dickins", "email": "hughd@google.com", "time": "Mon Jun 27 16:18:20 2011 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon Jun 27 18:00:14 2011 -0700" }, "message": "drm/i915: more struct_mutex locking\n\nWhen auditing the locking in i915_gem.c (for a prospective change which\nI then abandoned), I noticed two places where struct_mutex is not held\nacross GEM object manipulations that would usually require it.\n\nSince one is in initial setup and the other in driver unload, I\u0027m\nguessing the mutex is not required for either; but post a patch in case\nit is.\n\nSigned-off-by: Hugh Dickins \u003chughd@google.com\u003e\nCc: Chris Wilson \u003cchris@chris-wilson.co.uk\u003e\nCc: Keith Packard \u003ckeithp@keithp.com\u003e\nSigned-off-by: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "e2377fe0b65e3c7577ff6df1701c56ef477d336f", "tree": "ba110d07556128a0eff42496294c7dd4880ecfd7", "parents": [ "5949eac4d9b5bf936c12cb7ec3a09084c1326834" ], "author": { "name": "Hugh Dickins", "email": "hughd@google.com", "time": "Mon Jun 27 16:18:19 2011 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon Jun 27 18:00:14 2011 -0700" }, "message": "drm/i915: use shmem_truncate_range\n\nThe interface to -\u003etruncate_range is changing very slightly: once \"tmpfs:\ntake control of its truncate_range\" has been applied, this can be applied.\n For now there is only a slight inefficiency while this remains unapplied,\nbut it will soon become essential for managing shmem\u0027s use of swap.\n\nChange i915_gem_object_truncate() to use shmem_truncate_range() directly:\nwhich should also spare i915 later change if we switch from\ninode_operations-\u003etruncate_range to file_operations-\u003efallocate.\n\nSigned-off-by: Hugh Dickins \u003chughd@google.com\u003e\nCc: Christoph Hellwig \u003chch@infradead.org\u003e\nCc: Chris Wilson \u003cchris@chris-wilson.co.uk\u003e\nCc: Keith Packard \u003ckeithp@keithp.com\u003e\nCc: Dave Airlie \u003cairlied@redhat.com\u003e\nSigned-off-by: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "5949eac4d9b5bf936c12cb7ec3a09084c1326834", "tree": "1cb391ffd8ebab379e4c37953923baeeff9d3b65", "parents": [ "3142b651ad2232cf0e375c291ee4b893c8559df5" ], "author": { "name": "Hugh Dickins", "email": "hughd@google.com", "time": "Mon Jun 27 16:18:18 2011 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon Jun 27 18:00:13 2011 -0700" }, "message": "drm/i915: use shmem_read_mapping_page\n\nSoon tmpfs will stop supporting -\u003ereadpage and read_cache_page_gfp(): once\n\"tmpfs: add shmem_read_mapping_page_gfp\" has been applied, this patch can\nbe applied to ease the transition.\n\nMake i915_gem_object_get_pages_gtt() use shmem_read_mapping_page_gfp() in\nthe one place it\u0027s needed; elsewhere use shmem_read_mapping_page(), with\nthe mapping\u0027s gfp_mask properly initialized.\n\nForget about __GFP_COLD: since tmpfs initializes its pages with memset,\nasking for a cold page is counter-productive.\n\nInclude linux/shmem_fs.h also in drm_gem.c: with shmem_file_setup() now\ndeclared there too, we shall remove the prototype from linux/mm.h later.\n\nSigned-off-by: Hugh Dickins \u003chughd@google.com\u003e\nCc: Christoph Hellwig \u003chch@infradead.org\u003e\nCc: Chris Wilson \u003cchris@chris-wilson.co.uk\u003e\nCc: Keith Packard \u003ckeithp@keithp.com\u003e\nCc: Dave Airlie \u003cairlied@redhat.com\u003e\nSigned-off-by: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" } ], "next": "3142b651ad2232cf0e375c291ee4b893c8559df5" }