)]}' { "log": [ { "commit": "22cd7c625837e520c94ffda7bc926396bbc4ba67", "tree": "a331600b8a7f1e7030b05fdce21436478e48ab72", "parents": [ "687a040038fb92c764adbb349ca132226677b417" ], "author": { "name": "Ville Syrjälä", "email": "ville.syrjala@linux.intel.com", "time": "Tue Dec 20 00:06:46 2011 +0200" }, "committer": { "name": "Dave Airlie", "email": "airlied@redhat.com", "time": "Tue Dec 20 10:05:06 2011 +0000" }, "message": "drm: plane: Make \u0027formats\u0027 parameter to drm_plane_init() const\n\nSigned-off-by: Ville Syrjälä \u003cville.syrjala@linux.intel.com\u003e\nSigned-off-by: Dave Airlie \u003cairlied@redhat.com\u003e\n" }, { "commit": "687a040038fb92c764adbb349ca132226677b417", "tree": "6f3617f2a55a482313bd12999980e52e9c3dbed4", "parents": [ "42ef87896adeb3116835a1e88abab84dafc1912d" ], "author": { "name": "Ville Syrjälä", "email": "ville.syrjala@linux.intel.com", "time": "Tue Dec 20 00:06:45 2011 +0200" }, "committer": { "name": "Dave Airlie", "email": "airlied@redhat.com", "time": "Tue Dec 20 10:04:46 2011 +0000" }, "message": "drm: plane: Check crtc coordinates against integer overflows in setplane ioctl\n\nHelp drivers a little by guaranteeing that crtc_x+crtc_w and\ncrtc_y+crtc_h don\u0027t overflow.\n\nSigned-off-by: Ville Syrjälä \u003cville.syrjala@linux.intel.com\u003e\nSigned-off-by: Dave Airlie \u003cairlied@redhat.com\u003e\n" }, { "commit": "42ef87896adeb3116835a1e88abab84dafc1912d", "tree": "e5609ed1ad714b7d4d18a55cbeec618ea018d3da", "parents": [ "e5e3b44c676be2dac97efd94e581e14a073e4ca7" ], "author": { "name": "Ville Syrjälä", "email": "ville.syrjala@linux.intel.com", "time": "Tue Dec 20 00:06:44 2011 +0200" }, "committer": { "name": "Dave Airlie", "email": "airlied@redhat.com", "time": "Tue Dec 20 10:04:27 2011 +0000" }, "message": "drm: plane: Check source coordinates\n\nMake sure the source coordinates stay within the buffer.\n\nSigned-off-by: Ville Syrjälä \u003cville.syrjala@linux.intel.com\u003e\nSigned-off-by: Dave Airlie \u003cairlied@redhat.com\u003e\n" }, { "commit": "e5e3b44c676be2dac97efd94e581e14a073e4ca7", "tree": "68101c072a982ef722a05a2434c92a2b0146a4f2", "parents": [ "81f6c7f873a69346762c9cd6347b908ba7035532" ], "author": { "name": "Ville Syrjälä", "email": "ville.syrjala@linux.intel.com", "time": "Tue Dec 20 00:06:43 2011 +0200" }, "committer": { "name": "Dave Airlie", "email": "airlied@redhat.com", "time": "Tue Dec 20 10:03:50 2011 +0000" }, "message": "drm: plane: Clear plane.crtc and plane.fb after disable_plane()\n\nThese are the only indication to user space that the plane was disabled.\n\nSigned-off-by: Ville Syrjälä \u003cville.syrjala@linux.intel.com\u003e\nAcked-by: Jesse Barnes \u003cjbarnes@virtuousgeek.org\u003e\nSigned-off-by: Dave Airlie \u003cairlied@redhat.com\u003e\n" }, { "commit": "81f6c7f873a69346762c9cd6347b908ba7035532", "tree": "5133bfe1a320ea0046d24f4e9fc2fcf52fcf92e3", "parents": [ "10bf573bc10f50f316764418c704309b02cd1246" ], "author": { "name": "Ville Syrjälä", "email": "ville.syrjala@linux.intel.com", "time": "Tue Dec 20 00:06:42 2011 +0200" }, "committer": { "name": "Dave Airlie", "email": "airlied@redhat.com", "time": "Tue Dec 20 10:03:21 2011 +0000" }, "message": "drm: Fix __user sparse warnings\n\nSeveral pointers and casts were missing __user annotations.\n\nSigned-off-by: Ville Syrjälä \u003cville.syrjala@linux.intel.com\u003e\nSigned-off-by: Dave Airlie \u003cairlied@redhat.com\u003e\n" }, { "commit": "10bf573bc10f50f316764418c704309b02cd1246", "tree": "5862b3c0dab39c61e6467c93a151400d86284b80", "parents": [ "64760a4ee6e0d01c0019495a6513229259d86296" ], "author": { "name": "Ville Syrjälä", "email": "ville.syrjala@linux.intel.com", "time": "Tue Dec 20 00:06:41 2011 +0200" }, "committer": { "name": "Dave Airlie", "email": "airlied@redhat.com", "time": "Tue Dec 20 10:02:47 2011 +0000" }, "message": "drm: plane: mutex_unlock() was missing\n\nUnlock the mode_config mutex if drm_plane_init() fails.\n\nSigned-off-by: Ville Syrjälä \u003cville.syrjala@linux.intel.com\u003e\nSigned-off-by: Dave Airlie \u003cairlied@redhat.com\u003e\n" }, { "commit": "64760a4ee6e0d01c0019495a6513229259d86296", "tree": "6af92b096cca07a7f13ad7b86dc2fb40a490eacc", "parents": [ "b03166ac188ad643a55399f6c6a6a369beb099b1" ], "author": { "name": "Ville Syrjälä", "email": "ville.syrjala@linux.intel.com", "time": "Tue Dec 20 00:06:40 2011 +0200" }, "committer": { "name": "Dave Airlie", "email": "airlied@redhat.com", "time": "Tue Dec 20 10:02:18 2011 +0000" }, "message": "drm: fourcc: Use __u32 instead of u32\n\ndrm_fourcc.h can be included from user space so use the appropriate types.\n\nSigned-off-by: Ville Syrjälä \u003cville.syrjala@linux.intel.com\u003e\nSigned-off-by: Dave Airlie \u003cairlied@redhat.com\u003e\n" }, { "commit": "b03166ac188ad643a55399f6c6a6a369beb099b1", "tree": "1983478970e6f323a7f036f4b4e5be7dc420edd4", "parents": [ "cc5b6f00790da1fd00e6136ba4e4c1c16a581790" ], "author": { "name": "Ville Syrjälä", "email": "ville.syrjala@linux.intel.com", "time": "Tue Dec 20 00:06:39 2011 +0200" }, "committer": { "name": "Dave Airlie", "email": "airlied@redhat.com", "time": "Tue Dec 20 10:02:02 2011 +0000" }, "message": "drm: Install drm_fourcc.h\n\nUserspace needs this header.\n\nSigned-off-by: Ville Syrjälä \u003cville.syrjala@linux.intel.com\u003e\nSigned-off-by: Dave Airlie \u003cairlied@redhat.com\u003e\n" }, { "commit": "cc5b6f00790da1fd00e6136ba4e4c1c16a581790", "tree": "716a20395cfe0d884290d84ad15b29cdbaa54100", "parents": [ "59df7b1771c150163e522f33c638096ab0efbf42" ], "author": { "name": "Ville Syrjälä", "email": "ville.syrjala@linux.intel.com", "time": "Tue Dec 20 00:06:38 2011 +0200" }, "committer": { "name": "Dave Airlie", "email": "airlied@redhat.com", "time": "Tue Dec 20 10:01:42 2011 +0000" }, "message": "drm: Add a missing \u0027)\u0027\n\nThe code happened to compile because the flag wasn\u0027t actually used yet.\n\nSigned-off-by: Ville Syrjälä \u003cville.syrjala@linux.intel.com\u003e\nSigned-off-by: Dave Airlie \u003cairlied@redhat.com\u003e\n" }, { "commit": "59df7b1771c150163e522f33c638096ab0efbf42", "tree": "4109cb8f5934d87bf7f875a9f9f0cbb901d41c42", "parents": [ "4966b2a9351500cf36f424dfe7a683036fce5622" ], "author": { "name": "Christian Schmidt", "email": "schmidt@digadd.de", "time": "Mon Dec 19 20:03:33 2011 +0100" }, "committer": { "name": "Dave Airlie", "email": "airlied@redhat.com", "time": "Tue Dec 20 09:51:23 2011 +0000" }, "message": "drm/intel: Fix initialization if startup happens in interlaced mode [v2]\n\nMy EFI BIOS starts the graphics card up in my projector\u0027s preferred EDID\nmode, 1080@60i. The Intel driver does not clear all the interlaced bits.\n\nThis patch introduces a new PIPECONF_INTERLACE_MASK define and uses it\nto restore progressive mode.\n\nSigned-of-by: Christian Schmidt \u003cschmidt@digadd.de\u003e\nReviewed-by: Chris Wilson \u003cchris@chris-wilson.co.uk\u003e\nSigned-off-by: Dave Airlie \u003cairlied@redhat.com\u003e\n" }, { "commit": "4966b2a9351500cf36f424dfe7a683036fce5622", "tree": "c84d044d1838bb0e2184189832b4143de888923f", "parents": [ "a0ab734d62ef4c35ffa5e39f9ec1e6d6284f05fa" ], "author": { "name": "Christian Schmidt", "email": "schmidt@digadd.de", "time": "Mon Dec 19 20:03:43 2011 +0100" }, "committer": { "name": "Dave Airlie", "email": "airlied@redhat.com", "time": "Tue Dec 20 09:51:10 2011 +0000" }, "message": "Fix wrong assumptions in cea_for_each_detailed_block v2\n\nThe current logic misunderstands the spec about CEA 18byte descriptors.\nFirst, the spec doesn\u0027t state \"detailed timing descriptors\" but \"18 byte\ndescriptors\", so any data record could be stored, mixed timings and\nother data, just as in the standard EDID.\nSecond, the lower four bit of byte 3 of the CEA record do not contain\nthe number of descriptors, but \"the total number of DTDs defining native\nformats in the whole EDID [...], starting with the first DTD in the DTD\nlist (which starts in the base EDID block).\" A device can of course\nsupport non-native formats.\n\nAs such the number can\u0027t be used to determine n, and the existing code\nwill filter non-timing 18byte descriptors anyway.\n\nSigned-off-by: Christian Schmidt \u003cschmidt@digadd.de\u003e\nReviewed-by: Adam Jackson \u003cajax@redhat.com\u003e\nSigned-off-by: Dave Airlie \u003cairlied@redhat.com\u003e\n" }, { "commit": "a0ab734d62ef4c35ffa5e39f9ec1e6d6284f05fa", "tree": "f543a4b51b76585d2befd5552a7265955d3b9b58", "parents": [ "54ac76f851a1789b047b74a8e14980f2dd1ac749" ], "author": { "name": "Christian Schmidt", "email": "schmidt@digadd.de", "time": "Mon Dec 19 20:03:38 2011 +0100" }, "committer": { "name": "Dave Airlie", "email": "airlied@redhat.com", "time": "Tue Dec 20 09:51:06 2011 +0000" }, "message": "drm_edid_to_eld: check for CEA data blocks only from structure revision 3 on\n\nCEA datablocks are only defined from revision 3 onwards. Only check for\nthem if the revision says so.\n\nSigned-of-by: Christian Schmidt \u003cschmidt@digadd.de\u003e\nTested-by: James Cloos \u003ccloos@jhcloos.com\u003e\n\nSigned-off-by: Dave Airlie \u003cairlied@redhat.com\u003e\n" }, { "commit": "54ac76f851a1789b047b74a8e14980f2dd1ac749", "tree": "b0ff1cd87fd009370e605acfd2903ee6f5e7cb5f", "parents": [ "32faa34dc5ed121a1e927753dcbf0ad395d3a956" ], "author": { "name": "Christian Schmidt", "email": "schmidt@digadd.de", "time": "Mon Dec 19 14:53:16 2011 +0000" }, "committer": { "name": "Dave Airlie", "email": "airlied@redhat.com", "time": "Mon Dec 19 14:53:16 2011 +0000" }, "message": "drm/edid: support CEA video modes.\n\nTFT/plasma televisions and projectors have become commonplace, and so\nhas the use of PCs to drive them. Add the video modes specified by an\nEDID\u0027s CEA extension to the mode database for a connector.\n\nBefore:\n[ 1.158869] [drm:drm_mode_debug_printmodeline], Modeline\n19:\"1920x1080i\" 0 74250 1920 2448 2492 2640 1080 1084 1094 1125 0x40 0x15\n[ 1.158875] [drm:drm_mode_debug_printmodeline], Modeline\n18:\"1920x1080i\" 0 74250 1920 2008 2052 2200 1080 1084 1094 1125 0x48 0x15\n[ 1.158882] [drm:drm_mode_debug_printmodeline], Modeline\n20:\"1920x1080\" 24 74250 1920 2558 2602 2750 1080 1084 1089 1125 0x40 0x5\n\nAfter:\n[ 1.144175] [drm:drm_mode_debug_printmodeline], Modeline\n22:\"1920x1080\" 0 74250 1920 2448 2492 2640 1080 1084 1094 1125 0x40 0x15\n[ 1.144179] [drm:drm_mode_debug_printmodeline], Modeline\n21:\"1920x1080\" 0 74250 1920 2008 2052 2200 1080 1084 1094 1125 0x48 0x15\n[ 1.144187] [drm:drm_mode_debug_printmodeline], Modeline\n30:\"1920x1080\" 50 148500 1920 2448 2492 2640 1080 1084 1089 1125 0x40 0x5\n[ 1.144190] [drm:drm_mode_debug_printmodeline], Modeline\n29:\"1920x1080\" 60 148500 1920 2008 2052 2200 1080 1084 1089 1125 0x40 0x5\n[ 1.144192] [drm:drm_mode_debug_printmodeline], Modeline\n25:\"1920x1080\" 24 74250 1920 2558 2602 2750 1080 1084 1089 1125 0x40 0x5\n[ 1.144195] [drm:drm_mode_debug_printmodeline], Modeline\n24:\"1280x720\" 50 74250 1280 1720 1760 1980 720 725 730 750 0x40 0x5\n[ 1.144198] [drm:drm_mode_debug_printmodeline], Modeline\n23:\"1280x720\" 60 74250 1280 1390 1430 1650 720 725 730 750 0x40 0x5\n[ 1.144201] [drm:drm_mode_debug_printmodeline], Modeline 27:\"720x576\"\n50 27000 720 732 796 864 576 581 586 625 0x40 0xa\n[ 1.144203] [drm:drm_mode_debug_printmodeline], Modeline 26:\"720x480\"\n60 27000 720 736 798 858 480 489 495 525 0x40 0xa\n[ 1.144206] [drm:drm_mode_debug_printmodeline], Modeline 28:\"640x480\"\n60 25175 640 656 752 800 480 490 492 525 0x40 0xa\n\nSigned-off-by: Christian Schmidt \u003cschmidt@digadd.de\u003e\nReviewed-by: Adam Jackson \u003cajax@redhat.com\u003e\nSigned-off-by: Dave Airlie \u003cairlied@redhat.com\u003e\n" }, { "commit": "32faa34dc5ed121a1e927753dcbf0ad395d3a956", "tree": "afad2825ec463545dda7477be40ddb437686b58d", "parents": [ "bcdd6b2fd603340fbb0ed9984b32a9a066f1b806", "dc97b3409a790d2a21aac6e5cdb99558b5944119" ], "author": { "name": "Dave Airlie", "email": "airlied@redhat.com", "time": "Tue Dec 06 11:21:36 2011 +0000" }, "committer": { "name": "Dave Airlie", "email": "airlied@redhat.com", "time": "Tue Dec 06 11:21:49 2011 +0000" }, "message": "drm/Merge branch \u0027drm-ttm-glisse\u0027 of ../drm-radeon-next into drm-core-next\n\nMerge topic branch containing Jerome\u0027s TTM changes, contains one change from\nKonrad to swiotlb export.\n\n* \u0027drm-ttm-glisse\u0027 of ../drm-radeon-next:\n drm/ttm: callback move_notify any time bo placement change v4\n drm/ttm: simplify memory accounting for ttm user v2\n drm/ttm: isolate dma data from ttm_tt V4\n drm/nouveau: enable the ttm dma pool when swiotlb is active V3\n drm/radeon/kms: enable the ttm dma pool if swiotlb is on V4\n drm/ttm: provide dma aware ttm page pool code V9\n drm/ttm: introduce callback for ttm_tt populate \u0026 unpopulate V4\n drm/ttm: merge ttm_backend and ttm_tt V5\n drm/ttm: page allocation use page array instead of list\n drm/ttm: test for dma_address array allocation failure\n drm/ttm: use ttm put pages function to properly restore cache attribute\n drm/ttm: remove unused backend flags field\n drm/ttm: remove split btw highmen and lowmem page\n drm/ttm: remove userspace backed ttm object support\n swiotlb: Expose swiotlb_nr_tlb function to modules\n" }, { "commit": "dc97b3409a790d2a21aac6e5cdb99558b5944119", "tree": "afad2825ec463545dda7477be40ddb437686b58d", "parents": [ "57de4ba959b290f0b8cf36ecd5e7f1b29d4b8a12" ], "author": { "name": "Jerome Glisse", "email": "jglisse@redhat.com", "time": "Fri Nov 18 11:47:03 2011 -0500" }, "committer": { "name": "Dave Airlie", "email": "airlied@redhat.com", "time": "Tue Dec 06 10:40:23 2011 +0000" }, "message": "drm/ttm: callback move_notify any time bo placement change v4\n\nPreviously we were calling back move_notify in error path when the\nbo is returned to it\u0027s original position or when destroy the bo.\nWhen destroying the bo set the new mem placement as NULL when calling\nback in the driver.\n\nUpdating nouveau to deal with NULL placement properly.\n\nv2: reserve the object before calling move_notify in bo destroy path\n at that point ttm should be the only piece of code interacting\n with the object so atomic_set is safe here.\nv3: callback move notify only once the bo is in its new position\n call move notify want swaping out the buffer\nv4:- don\u0027t call move_notify when swapin out bo, assume driver should\n do what is appropriate in swap notify\n - move move_notify call back to ttm_bo_cleanup_memtype_use for\n destroy path\n\nReviewed-by: Jerome Glisse \u003cjglisse@redhat.com\u003e\nReviewed-by: Thomas Hellstrom \u003cthellstrom@vmware.com\u003e\n" }, { "commit": "57de4ba959b290f0b8cf36ecd5e7f1b29d4b8a12", "tree": "8063f4dfaf1a22bf8cf7a5f0410d4e4929b250ec", "parents": [ "8e7e70522d760c4ccd4cd370ebfa0ba69e006c6e" ], "author": { "name": "Jerome Glisse", "email": "jglisse@redhat.com", "time": "Fri Nov 11 15:42:57 2011 -0500" }, "committer": { "name": "Dave Airlie", "email": "airlied@redhat.com", "time": "Tue Dec 06 10:40:11 2011 +0000" }, "message": "drm/ttm: simplify memory accounting for ttm user v2\n\nProvide helper function to compute the kernel memory size needed\nfor each buffer object. Move all the accounting inside ttm, simplifying\ndriver and avoiding code duplication accross them.\n\nv2 fix accounting of ghost object, one would have thought that i\n would have run into the issue since a longtime but it seems\n ghost object are rare when you have plenty of vram ;)\n\nSigned-off-by: Jerome Glisse \u003cjglisse@redhat.com\u003e\nReviewed-by: Thomas Hellstrom \u003cthellstrom@vmware.com\u003e\n" }, { "commit": "8e7e70522d760c4ccd4cd370ebfa0ba69e006c6e", "tree": "a2b0f931e513f3aeba174b974bd5e869685fe288", "parents": [ "3230cfc34fca9d17c1628cf0e4ac25199592a69a" ], "author": { "name": "Jerome Glisse", "email": "jglisse@redhat.com", "time": "Wed Nov 09 17:15:26 2011 -0500" }, "committer": { "name": "Dave Airlie", "email": "airlied@redhat.com", "time": "Tue Dec 06 10:40:02 2011 +0000" }, "message": "drm/ttm: isolate dma data from ttm_tt V4\n\nMove dma data to a superset ttm_dma_tt structure which herit\nfrom ttm_tt. This allow driver that don\u0027t use dma functionalities\nto not have to waste memory for it.\n\nV2 Rebase on top of no memory account changes (where/when is my\n delorean when i need it ?)\nV3 Make sure page list is initialized empty\nV4 typo/syntax fixes\n\nSigned-off-by: Jerome Glisse \u003cjglisse@redhat.com\u003e\nReviewed-by: Thomas Hellstrom \u003cthellstrom@vmware.com\u003e\n" }, { "commit": "3230cfc34fca9d17c1628cf0e4ac25199592a69a", "tree": "40685914703f0a709b2180d7cdf01e770fa5a4dc", "parents": [ "c52494f69538f6fe1a234972f024011b17a48329" ], "author": { "name": "Konrad Rzeszutek Wilk", "email": "konrad.wilk@oracle.com", "time": "Mon Oct 17 17:14:26 2011 -0400" }, "committer": { "name": "Dave Airlie", "email": "airlied@redhat.com", "time": "Tue Dec 06 10:39:51 2011 +0000" }, "message": "drm/nouveau: enable the ttm dma pool when swiotlb is active V3\n\nIf the card is capable of more than 32-bit, then use the default\nTTM page pool code which allocates from anywhere in the memory.\n\nNote: If the \u0027ttm.no_dma\u0027 parameter is set, the override is ignored\nand the default TTM pool is used.\n\nV2 use pci_set_consistent_dma_mask\nV3 Rebase on top of no memory account changes (where/when is my\n delorean when i need it ?)\n\nCC: Ben Skeggs \u003cbskeggs@redhat.com\u003e\nCC: Francisco Jerez \u003ccurrojerez@riseup.net\u003e\nCC: Dave Airlie \u003cairlied@redhat.com\u003e\nSigned-off-by: Konrad Rzeszutek Wilk \u003ckonrad.wilk@oracle.com\u003e\nReviewed-by: Jerome Glisse \u003cjglisse@redhat.com\u003e\n" }, { "commit": "c52494f69538f6fe1a234972f024011b17a48329", "tree": "cb532a596f4c06b7b2efc05e887cfa78940348fa", "parents": [ "2334b75ffbef6b8932f09ec4418b65ddb764ae99" ], "author": { "name": "Konrad Rzeszutek Wilk", "email": "konrad.wilk@oracle.com", "time": "Mon Oct 17 17:15:08 2011 -0400" }, "committer": { "name": "Dave Airlie", "email": "airlied@redhat.com", "time": "Tue Dec 06 10:39:44 2011 +0000" }, "message": "drm/radeon/kms: enable the ttm dma pool if swiotlb is on V4\n\nWith the exception that we do not handle the AGP case. We only\ndeal with PCIe cards such as ATI ES1000 or HD3200 that have been\ndetected to only do DMA up to 32-bits.\n\nV2 force dma32 if we fail to set bigger dma mask\nV3 Rebase on top of no memory account changes (where/when is my\n delorean when i need it ?)\nV4 add debugfs entry is swiotlb is active not only if we are\n on dma 32bits only gpu\n\nCC: Dave Airlie \u003cairlied@redhat.com\u003e\nCC: Alex Deucher \u003calexdeucher@gmail.com\u003e\nSigned-off-by: Konrad Rzeszutek Wilk \u003ckonrad.wilk@oracle.com\u003e\nReviewed-by: Jerome Glisse \u003cjglisse@redhat.com\u003e\n" }, { "commit": "2334b75ffbef6b8932f09ec4418b65ddb764ae99", "tree": "3b1ebfbd1714adf1ac1595ca16303d2303c8c959", "parents": [ "b1e5f172325547270f35e7d1e42416a606e1dbd2" ], "author": { "name": "Konrad Rzeszutek Wilk", "email": "konrad.wilk@oracle.com", "time": "Thu Nov 03 16:46:34 2011 -0400" }, "committer": { "name": "Dave Airlie", "email": "airlied@redhat.com", "time": "Tue Dec 06 10:39:33 2011 +0000" }, "message": "drm/ttm: provide dma aware ttm page pool code V9\n\nIn TTM world the pages for the graphic drivers are kept in three different\npools: write combined, uncached, and cached (write-back). When the pages\nare used by the graphic driver the graphic adapter via its built in MMU\n(or AGP) programs these pages in. The programming requires the virtual address\n(from the graphic adapter perspective) and the physical address (either System RAM\nor the memory on the card) which is obtained using the pci_map_* calls (which does the\nvirtual to physical - or bus address translation). During the graphic application\u0027s\n\"life\" those pages can be shuffled around, swapped out to disk, moved from the\nVRAM to System RAM or vice-versa. This all works with the existing TTM pool code\n- except when we want to use the software IOTLB (SWIOTLB) code to \"map\" the physical\naddresses to the graphic adapter MMU. We end up programming the bounce buffer\u0027s\nphysical address instead of the TTM pool memory\u0027s and get a non-worky driver.\nThere are two solutions:\n1) using the DMA API to allocate pages that are screened by the DMA API, or\n2) using the pci_sync_* calls to copy the pages from the bounce-buffer and back.\n\nThis patch fixes the issue by allocating pages using the DMA API. The second\nis a viable option - but it has performance drawbacks and potential correctness\nissues - think of the write cache page being bounced (SWIOTLB-\u003eTTM), the\nWC is set on the TTM page and the copy from SWIOTLB not making it to the TTM\npage until the page has been recycled in the pool (and used by another application).\n\nThe bounce buffer does not get activated often - only in cases where we have\na 32-bit capable card and we want to use a page that is allocated above the\n4GB limit. The bounce buffer offers the solution of copying the contents\nof that 4GB page to an location below 4GB and then back when the operation has been\ncompleted (or vice-versa). This is done by using the \u0027pci_sync_*\u0027 calls.\nNote: If you look carefully enough in the existing TTM page pool code you will\nnotice the GFP_DMA32 flag is used - which should guarantee that the provided page\nis under 4GB. It certainly is the case, except this gets ignored in two cases:\n - If user specifies \u0027swiotlb\u003dforce\u0027 which bounces _every_ page.\n - If user is using a Xen\u0027s PV Linux guest (which uses the SWIOTLB and the\n underlaying PFN\u0027s aren\u0027t necessarily under 4GB).\n\nTo not have this extra copying done the other option is to allocate the pages\nusing the DMA API so that there is not need to map the page and perform the\nexpensive \u0027pci_sync_*\u0027 calls.\n\nThis DMA API capable TTM pool requires for this the \u0027struct device\u0027 to\nproperly call the DMA API. It also has to track the virtual and bus address of\nthe page being handed out in case it ends up being swapped out or de-allocated -\nto make sure it is de-allocated using the proper\u0027s \u0027struct device\u0027.\n\nImplementation wise the code keeps two lists: one that is attached to the\n\u0027struct device\u0027 (via the dev-\u003edma_pools list) and a global one to be used when\nthe \u0027struct device\u0027 is unavailable (think shrinker code). The global list can\niterate over all of the \u0027struct device\u0027 and its associated dma_pool. The list\nin dev-\u003edma_pools can only iterate the device\u0027s dma_pool.\n /[struct device_pool]\\\n /---------------------------------------------------| dev |\n / +-------| dma_pool |\n /-----+------\\ / \\--------------------/\n |struct device| /--\u003e[struct dma_pool for WC]\u003c/ /[struct device_pool]\\\n | dma_pools +----+ /-| dev |\n | ... | \\---\u003e[struct dma_pool for uncached]\u003c-/--| dma_pool |\n \\-----+------/ / \\--------------------/\n \\----------------------------------------------/\n[Two pools associated with the device (WC and UC), and the parallel list\ncontaining the \u0027struct dev\u0027 and \u0027struct dma_pool\u0027 entries]\n\nThe maximum amount of dma pools a device can have is six: write-combined,\nuncached, and cached; then there are the DMA32 variants which are:\nwrite-combined dma32, uncached dma32, and cached dma32.\n\nCurrently this code only gets activated when any variant of the SWIOTLB IOMMU\ncode is running (Intel without VT-d, AMD without GART, IBM Calgary and Xen PV\nwith PCI devices).\n\nTested-by: Michel Dänzer \u003cmichel@daenzer.net\u003e\n[v1: Using swiotlb_nr_tbl instead of swiotlb_enabled]\n[v2: Major overhaul - added \u0027inuse_list\u0027 to seperate used from inuse and reorder\nthe order of lists to get better performance.]\n[v3: Added comments/and some logic based on review, Added Jerome tag]\n[v4: rebase on top of ttm_tt \u0026 ttm_backend merge]\n[v5: rebase on top of ttm memory accounting overhaul]\n[v6: New rebase on top of more memory accouting changes]\n[v7: well rebase on top of no memory accounting changes]\n[v8: make sure pages list is initialized empty]\n[v9: calll ttm_mem_global_free_page in unpopulate for accurate accountg]\nSigned-off-by: Konrad Rzeszutek Wilk \u003ckonrad.wilk@oracle.com\u003e\nReviewed-by: Jerome Glisse \u003cjglisse@redhat.com\u003e\nAcked-by: Thomas Hellstrom \u003cthellstrom@vmware.com\u003e\n" }, { "commit": "b1e5f172325547270f35e7d1e42416a606e1dbd2", "tree": "03fc21fd5f74add89441308008b45987d09cfbc6", "parents": [ "649bf3ca77343e3be1e0af8e21356fa569b1abd9" ], "author": { "name": "Jerome Glisse", "email": "jglisse@redhat.com", "time": "Wed Nov 02 23:59:28 2011 -0400" }, "committer": { "name": "Dave Airlie", "email": "airlied@redhat.com", "time": "Tue Dec 06 10:39:24 2011 +0000" }, "message": "drm/ttm: introduce callback for ttm_tt populate \u0026 unpopulate V4\n\nMove the page allocation and freeing to driver callback and\nprovide ttm code helper function for those.\n\nMost intrusive change, is the fact that we now only fully\npopulate an object this simplify some of code designed around\nthe page fault design.\n\nV2 Rebase on top of memory accounting overhaul\nV3 New rebase on top of more memory accouting changes\nV4 Rebase on top of no memory account changes (where/when is my\n delorean when i need it ?)\n\nSigned-off-by: Jerome Glisse \u003cjglisse@redhat.com\u003e\nReviewed-by: Konrad Rzeszutek Wilk \u003ckonrad.wilk@oracle.com\u003e\nReviewed-by: Thomas Hellstrom \u003cthellstrom@vmware.com\u003e\n" }, { "commit": "649bf3ca77343e3be1e0af8e21356fa569b1abd9", "tree": "01ad6a5f3f74b087cb791f5965d3190916975789", "parents": [ "822c4d9ae0d55a4fcea9f0a462bc6406a06692e2" ], "author": { "name": "Jerome Glisse", "email": "jglisse@redhat.com", "time": "Tue Nov 01 20:46:13 2011 -0400" }, "committer": { "name": "Dave Airlie", "email": "airlied@redhat.com", "time": "Tue Dec 06 10:39:17 2011 +0000" }, "message": "drm/ttm: merge ttm_backend and ttm_tt V5\n\nttm_backend will only exist with a ttm_tt, and ttm_tt\nwill only be of interest when bound to a backend. Merge them\nto avoid code and data duplication.\n\nV2 Rebase on top of memory accounting overhaul\nV3 Rebase on top of more memory accounting changes\nV4 Rebase on top of no memory account changes (where/when is my\n delorean when i need it ?)\nV5 make sure ttm is unbound before destroying, change commit\n message on suggestion from Tormod Volden\n\nSigned-off-by: Jerome Glisse \u003cjglisse@redhat.com\u003e\nReviewed-by: Konrad Rzeszutek Wilk \u003ckonrad.wilk@oracle.com\u003e\nReviewed-by: Thomas Hellstrom \u003cthellstrom@vmware.com\u003e\n" }, { "commit": "822c4d9ae0d55a4fcea9f0a462bc6406a06692e2", "tree": "023576f530939ff497bb7fe44b62da0ce50221be", "parents": [ "f9517e63ffae6a1062a0a2ac4eea60be49b9dfd4" ], "author": { "name": "Jerome Glisse", "email": "jglisse@redhat.com", "time": "Thu Nov 10 18:24:09 2011 -0500" }, "committer": { "name": "Dave Airlie", "email": "airlied@redhat.com", "time": "Tue Dec 06 10:39:11 2011 +0000" }, "message": "drm/ttm: page allocation use page array instead of list\n\nUse the ttm_tt pages array for pages allocations, move the list\nunwinding into the page allocation functions.\n\nSigned-off-by: Jerome Glisse \u003cjglisse@redhat.com\u003e\n" }, { "commit": "f9517e63ffae6a1062a0a2ac4eea60be49b9dfd4", "tree": "1b1504efaa7cc10bf04e51b51e6bf800c98ddb9f", "parents": [ "5e2656804a34f58c2bf557465ab77f8a26a500eb" ], "author": { "name": "Jerome Glisse", "email": "jglisse@redhat.com", "time": "Tue Nov 01 19:07:31 2011 -0400" }, "committer": { "name": "Dave Airlie", "email": "airlied@redhat.com", "time": "Tue Dec 06 10:39:04 2011 +0000" }, "message": "drm/ttm: test for dma_address array allocation failure\n\nSigned-off-by: Jerome Glisse \u003cjglisse@redhat.com\u003e\nReviewed-by: Konrad Rzeszutek Wilk \u003ckonrad.wilk@oracle.com\u003e\nReviewed-by: Thomas Hellstrom \u003cthellstrom@vmware.com\u003e\n" }, { "commit": "5e2656804a34f58c2bf557465ab77f8a26a500eb", "tree": "1da5f23cbe2d67150c5998dc74c4647f004f918d", "parents": [ "a14af87b0b6f5c1d44c1adaa07f1bd347f81dc04" ], "author": { "name": "Jerome Glisse", "email": "jglisse@redhat.com", "time": "Thu Nov 03 01:22:39 2011 -0400" }, "committer": { "name": "Dave Airlie", "email": "airlied@redhat.com", "time": "Tue Dec 06 10:38:57 2011 +0000" }, "message": "drm/ttm: use ttm put pages function to properly restore cache attribute\n\nOn failure we need to make sure the page we free has wb cache\nattribute. Do this pas call the proper ttm page helper function.\n\nSigned-off-by: Jerome Glisse \u003cjglisse@redhat.com\u003e\nReviewed-by: Konrad Rzeszutek Wilk \u003ckonrad.wilk@oracle.com\u003e\nReviewed-by: Thomas Hellstrom \u003cthellstrom@vmware.com\u003e\n" }, { "commit": "a14af87b0b6f5c1d44c1adaa07f1bd347f81dc04", "tree": "df2d4ebbde1597e510bd10d94fe3a9a1217bb2b5", "parents": [ "667b7a27c221acaea844ba41f1c0a713aba44d31" ], "author": { "name": "Jerome Glisse", "email": "jglisse@redhat.com", "time": "Tue Nov 01 17:48:33 2011 -0400" }, "committer": { "name": "Dave Airlie", "email": "airlied@redhat.com", "time": "Tue Dec 06 10:38:48 2011 +0000" }, "message": "drm/ttm: remove unused backend flags field\n\nThis field is not use by any of the driver just drop it.\n\nSigned-off-by: Jerome Glisse \u003cjglisse@redhat.com\u003e\nReviewed-by: Konrad Rzeszutek Wilk \u003ckonrad.wilk@oracle.com\u003e\nReviewed-by: Thomas Hellstrom \u003cthellstrom@vmware.com\u003e\n" }, { "commit": "667b7a27c221acaea844ba41f1c0a713aba44d31", "tree": "2cea3d1fb60bcd81dd552022008e26c37b892fb7", "parents": [ "3316497bcd73dcad971d79bed32571ed785a8c01" ], "author": { "name": "Jerome Glisse", "email": "jglisse@redhat.com", "time": "Tue Nov 01 15:57:22 2011 -0400" }, "committer": { "name": "Dave Airlie", "email": "airlied@redhat.com", "time": "Tue Dec 06 10:38:36 2011 +0000" }, "message": "drm/ttm: remove split btw highmen and lowmem page\n\nSplit btw highmem and lowmem page was rendered useless by the\npool code. Remove it. Note further cleanup would change the\nttm page allocation helper to actualy take an array instead\nof relying on list this could drasticly reduce the number of\nfunction call in the common case of allocation whole buffer.\n\nSigned-off-by: Jerome Glisse \u003cjglisse@redhat.com\u003e\nReviewed-by: Konrad Rzeszutek Wilk \u003ckonrad.wilk@oracle.com\u003e\nReviewed-by: Thomas Hellstrom \u003cthellstrom@vmware.com\u003e\n" }, { "commit": "3316497bcd73dcad971d79bed32571ed785a8c01", "tree": "f5b35d24df66b379110b51d5c5b975d4dfbcfbe7", "parents": [ "f21ffe9f6da6d3a69c518b7345c198d48d941c34" ], "author": { "name": "Jerome Glisse", "email": "jglisse@redhat.com", "time": "Tue Nov 01 15:45:57 2011 -0400" }, "committer": { "name": "Dave Airlie", "email": "airlied@redhat.com", "time": "Tue Dec 06 10:38:10 2011 +0000" }, "message": "drm/ttm: remove userspace backed ttm object support\n\nThis was never use in none of the driver, properly using userspace\npage for bo would need more code (vma interaction mostly). Removing\nthis dead code in preparation of ttm_tt \u0026 backend merge.\n\nSigned-off-by: Jerome Glisse \u003cjglisse@redhat.com\u003e\nReviewed-by: Konrad Rzeszutek Wilk \u003ckonrad.wilk@oracle.com\u003e\nReviewed-by: Thomas Hellstrom \u003cthellstrom@vmware.com\u003e\n" }, { "commit": "f21ffe9f6da6d3a69c518b7345c198d48d941c34", "tree": "7981ef410a4960de07da4ffb6210e97b7836fca4", "parents": [ "bcdd6b2fd603340fbb0ed9984b32a9a066f1b806" ], "author": { "name": "Konrad Rzeszutek Wilk", "email": "konrad.wilk@oracle.com", "time": "Thu Aug 11 16:50:56 2011 -0400" }, "committer": { "name": "Dave Airlie", "email": "airlied@redhat.com", "time": "Tue Dec 06 10:38:03 2011 +0000" }, "message": "swiotlb: Expose swiotlb_nr_tlb function to modules\n\nAs a mechanism to detect whether SWIOTLB is enabled or not.\nWe also fix the spelling - it was swioltb instead of\nswiotlb.\n\nCC: FUJITA Tomonori \u003cfujita.tomonori@lab.ntt.co.jp\u003e\n[v1: Ripped out swiotlb_enabled]\nSigned-off-by: Konrad Rzeszutek Wilk \u003ckonrad.wilk@oracle.com\u003e\n" }, { "commit": "bcdd6b2fd603340fbb0ed9984b32a9a066f1b806", "tree": "b886fd732698c152ac7627caf7f7edee6e0016ea", "parents": [ "cee5ec43460351f0ce4617d3ffb34b74ad613a00", "acb4b992d8a13728044f430b47b9199aa45993e9" ], "author": { "name": "Dave Airlie", "email": "airlied@redhat.com", "time": "Tue Dec 06 10:28:21 2011 +0000" }, "committer": { "name": "Dave Airlie", "email": "airlied@redhat.com", "time": "Tue Dec 06 10:28:25 2011 +0000" }, "message": "drm: Merge branch \u0027drm-cleanups-jbarnes\u0027 into drm-core-next\n\nMerge topic branch with some of Jesse\u0027s cleanups, the save/restore hooks\nwere being used by GMA500 so we can\u0027t just drop them.\n\n* drm-cleanups-jbarnes:\n drm: remove some potentially dangerous DRM_ERRORs\n drm: document the drm_mode_config structure\n drm: document the drm_mode_group structure\n drm: document and cleanup drm_mode_config_funcs\n drm: document drm_mode_set structure\n drm: remove unused fields in drm_connector and document the rest\n drm: add drm_encoder comments\n drm: add comments for drm_encoder_funcs\n drm: fix comments for drm_crtc struct\n drm: remove unused connector_count field from drm_display_mode\n" }, { "commit": "acb4b992d8a13728044f430b47b9199aa45993e9", "tree": "b886fd732698c152ac7627caf7f7edee6e0016ea", "parents": [ "a62c93d5df1695535afa1413f6496adc219a196e" ], "author": { "name": "Jesse Barnes", "email": "jbarnes@virtuousgeek.org", "time": "Mon Nov 07 12:03:23 2011 -0800" }, "committer": { "name": "Dave Airlie", "email": "airlied@redhat.com", "time": "Tue Dec 06 10:23:36 2011 +0000" }, "message": "drm: remove some potentially dangerous DRM_ERRORs\n\nEach of these error messages can be caused by a broken or malicious\nuserspace wanting to spam the dmesg with useless info. They\u0027re really\nnot worthy of DRM_DEBUG statements either; those are generally only\nuseful during bringup of new hardware or versions, and ought to be\nremoved before going upstream anyway.\n\nSigned-off-by: Jesse Barnes \u003cjbarnes@virtuousgeek.org\u003e\nReviewed-by: Alex Deucher \u003calexdeucher@gmail.com\u003e\nSigned-off-by: Dave Airlie \u003cairlied@redhat.com\u003e\n" }, { "commit": "a62c93d5df1695535afa1413f6496adc219a196e", "tree": "82b959a4f635b8a39832305c1f26ed5f0babaab2", "parents": [ "c1aaca237c6d4d9a60390e69048d1eff1dc7506a" ], "author": { "name": "Jesse Barnes", "email": "jbarnes@virtuousgeek.org", "time": "Mon Nov 07 12:03:22 2011 -0800" }, "committer": { "name": "Dave Airlie", "email": "airlied@redhat.com", "time": "Tue Dec 06 10:23:35 2011 +0000" }, "message": "drm: document the drm_mode_config structure\n\nIncluding a comment about what the locks are for.\n\nSigned-off-by: Jesse Barnes \u003cjbarnes@virtuousgeek.org\u003e\nReviewed-by: Alex Deucher \u003calexdeucher@gmail.com\u003e\nSigned-off-by: Dave Airlie \u003cairlied@redhat.com\u003e\n" }, { "commit": "c1aaca237c6d4d9a60390e69048d1eff1dc7506a", "tree": "a8019ac771c9f6f032e20fbdd6691b4f476789fc", "parents": [ "550cebcdb5bebc655812b631156a162cec908794" ], "author": { "name": "Jesse Barnes", "email": "jbarnes@virtuousgeek.org", "time": "Mon Nov 07 12:03:21 2011 -0800" }, "committer": { "name": "Dave Airlie", "email": "airlied@redhat.com", "time": "Tue Dec 06 10:23:34 2011 +0000" }, "message": "drm: document the drm_mode_group structure\n\nThis is actually a core structure with a big future ahead of it. Make\nit a little less mysterious.\n\nSigned-off-by: Jesse Barnes \u003cjbarnes@virtuousgeek.org\u003e\nSigned-off-by: Dave Airlie \u003cairlied@redhat.com\u003e\n" }, { "commit": "550cebcdb5bebc655812b631156a162cec908794", "tree": "edc625deb75c916ed3b1b752bbb759d5ff37f69a", "parents": [ "ef27351ae1ee83bdd5114523fef9eff405c25a35" ], "author": { "name": "Jesse Barnes", "email": "jbarnes@virtuousgeek.org", "time": "Mon Nov 07 12:03:20 2011 -0800" }, "committer": { "name": "Dave Airlie", "email": "airlied@redhat.com", "time": "Tue Dec 06 10:23:33 2011 +0000" }, "message": "drm: document and cleanup drm_mode_config_funcs\n\nJust fix the wrapping mostly.\n\nSigned-off-by: Jesse Barnes \u003cjbarnes@virtuousgeek.org\u003e\nReviewed-by: Alex Deucher \u003calexdeucher@gmail.com\u003e\nSigned-off-by: Dave Airlie \u003cairlied@redhat.com\u003e\n" }, { "commit": "ef27351ae1ee83bdd5114523fef9eff405c25a35", "tree": "f0cc629026ba9ee9c18138ec44060aa16b555ae2", "parents": [ "722525481a058829f0bae0ec3aab96370f9ab455" ], "author": { "name": "Jesse Barnes", "email": "jbarnes@virtuousgeek.org", "time": "Mon Nov 07 12:03:19 2011 -0800" }, "committer": { "name": "Dave Airlie", "email": "airlied@redhat.com", "time": "Tue Dec 06 10:23:32 2011 +0000" }, "message": "drm: document drm_mode_set structure\n\nThis is a core mode setting structure that deserves a little verbiage.\n\nSigned-off-by: Jesse Barnes \u003cjbarnes@virtuousgeek.org\u003e\nReviewed-by: Alex Deucher \u003calexdeucher@gmail.com\u003e\nSigned-off-by: Dave Airlie \u003cairlied@redhat.com\u003e\n" }, { "commit": "722525481a058829f0bae0ec3aab96370f9ab455", "tree": "a0cc8a1c62905c49ecf0f34e053f78718e4ec525", "parents": [ "db3e44996f23a2a7e826ede2dd9cb1571687a60f" ], "author": { "name": "Jesse Barnes", "email": "jbarnes@virtuousgeek.org", "time": "Mon Nov 07 12:03:18 2011 -0800" }, "committer": { "name": "Dave Airlie", "email": "airlied@redhat.com", "time": "Tue Dec 06 10:23:31 2011 +0000" }, "message": "drm: remove unused fields in drm_connector and document the rest\n\nWe never used initial_x/y or the force_encoder_id, so drop those fields\nand proide a basic description of the others.\n\nReally, the ELD bits belong in drm_display_info rather than directly in\nthe connector, but that\u0027s a separate cleanup.\n\nSigned-off-by: Jesse Barnes \u003cjbarnes@virtuousgeek.org\u003e\nReviewed-by: Alex Deucher \u003calexdeucher@gmail.com\u003e\nSigned-off-by: Dave Airlie \u003cairlied@redhat.com\u003e\n" }, { "commit": "db3e44996f23a2a7e826ede2dd9cb1571687a60f", "tree": "c354d0b65938b1a197c271e80bd632b37b76d17e", "parents": [ "6c3db9200b75f0fd736c9d766b754b971ad07eb1" ], "author": { "name": "Jesse Barnes", "email": "jbarnes@virtuousgeek.org", "time": "Mon Nov 07 12:03:17 2011 -0800" }, "committer": { "name": "Dave Airlie", "email": "airlied@redhat.com", "time": "Tue Dec 06 10:23:30 2011 +0000" }, "message": "drm: add drm_encoder comments\n\nJust some basic comments about the place and function of the structure\nand fields.\n\nSigned-off-by: Jesse Barnes \u003cjbarnes@virtuousgeek.org\u003e\nReviewed-by: Alex Deucher \u003calexdeucher@gmail.com\u003e\nSigned-off-by: Dave Airlie \u003cairlied@redhat.com\u003e\n" }, { "commit": "6c3db9200b75f0fd736c9d766b754b971ad07eb1", "tree": "9d7d483e9b489750be87e427af3291f8fef38645", "parents": [ "7749163efe5b366d53a3609229263c7a7994a8df" ], "author": { "name": "Jesse Barnes", "email": "jbarnes@virtuousgeek.org", "time": "Mon Nov 07 12:03:16 2011 -0800" }, "committer": { "name": "Dave Airlie", "email": "airlied@redhat.com", "time": "Tue Dec 06 10:23:29 2011 +0000" }, "message": "drm: add comments for drm_encoder_funcs\n\nJust basic verbiage.\n\nSigned-off-by: Jesse Barnes \u003cjbarnes@virtuousgeek.org\u003e\nReviewed-by: Alex Deucher \u003calexdeucher@gmail.com\u003e\nSigned-off-by: Dave Airlie \u003cairlied@redhat.com\u003e\n" }, { "commit": "7749163efe5b366d53a3609229263c7a7994a8df", "tree": "310204964f4f54c9c94c7d5cdc269fcff0dc3de3", "parents": [ "6f215f9f86eedd8dd8709ba2f725b042da6b6e89" ], "author": { "name": "Jesse Barnes", "email": "jbarnes@virtuousgeek.org", "time": "Mon Nov 07 12:03:14 2011 -0800" }, "committer": { "name": "Dave Airlie", "email": "airlied@redhat.com", "time": "Tue Dec 06 10:23:28 2011 +0000" }, "message": "drm: fix comments for drm_crtc struct\n\nRemove stale entries and update with the latest stuff.\n\nSigned-off-by: Jesse Barnes \u003cjbarnes@virtuousgeek.org\u003e\nReviewed-by: Alex Deucher \u003calexdeucher@gmail.com\u003e\nSigned-off-by: Dave Airlie \u003cairlied@redhat.com\u003e\n" }, { "commit": "6f215f9f86eedd8dd8709ba2f725b042da6b6e89", "tree": "29fae20b06b8e40728ba42857637500813e16b97", "parents": [ "cee5ec43460351f0ce4617d3ffb34b74ad613a00" ], "author": { "name": "Jesse Barnes", "email": "jbarnes@virtuousgeek.org", "time": "Mon Nov 07 12:03:12 2011 -0800" }, "committer": { "name": "Dave Airlie", "email": "airlied@redhat.com", "time": "Tue Dec 06 10:06:25 2011 +0000" }, "message": "drm: remove unused connector_count field from drm_display_mode\n\nDoesn\u0027t really belong here anyway.\n\nSigned-off-by: Jesse Barnes \u003cjbarnes@virtuousgeek.org\u003e\nReviewed-by: Alex Deucher \u003calexdeucher@gmail.com\u003e\nSigned-off-by: Dave Airlie \u003cairlied@redhat.com\u003e\n" }, { "commit": "cee5ec43460351f0ce4617d3ffb34b74ad613a00", "tree": "1c3fddcf3e7fbf086e857884113a748d9b9d17e7", "parents": [ "04b3924db60f974d2b4af0b2e19a0ae7ca202dc7", "1b22edfd6efd02b6cb9cfe3389ed54731abb3a45" ], "author": { "name": "Dave Airlie", "email": "airlied@redhat.com", "time": "Tue Dec 06 09:59:52 2011 +0000" }, "committer": { "name": "Dave Airlie", "email": "airlied@redhat.com", "time": "Tue Dec 06 09:59:57 2011 +0000" }, "message": "drm: Merge branch \u0027drm-gma500-alancox\u0027 into drm-core-next\n\nThis merges a topic branch containing patches from Alan for the GMA500 driver.\n\n* drm-gma500-alancox:\n gma500: Oaktrail BIOS handling\n gma500: Fix oaktrail probing part 1\n gma500: Be smarter about layout\n gma500: gtt based hardware scrolling console\n gma500: frame buffer locking\n gma500: Fix backlight crash\n gma500: kill bogus code\n gma500: Convert spaces to tabs in accel_2d.c.\n gma500: do a pass over the FIXME tags\n gma500: Add VBLANK support for Poulsbo hardware\n gma500: Don\u0027t enable MSI on Poulsbo\n gma500: Only register interrupt handler for poulsbo hardware\n gma500: kill virtual mapping support\n gma500: Move the API\n gma500: kill off NUM_PIPE define\n gma500: Rename the ioctls to avoid clashing with the legacy drivers\n drm/gma500: begin pruning dead bits of API\n" }, { "commit": "1b22edfd6efd02b6cb9cfe3389ed54731abb3a45", "tree": "1c3fddcf3e7fbf086e857884113a748d9b9d17e7", "parents": [ "aa0c45fdca0cff3d1ba06578a84c9bc7f29a0960" ], "author": { "name": "Alan Cox", "email": "alan@linux.intel.com", "time": "Tue Nov 29 22:27:57 2011 +0000" }, "committer": { "name": "Dave Airlie", "email": "airlied@redhat.com", "time": "Tue Dec 06 09:55:42 2011 +0000" }, "message": "gma500: Oaktrail BIOS handling\n\nNow that we pull the right BIOS data out of the hat we need to use it when\ndoing our panel setup.\n\nSigned-off-by: Alan Cox \u003calan@linux.intel.com\u003e\nSigned-off-by: Dave Airlie \u003cairlied@redhat.com\u003e\n" }, { "commit": "aa0c45fdca0cff3d1ba06578a84c9bc7f29a0960", "tree": "ed2b380de5668f7b7d8ee87b8433ef2082924ef4", "parents": [ "1b223c9ebf11e9597820fac57b211709f8ffce26" ], "author": { "name": "Alan Cox", "email": "alan@linux.intel.com", "time": "Tue Nov 29 22:27:45 2011 +0000" }, "committer": { "name": "Dave Airlie", "email": "airlied@redhat.com", "time": "Tue Dec 06 09:55:41 2011 +0000" }, "message": "gma500: Fix oaktrail probing part 1\n\nThe Oaktrail platform does not use the GCT/VBT format that is used by the\nMoorestowm (non PC legacy) equivalent device. It uses the BIOS tables which\nmeans an opregion and the like.\n\nThe current code uses the wrong table which breaks things like the Fujitsu\nq550 tablets. Fix the table usage as a first step.\n\nThe problem was found and diagnosed by Chia-I Wu\n\nSigned-off-by: Alan Cox \u003calan@linux.intel.com\u003e\nSigned-off-by: Dave Airlie \u003cairlied@redhat.com\u003e\n" }, { "commit": "1b223c9ebf11e9597820fac57b211709f8ffce26", "tree": "d249394aeb95edb1b7c60cf53959d1183cae860f", "parents": [ "a6ba582d264f67074f669f76172e8a2afadff2a4" ], "author": { "name": "Alan Cox", "email": "alan@linux.intel.com", "time": "Tue Nov 29 22:27:34 2011 +0000" }, "committer": { "name": "Dave Airlie", "email": "airlied@redhat.com", "time": "Tue Dec 06 09:55:40 2011 +0000" }, "message": "gma500: Be smarter about layout\n\nIf we can\u0027t fit a page aligned display stride then it\u0027s not the end of the\nworld for a normal font, so try half a page and work down sizes.\n\nSigned-off-by: Alan Cox \u003calan@linux.intel.com\u003e\nSigned-off-by: Dave Airlie \u003cairlied@redhat.com\u003e\n" }, { "commit": "a6ba582d264f67074f669f76172e8a2afadff2a4", "tree": "424d22e0085589cf76d987aaebd1281cb0ea48ac", "parents": [ "9242fe23d2ebab9c61dbc50d65f30cfa20a856ae" ], "author": { "name": "Alan Cox", "email": "alan@linux.intel.com", "time": "Tue Nov 29 22:27:22 2011 +0000" }, "committer": { "name": "Dave Airlie", "email": "airlied@redhat.com", "time": "Tue Dec 06 09:55:39 2011 +0000" }, "message": "gma500: gtt based hardware scrolling console\n\nAdd support for GTT based scrolling. Instead of pushing bits around we simply\nuse the GTT to change the mappings. This provides us with a very fast way to\nscroll the display providing we have enough memory to allocate on 4K line\nboundaries. In practice this seems to be the case except for very big displays\nsuch as HDMI, and the usual configurations are netbooks/tablets.\n\nSigned-off-by: Alan Cox \u003calan@linux.intel.com\u003e\nSigned-off-by: Dave Airlie \u003cairlied@redhat.com\u003e\n" }, { "commit": "9242fe23d2ebab9c61dbc50d65f30cfa20a856ae", "tree": "e41e980dc788a75488e1fbfdadef47e250b0d902", "parents": [ "1f0d0b5183c8dd4d58678e8ba35553cabaf87390" ], "author": { "name": "Alan Cox", "email": "alan@linux.intel.com", "time": "Tue Nov 29 22:27:10 2011 +0000" }, "committer": { "name": "Dave Airlie", "email": "airlied@redhat.com", "time": "Tue Dec 06 09:55:38 2011 +0000" }, "message": "gma500: frame buffer locking\n\nIf we are the console then a printk can hit us with a spin lock held (and\nin fact the kernel will do its best to take the console printing lock).\n\nIn that case we cannot politely sleep when synching after an accelerated op\nbut must behave obnoxiously to be sure of getting the bits out.\n\nSigned-off-by: Alan Cox \u003calan@linux.intel.com\u003e\nSigned-off-by: Dave Airlie \u003cairlied@redhat.com\u003e\n" }, { "commit": "1f0d0b5183c8dd4d58678e8ba35553cabaf87390", "tree": "39627a64a010a1057097113be1298301f861edcf", "parents": [ "2357f7e61f4ca5789ce2ecbe44367acfe078a841" ], "author": { "name": "Alan Cox", "email": "alan@linux.intel.com", "time": "Tue Nov 29 22:26:58 2011 +0000" }, "committer": { "name": "Dave Airlie", "email": "airlied@redhat.com", "time": "Tue Dec 06 09:55:37 2011 +0000" }, "message": "gma500: Fix backlight crash\n\nInitial changes to get backlight behaviour we want and to fix backlight crashes\non suspend/resume paths.\n\n[Note: on some boxes this will now produce a warning about the backlight, this\n isn\u0027t a regression it\u0027s an unfixed but non harmful case I still need to nail]\n\nSigned-off-by: Alan Cox \u003calan@linux.intel.com\u003e\nSigned-off-by: Dave Airlie \u003cairlied@redhat.com\u003e\n" }, { "commit": "2357f7e61f4ca5789ce2ecbe44367acfe078a841", "tree": "9c527c145e7ca00978c86cbf5c9b55e36e9d0e5d", "parents": [ "cd009355cd43692e0490b39c983c674e0da3c72e" ], "author": { "name": "Alan Cox", "email": "alan@linux.intel.com", "time": "Tue Nov 29 22:26:44 2011 +0000" }, "committer": { "name": "Dave Airlie", "email": "airlied@redhat.com", "time": "Tue Dec 06 09:55:36 2011 +0000" }, "message": "gma500: kill bogus code\n\nDuring the power split ups and work a chunk of code escaped into the\nPoulsbo code path which it isn\u0027t for. On some devices such as the Dell\nmini-10 this causes problems.\n\nSigned-off-by: Alan Cox \u003calan@linux.intel.com\u003e\nSigned-off-by: Dave Airlie \u003cairlied@redhat.com\u003e\n" }, { "commit": "cd009355cd43692e0490b39c983c674e0da3c72e", "tree": "13444bb0eb8c02fadac385f344e7f4d96fa1e45a", "parents": [ "a746092b679e6045dae91ceacb9abc6c83e38e0e" ], "author": { "name": "Akshay Joshi", "email": "me@akshayjoshi.com", "time": "Tue Nov 29 22:22:13 2011 +0000" }, "committer": { "name": "Dave Airlie", "email": "airlied@redhat.com", "time": "Tue Dec 06 09:55:34 2011 +0000" }, "message": "gma500: Convert spaces to tabs in accel_2d.c.\n\nConvert the spaces within the accel_2d.c file to tabs in order to comply\nwith the coding style of the kernel.\n\nSigned-off-by: Akshay Joshi \u003cme@akshayjoshi.com\u003e\n[Trimmed to subset relevant to current tree]\nSigned-off-by: Alan Cox \u003calan@linux.intel.com\u003e\nSigned-off-by: Dave Airlie \u003cairlied@redhat.com\u003e\n" }, { "commit": "a746092b679e6045dae91ceacb9abc6c83e38e0e", "tree": "f1cc7a4da7f183dd5b2dab52ba4fabe7cb420fd9", "parents": [ "700e59f6924719c70ac63e004ccafc6f15074fb0" ], "author": { "name": "Alan Cox", "email": "alan@linux.intel.com", "time": "Tue Nov 29 22:21:03 2011 +0000" }, "committer": { "name": "Dave Airlie", "email": "airlied@redhat.com", "time": "Tue Dec 06 09:55:33 2011 +0000" }, "message": "gma500: do a pass over the FIXME tags\n\nSigned-off-by: Alan Cox \u003calan@linux.intel.com\u003e\nSigned-off-by: Dave Airlie \u003cairlied@redhat.com\u003e\n" }, { "commit": "700e59f6924719c70ac63e004ccafc6f15074fb0", "tree": "3d1177c8eef0743b5c6a13f5f65f0ec6465b86ad", "parents": [ "84b08fe62c9e8c066a29d6d6f656e409a2a86b27" ], "author": { "name": "Patrik Jakobsson", "email": "patrik.r.jakobsson@gmail.com", "time": "Tue Nov 29 22:20:34 2011 +0000" }, "committer": { "name": "Dave Airlie", "email": "airlied@redhat.com", "time": "Tue Dec 06 09:55:32 2011 +0000" }, "message": "gma500: Add VBLANK support for Poulsbo hardware\n\nSigned-off-by: Patrik Jakobsson \u003cpatrik.r.jakobsson@gmail.com\u003e\nSigned-off-by: Alan Cox \u003calan@linux.intel.com\u003e\nSigned-off-by: Dave Airlie \u003cairlied@redhat.com\u003e\n" }, { "commit": "84b08fe62c9e8c066a29d6d6f656e409a2a86b27", "tree": "5852e4db7b5b16315ca3d12ba907201f6495b9ef", "parents": [ "e036ba5914df8a6c2ce665ba4631fe1f17f4cc2b" ], "author": { "name": "Patrik Jakobsson", "email": "patrik.r.jakobsson@gmail.com", "time": "Tue Nov 29 22:20:20 2011 +0000" }, "committer": { "name": "Dave Airlie", "email": "airlied@redhat.com", "time": "Tue Dec 06 09:55:30 2011 +0000" }, "message": "gma500: Don\u0027t enable MSI on Poulsbo\n\nChipset reports MSI capabilities for Poulsbo even though it isn\u0027t really there.\n\nSigned-off-by: Patrik Jakobsson \u003cpatrik.r.jakobsson@gmail.com\u003e\nSigned-off-by: Alan Cox \u003calan@linux.intel.com\u003e\nSigned-off-by: Dave Airlie \u003cairlied@redhat.com\u003e\n" }, { "commit": "e036ba5914df8a6c2ce665ba4631fe1f17f4cc2b", "tree": "9cf9dba4d0b73c72c5211c7a27bdce9d143e0ac7", "parents": [ "dffc9ceb55695f121adc57dd1fde7304c3afe81e" ], "author": { "name": "Patrik Jakobsson", "email": "patrik.r.jakobsson@gmail.com", "time": "Tue Nov 29 22:20:07 2011 +0000" }, "committer": { "name": "Dave Airlie", "email": "airlied@redhat.com", "time": "Tue Dec 06 09:55:30 2011 +0000" }, "message": "gma500: Only register interrupt handler for poulsbo hardware\n\nFirst step in adding proper irq handling. We\u0027ll start with poulsbo support so\nmake sure other chips don\u0027t touch drm_irq_install().\n\nSigned-off-by: Patrik Jakobsson \u003cpatrik.r.jakobsson@gmail.com\u003e\nSigned-off-by: Alan Cox \u003calan@linux.intel.com\u003e\nSigned-off-by: Dave Airlie \u003cairlied@redhat.com\u003e\n" }, { "commit": "dffc9ceb55695f121adc57dd1fde7304c3afe81e", "tree": "b1457b5299c08ad2a03e9da4f38743f2fbcb7556", "parents": [ "838fa588a29331da012876623c3bc170d7d647c2" ], "author": { "name": "Alan Cox", "email": "alan@linux.intel.com", "time": "Tue Nov 29 22:19:47 2011 +0000" }, "committer": { "name": "Dave Airlie", "email": "airlied@redhat.com", "time": "Tue Dec 06 09:55:29 2011 +0000" }, "message": "gma500: kill virtual mapping support\n\nThis isn\u0027t actually usable - we simply don\u0027t have the vmap space on a 32bit\nsystem to do this stunt. Instead we will rely on the low level drivers\nlimiting the console resolution as before.\n\nThe real fix is for someone to write a page table aware version of the\nframebuffer console blit functions. Good university student project\nperhaps..\n\nSigned-off-by: Alan Cox \u003calan@linux.intel.com\u003e\nSigned-off-by: Dave Airlie \u003cairlied@redhat.com\u003e\n" }, { "commit": "838fa588a29331da012876623c3bc170d7d647c2", "tree": "3ac4f7b309a5b7afa8a20887fb3583622875823e", "parents": [ "04bd564fdb3cbea09d14a271b4f2d616cc8eac90" ], "author": { "name": "Alan Cox", "email": "alan@linux.intel.com", "time": "Wed Nov 16 22:39:45 2011 +0000" }, "committer": { "name": "Dave Airlie", "email": "airlied@redhat.com", "time": "Tue Dec 06 09:54:23 2011 +0000" }, "message": "gma500: Move the API\n\nFinally move the API where it can be seen\n\nSigned-off-by: Alan Cox \u003calan@linux.intel.com\u003e\nSigned-off-by: Dave Airlie \u003cairlied@redhat.com\u003e\n" }, { "commit": "04bd564fdb3cbea09d14a271b4f2d616cc8eac90", "tree": "96b8d695dc34b37c2ff34b2e9e0c34dbd794eed1", "parents": [ "770179d5e35c191e2c760d37abd5572ccdf6a002" ], "author": { "name": "Alan Cox", "email": "alan@linux.intel.com", "time": "Wed Nov 16 22:39:32 2011 +0000" }, "committer": { "name": "Dave Airlie", "email": "airlied@redhat.com", "time": "Tue Dec 06 09:43:18 2011 +0000" }, "message": "gma500: kill off NUM_PIPE define\n\nWe don\u0027t want this external in case someone adds more to the hardware. We\nwant it out of the ABI.\n\nSigned-off-by: Alan Cox \u003calan@linux.intel.com\u003e\nSigned-off-by: Dave Airlie \u003cairlied@redhat.com\u003e\n" }, { "commit": "770179d5e35c191e2c760d37abd5572ccdf6a002", "tree": "04f10728d5ee4ede65b7168d836f17dc23523bc5", "parents": [ "61bedf702c81c47edf3bb0dec50e2de7c4537255" ], "author": { "name": "Alan Cox", "email": "alan@linux.intel.com", "time": "Wed Nov 16 22:39:18 2011 +0000" }, "committer": { "name": "Dave Airlie", "email": "airlied@redhat.com", "time": "Tue Dec 06 09:43:13 2011 +0000" }, "message": "gma500: Rename the ioctls to avoid clashing with the legacy drivers\n\nSigned-off-by: Alan Cox \u003calan@linux.intel.com\u003e\nSigned-off-by: Dave Airlie \u003cairlied@redhat.com\u003e\n" }, { "commit": "61bedf702c81c47edf3bb0dec50e2de7c4537255", "tree": "d4fd0a69efb47b7685db88dc909c66fc7348779a", "parents": [ "04b3924db60f974d2b4af0b2e19a0ae7ca202dc7" ], "author": { "name": "Alan Cox", "email": "alan@linux.intel.com", "time": "Wed Nov 16 22:38:42 2011 +0000" }, "committer": { "name": "Dave Airlie", "email": "airlied@redhat.com", "time": "Tue Dec 06 09:42:49 2011 +0000" }, "message": "drm/gma500: begin pruning dead bits of API\n\nAt this point we won\u0027t add an external set of definitions. We want to get\neverything out before we admit to a public API beyond the standardised\nones.\n\nSigned-off-by: Alan Cox \u003calan@linux.intel.com\u003e\nSigned-off-by: Dave Airlie \u003cairlied@redhat.com\u003e\n" }, { "commit": "04b3924db60f974d2b4af0b2e19a0ae7ca202dc7", "tree": "f16a79ad676ba2333ee5af9c431b9882d574af9e", "parents": [ "248dbc2350501e2c7b9f5ceb60c75515d82f4134" ], "author": { "name": "Ville Syrjälä", "email": "ville.syrjala@linux.intel.com", "time": "Thu Nov 17 18:05:13 2011 +0200" }, "committer": { "name": "Dave Airlie", "email": "airlied@redhat.com", "time": "Thu Dec 01 14:16:10 2011 +0000" }, "message": "drm: Redefine pixel formats\n\nName the formats as DRM_FORMAT_X instead of DRM_FOURCC_X. Use consistent\nnames, especially for the RGB formats. Component order and byte order are\nnow strictly specified for each format.\n\nThe RGB format naming follows a convention where the components names\nand sizes are listed from left to right, matching the order within a\nsingle pixel from most significant bit to least significant bit.\n\nThe YUV format names vary more. For the 4:2:2 packed formats and 2\nplane formats use the fourcc. For the three plane formats the\nname includes the plane order and subsampling information using the\nstandard subsampling notation. Some of those also happen to match\nthe official fourcc definition.\n\nThe fourccs for for all the RGB formats and some of the YUV formats\nI invented myself. The idea was that looking at just the fourcc you\nget some idea what the format is about without having to decode it\nusing some external reference.\n\nSigned-off-by: Ville Syrjälä \u003cville.syrjala@linux.intel.com\u003e\nSigned-off-by: Dave Airlie \u003cairlied@redhat.com\u003e\n" }, { "commit": "248dbc2350501e2c7b9f5ceb60c75515d82f4134", "tree": "fb12f25d61f71eeba77931b96e58950fc9afd46f", "parents": [ "435ddd926e880f14ea2ae37062b9b45231d7fdf9" ], "author": { "name": "Dave Airlie", "email": "airlied@redhat.com", "time": "Tue Nov 29 20:02:54 2011 +0000" }, "committer": { "name": "Dave Airlie", "email": "airlied@redhat.com", "time": "Tue Nov 29 20:02:54 2011 +0000" }, "message": "drm: move the fb bpp/depth helper into the core.\n\nThis is used by nearly everyone including vmwgfx which doesn\u0027t generally\nuse the fb helper.\n\nSigned-off-by: Dave Airlie \u003cairlied@redhat.com\u003e\n" }, { "commit": "435ddd926e880f14ea2ae37062b9b45231d7fdf9", "tree": "3aab0acdcb71647bca8f246175bb80eb3235dcc9", "parents": [ "1595c568c9237d1b1371ef3a2a2d98d231b1b59b" ], "author": { "name": "Dave Airlie", "email": "airlied@redhat.com", "time": "Tue Nov 29 11:42:50 2011 +0000" }, "committer": { "name": "Dave Airlie", "email": "airlied@redhat.com", "time": "Tue Nov 29 11:42:50 2011 +0000" }, "message": "drm/radeon/kms: fix up for BIG ENDIAN breakage\n\nCommit 308e5bcbdb10 (\"drm: add an fb creation ioctl that takes a pixel\nformat v5\") missed one spot needing to be fixed up in the __BIG_ENDIAN\ncase.\n\nFixes build error:\n\ndrivers/gpu/drm/radeon/radeon_fb.c: In function\n\u0027radeonfb_create_pinned_object\u0027:\ndrivers/gpu/drm/radeon/radeon_fb.c:144:18: error: \u0027struct drm_mode_fb_cmd2\u0027\nhas no member named \u0027bpp\u0027\n\nSigned-off-by: Stephen Rothwell \u003csfr@canb.auug.org.au\u003e\nSigned-off-by: Dave Airlie \u003cairlied@redhat.com\u003e\n" }, { "commit": "1595c568c9237d1b1371ef3a2a2d98d231b1b59b", "tree": "c4ee9d3f7b52d1b5590368ac087244b92ddb90e9", "parents": [ "0cdbee3e811b1bbb347c61814c8570658f2ab15c" ], "author": { "name": "Ilija Hadzic", "email": "ihadzic@research.bell-labs.com", "time": "Sun Nov 27 11:08:33 2011 -0500" }, "committer": { "name": "Dave Airlie", "email": "airlied@redhat.com", "time": "Mon Nov 28 14:10:12 2011 +0000" }, "message": "drm/gma500: fix compile error\n\nfops field in drm_driver is a pointer to file_operations\nstruct, not embedded structure\n\nSigned-off-by: Ilija Hadzic \u003cihadzic@research.bell-labs.com\u003e\nSigned-off-by: Dave Airlie \u003cairlied@redhat.com\u003e\n" }, { "commit": "0cdbee3e811b1bbb347c61814c8570658f2ab15c", "tree": "5da605d01b26b560f0f677ac6c88297cc0091a1b", "parents": [ "a9a644ac9e8d6c8efdcc0581b120a0260d1f477d" ], "author": { "name": "Ilija Hadzic", "email": "ihadzic@research.bell-labs.com", "time": "Sun Nov 27 11:08:32 2011 -0500" }, "committer": { "name": "Dave Airlie", "email": "airlied@redhat.com", "time": "Mon Nov 28 14:09:50 2011 +0000" }, "message": "drm/gma500: remove genrated file\n\npsb_gfx.mod.c is a generated file and should not be\nrevision controlled\n\nSigned-off-by: Ilija Hadzic \u003cihadzic@research.bell-labs.com\u003e\nSigned-off-by: Dave Airlie \u003cairlied@redhat.com\u003e\n" }, { "commit": "a9a644ac9e8d6c8efdcc0581b120a0260d1f477d", "tree": "3360e55ba559d1c9e388663bc90919157db7e2a5", "parents": [ "15b273bb26085a0d7876df10fca2bedcb4e03287" ], "author": { "name": "Dave Airlie", "email": "airlied@redhat.com", "time": "Mon Nov 28 14:08:46 2011 +0000" }, "committer": { "name": "Dave Airlie", "email": "airlied@redhat.com", "time": "Mon Nov 28 14:08:46 2011 +0000" }, "message": "drm/gma500: port framebuffer to new plane interface.\n\nThis takes over the staging change into the mainline driver.\n\nFixes -next part one.\n\nSigned-off-by: Dave Airlie \u003cairlied@redhat.com\u003e\n" }, { "commit": "15b273bb26085a0d7876df10fca2bedcb4e03287", "tree": "9f02d635828e2f8992a48968a8b27754db488ea3", "parents": [ "b63e0f9cb433c75482770084f0fc59a6c62a60d5" ], "author": { "name": "Jesse Barnes", "email": "jbarnes@virtuousgeek.org", "time": "Wed Nov 16 08:42:49 2011 -0800" }, "committer": { "name": "Dave Airlie", "email": "airlied@redhat.com", "time": "Fri Nov 25 10:13:42 2011 +0000" }, "message": "drm/staging/gma500: fix linux-next build\n\nHere\u0027s a patch to move things over to the new addfb2 interfaces at\nleast.\n\nSigned-off-by: Dave Airlie \u003cairlied@redhat.com\u003e\n" }, { "commit": "b63e0f9cb433c75482770084f0fc59a6c62a60d5", "tree": "ef5078b51355333b81d12f6bf30ad1436451478d", "parents": [ "08aa3fe97a4a36b1cac53335f528435ee3ae02ed", "91c75492118bab5450488e7368bd79664ce2d621" ], "author": { "name": "Dave Airlie", "email": "airlied@redhat.com", "time": "Wed Nov 16 15:15:16 2011 +0000" }, "committer": { "name": "Dave Airlie", "email": "airlied@redhat.com", "time": "Wed Nov 16 15:15:16 2011 +0000" }, "message": "Merge branch \u0027drm-gma500-alanc\u0027 into drm-core-next\n\n* drm-gma500-alanc:\n gma500: Now connect up to the DRM build to finish the job\n gma500: fixup build versus latest header changes.\n gma500: Add support for Cedarview\n gma500: Add Oaktrail support\n gma500: Add Poulsbo support\n gma500: Add the core DRM files and headers\n gma500: Add the i2c bus support\n gma500: Add the glue to the various BIOS and firmware interfaces\n gma500: Add device framework\n gma500: introduce the framebuffer support code\n gma500: introduce the GTT and MMU handling logic\n gma500: GEM and GEM glue\n gma500: Move the basic driver out of staging\n" }, { "commit": "91c75492118bab5450488e7368bd79664ce2d621", "tree": "81c037ff957efc651ee412d2c27e585c00766301", "parents": [ "af3a2cfbd132a0556f0e5e457817337047ebcb4c" ], "author": { "name": "Alan Cox", "email": "alan@linux.intel.com", "time": "Thu Nov 03 18:22:48 2011 +0000" }, "committer": { "name": "Dave Airlie", "email": "airlied@redhat.com", "time": "Wed Nov 16 12:14:08 2011 +0000" }, "message": "gma500: Now connect up to the DRM build to finish the job\n\nSigned-off-by: Alan Cox \u003calan@linux.intel.com\u003e\nSigned-off-by: Dave Airlie \u003cairlied@redhat.com\u003e\n" }, { "commit": "af3a2cfbd132a0556f0e5e457817337047ebcb4c", "tree": "9521656ef57946ba56bbcc043354b5ca5c7ad344", "parents": [ "6a227d5fd6c4abe6a9226a40f6981825e9da5fbe" ], "author": { "name": "Dave Airlie", "email": "airlied@redhat.com", "time": "Wed Nov 16 12:13:30 2011 +0000" }, "committer": { "name": "Dave Airlie", "email": "airlied@redhat.com", "time": "Wed Nov 16 12:14:04 2011 +0000" }, "message": "gma500: fixup build versus latest header changes.\n\nSigned-off-by: Dave Airlie \u003cairlied@redhat.com\u003e\n" }, { "commit": "6a227d5fd6c4abe6a9226a40f6981825e9da5fbe", "tree": "c9bf4f59f45c84f668d15de32ac7d6420e700578", "parents": [ "1b082ccf5901108d3acd860a73d8c0442556c0bb" ], "author": { "name": "Alan Cox", "email": "alan@linux.intel.com", "time": "Thu Nov 03 18:22:37 2011 +0000" }, "committer": { "name": "Dave Airlie", "email": "airlied@redhat.com", "time": "Wed Nov 16 11:27:35 2011 +0000" }, "message": "gma500: Add support for Cedarview\n\nAgain this is similar but has some differences so we have a set of plug in\nsupport. This does make the driver bigger than is needed in some respects\nbut the tradeoff for maintainability is huge.\n\nSigned-off-by: Alan Cox \u003calan@linux.intel.com\u003e\nSigned-off-by: Dave Airlie \u003cairlied@redhat.com\u003e\n" }, { "commit": "1b082ccf5901108d3acd860a73d8c0442556c0bb", "tree": "d5b362913e21881a790490fe50228a13cb556be0", "parents": [ "89c78134cc54dff016c83367912eb055637fa50c" ], "author": { "name": "Alan Cox", "email": "alan@linux.intel.com", "time": "Thu Nov 03 18:22:26 2011 +0000" }, "committer": { "name": "Dave Airlie", "email": "airlied@redhat.com", "time": "Wed Nov 16 11:27:12 2011 +0000" }, "message": "gma500: Add Oaktrail support\n\nOaktrail (GMA600) is found on some tablet/slate PC type systems. It\u0027s a bit\ndifferent to the GMA500 but similar enough it makes sense to plug it into\nthe same driver.\n\nSigned-off-by: Alan Cox \u003calan@linux.intel.com\u003e\nSigned-off-by: Dave Airlie \u003cairlied@redhat.com\u003e\n" }, { "commit": "89c78134cc54dff016c83367912eb055637fa50c", "tree": "2f0d9167e187726c47efabe9a4d7811f950d191c", "parents": [ "5c49fd3aa0ab025e5f94617249db10a33138f37b" ], "author": { "name": "Alan Cox", "email": "alan@linux.intel.com", "time": "Thu Nov 03 18:22:15 2011 +0000" }, "committer": { "name": "Dave Airlie", "email": "airlied@redhat.com", "time": "Wed Nov 16 11:26:55 2011 +0000" }, "message": "gma500: Add Poulsbo support\n\nThis provides the specific code for Poulsbo, some of which is also used for\nthe later chipsets. We support the GTT, the 2D engine (for console), and\nthe display setup/management. We do not support 3D or the video overlays.\n\nIn theory enough public info is available to do the video overlay work\nbut that represents a large task.\n\nFramebuffer X will run nicely with this but do *NOT* use the VESA X\nserver at the same time as KMS. With a Dell mini 10 things like Xfce4 are\nnice and usable even when compositing as the CPU has a good path to the\nmemory.\n\nSigned-off-by: Alan Cox \u003calan@linux.intel.com\u003e\nSigned-off-by: Dave Airlie \u003cairlied@redhat.com\u003e\n" }, { "commit": "5c49fd3aa0ab025e5f94617249db10a33138f37b", "tree": "d0199b52770ef27685dd0e2e7ec32b8fc8550e91", "parents": [ "5091b7eb3f90a0aa5bb4f265b8427782539342c2" ], "author": { "name": "Alan Cox", "email": "alan@linux.intel.com", "time": "Thu Nov 03 18:22:04 2011 +0000" }, "committer": { "name": "Dave Airlie", "email": "airlied@redhat.com", "time": "Wed Nov 16 11:26:35 2011 +0000" }, "message": "gma500: Add the core DRM files and headers\n\nNot really a nice way to split this up further for submission. This\nprovides all the DRM interfacing logic, the headers and relevant glue.\n\nSigned-off-by: Alan Cox \u003calan@linux.intel.com\u003e\nSigned-off-by: Dave Airlie \u003cairlied@redhat.com\u003e\n" }, { "commit": "5091b7eb3f90a0aa5bb4f265b8427782539342c2", "tree": "1c291529f87c8a35cd3a2b16e454f2c28ba9b5b7", "parents": [ "f910b411053f04d5ccd6219a912eaea2b6f5ea6e" ], "author": { "name": "Alan Cox", "email": "alan@linux.intel.com", "time": "Thu Nov 03 18:21:53 2011 +0000" }, "committer": { "name": "Dave Airlie", "email": "airlied@redhat.com", "time": "Wed Nov 16 11:25:59 2011 +0000" }, "message": "gma500: Add the i2c bus support\n\nAgain this might be a candidate for sharing later.\n\nSigned-off-by: Alan Cox \u003calan@linux.intel.com\u003e\nSigned-off-by: Dave Airlie \u003cairlied@redhat.com\u003e\n" }, { "commit": "f910b411053f04d5ccd6219a912eaea2b6f5ea6e", "tree": "bd026e22a686f321c47c66011441ef77339c4c82", "parents": [ "bbbb262d375140a27ed9fe45a13f19a04a0c51b2" ], "author": { "name": "Alan Cox", "email": "alan@linux.intel.com", "time": "Thu Nov 03 18:21:42 2011 +0000" }, "committer": { "name": "Dave Airlie", "email": "airlied@redhat.com", "time": "Wed Nov 16 11:25:28 2011 +0000" }, "message": "gma500: Add the glue to the various BIOS and firmware interfaces\n\nSome of this should one day become a library shared by i915 and gma500 I\nsuspct. Best however to deal with that later once it is all nice and\nstably merged.\n\nSigned-off-by: Alan Cox \u003calan@linux.intel.com\u003e\nSigned-off-by: Dave Airlie \u003cairlied@redhat.com\u003e\n" }, { "commit": "bbbb262d375140a27ed9fe45a13f19a04a0c51b2", "tree": "dbd7960d612f3bbfc8ff6186be975a13159c2abe", "parents": [ "4d8d096e9ae86621cc38b5417f4353305c5fd3a9" ], "author": { "name": "Alan Cox", "email": "alan@linux.intel.com", "time": "Thu Nov 03 18:21:31 2011 +0000" }, "committer": { "name": "Dave Airlie", "email": "airlied@redhat.com", "time": "Wed Nov 16 11:25:08 2011 +0000" }, "message": "gma500: Add device framework\n\nThe devices have various internal differences so we have some abstractions\nto hide the ugly differences and we then wrap them up in standard\ninterfaces. Add these bits\n\nSigned-off-by: Alan Cox \u003calan@linux.intel.com\u003e\nSigned-off-by: Dave Airlie \u003cairlied@redhat.com\u003e\n" }, { "commit": "4d8d096e9ae86621cc38b5417f4353305c5fd3a9", "tree": "c158eec1389cfaaf7f4945440453bb63caceddc3", "parents": [ "8c8f1c958ab5e948e954ebd97e328f23d347293b" ], "author": { "name": "Alan Cox", "email": "alan@linux.intel.com", "time": "Thu Nov 03 18:21:20 2011 +0000" }, "committer": { "name": "Dave Airlie", "email": "airlied@redhat.com", "time": "Wed Nov 16 11:24:36 2011 +0000" }, "message": "gma500: introduce the framebuffer support code\n\nWe support 2D acceleration on some devices but we try and do tricks with\nthe GTT as a starting point as this is far faster. The GTT logic could be\nimproved further but for most display sizes it already makes a pretty good\ndecision.\n\nSigned-off-by: Alan Cox \u003calan@linux.intel.com\u003e\nSigned-off-by: Dave Airlie \u003cairlied@redhat.com\u003e\n" }, { "commit": "8c8f1c958ab5e948e954ebd97e328f23d347293b", "tree": "d2539a02b51207edc29d437b6ccf34a881cbd02e", "parents": [ "e32681d66dd33a7792a3f1a1e3ea0eb0c415f895" ], "author": { "name": "Alan Cox", "email": "alan@linux.intel.com", "time": "Thu Nov 03 18:21:09 2011 +0000" }, "committer": { "name": "Dave Airlie", "email": "airlied@redhat.com", "time": "Wed Nov 16 11:23:38 2011 +0000" }, "message": "gma500: introduce the GTT and MMU handling logic\n\nThis fits alongside the GEM support to manage our resources on the card\nitself. It\u0027s not actually clear we need to configure the MMU at all.\nFurther research is needed before removing it entirely. For now we suck it\nin (slightly abused) from the old semi-free driver.\n\nSigned-off-by: Alan Cox \u003calan@linux.intel.com\u003e\nSigned-off-by: Dave Airlie \u003cairlied@redhat.com\u003e\n" }, { "commit": "e32681d66dd33a7792a3f1a1e3ea0eb0c415f895", "tree": "2c8b091cc0e31c1b1c523eaafddcfff6e7e4c5e3", "parents": [ "3abcf41fb1fc6f127ff98d3bae75db7f8f575e47" ], "author": { "name": "Alan Cox", "email": "alan@linux.intel.com", "time": "Thu Nov 03 18:20:58 2011 +0000" }, "committer": { "name": "Dave Airlie", "email": "airlied@redhat.com", "time": "Wed Nov 16 11:22:36 2011 +0000" }, "message": "gma500: GEM and GEM glue\n\nThe driver uses GEM along with a couple of small bits of wrapping of its\nown. The only real oddity here is the support for using the \u0027stolen\u0027 memory\nrather than wasting several MB.\n\nWe use a simple resource manager as we don\u0027t need to manage our space\nintensively at all as we only do 2D work. We also have a GTT which is\nentirely GPU facing so in the Cedarview case are not even allocating from\nhost address space.\n\nSigned-off-by: Alan Cox \u003calan@linux.intel.com\u003e\nReviewed-by: Daniel Vetter \u003cdaniel.vetter@ffwll.ch\u003e\nSigned-off-by: Dave Airlie \u003cairlied@redhat.com\u003e\n" }, { "commit": "3abcf41fb1fc6f127ff98d3bae75db7f8f575e47", "tree": "4a9b0de862fad2c6b8693be5a24cdf17ea9ff8da", "parents": [ "1ea6b8f48918282bdca0b32a34095504ee65bab5" ], "author": { "name": "Alan Cox", "email": "alan@linux.intel.com", "time": "Thu Nov 03 18:20:47 2011 +0000" }, "committer": { "name": "Dave Airlie", "email": "airlied@redhat.com", "time": "Wed Nov 16 11:19:54 2011 +0000" }, "message": "gma500: Move the basic driver out of staging\n\nThis driver supports unaccelerated KMS display, and accelerated console\nhandling on the Intel Poulsbo, Oaktrail, Cedarview and Medfield hardware.\n\nFor the initial merge Medfield will be left out as it needs considerable\nfurther work to reach a decent standard\n\nBegin by adding the Makefiles and Kconfig. These are not yet plumbed into\nthe DRM layer so will have no effect on their own\n\nSigned-off-by: Alan Cox \u003calan@linux.intel.com\u003e\nSigned-off-by: Dave Airlie \u003cairlied@redhat.com\u003e\n" }, { "commit": "08aa3fe97a4a36b1cac53335f528435ee3ae02ed", "tree": "5e4eebef07685c4047f54d1727fc9bcbace8889d", "parents": [ "e08e96de986ceb2c6b683df0bd0c4ddd4f91dcfd", "308e5bcbdb10452e8aba31aa21432fb67ee46d72" ], "author": { "name": "Dave Airlie", "email": "airlied@redhat.com", "time": "Tue Nov 15 19:57:59 2011 +0000" }, "committer": { "name": "Dave Airlie", "email": "airlied@redhat.com", "time": "Tue Nov 15 19:57:59 2011 +0000" }, "message": "Merge branch \u0027drm-plane-jbarnes\u0027 into drm-core-next\n\n* drm-plane-jbarnes:\n drm: add an fb creation ioctl that takes a pixel format v5\n drm: add plane support v3\n" }, { "commit": "308e5bcbdb10452e8aba31aa21432fb67ee46d72", "tree": "5e4eebef07685c4047f54d1727fc9bcbace8889d", "parents": [ "8cf5c9177151537e73ff1816540e4ba24b174391" ], "author": { "name": "Jesse Barnes", "email": "jbarnes@virtuousgeek.org", "time": "Mon Nov 14 14:51:28 2011 -0800" }, "committer": { "name": "Dave Airlie", "email": "airlied@redhat.com", "time": "Tue Nov 15 19:53:23 2011 +0000" }, "message": "drm: add an fb creation ioctl that takes a pixel format v5\n\nTo properly support the various plane formats supported by different\nhardware, the kernel must know the pixel format of a framebuffer object.\nSo add a new ioctl taking a format argument corresponding to a fourcc\nname from the new drm_fourcc.h header file. Implement the fb creation\nhooks in terms of the new mode_fb_cmd2 using helpers where the old\nbpp/depth values are needed.\n\nv2: create DRM specific fourcc header file for sharing with libdrm etc\nv3: fix rebase failure and use DRM fourcc codes in intel_display.c and\n update commit message\nv4: make fb_cmd2 handle field into an array for multi-object formats\n pull in Ville\u0027s fix for the memcpy in drm_plane_init\n apply Ville\u0027s cleanup to zero out fb_cmd2 arg in drm_mode_addfb\nv5: add \u0027flags\u0027 field for interlaced support (from Ville)\n\nSigned-off-by: Ville Syrjälä \u003cville.syrjala@linux.intel.com\u003e\nAcked-by: Alan Cox \u003calan@lxorguk.ukuu.org.uk\u003e\nReviewed-by: Rob Clark \u003crob.clark@linaro.org\u003e\nSigned-off-by: Jesse Barnes \u003cjbarnes@virtuousgeek.org\u003e\nSigned-off-by: Dave Airlie \u003cairlied@redhat.com\u003e\n" }, { "commit": "8cf5c9177151537e73ff1816540e4ba24b174391", "tree": "0b805659ef5b68550b37166c5d98319c4fde5639", "parents": [ "e08e96de986ceb2c6b683df0bd0c4ddd4f91dcfd" ], "author": { "name": "Jesse Barnes", "email": "jbarnes@virtuousgeek.org", "time": "Mon Nov 14 14:51:27 2011 -0800" }, "committer": { "name": "Dave Airlie", "email": "airlied@redhat.com", "time": "Tue Nov 15 19:53:10 2011 +0000" }, "message": "drm: add plane support v3\n\nPlanes are a bit like half-CRTCs. They have a location and fb, but\ndon\u0027t drive outputs directly. Add support for handling them to the core\nKMS code.\n\nv2: fix ABI of get_plane - move format_type_ptr to the end\nv3: add \u0027flags\u0027 field for interlaced support (from Ville)\n\nAcked-by: Alan Cox \u003calan@lxorguk.ukuu.org.uk\u003e\nReviewed-by: Rob Clark \u003crob.clark@linaro.org\u003e\nReviewed-by: Daniel Vetter \u003cdaniel.vetter@ffwll.ch\u003e\nSigned-off-by: Jesse Barnes \u003cjbarnes@virtuousgeek.org\u003e\nSigned-off-by: Dave Airlie \u003cairlied@redhat.com\u003e\n" }, { "commit": "e08e96de986ceb2c6b683df0bd0c4ddd4f91dcfd", "tree": "632e9e5dc117204b0f1e78f57be6abdc6f4750f3", "parents": [ "d68752cf7bb92eafbbe6a0df0d0fab67e87523f6" ], "author": { "name": "Arjan van de Ven", "email": "arjan@infradead.org", "time": "Mon Oct 31 07:28:57 2011 -0700" }, "committer": { "name": "Dave Airlie", "email": "airlied@redhat.com", "time": "Fri Nov 11 11:14:47 2011 +0000" }, "message": "drm: Make the per-driver file_operations struct const\n\nFrom fdf1fdebaa00f81de18c227f32f8074c8b352d50 Mon Sep 17 00:00:00 2001\nFrom: Arjan van de Ven \u003carjan@linux.intel.com\u003e\nDate: Sun, 30 Oct 2011 19:06:07 -0700\nSubject: [PATCH] drm: Make the per-driver file_operations struct const\n\nThe DRM layer keeps a copy of struct file_operations inside its\nbig driver struct... which prevents it from being consistent and static.\nFor consistency (and the general security objective of having such things\nstatic), it\u0027s desirable to get this fixed.\n\nThis patch splits out the file_operations field to its own struct,\nwhich is then \"static const\", and just stick a pointer to this into\nthe driver struct, making it more consistent with how the rest of the\nkernel does this.\n\nSigned-off-by: Arjan van de Ven \u003carjan@linux.intel.com\u003e\nSigned-off-by: Dave Airlie \u003cairlied@redhat.com\u003e\n" }, { "commit": "d68752cf7bb92eafbbe6a0df0d0fab67e87523f6", "tree": "19ea6aaef4db1dbb9b12e7271e6da497d9e59ab1", "parents": [ "1ea6b8f48918282bdca0b32a34095504ee65bab5" ], "author": { "name": "Hugh Dickins", "email": "hughd@chromium.org", "time": "Mon Oct 17 17:06:40 2011 -0700" }, "committer": { "name": "Dave Airlie", "email": "airlied@redhat.com", "time": "Thu Nov 10 21:27:34 2011 +0000" }, "message": "drm: avoid switching to text console if there is no panic timeout\n\nAdd a check for panic_timeout in the drm_fb_helper_panic() notifier: if\nwe\u0027re going to reboot immediately, the user will not be able to see the\nmessages anyway, and messing with the video mode may display artifacts,\nand certainly get into several layers of complexity (including mutexes and\nmemory allocations) which we shall be much safer to avoid.\n\nSigned-off-by: Hugh Dickins \u003chughd@google.com\u003e\n[ Edited commit message and modified to short-circuit panic_timeout \u003c 0\n instead of testing panic_timeout \u003e\u003d 0. -Mandeep ]\nSigned-off-by: Mandeep Singh Baines \u003cmsb@chromium.org\u003e\nAcked-by: David Rientjes \u003crientjes@google.com\u003e\nAcked-by: Stéphane Marchesin \u003cmarcheu@chromium.org\u003e\nSigned-off-by: Dave Airlie \u003cairlied@redhat.com\u003e\n" }, { "commit": "1ea6b8f48918282bdca0b32a34095504ee65bab5", "tree": "01099b45d72a6b9977cebe34b97938b07d00a0b5", "parents": [ "075cb105cb6dcda8a585989ebd4a71f0b3c33f3e" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon Nov 07 16:16:02 2011 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon Nov 07 16:16:02 2011 -0800" }, "message": "Linux 3.2-rc1\n\n.. with new name. Because nothing says \"really solid kernel release\"\nlike naming it after an extinct animal that just happened to be in the\nnews lately.\n" }, { "commit": "075cb105cb6dcda8a585989ebd4a71f0b3c33f3e", "tree": "288b8ceb07f2f9780c572ca8c15b9d3096928ba0", "parents": [ "a3fbbde70a0cec017f2431e8f8de208708c76acc", "d30cc16c8e48368e0518f4975a78711e53e14a0f" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon Nov 07 16:14:26 2011 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon Nov 07 16:14:26 2011 -0800" }, "message": "Merge branch \u0027fixes\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap\n\n* \u0027fixes\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap: (31 commits)\n ARM: OMAP: Fix export.h or module.h includes\n ARM: OMAP: omap_device: Include linux/export.h\n ARM: OMAP2: Fix H4 matrix keyboard warning\n ARM: OMAP1: Remove unused omap-alsa.h\n ARM: OMAP1: Fix warnings about enabling 32 KiHz timer\n ARM: OMAP2+: timer: Remove omap_device_pm_latency\n ARM: OMAP2+: clock data: Remove redundant timer clkdev\n ARM: OMAP: Devkit8000: Remove double omap_mux_init_gpio\n ARM: OMAP: usb: musb: OMAP: Delete unused function\n MAINTAINERS: Update linux-omap git repository\n ARM: OMAP: change get_context_loss_count ret value to int\n ARM: OMAP4: hsmmc: configure SDMMC1_DR0 properly\n ARM: OMAP4: hsmmc: Fix Pbias configuration on regulator OFF\n ARM: OMAP3: hwmod: fix variant registration and remove SmartReflex from common list\n ARM: OMAP: I2C: Fix omap_register_i2c_bus() return value on success\n ARM: OMAP: dmtimer: Include linux/module.h\n ARM: OMAP2+: l3-noc: Include linux/module.h\n ARM: OMAP2+: devices: Fixes for McPDM\n ARM: OMAP: Fix errors and warnings when building for one board\n ARM: OMAP3: PM: restrict erratum i443 handling to OMAP3430 only\n ...\n" }, { "commit": "a3fbbde70a0cec017f2431e8f8de208708c76acc", "tree": "f584856e638ca916a8aca32eda58a8fe89722c9f", "parents": [ "54a0f91301950af3d6ae2ff2bf710c9c68a9bfea" ], "author": { "name": "Al Viro", "email": "viro@ZenIV.linux.org.uk", "time": "Mon Nov 07 21:21:26 2011 +0000" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon Nov 07 14:58:06 2011 -0800" }, "message": "VFS: we need to set LOOKUP_JUMPED on mountpoint crossing\n\nMountpoint crossing is similar to following procfs symlinks - we do\nnot get -\u003ed_revalidate() called for dentry we have arrived at, with\nunpleasant consequences for NFS4.\n\nSimple way to reproduce the problem in mainline:\n\n cat \u003e/tmp/a.c \u003c\u003c\u0027EOF\u0027\n #include \u003cunistd.h\u003e\n #include \u003cfcntl.h\u003e\n #include \u003cstdio.h\u003e\n main()\n {\n struct flock fl \u003d {.l_type \u003d F_RDLCK, .l_whence \u003d SEEK_SET, .l_len \u003d 1};\n if (fcntl(0, F_SETLK, \u0026fl))\n perror(\"setlk\");\n }\n EOF\n cc /tmp/a.c -o /tmp/test\n\nthen on nfs4:\n\n mount --bind file1 file2\n /tmp/test \u003c file1\t\t# ok\n /tmp/test \u003c file2\t\t# spews \"setlk: No locks available\"...\n\nWhat happens is the missing call of -\u003ed_revalidate() after mountpoint\ncrossing and that\u0027s where NFS4 would issue OPEN request to server.\n\nThe fix is simple - treat mountpoint crossing the same way we deal with\nfollowing procfs-style symlinks. I.e. set LOOKUP_JUMPED...\n\nCc: stable@kernel.org\nSigned-off-by: Al Viro \u003cviro@zeniv.linux.org.uk\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "54a0f91301950af3d6ae2ff2bf710c9c68a9bfea", "tree": "ffcdf0b916f9c5f805cab347e53b60be17c9aead", "parents": [ "94956eed14b4b16d401c8ad36d68df0608f968cb", "f9e3d4b1a9c86217655997d3ef109b1eaae967bc" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon Nov 07 12:38:11 2011 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon Nov 07 12:38:11 2011 -0800" }, "message": "Merge branch \u0027perf-urgent-for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip\n\n* \u0027perf-urgent-for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:\n perf top: Fix live annotation in the --stdio interface\n perf top tui: Don\u0027t recalc column widths considering just the first page\n perf report: Add progress bar when processing time ordered events\n perf hists browser: Warn about lost events\n perf tools: Fix a typo of command name as trace-cmd\n perf hists: Fix recalculation of total_period when sorting entries\n perf header: Fix build on old systems\n perf ui browser: Handle K_RESIZE in dialog windows\n perf ui browser: No need to switch char sets that often\n perf hists browser: Use K_TIMER\n perf ui: Rename ui__warning_paranoid to ui__error_paranoid\n perf ui: Reimplement the popup windows using libslang\n perf ui: Reimplement ui__popup_menu using ui__browser\n perf ui: Reimplement ui_helpline using libslang\n perf ui: Improve handling sigwinch a bit\n perf ui progress: Reimplement using slang\n perf evlist: Fix grouping of multiple events\n" }, { "commit": "d30cc16c8e48368e0518f4975a78711e53e14a0f", "tree": "26b57f7ab5a963cc3d6c57dff6951bd930875583", "parents": [ "41eb2d813f558900884e240c2f723e36c7bd151f", "a1bcc1dcef8451b4291ea2a1b2677cb194102952" ], "author": { "name": "Tony Lindgren", "email": "tony@atomide.com", "time": "Mon Nov 07 12:27:23 2011 -0800" }, "committer": { "name": "Tony Lindgren", "email": "tony@atomide.com", "time": "Mon Nov 07 12:27:23 2011 -0800" }, "message": "Merge branch \u0027fixes-modulesplit\u0027 into fixes\n" }, { "commit": "a1bcc1dcef8451b4291ea2a1b2677cb194102952", "tree": "156edbbee0f46bc89d7fb323673edd2a88ba0c1a", "parents": [ "5558141556d20f2bea7a664d70a867b8f64ca38d" ], "author": { "name": "Tony Lindgren", "email": "tony@atomide.com", "time": "Mon Nov 07 12:27:10 2011 -0800" }, "committer": { "name": "Tony Lindgren", "email": "tony@atomide.com", "time": "Mon Nov 07 12:27:10 2011 -0800" }, "message": "ARM: OMAP: Fix export.h or module.h includes\n\nCommit 32aaeffbd4a7457bf2f7448b33b5946ff2a960eb (Merge branch\n\u0027modsplit-Oct31_2011\u0027...) caused some build errors. Fix these\nand make sure we always have export.h or module.h included\nfor MODULE_ and EXPORT_SYMBOL users:\n\n$ grep -rl ^MODULE_ arch/arm/*omap*/*.c | xargs \\\n grep -L linux/module.h\n arch/arm/mach-omap2/dsp.c\n arch/arm/mach-omap2/mailbox.c\n arch/arm/mach-omap2/omap-iommu.c\n arch/arm/mach-omap2/smartreflex.c\n\nAlso check we either have export.h or module.h included\nfor the files exporting symbols:\n\n$ grep -rl EXPORT_SYMBOL arch/arm/*omap*/*.c | xargs \\\n grep -L linux/export.h | xargs grep -L linux/module.h\n\nCc: Russell King \u003crmk+kernel@arm.linux.org.uk\u003e\nSigned-off-by: Tony Lindgren \u003ctony@atomide.com\u003e\n" }, { "commit": "5558141556d20f2bea7a664d70a867b8f64ca38d", "tree": "2d5b5e5c3b2dbfe3471fc172a9e813d178c3fc0f", "parents": [ "32aaeffbd4a7457bf2f7448b33b5946ff2a960eb" ], "author": { "name": "Axel Lin", "email": "axel.lin@gmail.com", "time": "Mon Nov 07 12:27:10 2011 -0800" }, "committer": { "name": "Tony Lindgren", "email": "tony@atomide.com", "time": "Mon Nov 07 12:27:10 2011 -0800" }, "message": "ARM: OMAP: omap_device: Include linux/export.h\n\nInclude linux/export.h to fix below build warning:\n\n CC arch/arm/plat-omap/omap_device.o\narch/arm/plat-omap/omap_device.c:1055: warning: data definition has no type or storage class\narch/arm/plat-omap/omap_device.c:1055: warning: type defaults to \u0027int\u0027 in declaration of \u0027EXPORT_SYMBOL\u0027\narch/arm/plat-omap/omap_device.c:1055: warning: parameter names (without types) in function declaration\n\nSigned-off-by: Axel Lin \u003caxel.lin@gmail.com\u003e\nSigned-off-by: Tony Lindgren \u003ctony@atomide.com\u003e\n" }, { "commit": "94956eed14b4b16d401c8ad36d68df0608f968cb", "tree": "60e4e1a3c2c44e8f6616db78cd6b22737b2a1f37", "parents": [ "50e696308c3fb18a4a0dae7b3a4d47469149c919", "e45a618753d5a8bc9086382f73bbc2d6a3399250" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon Nov 07 10:55:33 2011 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon Nov 07 10:55:33 2011 -0800" }, "message": "Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net\n\n* git://git.kernel.org/pub/scm/linux/kernel/git/davem/net: (47 commits)\n forcedeth: fix a few sparse warnings (variable shadowing)\n forcedeth: Improve stats counters\n forcedeth: remove unneeded stats updates\n forcedeth: Acknowledge only interrupts that are being processed\n forcedeth: fix race when unloading module\n MAINTAINERS/rds: update maintainer\n wanrouter: Remove kernel_lock annotations\n usbnet: fix oops in usbnet_start_xmit\n ixgbe: Fix compile for kernel without CONFIG_PCI_IOV defined\n etherh: Add MAINTAINERS entry for etherh\n bonding: comparing a u8 with -1 is always false\n sky2: fix regression on Yukon Optima\n netlink: clarify attribute length check documentation\n netlink: validate NLA_MSECS length\n i825xx:xscale:8390:freescale: Fix Kconfig dependancies\n macvlan: receive multicast with local address\n tg3: Update version to 3.121\n tg3: Eliminate timer race with reset_task\n tg3: Schedule at most one tg3_reset_task run\n tg3: Obtain PCI function number from device\n ...\n" }, { "commit": "50e696308c3fb18a4a0dae7b3a4d47469149c919", "tree": "16ff458026c1551803b86d9e0f9f02c7a64182fa", "parents": [ "a84450604d0fe08b6a2335efbedede18d3d7cc75" ], "author": { "name": "Al Viro", "email": "viro@ZenIV.linux.org.uk", "time": "Mon Nov 07 16:39:57 2011 +0000" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon Nov 07 10:54:10 2011 -0800" }, "message": "vfs: d_invalidate() should leave mountpoints alone\n\nSigned-off-by: Al Viro \u003cviro@zeniv.linux.org.uk\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "e45a618753d5a8bc9086382f73bbc2d6a3399250", "tree": "5d703fb6c245a761d9d6b838ecc7d7c594c97f7b", "parents": [ "0bdfea8ba856826f5901fda608013f323c87f661" ], "author": { "name": "david decotigny", "email": "david.decotigny@google.com", "time": "Sat Nov 05 14:38:24 2011 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Mon Nov 07 13:31:25 2011 -0500" }, "message": "forcedeth: fix a few sparse warnings (variable shadowing)\n\nThis fixes the following sparse warnings:\ndrivers/net/ethernet/nvidia/forcedeth.c:2113:7: warning: symbol \u0027size\u0027 shadows an earlier one\ndrivers/net/ethernet/nvidia/forcedeth.c:2102:6: originally declared here\ndrivers/net/ethernet/nvidia/forcedeth.c:2155:7: warning: symbol \u0027size\u0027 shadows an earlier one\ndrivers/net/ethernet/nvidia/forcedeth.c:2102:6: originally declared here\ndrivers/net/ethernet/nvidia/forcedeth.c:2227:7: warning: symbol \u0027size\u0027 shadows an earlier one\ndrivers/net/ethernet/nvidia/forcedeth.c:2215:6: originally declared here\ndrivers/net/ethernet/nvidia/forcedeth.c:2271:7: warning: symbol \u0027size\u0027 shadows an earlier one\ndrivers/net/ethernet/nvidia/forcedeth.c:2215:6: originally declared here\ndrivers/net/ethernet/nvidia/forcedeth.c:2986:20: warning: symbol \u0027addr\u0027 shadows an earlier one\ndrivers/net/ethernet/nvidia/forcedeth.c:2963:6: originally declared here\n\nSigned-off-by: David Decotigny \u003cdavid.decotigny@google.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "0bdfea8ba856826f5901fda608013f323c87f661", "tree": "8527b969d9e27d5f2ded73c643dc79c0c7dd4433", "parents": [ "4687f3f364a1d5b2df815a8c58a763cab57724e8" ], "author": { "name": "Mandeep Baines", "email": "msb@google.com", "time": "Sat Nov 05 14:38:23 2011 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Mon Nov 07 13:31:24 2011 -0500" }, "message": "forcedeth: Improve stats counters\n\nRx byte count was off; instead use the hardware\u0027s count. Tx packet\ncount was counting pre-TSO packets; instead count on-the-wire packets.\nReport hardware dropped frame count as rx_fifo_errors.\n\n- The count of transmitted packets reported by the forcedeth driver\n reports pre-TSO (TCP Segmentation Offload) packet counts and not the\n count of the number of packets sent on the wire. This change fixes\n the forcedeth driver to report the correct count. Fixed the code by\n copying the count stored in the NIC H/W to the value reported by the\n driver.\n\n- Count rx_drop_frame errors as rx_fifo_errors:\n We see a lot of rx_drop_frame errors if we disable the rx bottom-halves\n for too long. Normally, rx_fifo_errors would be counted in this case.\n The rx_drop_frame error count is private to forcedeth and is not\n reported by ifconfig or sysfs. The rx_fifo_errors count is currently\n unused in the forcedeth driver. It is reported by ifconfig as overruns.\n This change reports rx_drop_frame errors as rx_fifo_errors.\n\nSigned-off-by: David Decotigny \u003cdavid.decotigny@google.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "4687f3f364a1d5b2df815a8c58a763cab57724e8", "tree": "9083050ec1f348c3f210172e337fcafb3b736678", "parents": [ "2a4e7a085fb44369c450c92cf8bd53b91f874a57" ], "author": { "name": "david decotigny", "email": "david.decotigny@google.com", "time": "Sat Nov 05 14:38:22 2011 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Mon Nov 07 13:31:24 2011 -0500" }, "message": "forcedeth: remove unneeded stats updates\n\nFunction ndo_get_stats() updates most of the stats from hardware\nregisters, making the manual updates un-needed. This change removes\nthese manual updates. Main exception is rx_missed_errors which needs\nmanual update.\n\nAnother exception is rx_packets, still updated manually in this commit\nto make sure this patch doesn\u0027t change behavior of driver. This will\nbe addressed by a future patch.\n\nSigned-off-by: David Decotigny \u003cdavid.decotigny@google.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "2a4e7a085fb44369c450c92cf8bd53b91f874a57", "tree": "c96dd683da76b9698281521d249a11ece0ad59ea", "parents": [ "f9c4082df59e43c6667db197a4fb3eb3286f3fc1" ], "author": { "name": "Mike Ditto", "email": "mditto@google.com", "time": "Sat Nov 05 14:38:21 2011 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Mon Nov 07 13:31:24 2011 -0500" }, "message": "forcedeth: Acknowledge only interrupts that are being processed\n\nThis is to avoid a race, accidentally acknowledging an interrupt that\nwe didn\u0027t notice and won\u0027t immediately process. This is based solely\non code inspection; it is not known if there was an actual bug here.\n\nSigned-off-by: David Decotigny \u003cdavid.decotigny@google.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "f9c4082df59e43c6667db197a4fb3eb3286f3fc1", "tree": "2bd8c50a7a0ea2b12b0f384fb656eb51e32cfbd0", "parents": [ "dd1294c4ed25725d13a6cb3d93ca0eb5fee14963" ], "author": { "name": "david decotigny", "email": "david.decotigny@google.com", "time": "Sat Nov 05 14:38:20 2011 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Mon Nov 07 13:31:24 2011 -0500" }, "message": "forcedeth: fix race when unloading module\n\nWhen forcedeth module is unloaded, there exists a path that can lead\nto mod_timer() after del_timer_sync(), causing an oops. This patch\nshort-circuits this unneeded path, which originates in\nnv_get_ethtool_stats().\n\nTested:\n x86_64 16-way + 3 ethtool -S infinite loops + 100Mbps incoming traffic\n + rmmod/modprobe/ifconfig in a loop\n\nInitial-Author: Salman Qazi \u003csqazi@google.com\u003e\nDiscussion: http://patchwork.ozlabs.org/patch/123548/\n\nSigned-off-by: David Decotigny \u003cdavid.decotigny@google.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "a84450604d0fe08b6a2335efbedede18d3d7cc75", "tree": "013be8cd17b787a3051d1d614f794f30573467f8", "parents": [ "6f66263f8ebe1fb1f138de41ca9aa0a4860b30d0" ], "author": { "name": "Stephen Rothwell", "email": "sfr@canb.auug.org.au", "time": "Tue Nov 01 20:27:43 2011 +1100" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon Nov 07 10:29:10 2011 -0800" }, "message": "device-mapper: using EXPORT_SYBOL in dm-space-map-checker.c needs export.h\n\nReported-by: Witold Baryluk \u003cbaryluk@smp.if.uj.edu.pl\u003e\nSigned-off-by: Stephen Rothwell \u003csfr@canb.auug.org.au\u003e\nSigned-off-by: Paul Gortmaker \u003cpaul.gortmaker@windriver.com\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "6f66263f8ebe1fb1f138de41ca9aa0a4860b30d0", "tree": "bf8057b31cafcd43e6c4a60551bf24ece185ff07", "parents": [ "1944ce60fe1e92506d3347f4d8e10a82b17096e4" ], "author": { "name": "Stephen Rothwell", "email": "sfr@canb.auug.org.au", "time": "Tue Nov 01 18:30:49 2011 +1100" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon Nov 07 10:29:10 2011 -0800" }, "message": "device-mapper: dm-bufio.c needs to include module.h\n\nsince it uses the module facilities.\n\nReported-by: Witold Baryluk \u003cbaryluk@smp.if.uj.edu.pl\u003e\nSigned-off-by: Stephen Rothwell \u003csfr@canb.auug.org.au\u003e\nSigned-off-by: Paul Gortmaker \u003cpaul.gortmaker@windriver.com\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" } ], "next": "1944ce60fe1e92506d3347f4d8e10a82b17096e4" }