)]}' { "log": [ { "commit": "e3ce8a0b277438591844847ac7c89a980b4cfa6d", "tree": "c9bf47675403a54be2e0c54df9357d2b9c65326b", "parents": [ "e1efc9b6ac22c605fd326b3f6af9b393325d43b4", "641934069d29211baf82afb93622a426172b67b6" ], "author": { "name": "Dave Airlie", "email": "airlied@redhat.com", "time": "Tue Oct 26 09:23:22 2010 +1000" }, "committer": { "name": "Dave Airlie", "email": "airlied@redhat.com", "time": "Tue Oct 26 09:23:22 2010 +1000" }, "message": "Merge remote branch \u0027intel/drm-intel-next\u0027 of ../drm-next into drm-core-next\n\n* \u0027intel/drm-intel-next\u0027 of ../drm-next: (63 commits)\n drm/i915: Move gpu_write_list to per-ring\n drm/i915: Invalidate the to-ring, flush the old-ring when updating domains\n drm/i915/ringbuffer: Write the value passed in to the tail register\n agp/intel: Restore valid PTE bit for Sandybridge after bdd3072\n drm/i915: Fix flushing regression from 9af90d19f\n drm/i915/sdvo: Remove unused encoding member\n i915: enable AVI infoframe for intel_hdmi.c [v4]\n drm/i915: Fix current fb blocking for page flip\n drm/i915: IS_IRONLAKE is synonymous with gen \u003d\u003d 5\n drm/i915: Enable SandyBridge blitter ring\n drm/i915/ringbuffer: Remove broken intel_fill_struct()\n drm/i915/ringbuffer: Fix emit batch buffer regression from 8187a2b\n drm/i915: Copy the updated reloc-\u003epresumed_offset back to the user\n drm/i915: Track objects in global active list (as well as per-ring)\n drm/i915: Simplify most HAS_BSD() checks\n drm/i915: cache the last object lookup during pin_and_relocate()\n drm/i915: Do interrupible mutex lock first to avoid locking for unreference\n drivers: gpu: drm: i915: Fix a typo.\n agp/intel: Also add B43.1 to list of supported devices\n drm/i915: rearrange mutex acquisition for pread\n ...\n" }, { "commit": "549f7365820a212a1cfd0871d377b1ad0d1e5723", "tree": "dbd39c10b32b35b762b083a358b7fc4c09783d5b", "parents": [ "e36c1cd7292efcb8daca26cd6331481736544742" ], "author": { "name": "Chris Wilson", "email": "chris@chris-wilson.co.uk", "time": "Tue Oct 19 11:19:32 2010 +0100" }, "committer": { "name": "Chris Wilson", "email": "chris@chris-wilson.co.uk", "time": "Thu Oct 21 19:08:39 2010 +0100" }, "message": "drm/i915: Enable SandyBridge blitter ring\n\nBased on an original patch by Zhenyu Wang, this initializes the BLT ring for\nSandyBridge and enables support for user execbuffers.\n\nCc: Zhenyu Wang \u003czhenyuw@linux.intel.com\u003e\nSigned-off-by: Chris Wilson \u003cchris@chris-wilson.co.uk\u003e\n" }, { "commit": "40d857bba2915a4e8d82f44744a186bfdd1a46ea", "tree": "75add808d5f133a2db13299c3336df33bb89c7cf", "parents": [ "21c74a8ea8b47eb6c3c621e36578f6e27f65c5c7" ], "author": { "name": "Thomas Hellstrom", "email": "thellstrom@vmware.com", "time": "Tue Oct 19 09:01:00 2010 +0200" }, "committer": { "name": "Dave Airlie", "email": "airlied@redhat.com", "time": "Thu Oct 21 11:53:24 2010 +1000" }, "message": "drm/ttm: Avoid using the ttm_mem_type_manager::put_locked function\n\nRelease the lru spinlock early.\n\nSigned-off-by: Thomas Hellstrom \u003cthellstrom@vmware.com\u003e\nSigned-off-by: Dave Airlie \u003cairlied@redhat.com\u003e\n" }, { "commit": "8fe9790d1652e7c306c862ea102a5e6126b412e1", "tree": "b3cdc7c842eef61efbdd63f791a210aa524df89f", "parents": [ "6d139a87b747aaebc969ac5f4eb8db766fcd9cbd" ], "author": { "name": "Zhenyu Wang", "email": "zhenyuw@linux.intel.com", "time": "Sun Sep 19 14:27:28 2010 +0800" }, "committer": { "name": "Chris Wilson", "email": "chris@chris-wilson.co.uk", "time": "Tue Oct 19 09:17:32 2010 +0100" }, "message": "drm/edid: add helper function to detect monitor audio capability\n\nTo help to determine if digital display port needs to enable\naudio output or not. This one adds a helper to get monitor\u0027s\naudio capability via EDID CEA extension block.\n\nTested-by: Wu Fengguang \u003cfengguang.wu@intel.com\u003e\nSigned-off-by: Zhenyu Wang \u003czhenyuw@linux.intel.com\u003e\nReviewed-by: Adam Jackson \u003cajax@redhat.com\u003e\nSigned-off-by: Chris Wilson \u003cchris@chris-wilson.co.uk\u003e\n" }, { "commit": "fb9a90f7c674f3ddef6baf55cb1612dadd8ea752", "tree": "f25cf2ce17449ba34cdfdfb948134eb3464e400e", "parents": [ "2d7b8366ae4a9ec2183c30e432a4a9a495c82bcd", "21c74a8ea8b47eb6c3c621e36578f6e27f65c5c7" ], "author": { "name": "Chris Wilson", "email": "chris@chris-wilson.co.uk", "time": "Tue Oct 19 09:13:00 2010 +0100" }, "committer": { "name": "Chris Wilson", "email": "chris@chris-wilson.co.uk", "time": "Tue Oct 19 09:14:50 2010 +0100" }, "message": "Merge remote branch \u0027airlied/drm-core-next\u0027 into tmp\n" }, { "commit": "21c74a8ea8b47eb6c3c621e36578f6e27f65c5c7", "tree": "c87eb392764e4bf2e8fe435d7bd70ddad7f75202", "parents": [ "99231028ff713820829b798d056c08a584281c25" ], "author": { "name": "Jason Wessel", "email": "jason.wessel@windriver.com", "time": "Wed Oct 13 14:09:44 2010 -0500" }, "committer": { "name": "Dave Airlie", "email": "airlied@redhat.com", "time": "Tue Oct 19 14:13:33 2010 +1000" }, "message": "drm, kdb, kms: Change mode_set_base_atomic() enter argument to be an enum\n\nThe enter argument as implemented by commit 413d45d3627 (drm, kdb, kms:\nAdd an enter argument to mode_set_base_atomic() API) should be more\ndescriptive as to what it does vs just passing 1 and 0 around.\n\nThere is no runtime behavior change as a result of this patch.\n\nReported-by: Jesse Barnes \u003cjbarnes@virtuousgeek.org\u003e\nSigned-off-by: Jason Wessel \u003cjason.wessel@windriver.com\u003e\nCC: David Airlie \u003cairlied@linux.ie\u003e\nCC: dri-devel@lists.freedesktop.org\nSigned-off-by: Dave Airlie \u003cairlied@redhat.com\u003e\n" }, { "commit": "c9220b0f7cbd1d2272426aa81a72ae2f6582bb71", "tree": "223bf3f0edb2bf151687155b1f199ee280376276", "parents": [ "b7ae5056c94a8191c1fd0b5697707377516c0c5d" ], "author": { "name": "Dave Airlie", "email": "airlied@redhat.com", "time": "Fri Oct 08 08:57:10 2010 +1000" }, "committer": { "name": "Dave Airlie", "email": "airlied@redhat.com", "time": "Tue Oct 19 09:49:42 2010 +1000" }, "message": "drm/ttm: add unlocked variant of new manager put node.\n\nWe need the unlocked variant for the new codepath introduced to fix the\nrace condition in master recently.\n\nSigned-off-by: Dave Airlie \u003cairlied@redhat.com\u003e\n" }, { "commit": "b7ae5056c94a8191c1fd0b5697707377516c0c5d", "tree": "394f68003ea0bc2a0c24e510a7c5b13f479ce743", "parents": [ "2126d0a4a205e2d6b763434f892524cd60f74228", "6a2a11dbea5db417d200d38dda53c30a2e5603e0" ], "author": { "name": "Dave Airlie", "email": "airlied@redhat.com", "time": "Tue Oct 19 09:48:34 2010 +1000" }, "committer": { "name": "Dave Airlie", "email": "airlied@redhat.com", "time": "Tue Oct 19 09:48:34 2010 +1000" }, "message": "Merge branch \u0027drm-fixes\u0027 of /home/airlied/kernel/linux-2.6 into drm-core-next\n\nConflicts:\n\tdrivers/gpu/drm/i915/intel_fb.c\n\tdrivers/gpu/drm/radeon/r600_blit_kms.c\n\tdrivers/gpu/drm/ttm/ttm_bo.c\n" }, { "commit": "9f0e7ff4b366d27570cbe0ffa137ed1018009114", "tree": "47c12c05cb5089ea00bbdad7715a2acaa8890ad0", "parents": [ "723bfd707a97fee06eb3ba4d3e8b4714c29a1064" ], "author": { "name": "Jesse Barnes", "email": "jbarnes@virtuousgeek.org", "time": "Thu Oct 07 16:01:14 2010 -0700" }, "committer": { "name": "Chris Wilson", "email": "chris@chris-wilson.co.uk", "time": "Fri Oct 08 10:28:21 2010 +0100" }, "message": "drm/i915: fetch eDP configuration data from the VBT\n\nWe need to use some of these values in eDP configurations, so be sure to\nfetch them and store them in the i915 private structure.\n\nSigned-off-by: Jesse Barnes \u003cjbarnes@virtuousgeek.org\u003e\nSigned-off-by: Chris Wilson \u003cchris@chris-wilson.co.uk\u003e\n" }, { "commit": "96a03fce54af40b4f0820cd729608bc32c9b8949", "tree": "91fbbaaacba4fe8562c5544460e99f3b09122e85", "parents": [ "0c8eb0dc65f5a78b252eeff6c729ba4741390e23", "a424d761a00c0233cb7734a8cd572ecd6d0362aa" ], "author": { "name": "Dave Airlie", "email": "airlied@redhat.com", "time": "Wed Oct 06 12:57:50 2010 +1000" }, "committer": { "name": "Dave Airlie", "email": "airlied@redhat.com", "time": "Wed Oct 06 12:57:50 2010 +1000" }, "message": "Merge branch \u0027drm-kdb-next\u0027 into drm-core-next\n\n* drm-kdb-next:\n drm/nouveau/kms: Avoid a hang entering KDB with VT accel on.\n radeon, kdb, kms: Save and restore the LUT on atomic KMS enter/exit\n drm, kdb, kms: Add an enter argument to mode_set_base_atomic() API\n drm/nouveau/kms: Implement KDB debug hooks for nouveau KMS.\n drm/radeon/kms: Implement KDB debug hooks for radeon KMS.\n" }, { "commit": "0c8eb0dc65f5a78b252eeff6c729ba4741390e23", "tree": "b3a64b52e9357ca8ea99966d411842659e2a27cf", "parents": [ "e6b46ee712b92db1cc2449cf4f65bc635366cad4", "d961db75ce86a84f1f04e91ad1014653ed7d9f46" ], "author": { "name": "Dave Airlie", "email": "airlied@redhat.com", "time": "Wed Oct 06 12:38:04 2010 +1000" }, "committer": { "name": "Dave Airlie", "email": "airlied@redhat.com", "time": "Wed Oct 06 12:57:11 2010 +1000" }, "message": "Merge remote branch \u0027nouveau/for-airlied\u0027 of ../drm-nouveau-next into drm-core-next\n\n[airlied - add fix for vmwgfx build]\n\n* \u0027nouveau/for-airlied\u0027 of ../drm-nouveau-next: (93 commits)\n drm/ttm: restructure to allow driver to plug in alternate memory manager\n drm/ttm: introduce utility function to free an allocated memory node\n drm/nouveau: fix thinkos in mem timing table recordlen check\n drm/nouveau: parse voltage from perf 0x40 entires\n drm/nouveau: don\u0027t use the default pll limits in table v2.1 on nv50+ cards\n drm/nv50: Fix large 3D performance regression caused by the interchannel sync patches.\n drm/nouveau: Synchronize buffer object moves in hardware.\n drm/nouveau: Use semaphores to handle inter-channel sync in hardware.\n drm/nouveau: Provide a means to have arbitrary work run on fence completion.\n drm/nouveau: Minor refactoring/cleanup of the fence code.\n drm/nouveau: Add a module option to force card POST.\n drm/nv50: prevent (IB_PUT \u003d\u003d IB_GET) for occurring unless idle\n drm/nv0x-nv4x: Leave the 0x40 bit untouched when changing CRE_LCD.\n drm/nv30-nv40: Fix postdivider mask when writing engine/memory PLLs.\n drm/nouveau: Fix perf table parsing on BMP v5.25.\n drm/nouveau: fix required mode bandwidth calculation for DP\n drm/nouveau: fix typo in c2aa91afea5f7e7ae4530fabd37414a79c03328c\n drm/nva3: split pm backend out from nv50\n drm/nouveau: run perflvl and M table scripts on mem clock change\n drm/nouveau: pass perflvl struct to clock_pre()\n ...\n" }, { "commit": "413d45d3627be4748058dea697718ed6fb88bd01", "tree": "038e5d5e80eefbb5d9771c489460653c6ef3cf79", "parents": [ "be64c2bb4731b0e6223a496eed615b816ac879ec" ], "author": { "name": "Jason Wessel", "email": "jason.wessel@windriver.com", "time": "Sun Sep 26 06:47:25 2010 -0500" }, "committer": { "name": "Dave Airlie", "email": "airlied@redhat.com", "time": "Wed Oct 06 11:50:31 2010 +1000" }, "message": "drm, kdb, kms: Add an enter argument to mode_set_base_atomic() API\n\nSome devices such as the radeon chips receive information from user\nspace which needs to be saved when executing an atomic mode set\noperation, else the user space would have to be queried again for the\ninformation.\n\nThis patch extends the mode_set_base_atomic() call to pass an argument\nto indicate if this is an entry or an exit from an atomic kernel mode\nset change. Individual drm drivers can properly save and restore\nstate accordingly.\n\nSigned-off-by: Jason Wessel \u003cjason.wessel@windriver.com\u003e\nCC: Jesse Barnes \u003cjbarnes@virtuousgeek.org\u003e\nCC: David Airlie \u003cairlied@linux.ie\u003e\nCC: dri-devel@lists.freedesktop.org\nSigned-off-by: Dave Airlie \u003cairlied@redhat.com\u003e\n" }, { "commit": "30f47fc85d524d25d63da9e6d77e55ab99c6cc4a", "tree": "f57fee13e97a278c22af096caba49eabc512bbee", "parents": [ "09e2601b5a7bb817fb07df6f430289484a9a2cad" ], "author": { "name": "Thomas Hellstrom", "email": "thellstrom@vmware.com", "time": "Tue Oct 05 12:43:06 2010 +0200" }, "committer": { "name": "Dave Airlie", "email": "airlied@redhat.com", "time": "Wed Oct 06 11:29:58 2010 +1000" }, "message": "drm/vmwgfx: Add a parameter to get the max fb size\n\nThis can be used by the X server to restrict mode resolutions and size of\nroot pixmap.\n\nBump minor to announce this availability.\nBump driver date.\n\nSigned-off-by: Thomas Hellstrom \u003cthellstrom@vmware.com\u003e\nSigned-off-by: Dave Airlie \u003cairlied@redhat.com\u003e\n" }, { "commit": "02b001624f0384540299d9288fdaf37b7d37c814", "tree": "93191693002394c0d02f9b7c4661349770ad63c9", "parents": [ "7fbd721ad35f8ffec8d9a82e0e4b390cb6c9f4f7" ], "author": { "name": "Thomas Hellstrom", "email": "thellstrom@vmware.com", "time": "Tue Oct 05 12:43:02 2010 +0200" }, "committer": { "name": "Dave Airlie", "email": "airlied@redhat.com", "time": "Wed Oct 06 11:29:41 2010 +1000" }, "message": "drm: vmwgfx: Add a struct drm_file parameter to the dirty framebuffer callback\n\nThis is needed for the callback to identify the caller and take\nappropriate locks if needed.\n\nSigned-off-by: Thomas Hellstrom \u003cthellstrom@vmware.com\u003e\nSigned-off-by: Dave Airlie \u003cairlied@redhat.com\u003e\n" }, { "commit": "fb7ba2114bcd8bb51640c20bc68f89164b29b9ed", "tree": "80b4a779130a477680a72109257fb8c19d66cf22", "parents": [ "9a170caed6fce89da77852575a7eee7dbadee332", "abb295f3b3db602f91accf58b526b30b48673af1" ], "author": { "name": "Dave Airlie", "email": "airlied@redhat.com", "time": "Wed Oct 06 11:10:48 2010 +1000" }, "committer": { "name": "Dave Airlie", "email": "airlied@redhat.com", "time": "Wed Oct 06 11:10:48 2010 +1000" }, "message": "Merge remote branch \u0027korg/drm-fixes\u0027 into drm-vmware-next\n\nnecessary for some of the vmware fixes to be pushed in.\n\nConflicts:\n\tdrivers/gpu/drm/drm_gem.c\n\tdrivers/gpu/drm/i915/intel_fb.c\n\tinclude/drm/drmP.h\n" }, { "commit": "1df6a2ebd75067aefbdf07482bf8e3d0584e04ee", "tree": "3cbe04b79b00b0ba15fda1e60e2544f152741a0e", "parents": [ "e1d9694cae722d00a94fb58f901aa69c9c324a16" ], "author": { "name": "Thomas Hellstrom", "email": "thellstrom@vmware.com", "time": "Thu Sep 30 12:36:45 2010 +0200" }, "committer": { "name": "Dave Airlie", "email": "airlied@redhat.com", "time": "Wed Oct 06 09:04:43 2010 +1000" }, "message": "drm/ttm: Fix two race conditions + fix busy codepaths\n\nThis fixes a race pointed out by Dave Airlie where we don\u0027t take a buffer\nobject about to be destroyed off the LRU lists properly. It also fixes a rare\ncase where a buffer object could be destroyed in the middle of an\naccelerated eviction.\n\nThe patch also adds a utility function that can be used to prematurely\nrelease GPU memory space usage of an object waiting to be destroyed.\nFor example during eviction or swapout.\n\nThe above mentioned commit didn\u0027t queue the buffer on the delayed destroy\nlist under some rare circumstances. It also didn\u0027t completely honor the\nremove_all parameter.\n\nFixes:\nhttps://bugzilla.redhat.com/show_bug.cgi?id\u003d615505\nhttp://bugs.debian.org/cgi-bin/bugreport.cgi?bug\u003d591061\n\nSigned-off-by: Thomas Hellstrom \u003cthellstrom@vmware.com\u003e\nSigned-off-by: Dave Airlie \u003cairlied@redhat.com\u003e\n" }, { "commit": "d961db75ce86a84f1f04e91ad1014653ed7d9f46", "tree": "a827b77524fdc0c37da70936fbb0627ac7e4b492", "parents": [ "42311ff90dc8746bd81427b2ed6efda9af791b77" ], "author": { "name": "Ben Skeggs", "email": "bskeggs@redhat.com", "time": "Thu Aug 05 10:48:18 2010 +1000" }, "committer": { "name": "Ben Skeggs", "email": "bskeggs@redhat.com", "time": "Tue Oct 05 10:01:20 2010 +1000" }, "message": "drm/ttm: restructure to allow driver to plug in alternate memory manager\n\nNouveau will need this on GeForce 8 and up to account for the GPU\nreordering physical VRAM for some memory types.\n\nReviewed-by: Jerome Glisse \u003cjglisse@redhat.com\u003e\nAcked-by: Thomas Hellström \u003cthellstrom@vmware.com\u003e\nSigned-off-by: Ben Skeggs \u003cbskeggs@redhat.com\u003e\n" }, { "commit": "42311ff90dc8746bd81427b2ed6efda9af791b77", "tree": "f41e0b9703463f712e1af5a817f0c81639336a9b", "parents": [ "a845fff841b13678b2d80f10425aba87db840e4a" ], "author": { "name": "Ben Skeggs", "email": "bskeggs@redhat.com", "time": "Wed Aug 04 12:07:08 2010 +1000" }, "committer": { "name": "Ben Skeggs", "email": "bskeggs@redhat.com", "time": "Tue Oct 05 10:00:34 2010 +1000" }, "message": "drm/ttm: introduce utility function to free an allocated memory node\n\nExisting core code/drivers call drm_mm_put_block on ttm_mem_reg.mm_node\ndirectly. Future patches will modify TTM behaviour in such a way that\nttm_mem_reg.mm_node doesn\u0027t necessarily belong to drm_mm.\n\nReviewed-by: Jerome Glisse \u003cjglisse@redhat.com\u003e\nAcked-by: Thomas Hellström \u003cthellstrom@vmware.com\u003e\nSigned-off-by: Ben Skeggs \u003cbskeggs@redhat.com\u003e\n" }, { "commit": "73aa808f10effc280e6eb70267314542a7c29426", "tree": "e8c7d0e25bb5d0658c47ff0339aec9a65367bbc2", "parents": [ "6a04002bea137d2c6359228316d9c827806e475f" ], "author": { "name": "Chris Wilson", "email": "chris@chris-wilson.co.uk", "time": "Thu Sep 30 11:46:12 2010 +0100" }, "committer": { "name": "Chris Wilson", "email": "chris@chris-wilson.co.uk", "time": "Fri Oct 01 14:45:20 2010 +0100" }, "message": "drm: Move the GTT accounting to i915\n\nOnly drm/i915 does the bookkeeping that makes the information useful,\nand the information maintained is driver specific, so move it out of the\ncore and into its single user.\n\nSigned-off-by: Chris Wilson \u003cchris@chris-wilson.co.uk\u003e\nCc: Dave Airlie \u003cairlied@redhat.com\u003e\n" }, { "commit": "39b4d07aa3583ceefe73622841303a0a3e942ca1", "tree": "d42f6e782f331b1d967f50ca3a02b9e51ea88515", "parents": [ "29d08b3efddca628b0360411ab2b85f7b1723f48" ], "author": { "name": "Chris Wilson", "email": "chris@chris-wilson.co.uk", "time": "Thu Sep 30 09:10:26 2010 +0100" }, "committer": { "name": "Dave Airlie", "email": "airlied@redhat.com", "time": "Fri Oct 01 21:08:45 2010 +1000" }, "message": "drm: Hold the mutex when dropping the last GEM reference (v2)\n\nIn order to be fully threadsafe we need to check that the drm_gem_object\nrefcount is still 0 after acquiring the mutex in order to call the free\nfunction. Otherwise, we may encounter scenarios like:\n\nThread A: Thread B:\ndrm_gem_close\nunreference_unlocked\nkref_put mutex_lock\n... i915_gem_evict\n... kref_get -\u003e BUG\n... i915_gem_unbind\n... kref_put\n... i915_gem_object_free\n... mutex_unlock\nmutex_lock\ni915_gem_object_free -\u003e BUG\ni915_gem_object_unbind\nkfree\nmutex_unlock\n\nNote that no driver is currently using the free_unlocked vfunc and it is\nscheduled for removal, hasten that process.\n\nBugzilla: https://bugs.freedesktop.org/show_bug.cgi?id\u003d30454\nReported-and-Tested-by: Magnus Kessler \u003cMagnus.Kessler@gmx.net\u003e\nSigned-off-by: Chris Wilson \u003cchris@chris-wilson.co.uk\u003e\nCc: stable@kernel.org\nSigned-off-by: Dave Airlie \u003cairlied@redhat.com\u003e\n" }, { "commit": "29d08b3efddca628b0360411ab2b85f7b1723f48", "tree": "f89a8a3069ebe9828b8a08c4b123f52625bf0bc7", "parents": [ "130b9851933e6da636502cd85e1ba8f45f862e8c" ], "author": { "name": "Dave Airlie", "email": "airlied@redhat.com", "time": "Mon Sep 27 16:17:17 2010 +1000" }, "committer": { "name": "Dave Airlie", "email": "airlied@redhat.com", "time": "Fri Oct 01 09:17:44 2010 +1000" }, "message": "drm/gem: handlecount isn\u0027t really a kref so don\u0027t make it one.\n\nThere were lots of places being inconsistent since handle count\nlooked like a kref but it really wasn\u0027t.\n\nFix this my just making handle count an atomic on the object,\nand have it increase the normal object kref.\n\nNow i915/radeon/nouveau drivers can drop the normal reference on\nuserspace object creation, and have the handle hold it.\n\nThis patch fixes a memory leak or corruption on unload, because\nthe driver had no way of knowing if a handle had been actually\nadded for this object, and the fbcon object needed to know this\nto clean itself up properly.\n\nReviewed-by: Chris Wilson \u003cchris@chris-wilson.co.uk\u003e\nSigned-off-by: Dave Airlie \u003cairlied@redhat.com\u003e\n" }, { "commit": "31dfbc93923c0aaa0440b809f80ff2830c6a531a", "tree": "9527de1c84f266ea23d6009c454d7cf1d1769889", "parents": [ "73758a5d51280ca0613b8380fc07351f4d64f9c8" ], "author": { "name": "Chris Wilson", "email": "chris@chris-wilson.co.uk", "time": "Mon Sep 27 21:28:30 2010 +0100" }, "committer": { "name": "Dave Airlie", "email": "airlied@redhat.com", "time": "Tue Sep 28 09:14:34 2010 +1000" }, "message": "drm: Prune GEM vma entries\n\nHook the GEM vm open/close ops into the generic drm vm open/close so\nthat the private vma entries are created and destroy appropriately.\nFixes the leak of the drm_vma_entries during the lifetime of the filp.\n\nReported-by: Matt Mackall \u003cmpm@selenic.com\u003e\nCc: Jesse Barnes \u003cjbarnes@virtuousgeek.org\u003e\nSigned-off-by: Chris Wilson \u003cchris@chris-wilson.co.uk\u003e\nAcked-by: Jesse Barnes \u003cjbarnes@virtuousgeek.org\u003e\nCc: stable@kernel.org\nSigned-off-by: Dave Airlie \u003cairlied@redhat.com\u003e\n" }, { "commit": "f459ffbdfd04edb4a8ce6eea33170eb057a5e695", "tree": "5b100aa27d6b94bed8eae5489c4a27cbe2cfb82f", "parents": [ "32163f4b2cef28a5aab8b226ffecfc6379a53786" ], "author": { "name": "Dave Airlie", "email": "airlied@redhat.com", "time": "Sat Sep 25 17:45:50 2010 +1000" }, "committer": { "name": "Dave Airlie", "email": "airlied@redhat.com", "time": "Mon Sep 27 09:21:28 2010 +1000" }, "message": "drm/radeon: fix PCI ID 5657 to be an RV410\n\nfixes https://bugzilla.kernel.org/show_bug.cgi?id\u003d19012\n\ncc: stable@kernel.org\nSigned-off-by: Dave Airlie \u003cairlied@redhat.com\u003e\n" }, { "commit": "4a445f291ac3faa08f56eaeb6e44856b6b72b74c", "tree": "b66cc93311dc4c623113a87aa9b40730a21ac18e", "parents": [ "cbc60ca04b342a4e1f2a1086a7277c077f07dbed", "a850ea30374ebed32a0724742601861853fde869" ], "author": { "name": "Dave Airlie", "email": "airlied@redhat.com", "time": "Fri Sep 24 15:37:33 2010 +1000" }, "committer": { "name": "Dave Airlie", "email": "airlied@redhat.com", "time": "Fri Sep 24 15:37:33 2010 +1000" }, "message": "Merge remote branch \u0027origin/master\u0027 of /home/airlied/kernel//linux-2.6 into drm-core-next\n" }, { "commit": "0af9e92e779602bdd6d4d19acf63b4802fab91b6", "tree": "d508f1db16ab519bc197f9691427455963562cfc", "parents": [ "aaa62591199162e6496b4f47cac4f5923bc571d1" ], "author": { "name": "Daniel Vetter", "email": "daniel.vetter@ffwll.ch", "time": "Sun Sep 12 14:04:03 2010 +0200" }, "committer": { "name": "Chris Wilson", "email": "chris@chris-wilson.co.uk", "time": "Tue Sep 21 11:40:06 2010 +0100" }, "message": "intel-gtt: clean up gtt size reporting\n\nConsolidate everything in intel-gtt.c and also kill the export\nof intel_max_stolen.\n\nSigned-off-by: Daniel Vetter \u003cdaniel.vetter@ffwll.ch\u003e\nSigned-off-by: Chris Wilson \u003cchris@chris-wilson.co.uk\u003e\n" }, { "commit": "e9e5f8e8d373e72f5c39dafde1ce110fc7082118", "tree": "2991e33571a59cc2488daef36dcfeab7bddb9d7f", "parents": [ "f899fc64cda8569d0529452aafc0da31c042df2e", "db8c076b9206ea35b1f7299708d5510b17674db2" ], "author": { "name": "Chris Wilson", "email": "chris@chris-wilson.co.uk", "time": "Tue Sep 21 11:19:32 2010 +0100" }, "committer": { "name": "Chris Wilson", "email": "chris@chris-wilson.co.uk", "time": "Tue Sep 21 11:19:32 2010 +0100" }, "message": "Merge branch \u0027drm-intel-fixes\u0027 into HEAD\n\nConflicts:\n\tdrivers/char/agp/intel-agp.c\n\tdrivers/gpu/drm/i915/intel_crt.c\n" }, { "commit": "930a9e283516a3a3595c0c515113f1b78d07f695", "tree": "b527736ae76d678f8791755be28a250a6e2593bc", "parents": [ "a41ceb1c17af06a17c0d88e987215ef20b93c471" ], "author": { "name": "Chris Wilson", "email": "chris@chris-wilson.co.uk", "time": "Tue Sep 14 11:07:23 2010 +0100" }, "committer": { "name": "Dave Airlie", "email": "airlied@redhat.com", "time": "Tue Sep 14 20:38:48 2010 +1000" }, "message": "drm: Use a nondestructive mode for output detect when polling (v2)\n\nv2: Julien Cristau pointed out that @nondestructive results in\ndouble-negatives and confusion when trying to interpret the parameter,\nso use @force instead. Much easier to type as well. ;-)\n\nAnd fix the miscompilation of vmgfx reported by Sedat Dilek.\n\nSigned-off-by: Chris Wilson \u003cchris@chris-wilson.co.uk\u003e\nCc: stable@kernel.org\nSigned-off-by: Dave Airlie \u003cairlied@redhat.com\u003e\n" }, { "commit": "7b334fcb45b757ffb093696ca3de1b0c8b4a33f1", "tree": "fe56259639b9f1c993d742e27468087c46e51f05", "parents": [ "27849044ca6ff9c52f63271b511282acf6d1c251" ], "author": { "name": "Chris Wilson", "email": "chris@chris-wilson.co.uk", "time": "Thu Sep 09 23:51:02 2010 +0100" }, "committer": { "name": "Dave Airlie", "email": "airlied@redhat.com", "time": "Mon Sep 13 20:29:11 2010 +1000" }, "message": "drm: Use a nondestructive mode for output detect when polling\n\nDestructive load-detection is very expensive and due to failings\nelsewhere can trigger system wide stalls of up to 600ms. A simple\nfirst step to correcting this is not to invoke such an expensive\nand destructive load-detection operation automatically.\n\nBugzilla: https://bugs.freedesktop.org/show_bug.cgi?id\u003d29536\nBugzilla: https://bugzilla.kernel.org/show_bug.cgi?id\u003d16265\nReported-by: Bruno Prémont \u003cbonbons@linux-vserver.org\u003e\nTested-by: Sitsofe Wheeler \u003csitsofe@yahoo.com\u003e\nSigned-off-by: Chris Wilson \u003cchris@chris-wilson.co.uk\u003e\nCc: stable@kernel.org\nSigned-off-by: Dave Airlie \u003cairlied@redhat.com\u003e\n" }, { "commit": "19966754328d99ee003ddfc7a8c31ceb115483ac", "tree": "c057dfaf9f9354168102e5ae450ebefbc158bd28", "parents": [ "ac622a9cdb742cad90648d95f2c4877774518f19" ], "author": { "name": "Daniel Vetter", "email": "daniel.vetter@ffwll.ch", "time": "Mon Sep 06 20:08:44 2010 +0200" }, "committer": { "name": "Chris Wilson", "email": "chris@chris-wilson.co.uk", "time": "Wed Sep 08 21:20:21 2010 +0100" }, "message": "drm/i915: die, i915_probe_agp, die\n\nUse the detection from intel-gtt.ko instead. Hooray!\n\nAlso move the stolen mem allocator to the other gtt stuff in dev_prv-\u003emem.\n\nv2: Chris Wilson noted that my error handling was crap. Fix it. He also\nsaid that this fixes a problem on his i845. Indeed, i915_probe_agp\nmisses a special case for i830/i845 stolen mem detection.\n\nBugzilla: https://bugs.freedesktop.org/show_bug.cgi?id\u003d25476\nCc: stable@kernel.org\nSigned-off-by: Daniel Vetter \u003cdaniel.vetter@ffwll.ch\u003e\nSigned-off-by: Chris Wilson \u003cchris@chris-wilson.co.uk\u003e\n" }, { "commit": "0ade638655f0ef4d807295c14a4c97544bd6b9ca", "tree": "23ddab04b976c4133e1528d3be2aaa53d9e195d7", "parents": [ "e2404e7c3fe6f46e161edf085c6d9bea06ebe488" ], "author": { "name": "Daniel Vetter", "email": "daniel.vetter@ffwll.ch", "time": "Tue Aug 24 22:18:41 2010 +0200" }, "committer": { "name": "Chris Wilson", "email": "chris@chris-wilson.co.uk", "time": "Wed Sep 08 21:20:07 2010 +0100" }, "message": "intel-gtt: introduce drm/intel-gtt.h\n\nAdd a few definitions to it that are already shared and that will\nbe shared in the future (like the number of stolen entries).\nNo functional changes in here.\n\nSigned-off-by: Daniel Vetter \u003cdaniel.vetter@ffwll.ch\u003e\nSigned-off-by: Chris Wilson \u003cchris@chris-wilson.co.uk\u003e\n" }, { "commit": "cbc60ca04b342a4e1f2a1086a7277c077f07dbed", "tree": "3979a1304b20cc90a7ec1dce593657435aa48c8d", "parents": [ "df8fcb09667c1b2c9dcf65de23f0bfa851e8138e" ], "author": { "name": "Daniel Vetter", "email": "daniel.vetter@ffwll.ch", "time": "Mon Aug 23 22:53:28 2010 +0200" }, "committer": { "name": "Dave Airlie", "email": "airlied@redhat.com", "time": "Mon Aug 30 09:44:56 2010 +1000" }, "message": "drm: kill get_reg_ofs callback\n\nEvery driver used the default implementation. Fold that one into\nthe only callsite and drop the callback.\n\nSigned-off-by: Daniel Vetter \u003cdaniel.vetter@ffwll.ch\u003e\nSigned-off-by: Dave Airlie \u003cairlied@redhat.com\u003e\n" }, { "commit": "df8fcb09667c1b2c9dcf65de23f0bfa851e8138e", "tree": "c49982905d4f9e7bffb24b9ca8d54b47c406302e", "parents": [ "89c372647d1d698a96e2189ef4312a977b939839" ], "author": { "name": "Daniel Vetter", "email": "daniel.vetter@ffwll.ch", "time": "Mon Aug 23 22:53:32 2010 +0200" }, "committer": { "name": "Dave Airlie", "email": "airlied@redhat.com", "time": "Mon Aug 30 09:44:54 2010 +1000" }, "message": "drm: kill dev-\u003etimer\n\nTotally unused.\n\nSigned-off-by: Daniel Vetter \u003cdaniel.vetter@ffwll.ch\u003e\nSigned-off-by: Dave Airlie \u003cairlied@redhat.com\u003e\n" }, { "commit": "89c372647d1d698a96e2189ef4312a977b939839", "tree": "a9ac9335b7c9079c6d119c4de318af3e83368512", "parents": [ "8f879194f88742d9c452f669482b6d6abdc1e1e7" ], "author": { "name": "Daniel Vetter", "email": "daniel.vetter@ffwll.ch", "time": "Mon Aug 23 22:53:36 2010 +0200" }, "committer": { "name": "Dave Airlie", "email": "airlied@redhat.com", "time": "Mon Aug 30 09:44:40 2010 +1000" }, "message": "drm: kill agp indirection mess\n\nThere\u0027s no point in jumping through two indirections. So kill one\nand call the kernels agp functions directly.\n\nSigned-off-by: Daniel Vetter \u003cdaniel.vetter@ffwll.ch\u003e\nSigned-off-by: Dave Airlie \u003cairlied@redhat.com\u003e\n" }, { "commit": "8f879194f88742d9c452f669482b6d6abdc1e1e7", "tree": "d50a7d96a2150c2c7df7b116f4eb478a2c28f6cc", "parents": [ "4ac5ec40ec70022e4dea8cc6254d2dadd1e43d57" ], "author": { "name": "Daniel Vetter", "email": "daniel.vetter@ffwll.ch", "time": "Mon Aug 23 22:53:31 2010 +0200" }, "committer": { "name": "Dave Airlie", "email": "airlied@redhat.com", "time": "Mon Aug 30 09:39:11 2010 +1000" }, "message": "drm: replace drawable ioctl by noops\n\nThe information supplied by userspace through these ioctls is only\naccessible by dev-\u003edrw_idr. But there\u0027s no in-tree user of that.\nAlso userspace does not really care about return values of these ioctls,\neither. Only hw/xfree86/dri/dri.c from the xserver actually checks the\nreturn from adddraw and keeps on trying to create a kernel drawable\nevery time somebody creates a dri drawable. But since that\u0027s now a noop,\nwho cares.\n\nTherefore it\u0027s safe to replace these three ioctls with noops and rip\nout the implementation.\n\nSigned-off-by: Daniel Vetter \u003cdaniel.vetter@ffwll.ch\u003e\nReviewed-by: Kristian Høgsberg \u003ckrh@bitplanet.net\u003e\nReviewed-by: Michel Dänzer \u003cmichel@daenzer.net\u003e\nSigned-off-by: Dave Airlie \u003cairlied@redhat.com\u003e\n" }, { "commit": "4ac5ec40ec70022e4dea8cc6254d2dadd1e43d57", "tree": "fbe2a7b487a0b0d13275c45c2c7570945370a26a", "parents": [ "793a97e4cc38f834e0488ccc1ecbfe52ff6f5b84" ], "author": { "name": "Daniel Vetter", "email": "daniel.vetter@ffwll.ch", "time": "Mon Aug 23 22:53:34 2010 +0200" }, "committer": { "name": "Dave Airlie", "email": "airlied@redhat.com", "time": "Mon Aug 30 09:39:00 2010 +1000" }, "message": "drm: don\u0027t export dri1 locking functions\n\nOnly used by ioctl, not by any in-tree drivers.\n\nSigned-off-by: Daniel Vetter \u003cdaniel.vetter@ffwll.ch\u003e\nSigned-off-by: Dave Airlie \u003cairlied@redhat.com\u003e\n" }, { "commit": "793a97e4cc38f834e0488ccc1ecbfe52ff6f5b84", "tree": "418e5c4eef9c7566625829ddc823fa36c6a0d65e", "parents": [ "690bb51b54a986e48c7b8b2dba51a3cd262a7266" ], "author": { "name": "Daniel Vetter", "email": "daniel.vetter@ffwll.ch", "time": "Mon Aug 23 22:53:27 2010 +0200" }, "committer": { "name": "Dave Airlie", "email": "airlied@redhat.com", "time": "Mon Aug 30 09:38:50 2010 +1000" }, "message": "drm: kill drm_map_ofs callbacks\n\nAll drivers happily copy\u0026pasted the default implementation without\nchecking whether this callback is used at all. It\u0027s not. Sigh.\n\nKill it.\n\nSigned-off-by: Daniel Vetter \u003cdaniel.vetter@ffwll.ch\u003e\nSigned-off-by: Dave Airlie \u003cairlied@redhat.com\u003e\n" }, { "commit": "690bb51b54a986e48c7b8b2dba51a3cd262a7266", "tree": "7943c7eaf853d987dedff50ec507d25cd5da9c11", "parents": [ "a2a273c94357ffd24e635cf9ec9b2e5c6f02b63b" ], "author": { "name": "Daniel Vetter", "email": "daniel.vetter@ffwll.ch", "time": "Mon Aug 23 22:53:35 2010 +0200" }, "committer": { "name": "Dave Airlie", "email": "airlied@redhat.com", "time": "Mon Aug 30 09:38:39 2010 +1000" }, "message": "drm: drop return value of drm_free_agp\n\nNo caller (rightly) cares about it, so drop it.\n\nSigned-off-by: Daniel Vetter \u003cdaniel.vetter@ffwll.ch\u003e\nSigned-off-by: Dave Airlie \u003cairlied@redhat.com\u003e\n" }, { "commit": "a2a273c94357ffd24e635cf9ec9b2e5c6f02b63b", "tree": "87c217ff0f3dee41cd994f437a8ac5069174932d", "parents": [ "b3da8f7d2d1fa81fb65cb3f5d9e50dde40a83182" ], "author": { "name": "Daniel Vetter", "email": "daniel.vetter@ffwll.ch", "time": "Mon Aug 23 22:53:30 2010 +0200" }, "committer": { "name": "Dave Airlie", "email": "airlied@redhat.com", "time": "Mon Aug 30 09:38:37 2010 +1000" }, "message": "drm: don\u0027t export drm_get_drawable_info\n\nNot used by any in-tree user. So drop it.\n\nSigned-off-by: Daniel Vetter \u003cdaniel.vetter@ffwll.ch\u003e\nSigned-off-by: Dave Airlie \u003cairlied@redhat.com\u003e\n" }, { "commit": "b3da8f7d2d1fa81fb65cb3f5d9e50dde40a83182", "tree": "3fcc266b657a1b16f644eb214e3c774047fdea6f", "parents": [ "fd2e7931cdefa8e9acf63f0a4efd61ae0f89e77b" ], "author": { "name": "Daniel Vetter", "email": "daniel.vetter@ffwll.ch", "time": "Mon Aug 23 22:53:29 2010 +0200" }, "committer": { "name": "Dave Airlie", "email": "airlied@redhat.com", "time": "Mon Aug 30 09:38:25 2010 +1000" }, "message": "drm: kill context_ctor callback\n\nIt\u0027s not used by any driver. The destructor callback is unfortunately\nused by the via driver in a rather convoluted piece of code used\nto reimplement something resembling broken futexes. I didn\u0027t dare\nto touch this code. But at least kill the needless NULL assignemt\nin the sis driver.\n\nSigned-off-by: Daniel Vetter \u003cdaniel.vetter@ffwll.ch\u003e\nSigned-off-by: Dave Airlie \u003cairlied@redhat.com\u003e\n" }, { "commit": "fd2e7931cdefa8e9acf63f0a4efd61ae0f89e77b", "tree": "ea2d64ccff37e5d97ed94abab8851ac89dd5d1da", "parents": [ "23ddc0243d7313942b94f1a2e44e6394f7bb996e" ], "author": { "name": "Daniel Vetter", "email": "daniel.vetter@ffwll.ch", "time": "Mon Aug 23 22:53:33 2010 +0200" }, "committer": { "name": "Dave Airlie", "email": "airlied@redhat.com", "time": "Mon Aug 30 09:38:18 2010 +1000" }, "message": "drm: kill gem_free_object_unlocked driver callback\n\nNot used by any current driver.\n\nSigned-off-by: Daniel Vetter \u003cdaniel.vetter@ffwll.ch\u003e\nSigned-off-by: Dave Airlie \u003cairlied@redhat.com\u003e\n" }, { "commit": "23ddc0243d7313942b94f1a2e44e6394f7bb996e", "tree": "33519710bd456a48fb8f7a7e572618d5ddc8471b", "parents": [ "be72ae26b11478c00c64858c86b647b438791671" ], "author": { "name": "Daniel Vetter", "email": "daniel.vetter@ffwll.ch", "time": "Mon Aug 23 22:53:25 2010 +0200" }, "committer": { "name": "Dave Airlie", "email": "airlied@redhat.com", "time": "Mon Aug 30 09:38:12 2010 +1000" }, "message": "drm: kill dma_ready callbacks\n\nNot used by any driver. So drop it.\n\nSigned-off-by: Daniel Vetter \u003cdaniel.vetter@ffwll.ch\u003e\nSigned-off-by: Dave Airlie \u003cairlied@redhat.com\u003e\n" }, { "commit": "be72ae26b11478c00c64858c86b647b438791671", "tree": "d4490daab3f4c193e7e4768f083c13ca77ac98eb", "parents": [ "1da3f87ebb7edb3e0b829ec4bbe5fb3d9d93986f" ], "author": { "name": "Daniel Vetter", "email": "daniel.vetter@ffwll.ch", "time": "Mon Aug 23 22:53:26 2010 +0200" }, "committer": { "name": "Dave Airlie", "email": "airlied@redhat.com", "time": "Mon Aug 30 09:38:08 2010 +1000" }, "message": "drm: kill procfs callbacks\n\nNot used by any driver (rightly so!). Kill them.\n\nSigned-off-by: Daniel Vetter \u003cdaniel.vetter@ffwll.ch\u003e\nSigned-off-by: Dave Airlie \u003cairlied@redhat.com\u003e\n" }, { "commit": "1da3f87ebb7edb3e0b829ec4bbe5fb3d9d93986f", "tree": "af611e50ee6120297e56eed52c041f2ba008ed6d", "parents": [ "59506197c7d0a94088dc15d488d8c964f909a6b1" ], "author": { "name": "Daniel Vetter", "email": "daniel.vetter@ffwll.ch", "time": "Mon Aug 23 22:53:24 2010 +0200" }, "committer": { "name": "Dave Airlie", "email": "airlied@redhat.com", "time": "Mon Aug 30 09:37:56 2010 +1000" }, "message": "drm: kill kernel_context_switch callbacks\n\nNot used by any in-kernel driver. So drop it.\n\nSigned-off-by: Daniel Vetter \u003cdaniel.vetter@ffwll.ch\u003e\nSigned-off-by: Dave Airlie \u003cairlied@redhat.com\u003e\n" }, { "commit": "ee005577aa3b89f5291fe73be2054d375d23f5eb", "tree": "50fc586c3a3b6bdc73d68d103e2554544060e8bf", "parents": [ "2e9e018ecd836d92cc4735b4d878d8b20c08b070", "d03330383c9255cdb184dd33594e89c3542f191b" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon Aug 23 18:28:03 2010 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon Aug 23 18:28:03 2010 -0700" }, "message": "Merge branch \u0027drm-core-next\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/airlied/drm-2.6\n\n* \u0027drm-core-next\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/airlied/drm-2.6: (33 commits)\n drm/radeon/kms: fix typo in radeon_compute_pll_gain\n drm/radeon/kms: try to detect tv vs monitor for underscan\n drm/radeon/kms: fix sideport detection on newer rs880 boards\n drm/radeon: fix passing wrong type to gem object create.\n drm/radeon/kms: set encoder type to DVI for HDMI on evergreen\n drm/radeon/kms: add back missing break in info ioctl\n drm/radeon/kms: don\u0027t enable MSIs on AGP boards\n drm/radeon/kms: fix agp mode setup on cards that use pcie bridges\n drm: move dereference below check\n drm: fix end of loop test\n drm/radeon/kms: rework radeon_dp_detect() logic\n drm/radeon/kms: add missing asic callback assignment for evergreen\n drm/radeon/kms/DCE3+: switch pads to ddc mode when going i2c\n drm/radeon/kms/pm: bail early if nothing\u0027s changing\n drm/radeon/kms/atom: clean up dig atom handling\n drm/radeon/kms: DCE3/4 transmitter fixes\n drm/radeon/kms: rework encoder handling\n drm/radeon/kms: DCE3/4 AdjustPixelPll updates\n drm/radeon: Fix stack data leak\n drm/radeon/kms: fix GTT/VRAM overlapping test\n ...\n" }, { "commit": "1b2f1489633888d4a06028315dc19d65768a1c05", "tree": "8d5d3bfec854d6c96c19a781bf9c873409b74210", "parents": [ "b9f0aee83335db1f3915f4e42a5e21b351740afd" ], "author": { "name": "Dave Airlie", "email": "airlied@redhat.com", "time": "Sat Aug 14 20:20:34 2010 +1000" }, "committer": { "name": "Dave Airlie", "email": "airlied@redhat.com", "time": "Tue Aug 17 14:52:25 2010 +1000" }, "message": "drm: block userspace under allocating buffer and having drivers overwrite it (v2)\n\nWith the current screwed but its ABI, ioctls for the drm, Linus pointed out that we could allow userspace to specify the allocation size, but we pass it to the driver which then uses it blindly to store a struct. Now if userspace specifies the allocation size as smaller than the driver needs, the driver can possibly overwrite memory.\n\nThis patch restructures the driver ioctls so we store the structure size we are expecting, and make sure we allocate at least that size. The copy from/to userspace are still restricted to the size the user specifies, this allows ioctl structs to grow on both sides of the equation.\n\nUp until now we didn\u0027t really use the DRM_IOCTL defines in the kernel, so this cleans them up and adds them for nouveau.\n\nv2:\nfix nouveau pushbuf arg (thanks to Ben for pointing it out)\n\nReported-by: Linus Torvalds \u003ctorvalds@linuxfoundation.org\u003e\nSigned-off-by: Dave Airlie \u003cairlied@redhat.com\u003e\n" }, { "commit": "60641aa1f379820e99ac7f45a38b43795670c741", "tree": "a4a68780ba75bbf8f2fc96dba880ea39da2c717b", "parents": [ "c29c08b59875fe053471cf9eb66f8cfef39bc509" ], "author": { "name": "Sam Ravnborg", "email": "sam@ravnborg.org", "time": "Sat Aug 14 10:15:12 2010 +0200" }, "committer": { "name": "Sam Ravnborg", "email": "sam@ravnborg.org", "time": "Sat Aug 14 22:26:51 2010 +0200" }, "message": "include: replace unifdef-y with header-y\n\nunifdef-y and header-y has same semantic.\nSo there is no need to have both.\n\nDrop the unifdef-y variant and sort all lines again\n\nSigned-off-by: Sam Ravnborg \u003csam@ravnborg.org\u003e\n" }, { "commit": "aa9f56b66d278aba2f278c75761b7e19fbaca97a", "tree": "f1a9a0e68b07a3a1a0643389cb5ff838366a2d32", "parents": [ "58d4ea65b98f154f3326b038eecda32f90b46ea8", "31ce4bfdfd10bf5db9bf85c92bbe0cf2edbdcad8" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Aug 12 09:21:39 2010 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Aug 12 09:21:39 2010 -0700" }, "message": "Merge branch \u0027drm-core-next\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/airlied/drm-2.6\n\n* \u0027drm-core-next\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/airlied/drm-2.6: (55 commits)\n io-mapping: move asm include inside the config option\n vgaarb: drop vga.h include\n drm/radeon: Add probing of clocks from device-tree\n drm/radeon: drop old and broken mesa warning\n drm/radeon: Fix pci_map_page() error checking\n drm: Remove count_lock for calling lastclose() after 58474713 (v2)\n drm/radeon/kms: allow FG_ALPHA_VALUE on r5xx\n drm/radeon/kms: another r6xx/r7xx CS checker fix\n DRM: Replace kmalloc/memset combos with kzalloc\n drm: expand gamma_set\n drm/edid: Split mode lists out to their own header for readability\n drm/edid: Rewrite mode parse to use the generic detailed block walk\n drm/edid: Add detailed block walk for VTB extensions\n drm/edid: Add detailed block walk for CEA extensions\n drm: Remove unused fields from drm_display_info\n drm: Use ENOENT consistently for the error return for an unmatched handle.\n drm/radeon/kms: mark 3D power states as performance\n drm: Only set DPMS once on the CRTC not after every encoder.\n drm/radeon/kms: add additional quirk for Acer rv620 laptop\n drm: Propagate error code from fb_create()\n ...\n\nFix up trivial conflicts in drivers/gpu/drm/drm_edid.c\n" }, { "commit": "7203425a943eb3e189ba6b512827e0deb5f23872", "tree": "e0fdc7ed583f6990bbffde67f4f45b1f11b5a39e", "parents": [ "38fcbb674d7cc37b38473a89e8045ee80364e4f9" ], "author": { "name": "James Simmons", "email": "jsimmons@infradead.org", "time": "Tue Aug 03 01:33:19 2010 +0100" }, "committer": { "name": "Dave Airlie", "email": "airlied@redhat.com", "time": "Tue Aug 10 10:47:00 2010 +1000" }, "message": "drm: expand gamma_set\n\nExpand the crtc_gamma_set function to accept a starting offset. The\nreason for this is to eventually use this function for setcolreg from\ndrm_fb_helper.c. The fbdev colormap function can start at any offset in\nthe color map.\n\nSigned-by: James Simmons \u003cjsimmons@infradead.org\u003e\nSigned-off-by: Dave Airlie \u003cairlied@redhat.com\u003e\n" }, { "commit": "4d76a22134d5a5ad259fd667f3d2b215b7e71d10", "tree": "683d8df7efc2a652cc78146022a31bbab1877950", "parents": [ "fb439640145df0d3af7eacb83a19d8eb0a24002a" ], "author": { "name": "Adam Jackson", "email": "ajax@redhat.com", "time": "Tue Aug 03 14:38:17 2010 -0400" }, "committer": { "name": "Dave Airlie", "email": "airlied@redhat.com", "time": "Tue Aug 10 10:46:57 2010 +1000" }, "message": "drm/edid: Add detailed block walk for CEA extensions\n\nSigned-off-by: Adam Jackson \u003cajax@redhat.com\u003e\nSigned-off-by: Dave Airlie \u003cairlied@redhat.com\u003e\n" }, { "commit": "fb439640145df0d3af7eacb83a19d8eb0a24002a", "tree": "99bac1a4955d6732e311f415223dff61b7759d3e", "parents": [ "bf79cb914dbfe848add8bb76cbb8ff89110d29ff" ], "author": { "name": "Adam Jackson", "email": "ajax@redhat.com", "time": "Tue Aug 03 14:38:16 2010 -0400" }, "committer": { "name": "Dave Airlie", "email": "airlied@redhat.com", "time": "Tue Aug 10 10:46:56 2010 +1000" }, "message": "drm: Remove unused fields from drm_display_info\n\nSigned-off-by: Adam Jackson \u003cajax@redhat.com\u003e\nSigned-off-by: Dave Airlie \u003cairlied@redhat.com\u003e\n" }, { "commit": "c17c2f892e23a3c70281a4e79bd7c2c226b1a561", "tree": "73e048ae853103479e3ba747809fc8c38f6b7de8", "parents": [ "c3b6ef8633e75bdcde8e845548e3b95e9a21cdf6" ], "author": { "name": "Benjamin Herrenschmidt", "email": "benh@kernel.crashing.org", "time": "Fri Aug 06 13:55:10 2010 +1000" }, "committer": { "name": "Dave Airlie", "email": "airlied@redhat.com", "time": "Tue Aug 10 08:20:20 2010 +1000" }, "message": "drm: Fix support for PCI domains\n\n(For some reason I thought that went in ages ago ...)\n\nThis fixes support for PCI domains in what should hopefully be a backward\ncompatible way along with a change to libdrm.\n\nWhen the interface version is set to 1.4, we assume userspace understands\ndomains and the world is at peace. We thus pass proper domain numbers\ninstead of 0 to userspace.\n\nThe newer libdrm will then try 1.4 first, and fallback to 1.1, along with\nignoring domains in the later case (well, except on alpha of course)\n\nSigned-off-by: Benjamin Herrenschmidt \u003cbenh@kernel.crashing.org\u003e\nSigned-off-by: Dave Airlie \u003cairlied@redhat.com\u003e\n" }, { "commit": "3b7433b8a8a83c87972065b1852b7dcae691e464", "tree": "93fa2c003f8baef5ab0733b53bac77961ed5240c", "parents": [ "4a386c3e177ca2fbc70c9283d0b46537844763a0", "6ee0578b4daaea01c96b172c6aacca43fd9807a6" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sat Aug 07 12:42:58 2010 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sat Aug 07 12:42:58 2010 -0700" }, "message": "Merge branch \u0027for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/tj/wq\n\n* \u0027for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/tj/wq: (55 commits)\n workqueue: mark init_workqueues() as early_initcall()\n workqueue: explain for_each_*cwq_cpu() iterators\n fscache: fix build on !CONFIG_SYSCTL\n slow-work: kill it\n gfs2: use workqueue instead of slow-work\n drm: use workqueue instead of slow-work\n cifs: use workqueue instead of slow-work\n fscache: drop references to slow-work\n fscache: convert operation to use workqueue instead of slow-work\n fscache: convert object to use workqueue instead of slow-work\n workqueue: fix how cpu number is stored in work-\u003edata\n workqueue: fix mayday_mask handling on UP\n workqueue: fix build problem on !CONFIG_SMP\n workqueue: fix locking in retry path of maybe_create_worker()\n async: use workqueue for worker pool\n workqueue: remove WQ_SINGLE_CPU and use WQ_UNBOUND instead\n workqueue: implement unbound workqueue\n workqueue: prepare for WQ_UNBOUND implementation\n libata: take advantage of cmwq and remove concurrency limitations\n workqueue: fix worker management invocation without pending works\n ...\n\nFixed up conflicts in fs/cifs/* as per Tejun. Other trivial conflicts in\ninclude/linux/workqueue.h, kernel/trace/Kconfig and kernel/workqueue.c\n" }, { "commit": "fc1caf6eafb30ea185720e29f7f5eccca61ecd60", "tree": "666dabc25a9b02e5c05f9eba32fa6b0d8027341a", "parents": [ "9779714c8af09d57527f18d9aa2207dcc27a8687", "96576a9e1a0cdb8a43d3af5846be0948f52b4460" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Aug 05 16:02:01 2010 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Aug 05 16:02:01 2010 -0700" }, "message": "Merge branch \u0027drm-core-next\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/airlied/drm-2.6\n\n* \u0027drm-core-next\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/airlied/drm-2.6: (204 commits)\n agp: intel-agp: do not use PCI resources before pci_enable_device()\n agp: efficeon-agp: do not use PCI resources before pci_enable_device()\n drm: kill BKL from common code\n drm/kms: Simplify setup of the initial I2C encoder config.\n drm,io-mapping: Specify slot to use for atomic mappings\n drm/radeon/kms: only expose underscan on avivo chips\n drm/radeon: add new pci ids\n drm: Cleanup after failing to create master-\u003eunique and dev-\u003ename\n drm/radeon: tone down overchatty acpi debug messages.\n drm/radeon/kms: enable underscan option for digital connectors\n drm/radeon/kms: fix calculation of h/v scaling factors\n drm/radeon/kms/igp: sideport is AMD only\n drm/radeon/kms: handle the case of no active displays properly in the bandwidth code\n drm: move ttm global code to core drm\n drm/i915: Clear the Ironlake dithering flags when the pipe doesn\u0027t want it.\n drm/radeon/kms: make sure HPD is set to NONE on analog-only connectors\n drm/radeon/kms: make sure rio_mem is valid before unmapping it\n drm/agp/i915: trim stolen space to 32M\n drm/i915: Unset cursor if out-of-bounds upon mode change (v4)\n drm/i915: Unreference object not handle on creation\n ...\n" }, { "commit": "9779714c8af09d57527f18d9aa2207dcc27a8687", "tree": "52182f2289d9b7a77fbe119f4cd5726ef6494e66", "parents": [ "89a6c8cb9e6e11b6e3671dce7e037789b8f7cf62", "65b5ac1479840a3e87f086d68e5ef91f3002e8e2" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Aug 05 16:00:44 2010 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Aug 05 16:00:44 2010 -0700" }, "message": "Merge branch \u0027kms-merge\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/jwessel/linux-2.6-kgdb\n\n* \u0027kms-merge\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/jwessel/linux-2.6-kgdb:\n kgdb,docs: Update the kgdb docs to include kms\n drm_fb_helper: Preserve capability to use atomic kms\n i915: when kgdb is active display compression should be off\n drm/i915: use new fb debug hooks\n drm: add KGDB/KDB support\n fb: add hooks to handle KDB enter/exit\n kgdboc: Add call backs to allow kernel mode switching\n vt,console,kdb: automatically set kdb LINES variable\n vt,console,kdb: implement atomic console enter/leave functions\n" }, { "commit": "1a7aba7f4e45014c5a4741164b1ecb4ffe616fb7", "tree": "f6884f1f17cf8715b6c3d21fc821847cebc3f7ad", "parents": [ "d219adc1228a3887486b58a430e736b0831f192c" ], "author": { "name": "Jesse Barnes", "email": "jbarnes@virtuousgeek.org", "time": "Thu Aug 05 09:22:31 2010 -0500" }, "committer": { "name": "Jason Wessel", "email": "jason.wessel@windriver.com", "time": "Thu Aug 05 09:22:31 2010 -0500" }, "message": "drm: add KGDB/KDB support\n\nImplement the callbacks for KDB entry/exit via the drm helpers.\n\nSigned-off-by: Jesse Barnes \u003cjbarnes@virtuousgeek.org\u003e\nSigned-off-by: Jason Wessel \u003cjason.wessel@windriver.com\u003e\n" }, { "commit": "58374713c9dfb4d231f8c56cac089f6fbdedc2ec", "tree": "9ba01c3990b5a8625437d13722595f5063f2d915", "parents": [ "a1e09b62592eb57e25f8d076ffa5b7bef18be812" ], "author": { "name": "Arnd Bergmann", "email": "arnd@arndb.de", "time": "Sat Jul 10 23:51:39 2010 +0200" }, "committer": { "name": "Dave Airlie", "email": "airlied@redhat.com", "time": "Thu Aug 05 11:54:40 2010 +1000" }, "message": "drm: kill BKL from common code\n\nThis restricts the use of the big kernel lock to the i830 and i810\ndevice drivers. The three remaining users in common code (open, ioctl\nand release) get converted to a new mutex, the drm_global_mutex,\nmaking the locking stricter than the big kernel lock.\n\nThis may have a performance impact, but only in those cases that\ncurrently don\u0027t use DRM_UNLOCKED flag in the ioctl list and would\nbenefit from that anyway.\n\nThe reason why i810 and i830 cannot use drm_global_mutex in their\nmmap functions is a lock-order inversion problem between the current\nuse of the BKL and mmap_sem in these drivers. Since the BKL has\nrelease-on-sleep semantics, it\u0027s harmless but it would cause trouble\nif we replace the BKL with a mutex.\n\nInstead, these drivers get their own ioctl wrappers that take the\nBKL around every ioctl call and then set their own handlers as\nDRM_UNLOCKED.\n\nSigned-off-by: Arnd Bergmann \u003carnd@arndb.de\u003e\nCc: David Airlie \u003cairlied@linux.ie\u003e\nCc: dri-devel@lists.freedesktop.org\nSigned-off-by: Dave Airlie \u003cairlied@redhat.com\u003e\n" }, { "commit": "1297c05a8dfb568c689f057d51a65eebe5ddc86f", "tree": "05d4416a33ef57f7f0b61309a5c686be427ae0b2", "parents": [ "3fb688fdc1890f9e8e97597f690c145ab888aec0" ], "author": { "name": "Alex Deucher", "email": "alexdeucher@gmail.com", "time": "Wed Aug 04 11:40:00 2010 -0400" }, "committer": { "name": "Dave Airlie", "email": "airlied@redhat.com", "time": "Thu Aug 05 08:47:00 2010 +1000" }, "message": "drm/radeon: add new pci ids\n\nNew evergreen and r7xx ids.\n\nSigned-off-by: Alex Deucher \u003calexdeucher@gmail.com\u003e\nCc: stable@kernel.org\nSigned-off-by: Dave Airlie \u003cairlied@redhat.com\u003e\n" }, { "commit": "ba4420c224c2808f2661cf8428f43ceef7a73a4a", "tree": "67b32498483c797c76e8f504a83746bdef35db7d", "parents": [ "2581afccadd347bf97c3a5620ba72c99aca8c355" ], "author": { "name": "Dave Airlie", "email": "airlied@redhat.com", "time": "Tue Mar 09 10:56:52 2010 +1000" }, "committer": { "name": "Dave Airlie", "email": "airlied@redhat.com", "time": "Wed Aug 04 09:46:06 2010 +1000" }, "message": "drm: move ttm global code to core drm\n\nI wrote this for the prime sharing work, but I also noticed other external\nnon-upstream drivers from a large company carrying a similiar patch, so I\nmay as well ship it in master.\n\nSigned-off-by: Dave Airlie \u003cairlied@redhat.com\u003e\n" }, { "commit": "aa7ffc01d254c91a36bf854d57a14049c6134c72", "tree": "589fb5fbaf42a41de2915818e589e7368df67778", "parents": [ "8cadd2831bf3abc94f4530e7fdbab7bb39b6b27d" ], "author": { "name": "Jesse Barnes", "email": "jbarnes@virtuousgeek.org", "time": "Fri May 14 15:41:14 2010 -0700" }, "committer": { "name": "Matthew Garrett", "email": "mjg@redhat.com", "time": "Tue Aug 03 09:48:45 2010 -0400" }, "message": "x86 platform driver: intelligent power sharing driver\n\nIntel Core i3/5 platforms with integrated graphics support both CPU and\nGPU turbo mode. CPU turbo mode is opportunistic: the CPU will use any\navailable power to increase core frequencies if thermal headroom is\navailable. The GPU side is more manual however; the graphics driver\nmust monitor GPU power and temperature and coordinate with a core\nthermal driver to take advantage of available thermal and power headroom\nin the package.\n\nThe intelligent power sharing (IPS) driver is intended to coordinate\nthis activity by monitoring MCP (multi-chip package) temperature and\npower, allowing the CPU and/or GPU to increase their power consumption,\nand thus performance, when possible. The goal is to maximize\nperformance within a given platform\u0027s TDP (thermal design point).\n\nSigned-off-by: Jesse Barnes \u003cjbarnes@virtuousgeek.org\u003e\nSigned-off-by: Matthew Garrett \u003cmjg@redhat.com\u003e\n" }, { "commit": "ab9e1f5966591dc3e811418e96ba04f284c52458", "tree": "d2021a631d17cb8d505b8bc8f8df39becf2cca49", "parents": [ "d9fdaafbe912a34ef06ed569c6606fe2811f325b" ], "author": { "name": "Dave Airlie", "email": "airlied@redhat.com", "time": "Tue Jul 13 11:11:11 2010 +1000" }, "committer": { "name": "Dave Airlie", "email": "airlied@redhat.com", "time": "Mon Aug 02 11:54:26 2010 +1000" }, "message": "drm/radeon: add basic zmask/hiz support (v4)\n\nThis interface allows userspace to request hyperz support, it probably\nneeds more locking, and really reporting that you can have hyperz is racy\nsince someone else might get it before you do.\n\nv2: modify so we pass 0 valued packets to let DDX/r300c keep working.\nalso fixed incorrect 0x4f1c reference.\n\nv3: fixup zb_bw_cntl so older drivers keep working\n\nv4: add locking, fixup SC_HYPERZ_EN - patch stream to disable hiz\n\nSigned-off-by: Dave Airlie \u003cairlied@redhat.com\u003e\n" }, { "commit": "7827627107aeb629f1a056cb56b17bd4fb789e03", "tree": "cbd83582abb9120c7ef724bf439916c8bf864e37", "parents": [ "e190bfe56841551b1ad5abb42ebd0c4798cc8c01", "219de62a1627247fca10789f28902f66cb0b408f" ], "author": { "name": "Dave Airlie", "email": "airlied@redhat.com", "time": "Mon Aug 02 10:24:46 2010 +1000" }, "committer": { "name": "Dave Airlie", "email": "airlied@redhat.com", "time": "Mon Aug 02 10:24:46 2010 +1000" }, "message": "Merge branch \u0027drm-radeon-next\u0027 of ../drm-radeon-next into drm-core-next\n\n* \u0027drm-radeon-next\u0027 of ../drm-radeon-next: (333 commits)\n drm/radeon/kms: trivial code style fixes for audio\n drm/radeon: remove viewport transform from r6xx/r7xx blit emit\n drm/radeon: group r6xx/r7xx newly sequential blit state\n drm/radeon: reorder r6xx/r7xx blit state emit to make more regs sequential\n drm/radeon: r6xx/r7xx move vport clipping to a single packet\n drm/radeon: group r6xx/r7xx sequential blit state\n drm/radeon: remove duplicate state emit in r6xx/r7xx blit\n drm/radeon: add comments to r6xx/r7xx blit state\n drm/radeon/kms/r7xx: add workaround for hw issue with HDP flush\n drm/radeon/kms: remove rs4xx gart limit\n drm: radeon: fix sign bug\n drm/radeon/kms: check/restore sanity before doing anything else with GPU.\n drm/radeon: fall back to GTT if bo creation/validation in VRAM fails.\n drm/radeon/kms: add ioport register access\n drm/radeon/kms: enable HDMI audio on RS600/RS690/RS740\n drm/radeon/kms: track audio engine state, do not use not setup timer\n drm/radeon/kms/r6xx+: add query for tile config (v2)\n drm/radeon/kms: fix CS alignment checking for tiling (v2)\n drm/radeon/kms: add tiling support to the cs checker for r6xx/r7xx\n drm/radeon/kms: Add crtc tiling setup support for evergreen\n ...\n" }, { "commit": "e190bfe56841551b1ad5abb42ebd0c4798cc8c01", "tree": "5a4759222056f95e0ffb085b267f8edb949579d4", "parents": [ "a7b98b6748efdddd832b39662801c9f828df1813" ], "author": { "name": "Francisco Jerez", "email": "currojerez@riseup.net", "time": "Thu Jul 22 17:06:18 2010 +0200" }, "committer": { "name": "Dave Airlie", "email": "airlied@redhat.com", "time": "Mon Aug 02 10:21:13 2010 +1000" }, "message": "drm: Import driver for the sil164 I2C TMDS transmitter.\n\nsil164 transmitters are used for DVI outputs on Intel/nvidia and ATI setups.\n\nSo far only nouveau can use this driver.\n\nSigned-off-by: Francisco Jerez \u003ccurrojerez@riseup.net\u003e\nTested-by: Patrice Mandin \u003cpatmandin@gmail.com\u003e\nSigned-off-by: Dave Airlie \u003cairlied@redhat.com\u003e\n" }, { "commit": "e7aeeba6a8fb86ac52bcffa0b72942f784f2b37f", "tree": "889d8196e31ec490beba8b801236d7734e8d36bb", "parents": [ "40e2a5c15d09e02a71711735564151c789f95032" ], "author": { "name": "Alex Deucher", "email": "alexdeucher@gmail.com", "time": "Fri Jun 04 13:10:12 2010 -0400" }, "committer": { "name": "Dave Airlie", "email": "airlied@redhat.com", "time": "Mon Aug 02 10:00:05 2010 +1000" }, "message": "drm/radeon/kms/r6xx+: add query for tile config (v2)\n\nUserspace needs this information to access tiled\nbuffers via the CPU.\n\nv2: rebased on evergreen accel changes\n\nSigned-off-by: Alex Deucher \u003calexdeucher@gmail.com\u003e\nSigned-off-by: Dave Airlie \u003cairlied@redhat.com\u003e\n" }, { "commit": "991ea75cb1df7188d209274b3d51c105b4f18ffe", "tree": "3798ac7d956cfdbb9f77497597d3a9c24cc6e6e5", "parents": [ "9b646972467fb5fdc677f9e4251875db20bdbb64" ], "author": { "name": "Tejun Heo", "email": "tj@kernel.org", "time": "Tue Jul 20 22:09:02 2010 +0200" }, "committer": { "name": "Tejun Heo", "email": "tj@kernel.org", "time": "Thu Jul 22 23:18:20 2010 +0200" }, "message": "drm: use workqueue instead of slow-work\n\nWorkqueue can now handle high concurrency. Convert drm_crtc_helper to\nuse system_nrt_wq instead of slow-work. The conversion is mostly\nstraight forward. One difference is that drm_helper_hpd_irq_event()\nno longer blocks and can be called from any context.\n\nSigned-off-by: Tejun Heo \u003ctj@kernel.org\u003e\nAcked-by: David Airlie \u003cairlied@linux.ie\u003e\nCc: dri-devel@lists.freedesktop.org\n" }, { "commit": "92897b5c669f5e819ff2596fe6228ca2e4904981", "tree": "7bd7f559624915873635d1255f473ff972860194", "parents": [ "9440106b460ddfb7c0ff98beb6a6741f1f67b92b" ], "author": { "name": "Ben Skeggs", "email": "bskeggs@redhat.com", "time": "Fri Jul 16 15:09:17 2010 +1000" }, "committer": { "name": "Dave Airlie", "email": "airlied@redhat.com", "time": "Wed Jul 21 11:19:45 2010 +1000" }, "message": "drm: add \"auto\" dithering method\n\nThere\u0027s no convenient/reliable way for drivers to both obey the dithering\nmode property, and to be able to attempt to provide a good default in all\ncases.\n\nThis commit adds an \"auto\" method to the property which drivers can default\nto if they wish, whilst still allowing the user to override the choice as\nthey do now.\n\nSigned-off-by: Ben Skeggs \u003cbskeggs@redhat.com\u003e\nSigned-off-by: Dave Airlie \u003cairlied@redhat.com\u003e\n" }, { "commit": "102e73463e1bb921b3a829a1392a29dba16bbabd", "tree": "8c569c1a6a7fd3ffc21cf1780bd8fa62be5b23b2", "parents": [ "5c8d7171cc4984351af802a525675d50ae555a7b", "e5510fac98a706c424034950f55bb5e819c46f51" ], "author": { "name": "Dave Airlie", "email": "airlied@redhat.com", "time": "Wed Jul 07 18:38:44 2010 +1000" }, "committer": { "name": "Dave Airlie", "email": "airlied@redhat.com", "time": "Wed Jul 07 18:38:44 2010 +1000" }, "message": "Merge branch \u0027drm-tracepoints\u0027 into drm-testing\n" }, { "commit": "5c8d7171cc4984351af802a525675d50ae555a7b", "tree": "ed6337bff7e94fb3d2ef5fe96bd70e8882d6991e", "parents": [ "a907a2e7d287f2b89fd81bc8edf164c0008c624f" ], "author": { "name": "Alex Deucher", "email": "alexdeucher@gmail.com", "time": "Fri Jun 11 17:04:35 2010 -0400" }, "committer": { "name": "Dave Airlie", "email": "airlied@redhat.com", "time": "Wed Jul 07 18:38:32 2010 +1000" }, "message": "drm/kms: add crtc disable function\n\nMore explicit than dpms. Same as the encoder disable function.\n\nNeed this to explicity disconnect plls from crtcs for reuse when you\nplls:crtcs ratio isn\u0027t 1:1.\n\nSigned-off-by: Alex Deucher \u003calexdeucher@gmail.com\u003e\nSigned-off-by: Dave Airlie \u003cairlied@redhat.com\u003e\n" }, { "commit": "a907a2e7d287f2b89fd81bc8edf164c0008c624f", "tree": "d93fecbe492cb9f65e6253d10a2f55333b8800de", "parents": [ "db8cc27b804f89e8fd5f9d5385161956a777c471", "709ea97145c125b3811ff70429e90ebdb0e832e5" ], "author": { "name": "Dave Airlie", "email": "airlied@redhat.com", "time": "Wed Jul 07 18:37:37 2010 +1000" }, "committer": { "name": "Dave Airlie", "email": "airlied@redhat.com", "time": "Wed Jul 07 18:37:37 2010 +1000" }, "message": "Merge branch \u0027drm-intel-lru\u0027 into drm-testing\n\n* drm-intel-lru:\n drm: implement helper functions for scanning lru list\n drm_mm: extract check_free_mm_node\n drm: sane naming for drm_mm.c\n drm: kill dead code in drm_mm.c\n drm: kill drm_mm_node-\u003eprivate\n drm: use list_for_each_entry in drm_mm.c\n" }, { "commit": "db8cc27b804f89e8fd5f9d5385161956a777c471", "tree": "4d84e12dbf9b4bd75fa6150f4aedf54a41d722db", "parents": [ "6dbe7465713f0e45f0e867105ca944978d57346e", "05269a3a5a78bb074413de495105d7a2686c4529" ], "author": { "name": "Dave Airlie", "email": "airlied@redhat.com", "time": "Wed Jul 07 18:37:35 2010 +1000" }, "committer": { "name": "Dave Airlie", "email": "airlied@redhat.com", "time": "Wed Jul 07 18:37:35 2010 +1000" }, "message": "Merge branch \u0027drm-platform\u0027 into drm-testing\n\n* drm-platform:\n drm: Make sure the DRM offset matches the CPU\n drm: Add __arm defines to DRM\n drm: Add support for platform devices to register as DRM devices\n drm: Remove drm_resource wrappers\n" }, { "commit": "709ea97145c125b3811ff70429e90ebdb0e832e5", "tree": "222c5cafcae50f06e0e2c2591ab09f3bd1e89827", "parents": [ "7a6b2896f261894dde287d3faefa4b432cddca53" ], "author": { "name": "Daniel Vetter", "email": "daniel.vetter@ffwll.ch", "time": "Fri Jul 02 15:02:16 2010 +0100" }, "committer": { "name": "Dave Airlie", "email": "airlied@redhat.com", "time": "Wed Jul 07 12:29:51 2010 +1000" }, "message": "drm: implement helper functions for scanning lru list\n\nThese helper functions can be used to efficiently scan lru list\nfor eviction. Eviction becomes a three stage process:\n1. Scanning through the lru list until a suitable hole has been found.\n2. Scan backwards to restore drm_mm consistency and find out which\n objects fall into the hole.\n3. Evict the objects that fall into the hole.\n\nThese helper functions don\u0027t allocate any memory (at the price of\nnot allowing any other concurrent operations). Hence this can also be\nused for ttm (which does lru scanning under a spinlock).\n\nEvicting objects in this fashion should be more fair than the current\napproach by i915 (scan the lru for a object large enough to contain\nthe new object). It\u0027s also more efficient than the current approach used\nby ttm (uncoditionally evict objects from the lru until there\u0027s enough\nfree space).\n\nSigned-Off-by: Daniel Vetter \u003cdaniel.vetter@ffwll.ch\u003e\nAcked-by: Thomas Hellstrom \u003cthellstrom@vmwgfx.com\u003e\nSigned-off-by: Chris Wilson \u003cchris@chris-wilson.co.uk\u003e\nSigned-off-by: Dave Airlie \u003cairlied@redhat.com\u003e\n" }, { "commit": "d1024ce91ff4c2c4ccbf692d204c71cbf215157a", "tree": "70bef4a1ad212c81020d2deadeb5aaca02df4aa1", "parents": [ "ca31efa89ae16c66966b8d5a5df3ae5cbffa61de" ], "author": { "name": "Daniel Vetter", "email": "daniel.vetter@ffwll.ch", "time": "Fri Jul 02 15:02:14 2010 +0100" }, "committer": { "name": "Dave Airlie", "email": "airlied@redhat.com", "time": "Wed Jul 07 12:27:53 2010 +1000" }, "message": "drm: sane naming for drm_mm.c\n\nYeah, I\u0027ve kinda noticed that fl_entry is the free stack. Still\ngive it (and the memory node list ml_entry) decent names.\n\nSigned-off-by: Daniel Vetter \u003cdaniel.vetter@ffwll.ch\u003e\nAcked-by: Thomas Hellstrom \u003cthellstrom@vmwgfx.com\u003e\nSigned-off-by: Chris Wilson \u003cchris@chris-wilson.co.uk\u003e\nSigned-off-by: Dave Airlie \u003cairlied@redhat.com\u003e\n" }, { "commit": "db3307a9f7b8078c654021e3b35354a2b09a8e67", "tree": "95c0a9382dcd95f75977f6dff07e2f7a557967d0", "parents": [ "26f3751eb47c757c656333e74bdceccd8d286d76" ], "author": { "name": "Daniel Vetter", "email": "daniel.vetter@ffwll.ch", "time": "Fri Jul 02 15:02:12 2010 +0100" }, "committer": { "name": "Dave Airlie", "email": "airlied@redhat.com", "time": "Wed Jul 07 12:26:44 2010 +1000" }, "message": "drm: kill drm_mm_node-\u003eprivate\n\nOnly ever assigned, never used.\n\nSigned-off-by: Daniel Vetter \u003cdaniel.vetter@ffwll.ch\u003e\n[glisse: I will re-add if needed for range-restricted allocations]\nSigned-off-by: Chris Wilson \u003cchris@chris-wilson.co.uk\u003e\nSigned-off-by: Dave Airlie \u003cairlied@redhat.com\u003e\n" }, { "commit": "5870a4d97da136908ca477e3a21bc9f4c2705161", "tree": "3030a0ee387f3187a5a30f8f4cc745788c7d69e7", "parents": [ "123f94f22e3d283dfe68742b269c245b0501ad82" ], "author": { "name": "Francisco Jerez", "email": "currojerez@riseup.net", "time": "Sun Jul 04 04:03:07 2010 +0200" }, "committer": { "name": "Dave Airlie", "email": "airlied@redhat.com", "time": "Wed Jul 07 12:14:11 2010 +1000" }, "message": "drm/ttm: Allocate the page pool manager in the heap.\n\nRepeated ttm_page_alloc_init/fini fails noisily because the pool\nmanager kobj isn\u0027t zeroed out between uses (we could do just that but\nstatically allocated kobjects are generally considered a bad thing).\nMove it to kzalloc\u0027ed memory.\n\nNote that this patch drops the refcounting behavior of the pool\nallocator init/fini functions: it would have led to a race condition\nin its current form, and anyway it was never exploited.\n\nThis fixes a regression with reloading kms modules at runtime, since\npage allocator was introduced.\n\nSigned-off-by: Francisco Jerez \u003ccurrojerez@riseup.net\u003e\nSigned-off-by: Dave Airlie \u003cairlied@redhat.com\u003e\n" }, { "commit": "b9c2c9ae882f058084e13e339925dbf8d2d20271", "tree": "2c3baccc55ef03477a4fc3e08473ea35931e56ec", "parents": [ "ac2874b980e05ed7a4ea8fed7b0a92428b51ce58" ], "author": { "name": "Jesse Barnes", "email": "jbarnes@virtuousgeek.org", "time": "Thu Jul 01 16:48:09 2010 -0700" }, "committer": { "name": "Dave Airlie", "email": "airlied@redhat.com", "time": "Fri Jul 02 14:03:24 2010 +1000" }, "message": "drm: add per-event vblank event trace points\n\nAllows us to track each process that requests and completes events.\n\nSigned-off-by: Jesse Barnes \u003cjbarnes@virtuousgeek.org\u003e\nSigned-off-by: Dave Airlie \u003cairlied@redhat.com\u003e\n" }, { "commit": "148a03bc0b0e3ef153d0cade7bc88e9b14edfb7a", "tree": "ec5cf10676d6f69848952f6a89b475eb664333e2", "parents": [ "9b8eb4d14767209c83087063352cd04266ecdfd1" ], "author": { "name": "Alex Deucher", "email": "alexdeucher@gmail.com", "time": "Thu Jun 03 19:00:03 2010 -0400" }, "committer": { "name": "Dave Airlie", "email": "airlied@redhat.com", "time": "Tue Jun 08 09:34:42 2010 +1000" }, "message": "drm/radeon/kms/evergreen: set accel_enabled\n\nThis is needed to enable accel in the ddx. However,\ndue to a bug in older versions of the ddx, it relies\non accel being disabled in order to load properly on\nevergreen chips. To maintain compatility, we add a new\nget accel param and call that from the ddx. The old one\nalways returns false for evergreen cards.\n\n[this fixes a regression with older userspaces on newer kernels].\n\nSigned-off-by: Alex Deucher \u003calexdeucher@gmail.com\u003e\nSigned-off-by: Dave Airlie \u003cairlied@redhat.com\u003e\n" }, { "commit": "1067b6c2bea7fd2cc9da290d865ab3f3b91c8130", "tree": "5b20d5fbe9f9a2b3cfbb794018d74606f5031a88", "parents": [ "a652883a244901742d6c9733a9eebdf72e3114ea", "d8dcaa1dc50f5aecd38d34180cd99d6af8566c88" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Jun 03 07:19:45 2010 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Jun 03 07:19:45 2010 -0700" }, "message": "Merge branch \u0027drm-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/airlied/drm-2.6\n\n* \u0027drm-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/airlied/drm-2.6: (41 commits)\n drm/radeon/kms: make sure display hw is disabled when suspending\n drm/vmwgfx: Allow userspace to change default layout. Bump minor.\n drm/vmwgfx: Fix framebuffer modesetting\n drm/vmwgfx: Fix vga save / restore with display topology.\n vgaarb: use MIT license\n vgaarb: convert pr_devel() to pr_debug()\n drm: fix typos in Linux DRM Developer\u0027s Guide\n drm/radeon/kms/pm: voltage fixes\n drm/radeon/kms/pm: radeon_set_power_state fixes\n drm/radeon/kms/pm: patch default power state with default clocks/voltages on r6xx+\n drm/radeon/kms/pm: enable SetVoltage on r7xx/evergreen\n drm/radeon/kms/pm: add support for SetVoltage cmd table (V2)\n drm/radeon/kms/evergreen: add initial CS parser\n drm/kms: disable/enable poll around switcheroo on/off\n drm/nouveau: fixup confusion over which handle the DSM is hanging off.\n drm/nouveau: attempt to get bios from ACPI v3\n drm/nv50: cast IGP memory location to u64 before shifting\n drm/ttm: Fix ttm_page_alloc.c\n drm/ttm: Fix cached TTM page allocation.\n drm/vmwgfx: Remove some leftover debug messages.\n ...\n" }, { "commit": "d8bd19d2aff95e52c7f356cc2fc722584a656065", "tree": "e9312e761aede46a030030288a4a51a576019396", "parents": [ "991b7b44f8cfa1b9beff8c4c2f2ec888b925c2a7" ], "author": { "name": "Jakob Bornecrantz", "email": "jakob@vmware.com", "time": "Tue Jun 01 11:54:20 2010 +0200" }, "committer": { "name": "Dave Airlie", "email": "airlied@redhat.com", "time": "Thu Jun 03 13:13:36 2010 +1000" }, "message": "drm/vmwgfx: Allow userspace to change default layout. Bump minor.\n\nThe host may change the layout and, since the change is\ncommunicated to the master, the master needs a way to\ncommunicate the change to the kernel driver.\n\nThe minor version number is bumped to advertize the\navailability of this feature.\n\nSigned-off-by: Jakob Bornecrantz \u003cjakob@vmware.com\u003e\nSigned-off-by: Thomas Hellstrom \u003cthellstrom@vmware.com\u003e\nSigned-off-by: Dave Airlie \u003cairlied@redhat.com\u003e\n" }, { "commit": "e3a815fcd38043b8f1bb526123d8ab6ae01deb77", "tree": "903c75fcd0e5cc7ef20885562c7807de23323968", "parents": [ "9bc354998f8aa8a83b0cd430e8fcf2cbc3be7367" ], "author": { "name": "Zou Nan hai", "email": "nanhai.zou@intel.com", "time": "Mon May 31 13:58:47 2010 +0800" }, "committer": { "name": "Eric Anholt", "email": "eric@anholt.net", "time": "Tue Jun 01 11:21:09 2010 -0700" }, "message": "drm/i915: add HAS_BSD check to i915_getparam\n\nThis will let userland only try to use the new media decode\nfunctionality when the appropriate kernel is present.\n\nSigned-off-by: Zou Nan hai \u003cnanhai.zou@intel.com\u003e\nSigned-off-by: Eric Anholt \u003ceric@anholt.net\u003e\n" }, { "commit": "36d1701c502d4f46386e1000ad58d9497a11688d", "tree": "474f0d29edc8405a14e23383e2b0afc0f325a1ee", "parents": [ "afa3b60c905f606e8245115474d77787035e02eb", "8b281db596744a15b2abbfdbf655796c64e172ca" ], "author": { "name": "Dave Airlie", "email": "airlied@redhat.com", "time": "Tue Jun 01 11:32:29 2010 +1000" }, "committer": { "name": "Dave Airlie", "email": "airlied@redhat.com", "time": "Tue Jun 01 11:32:29 2010 +1000" }, "message": "Merge remote branch \u0027nouveau/for-airlied\u0027 of ../drm-nouveau-next into drm-testing\n\n* \u0027nouveau/for-airlied\u0027 of ../drm-nouveau-next:\n drm/nv50: cast IGP memory location to u64 before shifting\n drm/nv50: use alternate source of SOR_MODE_CTRL for DP hack\n drm/nouveau: fix dual-link displays when plugged into single-link outputs\n drm/nv50: obey dcb-\u003eduallink_possible\n drm/nv50: fix duallink_possible calculation for DCB 4.0 cards\n drm/nouveau: don\u0027t execute INIT_GPIO unless we\u0027re really running the table\n drm/nv40: allow cold-booting of nv4x chipsets\n drm/nouveau: fix POST detection for certain chipsets\n drm/nouveau: Add getparam for current PTIMER time.\n drm/nouveau: allow cursor image and position to survive suspend\n" }, { "commit": "fbf81762e385d3d45acad057b654d56972acf58c", "tree": "bc1b9e31e92ca702ea808650fda45443145f6776", "parents": [ "fc5ea29d72bde1bec230538becf396caad8621b8" ], "author": { "name": "Dave Airlie", "email": "airlied@redhat.com", "time": "Tue Jun 01 09:09:06 2010 +1000" }, "committer": { "name": "Dave Airlie", "email": "airlied@redhat.com", "time": "Tue Jun 01 10:36:02 2010 +1000" }, "message": "drm/kms: disable/enable poll around switcheroo on/off\n\nBecause we aren\u0027t in a suspend state the poll will still run when we have switcherooed a card off.\n\nSigned-off-by: Dave Airlie \u003cairlied@redhat.com\u003e\n" }, { "commit": "dcdb167402cbdca1d021bdfa5f63995ee0a79317", "tree": "3cd0ab1189d972b59daaaf863f518d7b94d2de7a", "parents": [ "01d73a6967f12fe6c4bbde1834a9fe662264a2eb" ], "author": { "name": "Jordan Crouse", "email": "jcrouse@codeaurora.org", "time": "Thu May 27 13:40:25 2010 -0600" }, "committer": { "name": "Dave Airlie", "email": "airlied@redhat.com", "time": "Tue Jun 01 10:07:39 2010 +1000" }, "message": "drm: Add support for platform devices to register as DRM devices\n\nAllow platform devices without PCI resources to be DRM devices.\n\n[airlied: fixup warnings with dev pointers]\n\nSigned-off-by: Jordan Crouse \u003cjcrouse@codeaurora.org\u003e\nSigned-off-by: Dave Airlie \u003cairlied@redhat.com\u003e\n" }, { "commit": "01d73a6967f12fe6c4bbde1834a9fe662264a2eb", "tree": "32e4a3171cd371dfc037af52e181e6c8454a961b", "parents": [ "cf22f20ade30f8c03955324aaf27b1049e182600" ], "author": { "name": "Jordan Crouse", "email": "jcrouse@codeaurora.org", "time": "Thu May 27 13:40:24 2010 -0600" }, "committer": { "name": "Dave Airlie", "email": "airlied@redhat.com", "time": "Tue Jun 01 10:07:24 2010 +1000" }, "message": "drm: Remove drm_resource wrappers\n\nRemove the drm_resource wrappers and directly use the\nactual PCI and/or platform functions in their place.\n\n[airlied: fixup nouveau properly to build]\n\nSigned-off-by: Jordan Crouse \u003cjcrouse@codeaurora.org\u003e\nReviewed-by: Matt Turner \u003cmattst88@gmail.com\u003e\nSigned-off-by: Dave Airlie \u003cairlied@redhat.com\u003e\n" }, { "commit": "7fc74f17e6c9b4d86371c3a947afc32bd6bc9691", "tree": "3658c270bd5c45a408779040e2db181e5fca855b", "parents": [ "b334f2b3b68c35fd86a0cbc90ecee40e63ba2f37" ], "author": { "name": "Marcin Kościelnicki", "email": "koriakin@0x04.net", "time": "Sun May 23 11:36:04 2010 +0000" }, "committer": { "name": "Ben Skeggs", "email": "bskeggs@redhat.com", "time": "Fri May 28 16:06:21 2010 +1000" }, "message": "drm/nouveau: Add getparam for current PTIMER time.\n\nThis will be useful for computing GPU-CPU latency, including\nGL_ARB_timer_query extension.\n\nSigned-off-by: Marcin Kościelnicki \u003ckoriakin@0x04.net\u003e\nSigned-off-by: Ben Skeggs \u003cbskeggs@redhat.com\u003e\n" }, { "commit": "8187a2b70e34c727a06617441f74f202b6fefaf9", "tree": "48622c6f95282dc0a0fa668110aac4efa6e89066", "parents": [ "d3301d86b4bf2bcf649982ae464211d8bcf9575a" ], "author": { "name": "Zou Nan hai", "email": "nanhai.zou@intel.com", "time": "Fri May 21 09:08:55 2010 +0800" }, "committer": { "name": "Eric Anholt", "email": "eric@anholt.net", "time": "Wed May 26 13:24:49 2010 -0700" }, "message": "drm/i915: introduce intel_ring_buffer structure (V2)\n\nIntroduces a more complete intel_ring_buffer structure with callbacks\nfor setup and management of a particular ringbuffer, and converts the\nrender ring buffer consumers to use it.\n\nSigned-off-by: Zou Nan hai \u003cnanhai.zou@intel.com\u003e\nSigned-off-by: Xiang Hai hao \u003chaihao.xiang@intel.com\u003e\n[anholt: Fixed up whitespace fail and rebased against prep patches]\nSigned-off-by: Eric Anholt \u003ceric@anholt.net\u003e\n" }, { "commit": "59534f7298c5e28aaa64e6ed550e247f64ee72ae", "tree": "b9fef7756abf897d9e1b10950cdf10bf6dfe5cb7", "parents": [ "ac3ee84c604502240122c47b52f0542ec8774f15", "b486787ee4797d6e42a9bd3a6f079385ad0f4472" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri May 21 11:14:52 2010 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri May 21 11:14:52 2010 -0700" }, "message": "Merge branch \u0027drm-for-2.6.35\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/airlied/drm-2.6\n\n* \u0027drm-for-2.6.35\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/airlied/drm-2.6: (207 commits)\n drm/radeon/kms/pm/r600: select the mid clock mode for single head low profile\n drm/radeon: fix power supply kconfig interaction.\n drm/radeon/kms: record object that have been list reserved\n drm/radeon: AGP memory is only I/O if the aperture can be mapped by the CPU.\n drm/radeon/kms: don\u0027t default display priority to high on rs4xx\n drm/edid: fix typo in 1600x1200@75 mode\n drm/nouveau: fix i2c-related init table handlers\n drm/nouveau: support init table i2c device identifier 0x81\n drm/nouveau: ensure we\u0027ve parsed i2c table entry for INIT_*I2C* handlers\n drm/nouveau: display error message for any failed init table opcode\n drm/nouveau: fix init table handlers to return proper error codes\n drm/nv50: support fractional feedback divider on newer chips\n drm/nv50: fix monitor detection on certain chipsets\n drm/nv50: store full dcb i2c entry from vbios\n drm/nv50: fix suspend/resume with DP outputs\n drm/nv50: output calculated crtc pll when debugging on\n drm/nouveau: dump pll limits entries when debugging is on\n drm/nouveau: bios parser fixes for eDP boards\n drm/nouveau: fix a nouveau_bo dereference after it\u0027s been destroyed\n drm/nv40: remove some completed ctxprog TODOs\n ...\n" }, { "commit": "68adac5e49436992e9c999fbae879d9ac5b72d4e", "tree": "6593c74a8baf4a0424bbc5b2a06264c0a6a9338d", "parents": [ "15a7df8db84e7a9d9915d879199ac4a870836c54" ], "author": { "name": "Ben Skeggs", "email": "bskeggs@redhat.com", "time": "Wed Apr 28 11:46:42 2010 +1000" }, "committer": { "name": "Dave Airlie", "email": "airlied@redhat.com", "time": "Tue May 18 18:21:33 2010 +1000" }, "message": "drm: move radeon_fixed.h to shared drm_fixed.h header\n\nWill be used by nouveau driver also in the near future.\n\nSigned-off-by: Ben Skeggs \u003cbskeggs@redhat.com\u003e\nSigned-off-by: Dave Airlie \u003cairlied@redhat.com\u003e\n" }, { "commit": "7c5ee5366f79f53de2a11e73953daee6d58df124", "tree": "b687002e761917b91e17fed3f327015939b115c8", "parents": [ "8f5b5e632cd55d9acf10ba498b858fd996bd1a39" ], "author": { "name": "Matthew Garrett", "email": "mjg@redhat.com", "time": "Mon Apr 26 16:00:09 2010 -0400" }, "committer": { "name": "Dave Airlie", "email": "airlied@redhat.com", "time": "Tue May 18 18:21:20 2010 +1000" }, "message": "ttm: Provide an API for starting and stopping the delayed workqueue\n\nWe want to be able to prevent the delayed workqueue from changing state\nwhile we\u0027re reclocking, so add an API to block and unblock it.\n\nSigned-off-by: Matthew Garrett \u003cmjg@redhat.com\u003e\nSigned-off-by: Dave Airlie \u003cairlied@redhat.com\u003e\n" }, { "commit": "1d42bbc8f7f9ce4d852692ef7aa336b133b0830a", "tree": "a0ea2d17508104ab681c829f0552e7f13512c8e2", "parents": [ "eb1f8e4f3be898df808e2dfc131099f5831d491d" ], "author": { "name": "Dave Airlie", "email": "airlied@redhat.com", "time": "Fri May 07 05:02:30 2010 +0000" }, "committer": { "name": "Dave Airlie", "email": "airlied@redhat.com", "time": "Tue May 18 17:40:22 2010 +1000" }, "message": "drm/fbdev: fix cloning on fbcon\n\nSimple cloning rules compared to server:\n(a) single crtc\n(b) \u003e 1 connector active\n(c) check command line mode\n(d) try and find 1024x768 DMT mode if no command line.\n(e) fail to clone\n\nSigned-off-by: Dave Airlie \u003cairlied@redhat.com\u003e\n" }, { "commit": "eb1f8e4f3be898df808e2dfc131099f5831d491d", "tree": "9e5807824c60601f23016f3a2e82f8de10f7435a", "parents": [ "0ddfa7d574e0f3a7510b0be6c8ed807af017223f" ], "author": { "name": "Dave Airlie", "email": "airlied@redhat.com", "time": "Fri May 07 06:42:51 2010 +0000" }, "committer": { "name": "Dave Airlie", "email": "airlied@redhat.com", "time": "Tue May 18 17:40:11 2010 +1000" }, "message": "drm/fbdev: rework output polling to be back in the core. (v4)\n\nAfter thinking it over a lot it made more sense for the core to deal with\nthe output polling especially so it can notify X.\n\nv2: drop plans for fake connector - per Michel\u0027s comments - fix X patch sent to xorg-devel, add intel polled/hpd setting, add initial nouveau polled/hpd settings.\n\nv3: add config lock take inside polling, add intel/nouveau poll init/fini calls\n\nv4: config lock was a bit agressive, only needed around connector list reading.\notherwise it could re-enter.\n\nglisse: discard drm_helper_hpd_irq_event\n\nv3: Reviewed-by: Michel Dänzer \u003cmichel@daenzer.net\u003e\nSigned-off-by: Dave Airlie \u003cairlied@redhat.com\u003e\n" }, { "commit": "bc35afdb182d4c48c889fe27ba7a5d7ea0c8194d", "tree": "0e8f87e31a8a979a9c1a3090f9bf9d906981afa6", "parents": [ "61dd98fad58f945ed720ba132681acb58fcee015" ], "author": { "name": "Jerome Glisse", "email": "jglisse@redhat.com", "time": "Wed May 12 18:01:13 2010 +0200" }, "committer": { "name": "Dave Airlie", "email": "airlied@redhat.com", "time": "Tue May 18 15:59:08 2010 +1000" }, "message": "drm/radeon/kms: add query for crtc hw id from crtc id to get info V2\n\nUserspace need to know the hw crtc id (0, 1, 2, ...) from the drm\ncrtc id. Bump the minor version so userspace can enable conditionaly\nfeatures depend on this.\n\nV2 use num_crtc and avoid DRM_ERROR\n\nSigned-off-by: Jerome Glisse \u003cjglisse@redhat.com\u003e\nSigned-off-by: Dave Airlie \u003cairlied@redhat.com\u003e\n" }, { "commit": "96525a2f7448c427bb8d99240907a6bd2d9e818c", "tree": "2794c2f359003f432d40cba0e007531f8fadeb02", "parents": [ "f405a1ab2bf316b1969fc5355891e5dff4e1a54c" ], "author": { "name": "Dan Carpenter", "email": "error27@gmail.com", "time": "Fri May 14 13:06:19 2010 +0200" }, "committer": { "name": "Dave Airlie", "email": "airlied@redhat.com", "time": "Tue May 18 15:56:14 2010 +1000" }, "message": "drm_edid: There should be 6 Standard Timings\n\nSmatch complained that we initialize 6 elements in add_detailed_modes()\nbut the timings[] array is declared with 5 elements. Adam Jackson\nverified that 6 is the correct number of timings.\n\nOn Mon, May 10, 2010 at 12:08:24PM -0400, Adam Jackson wrote:\n\u003e \u003e \u003e struct std_timing timings[5];\n\u003e \u003e \u003e ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^\n\u003e\n\u003e This decl is wrong, should be 6. From the 1.4 spec:\n\u003e\n\u003e \"Six additional Standard Timings may be listed as a display descriptor\n\u003e (tag #FAh).\"\n\u003e\n\u003e The 1.3 spec is a little less explicit about it, but does show 6\n\u003e standard timing codes in the 0xFA detailed subblock, terminated by 0x0A\n\u003e in the 18th byte. I don\u0027t have the docs for 1.2 or earlier, but we\u0027re\n\u003e paranoid enough about not adding broken timings that we should be fine.\n\nThis patch is basically a clean up, because timings[] is declared inside\na union and increasing the number of elements here doesn\u0027t change the\noverall size of the union.\n\nSigned-off-by: Dan Carpenter \u003cerror27@gmail.com\u003e\nSigned-off-by: Dave Airlie \u003cairlied@redhat.com\u003e\n" }, { "commit": "e33b3e7567f8636c61e79ff1da5ff9a6cf6562c7", "tree": "72f361fec4a8c81d5003b93344bf3eab3eb21775", "parents": [ "e2dbe06c271f3bb2a495627980aad3d1d8ccef2a", "8cfe92d683a0041ac8e016a0b0a487c99a78f6c1" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri May 07 14:02:01 2010 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri May 07 14:02:01 2010 -0700" }, "message": "Merge branch \u0027drm-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/airlied/drm-2.6\n\n* \u0027drm-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/airlied/drm-2.6:\n drm/ttm: Remove the ttm_bo_block_reservation() function.\n drm/ttm: Remove some leftover debug messages.\n drm/radeon: async event synchronization for drmWaitVblank\n" }, { "commit": "8cfe92d683a0041ac8e016a0b0a487c99a78f6c1", "tree": "5949c336ea881c9fb51aee811432125451fef45d", "parents": [ "5be6eff965aee22181d7f6210c2c463420e94e03" ], "author": { "name": "Thomas Hellstrom", "email": "thellstrom@vmware.com", "time": "Wed Apr 28 11:33:25 2010 +0200" }, "committer": { "name": "Dave Airlie", "email": "airlied@redhat.com", "time": "Fri May 07 09:21:28 2010 +1000" }, "message": "drm/ttm: Remove the ttm_bo_block_reservation() function.\n\nIt\u0027s unused and buggy in its current form, since it can place a bo\nin the reserved state without removing it from lru lists.\n\nSigned-off-by: Thomas Hellstrom \u003cthellstrom@vmware.com\u003e\nSigned-off-by: Dave Airlie \u003cairlied@redhat.com\u003e\n" }, { "commit": "7547a917fa5f3b2406f52c7dcf7ec9ad3c8532eb", "tree": "59b0d0e9b6c251c4df5799b93395454592004d57", "parents": [ "a8089e849a32c5b6bfd6c88dbd09c0ea4a779b71", "6b8b1786a8c29ce6e32298b93ac8d4a18a2b11c4" ], "author": { "name": "Dave Airlie", "email": "airlied@redhat.com", "time": "Tue Apr 20 14:15:09 2010 +1000" }, "committer": { "name": "Dave Airlie", "email": "airlied@redhat.com", "time": "Tue Apr 20 14:15:09 2010 +1000" }, "message": "Merge branch \u0027drm-ttm-unmappable\u0027 into drm-core-next\n\n* drm-ttm-unmappable:\n drm/radeon/kms: enable use of unmappable VRAM V2\n drm/ttm: remove io_ field from TTM V6\n drm/vmwgfx: add support for new TTM fault callback V5\n drm/nouveau/kms: add support for new TTM fault callback V5\n drm/radeon/kms: add support for new fault callback V7\n drm/ttm: ttm_fault callback to allow driver to handle bo placement V6\n drm/ttm: split no_wait argument in 2 GPU or reserve wait\n\nConflicts:\n\tdrivers/gpu/drm/nouveau/nouveau_bo.c\n" }, { "commit": "0c321c79627189204d7d0bf65ab19f5ac419abed", "tree": "9df52ae46164bdca3dab6a36d5ec17360c60b9e4", "parents": [ "96bf8b8778976a6e6a4fe4e6e0421d8ed7892798" ], "author": { "name": "Jerome Glisse", "email": "jglisse@redhat.com", "time": "Wed Apr 07 10:21:27 2010 +0000" }, "committer": { "name": "Dave Airlie", "email": "airlied@redhat.com", "time": "Tue Apr 20 14:13:09 2010 +1000" }, "message": "drm/ttm: remove io_ field from TTM V6\n\nAll TTM driver have been converted to new io_mem_reserve/free\ninterface which allow driver to choose and return proper io\nbase, offset to core TTM for ioremapping if necessary. This\npatch remove what is now deadcode.\n\nV2 adapt to match with change in first patch of the patchset\nV3 update after io_mem_reserve/io_mem_free callback balancing\nV4 adjust to minor cleanup\nV5 remove the needs ioremap flag\nV6 keep the ioremapping facility in TTM\n\n[airlied- squashed driver removals in here also]\n\nSigned-off-by: Jerome Glisse \u003cjglisse@redhat.com\u003e\nReviewed-by: Thomas Hellstrom \u003cthellstrom@vmware.com\u003e\nSigned-off-by: Dave Airlie \u003cairlied@redhat.com\u003e\n" }, { "commit": "82c5da6bf8b55a931b042fb531083863d26c8020", "tree": "88168d32d7060598ac730c30967b2e62dc5da28d", "parents": [ "9d87fa2138d06ff400551800d67d522625033e35" ], "author": { "name": "Jerome Glisse", "email": "jglisse@redhat.com", "time": "Fri Apr 09 14:39:23 2010 +0200" }, "committer": { "name": "Dave Airlie", "email": "airlied@redhat.com", "time": "Tue Apr 20 14:12:05 2010 +1000" }, "message": "drm/ttm: ttm_fault callback to allow driver to handle bo placement V6\n\nOn fault the driver is given the opportunity to perform any operation\nit sees fit in order to place the buffer into a CPU visible area of\nmemory. This patch doesn\u0027t break TTM users, nouveau, vmwgfx and radeon\nshould keep working properly. Future patch will take advantage of this\ninfrastructure and remove the old path from TTM once driver are\nconverted.\n\nV2 return VM_FAULT_NOPAGE if callback return -EBUSY or -ERESTARTSYS\nV3 balance io_mem_reserve and io_mem_free call, fault_reserve_notify\n is responsible to perform any necessary task for mapping to succeed\nV4 minor cleanup, atomic_t -\u003e bool as member is protected by reserve\n mecanism from concurent access\nV5 the callback is now responsible for iomapping the bo and providing\n a virtual address this simplify TTM and will allow to get rid of\n TTM_MEMTYPE_FLAG_NEEDS_IOREMAP\nV6 use the bus addr data to decide to ioremap or this isn\u0027t needed\n but we don\u0027t necesarily need to ioremap in the callback but still\n allow driver to use static mapping\n\nSigned-off-by: Jerome Glisse \u003cjglisse@redhat.com\u003e\nReviewed-by: Thomas Hellstrom \u003cthellstrom@vmware.com\u003e\nSigned-off-by: Dave Airlie \u003cairlied@redhat.com\u003e\n" }, { "commit": "fd632aa34c8592fb1d37fc83cbffa827bc7dd42c", "tree": "5c6a0fc186e297590aee2c050b837a721db337b2", "parents": [ "1d397043bcc2c8cdccb584a8ef73131f28f18e4c" ], "author": { "name": "Daniel Vetter", "email": "daniel.vetter@ffwll.ch", "time": "Fri Apr 09 19:05:05 2010 +0000" }, "committer": { "name": "Dave Airlie", "email": "airlied@redhat.com", "time": "Tue Apr 20 13:19:33 2010 +1000" }, "message": "drm: free core gem object from driver callbacks\n\nWhen drivers embed the core gem object into their own structures,\nthey\u0027ll have to do this. Temporarily this results in an ugly\n\nkfree(gem_obj);\n\nin every gem driver.\n\nSigned-off-by: Daniel Vetter \u003cdaniel.vetter@ffwll.ch\u003e\nAcked-by: Eric Anholt \u003ceric@anholt.net\u003e\nSigned-off-by: Dave Airlie \u003cairlied@redhat.com\u003e\n" }, { "commit": "1d397043bcc2c8cdccb584a8ef73131f28f18e4c", "tree": "564c09e78bffef21ff65988ea76380db132cc02a", "parents": [ "153549b8b63d71a9c5d8cbde887097b995c32bd6" ], "author": { "name": "Daniel Vetter", "email": "daniel.vetter@ffwll.ch", "time": "Fri Apr 09 19:05:04 2010 +0000" }, "committer": { "name": "Dave Airlie", "email": "airlied@redhat.com", "time": "Tue Apr 20 13:19:25 2010 +1000" }, "message": "drm: extract drm_gem_object_init\n\nThis function can be used by drivers who allocate the drm gem object\non their own. No functional change in here, just preparation.\n\nSigned-off-by: Daniel Vetter \u003cdaniel.vetter@ffwll.ch\u003e\nAcked-by: Eric Anholt \u003ceric@anholt.net\u003e\nSigned-off-by: Dave Airlie \u003cairlied@redhat.com\u003e\n" }, { "commit": "7fff400be6fbf64f10abca9939718aaf1d61c255", "tree": "384118628f5c5aa2d74303cddd120de75308beea", "parents": [ "0bcb1d844ac638a4c4280f697d5bfac9791e9a70", "b1f201980eb4a7a59277a13cf18acdbb46167ad5" ], "author": { "name": "Dave Airlie", "email": "airlied@redhat.com", "time": "Tue Apr 20 13:16:04 2010 +1000" }, "committer": { "name": "Dave Airlie", "email": "airlied@redhat.com", "time": "Tue Apr 20 13:16:04 2010 +1000" }, "message": "Merge branch \u0027drm-fbdev-cleanup\u0027 into drm-core-next\n\n* drm-fbdev-cleanup:\n drm/fb: remove drm_fb_helper_setcolreg\n drm/kms/fb: use slow work mechanism for normal hotplug also.\n drm/kms/fb: add polling support for when nothing is connected.\n drm/kms/fb: provide a 1024x768 fbcon if no outputs found.\n drm/kms/fb: separate fbdev connector list from core drm connectors\n drm/kms/fb: move to using fb helper crtc grouping instead of core crtc list\n drm/fb: fix fbdev object model + cleanup properly.\n\nConflicts:\n\tdrivers/gpu/drm/i915/i915_drv.h\n\tdrivers/gpu/drm/nouveau/nouveau_drv.h\n" }, { "commit": "c9c2625ff4fc4ce652e686f895059d2902c01ca0", "tree": "243c07b0380d60d15566064843acb2213b0cacdf", "parents": [ "c2b41276da65481d36311a13d69020d150861c43", "522032da7ed3068cf79f733fb836118d908b7719" ], "author": { "name": "Dave Airlie", "email": "airlied@redhat.com", "time": "Tue Apr 20 13:14:38 2010 +1000" }, "committer": { "name": "Dave Airlie", "email": "airlied@redhat.com", "time": "Tue Apr 20 13:14:38 2010 +1000" }, "message": "Merge branch \u0027drm-edid-fixes\u0027 into drm-core-next\n\n* drm-edid-fixes:\n drm/edid: When checking duplicate standard modes, walked the probed list\n drm/edid: Fix sync polarity for secondary GTF curve\n drm/modes: Fix interlaced mode names\n drm/edid: Add secondary GTF curve support\n drm/edid: Strengthen the algorithm for standard mode codes\n drm/edid: Fix the HDTV hack.\n drm/edid: Extend range-based mode addition for EDID 1.4\n drm/edid: Add test for monitor reduced blanking support.\n drm/edid: Fix preferred mode parse for EDID 1.4\n drm/edid: Remove some silly comments\n drm/edid: Remove arbitrary EDID extension limit\n drm/edid: Add modes for Established Timings III section\n drm/edid: Reshuffle mode list construction to closer match the spec\n drm/edid: Remove a redundant check\n drm/edid: Remove some misleading comments\n drm/edid: Fix secondary block fetch.\n" } ], "next": "c2b41276da65481d36311a13d69020d150861c43" }