)]}' { "log": [ { "commit": "89177644a7b6306e6084a89eab7e290f4bfef397", "tree": "e8bac93d626a14df07b2d904797c5d0e86f6251a", "parents": [ "6504d0d9900a2c05ea1fbab2ec008bf442993d94" ], "author": { "name": "Aaron Plattner", "email": "aplattner@nvidia.com", "time": "Tue Jan 15 20:47:42 2013 +0000" }, "committer": { "name": "Dave Airlie", "email": "airlied@redhat.com", "time": "Fri Feb 08 13:39:08 2013 +1000" }, "message": "drm: add prime helpers\n\nInstead of reimplementing all of the dma_buf functionality in every driver,\ncreate helpers drm_prime_import and drm_prime_export that implement them in\nterms of new, lower-level hook functions:\n\n gem_prime_pin: callback when a buffer is created, used to pin buffers into GTT\n gem_prime_get_sg_table: convert a drm_gem_object to an sg_table for export\n gem_prime_import_sg_table: convert an sg_table into a drm_gem_object\n gem_prime_vmap, gem_prime_vunmap: map and unmap an object\n\nThese hooks are optional; drivers can opt in by using drm_gem_prime_import and\ndrm_gem_prime_export as the .gem_prime_import and .gem_prime_export fields of\nstruct drm_driver.\n\nv2:\n- Drop .begin_cpu_access. None of the drivers this code replaces implemented\n it. Having it here was a leftover from when I was trying to include i915 in\n this rework.\n- Use mutex_lock instead of mutex_lock_interruptible, as these three drivers\n did. This patch series shouldn\u0027t change that behavior.\n- Rename helpers to gem_prime_get_sg_table and gem_prime_import_sg_table.\n Rename struct sg_table* variables to \u0027sgt\u0027 for clarity.\n- Update drm.tmpl for these new hooks.\n\nv3:\n- Pass the vaddr down to the driver. This lets drivers that just call vunmap on\n the pointer avoid having to store the pointer in their GEM private structures.\n- Move documentation into a /** DOC */ comment in drm_prime.c and include it in\n drm.tmpl with a !P line. I tried to use !F lines to include documentation of\n the individual functions from drmP.h, but the docproc / kernel-doc scripts\n barf on that file, so hopefully this is good enough for now.\n- apply refcount fix from commit be8a42ae60addd8b6092535c11b42d099d6470ec\n (\"drm/prime: drop reference on imported dma-buf come from gem\")\n\nSigned-off-by: Aaron Plattner \u003caplattner@nvidia.com\u003e\nCc: Daniel Vetter \u003cdaniel.vetter@ffwll.ch\u003e\nCc: David Airlie \u003cairlied@linux.ie\u003e\nSigned-off-by: Dave Airlie \u003cairlied@redhat.com\u003e\n" }, { "commit": "ed914f69f8f979ea2b664abc4f1437235cf3db35", "tree": "43d839d79d02f4a9415199a2db7a4b6cfeb281eb", "parents": [ "bb0f78dd7ded88082b2430c43c65bc821c4ea360", "edb37a95c58147f89713e6c5cd220fa8fdfb4833" ], "author": { "name": "Dave Airlie", "email": "airlied@redhat.com", "time": "Fri Feb 08 12:34:44 2013 +1000" }, "committer": { "name": "Dave Airlie", "email": "airlied@redhat.com", "time": "Fri Feb 08 12:34:44 2013 +1000" }, "message": "Merge tag \u0027of_videomode_helper\u0027 of git://git.pengutronix.de/git/str/linux into drm-next\n\nvideomode helpers for of + devicetree stuff, required for new kms drivers\n\n(not the fbdev maintainer).\n\n* tag \u0027of_videomode_helper\u0027 of git://git.pengutronix.de/git/str/linux:\n drm_modes: add of_videomode helpers\n drm_modes: add videomode helpers\n fbmon: add of_videomode helpers\n fbmon: add videomode helpers\n video: add of helper for display timings/videomode\n video: add display_timing and videomode\n viafb: rename display_timing to via_display_timing\n" }, { "commit": "edb37a95c58147f89713e6c5cd220fa8fdfb4833", "tree": "f4f344a417e57d115e80f2bffc05d2b81c08986c", "parents": [ "ebc64e453857e93b230881f48126257be9aa8830" ], "author": { "name": "Steffen Trumtrar", "email": "s.trumtrar@pengutronix.de", "time": "Sun Oct 28 18:28:06 2012 +0100" }, "committer": { "name": "Steffen Trumtrar", "email": "s.trumtrar@pengutronix.de", "time": "Thu Jan 24 09:04:14 2013 +0100" }, "message": "drm_modes: add of_videomode helpers\n\nAdd helper to get drm_display_mode from devicetree.\n\nSigned-off-by: Steffen Trumtrar \u003cs.trumtrar@pengutronix.de\u003e\nReviewed-by: Thierry Reding \u003cthierry.reding@avionic-design.de\u003e\nAcked-by: Thierry Reding \u003cthierry.reding@avionic-design.de\u003e\nTested-by: Thierry Reding \u003cthierry.reding@avionic-design.de\u003e\nTested-by: Philipp Zabel \u003cp.zabel@pengutronix.de\u003e\nReviewed-by: Laurent Pinchart \u003claurent.pinchart@ideasonboard.com\u003e\nAcked-by: Laurent Pinchart \u003claurent.pinchart@ideasonboard.com\u003e\nTested-by: Afzal Mohammed \u003cAfzal@ti.com\u003e\nTested-by: Rob Clark \u003crobclark@gmail.com\u003e\nTested-by: Leela Krishna Amudala \u003cleelakrishna.a@gmail.com\u003e\n" }, { "commit": "ebc64e453857e93b230881f48126257be9aa8830", "tree": "8ccb80725d3c273f5579bc1539ca841acd35381f", "parents": [ "790890444f591145d3a00623af461c9006e17d51" ], "author": { "name": "Steffen Trumtrar", "email": "s.trumtrar@pengutronix.de", "time": "Wed Nov 14 11:22:52 2012 +0100" }, "committer": { "name": "Steffen Trumtrar", "email": "s.trumtrar@pengutronix.de", "time": "Thu Jan 24 09:04:09 2013 +0100" }, "message": "drm_modes: add videomode helpers\n\nAdd conversion from videomode to drm_display_mode\n\nSigned-off-by: Steffen Trumtrar \u003cs.trumtrar@pengutronix.de\u003e\nReviewed-by: Thierry Reding \u003cthierry.reding@avionic-design.de\u003e\nAcked-by: Thierry Reding \u003cthierry.reding@avionic-design.de\u003e\nTested-by: Thierry Reding \u003cthierry.reding@avionic-design.de\u003e\nTested-by: Philipp Zabel \u003cp.zabel@pengutronix.de\u003e\nReviewed-by: Laurent Pinchart \u003claurent.pinchart@ideasonboard.com\u003e\nAcked-by: Laurent Pinchart \u003claurent.pinchart@ideasonboard.com\u003e\nTested-by: Afzal Mohammed \u003cAfzal@ti.com\u003e\nTested-by: Rob Clark \u003crobclark@gmail.com\u003e\nTested-by: Leela Krishna Amudala \u003cleelakrishna.a@gmail.com\u003e\n" }, { "commit": "4b096ac10da0b63f09bd123b86fed8deb80646ce", "tree": "3d252a1b2ed182beb769796fb99eb68693176bfa", "parents": [ "dac35663cef4ca7f572d430bb54b14be8f03cb10" ], "author": { "name": "Daniel Vetter", "email": "daniel.vetter@ffwll.ch", "time": "Mon Dec 10 21:19:18 2012 +0100" }, "committer": { "name": "Daniel Vetter", "email": "daniel.vetter@ffwll.ch", "time": "Sun Jan 20 22:16:58 2013 +0100" }, "message": "drm: revamp locking around fb creation/destruction\n\nWell, at least step 1. The goal here is that framebuffer objects can\nsurvive outside of the mode_config lock, with just a reference held\nas protection. The first step to get there is to introduce a special\nfb_lock which protects fb lookup, creation and destruction, to make\nthem appear atomic.\n\nThis new fb_lock can nest within the mode_config lock. But the idea is\n(once the reference counting part is completed) that we only quickly\ntake that fb_lock to lookup a framebuffer and grab a reference,\nwithout any other locks involved.\n\nvmwgfx is the only driver which does framebuffer lookups itself, also\nwrap those calls to drm_mode_object_find with the new lock.\n\nAlso protect the fb_list walking in i915 and omapdrm with the new lock.\n\nAs a slight complication there\u0027s also the list of user-created fbs\nattached to the file private. The problem now is that at fclose() time\nwe need to walk that list, eventually do a modeset call to remove the\nfb from active usage (and are required to be able to take the\nmode_config lock), but in the end we need to grab the new fb_lock to\nremove the fb from the list. The easiest solution is to add another\nmutex to protect this per-file list.\n\nCurrently that new fbs_lock nests within the modeset locks and so\nappears redudant. But later patches will switch around this sequence\nso that taking the modeset locks in the fb destruction path is\noptional in the fastpath. Ultimately the goal is that addfb and rmfb\ndo not require the mode_config lock, since otherwise they have the\npotential to introduce stalls in the pageflip sequence of a compositor\n(if the compositor e.g. switches to a fullscreen client or if it\nenables a plane). But that requires a few more steps and hoops to jump\nthrough.\n\nNote that framebuffer creation/destruction is now double-protected -\nonce by the fb_lock and in parts by the idr_lock. The later would be\nunnecessariy if framebuffers would have their own idr allocator. But\nthat\u0027s material for another patch (series).\n\nv2: Properly initialize the fb-\u003efilp_head list in _init, otherwise the\nnewly added WARN to check whether the fb isn\u0027t on a fpriv list any\nmore will fail for driver-private objects.\n\nv3: Fixup two error-case unlock bugs spotted by Richard Wilbur.\n\nReviewed-by: Rob Clark \u003crob@ti.com\u003e\nSigned-off-by: Daniel Vetter \u003cdaniel.vetter@ffwll.ch\u003e\n" }, { "commit": "8faf6b18a2a6bece008de1e6bb80f0c608e58483", "tree": "e30089b80dc9706a4842c9d53094a4f9ecadb2e4", "parents": [ "7d1f9aeff1ee4a20b1aeb377dd0f579fe9647619" ], "author": { "name": "Daniel Vetter", "email": "daniel.vetter@ffwll.ch", "time": "Sat Dec 01 23:43:11 2012 +0100" }, "committer": { "name": "Daniel Vetter", "email": "daniel.vetter@ffwll.ch", "time": "Sun Jan 20 15:29:04 2013 +0100" }, "message": "drm: review locking rules in drm_crtc.c\n\n- config_cleanup was confused: It claimed that callers need to hold\n the modeset lock, but the connector|encoder_cleanup helpers grabbed\n that themselves (note that crtc_cleanup did _not_ grab the modeset\n lock). Which resulted in all drivers _not_ hodling the lock. Since\n this is for single-threaded cleanup code, drop the requirement from\n docs and also drop the lock_grabbing from all _cleanup functions.\n\n- Kill the LOCKING section in the doctype, since clearly we\u0027re not\n good enough to keep them up-to-date. And misleading locking\n documentation is worse than useless (see e.g. the comment in the\n vmgfx driver about the cleanup mess). And since for most functions\n the very first line either grabs the lock or has a WARN_ON(!locked)\n the documentation doesn\u0027t really add anything.\n\n- Instead put in some effort into explaining the only two special\n cases a bit better: config_init and config_cleanup are both called\n from single-threaded setup/teardown code, so don\u0027t do any locking.\n It\u0027s the driver\u0027s job though to enforce this.\n\n- Where lacking, add a WARN_ON(!is_locked). Not many places though,\n since locking around fbdev setup/teardown is through-roughly screwed\n up, and so will break almost every single WARN annotation I\u0027ve tried\n to add.\n\n- Add a drm_modeset_is_locked helper - the Grate Modset Locking Rework\n will use the compiler to assist in the big reorg by renaming the\n mode lock, so start encapsulating things. Unfortunately this ended\n up in the \"wrong\" header file since it needs the definition of\n struct drm_device.\n\nv2: Drop most WARNS again - we hit them all over the place, mostly in\nthe setup and teardown sequences. And trying to fix it up leads to\nnice deadlocks, since the locking in the setup code is really\ninconsistent.\n\nReviewed-by: Rob Clark \u003crob@ti.com\u003e\nSigned-off-by: Daniel Vetter \u003cdaniel.vetter@ffwll.ch\u003e\n" }, { "commit": "c61eef726a78ae77b6ce223d01ea2130f465fe5c", "tree": "7bd310556195005b5c4c1cbadadc9da1fbf5163c", "parents": [ "e62f2f5acba1d466da047983ae16f6b96b68b310" ], "author": { "name": "Imre Deak", "email": "imre.deak@intel.com", "time": "Tue Oct 23 18:53:26 2012 +0000" }, "committer": { "name": "Dave Airlie", "email": "airlied@redhat.com", "time": "Tue Nov 20 16:06:16 2012 +1000" }, "message": "drm: add support for monotonic vblank timestamps\n\nJumps in the vblank and page flip event timestamps cause trouble for\nclients, so we should avoid them. The timestamp we get currently with\ngettimeofday can jump, so use instead monotonic timestamps.\n\nFor backward compatibility use a module flag to revert back to using\ngettimeofday timestamps. Add also a DRM_CAP_TIMESTAMP_MONOTONIC flag\nthat is simply a read only version of the module flag, so that clients\ncan query this without depending on sysfs.\n\nSigned-off-by: Imre Deak \u003cimre.deak@intel.com\u003e\nSigned-off-by: Dave Airlie \u003cairlied@redhat.com\u003e\n" }, { "commit": "c6eefa1750ec0308956895027c3a79eee2ef9726", "tree": "9bff1495c1be215c41d956578262575723c19895", "parents": [ "edec4af4c3d6d225578290a9acc38c78147df55b" ], "author": { "name": "Rob Clark", "email": "rob@ti.com", "time": "Tue Oct 16 22:48:40 2012 +0000" }, "committer": { "name": "Dave Airlie", "email": "airlied@redhat.com", "time": "Tue Nov 20 15:47:21 2012 +1000" }, "message": "drm: add drm_send_vblank_event() helper (v5)\n\nA helper that drivers can use to send vblank event after a pageflip.\nIf the driver doesn\u0027t support proper vblank irq based time/seqn then\njust pass -1 for the pipe # to get do_gettimestamp() behavior (since\nthere are a lot of drivers that don\u0027t use drm_vblank_count_and_time())\n\nAlso an internal send_vblank_event() helper for the various other code\npaths within drm_irq that also need to send vblank events.\n\nv1: original\nv2: add back \u0027vblwait-\u003ereply.sequence \u003d seq\u0027 which should not have\n been deleted\nv3: add WARN_ON() in case lock is not held and comments\nv4: use WARN_ON_SMP() instead to fix issue with !SMP \u0026\u0026 !DEBUG_SPINLOCK\n as pointed out by Marcin Slusarz\nv5: update docbook\n\nSigned-off-by: Rob Clark \u003crob@ti.com\u003e\nSigned-off-by: Dave Airlie \u003cairlied@redhat.com\u003e\n" }, { "commit": "612a9aab56a93533e76e3ad91642db7033e03b69", "tree": "8402096973f67af941f9392f7da06cca03e0b58a", "parents": [ "3a494318b14b1bc0f59d2d6ce84c505c74d82d2a", "268d28371cd326be4dfcd7eba5917bf4b9d30c8f" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Oct 03 23:29:23 2012 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Oct 03 23:29:23 2012 -0700" }, "message": "Merge branch \u0027drm-next\u0027 of git://people.freedesktop.org/~airlied/linux\n\nPull drm merge (part 1) from Dave Airlie:\n \"So first of all my tree and uapi stuff has a conflict mess, its my\n fault as the nouveau stuff didn\u0027t hit -next as were trying to rebase\n regressions out of it before we merged.\n\n Highlights:\n - SH mobile modesetting driver and associated helpers\n - some DRM core documentation\n - i915 modesetting rework, haswell hdmi, haswell and vlv fixes, write\n combined pte writing, ilk rc6 support,\n - nouveau: major driver rework into a hw core driver, makes features\n like SLI a lot saner to implement,\n - psb: add eDP/DP support for Cedarview\n - radeon: 2 layer page tables, async VM pte updates, better PLL\n selection for \u003e 2 screens, better ACPI interactions\n\n The rest is general grab bag of fixes.\n\n So why part 1? well I have the exynos pull req which came in a bit\n late but was waiting for me to do something they shouldn\u0027t have and it\n looks fairly safe, and David Howells has some more header cleanups\n he\u0027d like me to pull, that seem like a good idea, but I\u0027d like to get\n this merge out of the way so -next dosen\u0027t get blocked.\"\n\nTons of conflicts mostly due to silly include line changes, but mostly\nmindless. A few other small semantic conflicts too, noted from Dave\u0027s\npre-merged branch.\n\n* \u0027drm-next\u0027 of git://people.freedesktop.org/~airlied/linux: (447 commits)\n drm/nv98/crypt: fix fuc build with latest envyas\n drm/nouveau/devinit: fixup various issues with subdev ctor/init ordering\n drm/nv41/vm: fix and enable use of \"real\" pciegart\n drm/nv44/vm: fix and enable use of \"real\" pciegart\n drm/nv04/dmaobj: fixup vm target handling in preparation for nv4x pcie\n drm/nouveau: store supported dma mask in vmmgr\n drm/nvc0/ibus: initial implementation of subdev\n drm/nouveau/therm: add support for fan-control modes\n drm/nouveau/hwmon: rename pwm0* to pmw1* to follow hwmon\u0027s rules\n drm/nouveau/therm: calculate the pwm divisor on nv50+\n drm/nouveau/fan: rewrite the fan tachometer driver to get more precision, faster\n drm/nouveau/therm: move thermal-related functions to the therm subdev\n drm/nouveau/bios: parse the pwm divisor from the perf table\n drm/nouveau/therm: use the EXTDEV table to detect i2c monitoring devices\n drm/nouveau/therm: rework thermal table parsing\n drm/nouveau/gpio: expose the PWM/TOGGLE parameter found in the gpio vbios table\n drm/nouveau: fix pm initialization order\n drm/nouveau/bios: check that fixed tvdac gpio data is valid before using it\n drm/nouveau: log channel debug/error messages from client object rather than drm client\n drm/nouveau: have drm debugging macros build on top of core macros\n ...\n" }, { "commit": "9b2e077c42a97fcbdc0dd71edb1fc9d15c74ad29", "tree": "20bf301d21f6c3776046acada5070630009ceedb", "parents": [ "a54dfb1a845c38a97686268d8c4086a63d9493aa", "10b63956fce7f369cc37fd4d994f09bd5203efe4" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Oct 03 13:45:43 2012 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Oct 03 13:45:43 2012 -0700" }, "message": "Merge tag \u0027uapi-prep-20121002\u0027 of git://git.infradead.org/users/dhowells/linux-headers\n\nPull preparatory patches for user API disintegration from David Howells:\n \"The patches herein prepare for the extraction of the Userspace API\n bits from the various header files named in the Kbuild files.\n\n New subdirectories are created under either include/uapi/ or\n arch/x/include/uapi/ that correspond to the subdirectory containing\n that file under include/ or arch/x/include/.\n\n The new subdirs under the uapi/ directory are populated with Kbuild\n files that mostly do nothing at this time. Further patches will\n disintegrate the headers in each original directory and fill in the\n Kbuild files as they do it.\n\n These patches also:\n\n (1) fix up #inclusions of \"foo.h\" rather than \u003cfoo.h\u003e.\n\n (2) Remove some redundant #includes from the DRM code.\n\n (3) Make the kernel build infrastructure handle Kbuild files both in\n the old places and the new UAPI place that both specify headers\n to be exported.\n\n (4) Fix some kernel tools that #include kernel headers during their\n build.\n\n I have compile tested this with allyesconfig against x86_64,\n allmodconfig against i386 and a scattering of additional defconfigs of\n other arches. Prepared for main script\n\n Signed-off-by: David Howells \u003cdhowells@redhat.com\u003e\n Acked-by: Arnd Bergmann \u003carnd@arndb.de\u003e\n Acked-by: Thomas Gleixner \u003ctglx@linutronix.de\u003e\n Acked-by: Michael Kerrisk \u003cmtk.manpages@gmail.com\u003e\n Acked-by: Paul E. McKenney \u003cpaulmck@linux.vnet.ibm.com\u003e\n Acked-by: Dave Jones \u003cdavej@redhat.com\u003e\n Acked-by: H. Peter Anvin \u003chpa@zytor.com\u003e\"\n\n* tag \u0027uapi-prep-20121002\u0027 of git://git.infradead.org/users/dhowells/linux-headers:\n UAPI: Plumb the UAPI Kbuilds into the user header installation and checking\n UAPI: x86: Differentiate the generated UAPI and internal headers\n UAPI: Remove the objhdr-y export list\n UAPI: Move linux/version.h\n UAPI: Set up uapi/asm/Kbuild.asm\n UAPI: x86: Fix insn_sanity build failure after UAPI split\n UAPI: x86: Fix the test_get_len tool\n UAPI: (Scripted) Set up UAPI Kbuild files\n UAPI: Partition the header include path sets and add uapi/ header directories\n UAPI: (Scripted) Convert #include \"...\" to #include \u003cpath/...\u003e in kernel system headers\n UAPI: (Scripted) Convert #include \"...\" to #include \u003cpath/...\u003e in drivers/gpu/\n UAPI: (Scripted) Remove redundant DRM UAPI header #inclusions from drivers/gpu/.\n UAPI: Refer to the DRM UAPI headers with \u003c...\u003e and from certain headers only\n" }, { "commit": "a1ce39288e6fbefdd8d607021d02384eb4a20b99", "tree": "c72e67f0c9d828420788f9086a19df1b9a7e39ae", "parents": [ "760285e7e7ab282c25b5e90816f7c47000557f4f" ], "author": { "name": "David Howells", "email": "dhowells@redhat.com", "time": "Tue Oct 02 18:01:25 2012 +0100" }, "committer": { "name": "David Howells", "email": "dhowells@redhat.com", "time": "Tue Oct 02 18:01:25 2012 +0100" }, "message": "UAPI: (Scripted) Convert #include \"...\" to #include \u003cpath/...\u003e in kernel system headers\n\nConvert #include \"...\" to #include \u003cpath/...\u003e in kernel system headers.\n\nSigned-off-by: David Howells \u003cdhowells@redhat.com\u003e\nAcked-by: Arnd Bergmann \u003carnd@arndb.de\u003e\nAcked-by: Thomas Gleixner \u003ctglx@linutronix.de\u003e\nAcked-by: Paul E. McKenney \u003cpaulmck@linux.vnet.ibm.com\u003e\nAcked-by: Dave Jones \u003cdavej@redhat.com\u003e\n" }, { "commit": "19218e482d3f023166b26143c1a1c6d166a30415", "tree": "e67dac7d591077432fd8838d1e5d8fe91456c227", "parents": [ "974a847e00cf3ff1695e62b276892137893706ab" ], "author": { "name": "David Howells", "email": "dhowells@redhat.com", "time": "Tue Oct 02 18:01:03 2012 +0100" }, "committer": { "name": "David Howells", "email": "dhowells@redhat.com", "time": "Tue Oct 02 18:01:03 2012 +0100" }, "message": "UAPI: Refer to the DRM UAPI headers with \u003c...\u003e and from certain headers only\n\nOnly refer to the DRM UAPI headers (drm.h, drm_mode.h and drm_sarea.h) from\nwithin drmP.h and drm_crtc.h, and use #include \u003c...\u003e to refer to them so that\nwhen the UAPI split happens they can still be accessed.\n\nSigned-off-by: David Howells \u003cdhowells@redhat.com\u003e\nAcked-by: Dave Airlie \u003cairlied@redhat.com\u003e\nAcked-by: Arnd Bergmann \u003carnd@arndb.de\u003e\nAcked-by: Thomas Gleixner \u003ctglx@linutronix.de\u003e\nAcked-by: Paul E. McKenney \u003cpaulmck@linux.vnet.ibm.com\u003e\nAcked-by: Dave Jones \u003cdavej@redhat.com\u003e\n" }, { "commit": "9da3da660d8c19a54f6e93361d147509be3fff84", "tree": "3479ef13a733975a02dd679e3fc9ae0872e3be25", "parents": [ "f60d7f0c1d55a935475ab394955cafddefaa6533" ], "author": { "name": "Chris Wilson", "email": "chris@chris-wilson.co.uk", "time": "Fri Jun 01 15:20:22 2012 +0100" }, "committer": { "name": "Daniel Vetter", "email": "daniel.vetter@ffwll.ch", "time": "Thu Sep 20 14:22:57 2012 +0200" }, "message": "drm/i915: Replace the array of pages with a scatterlist\n\nRather than have multiple data structures for describing our page layout\nin conjunction with the array of pages, we can migrate all users over to\na scatterlist.\n\nOne major advantage, other than unifying the page tracking structures,\nthis offers is that we replace the vmalloc\u0027ed array (which can be up to\na megabyte in size) with a chain of individual pages which helps reduce\nmemory pressure.\n\nThe disadvantage is that we then do not have a simple array to iterate,\nor to access randomly. The common case for this is in the relocation\nprocessing, which will typically fit within a single scatterlist page\nand so be almost the same cost as the simple array. For iterating over\nthe array, the extra function call could be optimised away, but in\nreality is an insignificant cost of either binding the pages, or\nperforming the pwrite/pread.\n\nv2: Fix drm_clflush_sg() to not invoke wbinvd as well! And fix the\ntrivial compile error from rebasing.\n\nSigned-off-by: Chris Wilson \u003cchris@chris-wilson.co.uk\u003e\nSigned-off-by: Daniel Vetter \u003cdaniel.vetter@ffwll.ch\u003e\n" }, { "commit": "5fce5e0bbd44263c36f58ad1113b599d06ed1978", "tree": "1864cb5740d44f1e16d373e69fca5eb54e449213", "parents": [ "1efdb69b0bb41dec8ee3e2cac0a0f167837d0919" ], "author": { "name": "Eric W. Biederman", "email": "ebiederm@xmission.com", "time": "Tue Feb 07 16:47:26 2012 -0800" }, "committer": { "name": "Eric W. Biederman", "email": "ebiederm@xmission.com", "time": "Thu Sep 13 14:32:24 2012 -0700" }, "message": "userns: Convert drm to use kuid and kgid and struct pid where appropriate\n\nBlink Blink this had not been converted to use struct pid ages ago?\n\n- On drm open capture the openers kuid and struct pid.\n- On drm close release the kuid and struct pid\n- When reporting the uid and pid convert the kuid and struct pid\n into values in the appropriate namespace.\n\nCc: dri-devel@lists.freedesktop.org\nAcked-by: Dave Airlie \u003cairlied@redhat.com\u003e\nAcked-by: Serge Hallyn \u003cserge.hallyn@canonical.com\u003e\nSigned-off-by: Eric W. Biederman \u003cebiederm@xmission.com\u003e\n" }, { "commit": "a344a7e7c27776950a70ce4b829a9ac15a212e65", "tree": "cec3273f7d64c1aff3505c500a17a2a92fd8199d", "parents": [ "4c373790a4d4d667d1ab38b1fe2bbf6a8322e93b" ], "author": { "name": "Daniel Vetter", "email": "daniel.vetter@ffwll.ch", "time": "Wed Oct 26 00:54:41 2011 +0200" }, "committer": { "name": "Dave Airlie", "email": "airlied@redhat.com", "time": "Thu Jul 19 22:50:55 2012 -0400" }, "message": "drm: kill dma queue support\n\nAbsolutely unused. All the values are only ever initialized and\nthen used at most in some debug printout functions.\n\nSigned-off-by: Daniel Vetter \u003cdaniel.vetter@ffwll.ch\u003e\nSigned-off-by: Dave Airlie \u003cairlied@redhat.com\u003e\n" }, { "commit": "b0071efe827f68cf173e1a8868b70618e9aca7d7", "tree": "94b8d7ea720143811f223a2ae5ed2e7365390b52", "parents": [ "e2b3c5b64b35af35b0715936f88212c457394c2f" ], "author": { "name": "Daniel Vetter", "email": "daniel.vetter@ffwll.ch", "time": "Wed Oct 26 00:20:57 2011 +0200" }, "committer": { "name": "Dave Airlie", "email": "airlied@redhat.com", "time": "Thu Jul 19 22:50:28 2012 -0400" }, "message": "drm: kill reclaim_buffers callback\n\nAll leftover users either haven\u0027t set DRIVER_HAVE_DMA, in which\ncase this will never be called, or use the drm_core implementation.\n\nCall that directly in the only callsite.\n\nSigned-off-by: Daniel Vetter \u003cdaniel.vetter@ffwll.ch\u003e\nSigned-off-by: Dave Airlie \u003cairlied@redhat.com\u003e\n" }, { "commit": "923d1fe86b4a98292bee8f08f386eb3eb4c7927e", "tree": "f293c533806880886e145d00965022db5d907795", "parents": [ "d5346b3727bad3a033cb0a5b45a4a2da45119ec3" ], "author": { "name": "Daniel Vetter", "email": "daniel.vetter@ffwll.ch", "time": "Tue Oct 25 23:57:28 2011 +0200" }, "committer": { "name": "Dave Airlie", "email": "airlied@redhat.com", "time": "Thu Jul 19 22:49:58 2012 -0400" }, "message": "drm: kill reclaim_buffers_locked\n\ni810 was the last user of this code, with that gone, kill it.\n\nSigned-off-by: Daniel Vetter \u003cdaniel.vetter@ffwll.ch\u003e\nSigned-off-by: Dave Airlie \u003cairlied@redhat.com\u003e\n" }, { "commit": "3ae6b64400cc92530bcab73d13c6e1b7a5cfd915", "tree": "e83f18adb3a010b51dcc4e8b86e9f7f2adb2308b", "parents": [ "ea5e437406701838751ebc0f797d8b1c31df8121" ], "author": { "name": "Daniel Vetter", "email": "daniel.vetter@ffwll.ch", "time": "Tue Oct 25 23:42:29 2011 +0200" }, "committer": { "name": "Dave Airlie", "email": "airlied@redhat.com", "time": "Thu Jul 19 22:49:27 2012 -0400" }, "message": "drm: kill reclaim_buffers_idlelocked functions\n\nThe only two users are now folded into the drivers preclose functions,\nso this is unused.\n\nSigned-off-by: Daniel Vetter \u003cdaniel.vetter@ffwll.ch\u003e\nSigned-off-by: Dave Airlie \u003cairlied@redhat.com\u003e\n" }, { "commit": "f42977841f4a28b82820384fdb9b9581b410dbb1", "tree": "6ff53762d300714f76237c5e8ba34b2b57056f01", "parents": [ "cdcac9cd7741af2c2b9255cbf060f772596907bb" ], "author": { "name": "Dave Airlie", "email": "airlied@redhat.com", "time": "Wed Jun 27 08:35:53 2012 +0100" }, "committer": { "name": "Dave Airlie", "email": "airlied@redhat.com", "time": "Thu Jul 19 22:29:25 2012 -0400" }, "message": "drm/pci: add support for getting the supported link bw.\n\nThis should work for PCIE3.0 as well.\n\nSigned-off-by: Dave Airlie \u003cairlied@redhat.com\u003e\n" }, { "commit": "51ab7ba2673758561074184795bba5bac780a038", "tree": "698c399d22524b5ec018af82c89d6c5c8ff422a3", "parents": [ "4d93914ae3db4a897ead4b1e33eca7cdfff4c6f7" ], "author": { "name": "Dave Airlie", "email": "airlied@redhat.com", "time": "Fri May 18 15:40:33 2012 +0100" }, "committer": { "name": "Dave Airlie", "email": "airlied@redhat.com", "time": "Wed May 23 10:45:57 2012 +0100" }, "message": "drm/prime: introduce sg-\u003epages/addr arrays helper\n\nthe ttm drivers need this currently, in order to get fault handling\nworking and efficient.\n\nIt also allows addrs to be NULL for devices like udl.\n\nReviewed-by: Alex Deucher \u003calexander.deucher@amd.com\u003e\nSigned-off-by: Dave Airlie \u003cairlied@redhat.com\u003e\n" }, { "commit": "78b68556a964e74fb803b08c5b2d9c6ba3ec3787", "tree": "2147b191085b2fef211e0b8048bf658dab178479", "parents": [ "3b02ab8893d45f17ae104588e337188127068a92" ], "author": { "name": "Laurent Pinchart", "email": "laurent.pinchart@ideasonboard.com", "time": "Thu May 17 13:27:22 2012 +0200" }, "committer": { "name": "Dave Airlie", "email": "airlied@redhat.com", "time": "Tue May 22 10:34:53 2012 +0100" }, "message": "drm: Constify gem_vm_ops pointer\n\nThe GEM vm operations structure is passed to the VM core that stores it\nin a const field. There vm operations structures can thus be const in\nDRM as well.\n\nSigned-off-by: Laurent Pinchart \u003claurent.pinchart@ideasonboard.com\u003e\nCc: Inki Dae \u003cinki.dae@samsung.com\u003e\nCc: Alan Cox \u003calan@linux.intel.com\u003e\nCc: Daniel Vetter \u003cdaniel.vetter@ffwll.ch\u003e\nCc: Rob Clark \u003crob.clark@linaro.org\u003e\nReviewed-by: Alex Deucher \u003calexdeucher@gmail.com\u003e\nSigned-off-by: Dave Airlie \u003cairlied@redhat.com\u003e\n" }, { "commit": "3b02ab8893d45f17ae104588e337188127068a92", "tree": "27a83d4543233d151e8063ef75916897bca364a1", "parents": [ "4a1b0714275796fdbc35427cf361eb4123e5e9f6" ], "author": { "name": "Laurent Pinchart", "email": "laurent.pinchart@ideasonboard.com", "time": "Thu May 17 13:27:20 2012 +0200" }, "committer": { "name": "Dave Airlie", "email": "airlied@redhat.com", "time": "Tue May 22 10:34:33 2012 +0100" }, "message": "drm: Miscellaneous typo fixes and documentation updates\n\nSigned-off-by: Laurent Pinchart \u003claurent.pinchart@ideasonboard.com\u003e\nReviewed-by: Alex Deucher \u003calexander.deucher@amd.com\u003e\nSigned-off-by: Dave Airlie \u003cairlied@redhat.com\u003e\n" }, { "commit": "b06d66be3b0b198ee30bd9f779874ae7115570a0", "tree": "a50e0dcb547b45f2ca3c6ff0a298bfe4b73b298f", "parents": [ "62363a486019b57be1b286f5235bc0d637aa1dda" ], "author": { "name": "Rob Clark", "email": "rob@ti.com", "time": "Tue May 01 11:04:51 2012 -0500" }, "committer": { "name": "Dave Airlie", "email": "airlied@redhat.com", "time": "Fri May 11 17:37:46 2012 +0100" }, "message": "drm: pass dev to drm_vm_{open,close}_locked()\n\nPreviously these functions would assume that vma-\u003evm_file was the\ndrm_file. Although if in some cases if the drm driver needs to use\nsomething else for the backing file (such as the tmpfs filp) then this\nassumption is no longer true. But vma-\u003evm_private_data is still the\nGEM object.\n\nWith this change, now the drm_device comes from the GEM object rather\nthan the drm_file so the driver is more free to play with vma-\u003evm_file.\n\nThe scenario where this comes up is for mmap\u0027ing of cached dmabuf\u0027s\nfor non-coherent systems, where the driver needs to use fault handling\nand PTE shootdown to simulate coherency. We can\u0027t use the vma-\u003evm_file\nof the dmabuf, which is using anon_inode\u0027s address_space. The most\nstraightforward thing to do is to use the GEM object\u0027s obj-\u003efilp for\nvma-\u003evm_file in all cases, for which we need this patch.\n\nSigned-off-by: Rob Clark \u003crob@ti.com\u003e\nSigned-off-by: Dave Airlie \u003cairlied@redhat.com\u003e\n" }, { "commit": "effbc4fd8e37e41d6f2bb6bcc611c14b4fbdcf9b", "tree": "8bc2a6a2116f1031b0033bf1a8f9fbe92201c5c1", "parents": [ "6a7068b4ef17dfb9de3191321f1adc91fa1659ca", "ec34a01de31128e5c08e5f05c47f4a787f45a33c" ], "author": { "name": "Dave Airlie", "email": "airlied@redhat.com", "time": "Thu Apr 12 10:27:01 2012 +0100" }, "committer": { "name": "Dave Airlie", "email": "airlied@redhat.com", "time": "Thu Apr 12 10:27:01 2012 +0100" }, "message": "Merge branch \u0027drm-intel-next\u0027 of git://people.freedesktop.org/~danvet/drm-intel into drm-core-next\n\nDaniel Vetter wrote\nFirst pull request for 3.5-next, slightly large than usual because new\nthings kept coming in since the last pull for 3.4.\nHighlights:\n- first batch of hw enablement for vlv (Jesse et al) and hsw (Eugeni). pci\n ids are not yet added, and there\u0027s still quite a few patches to merge\n (mostly modesetting). To make QA easier I\u0027ve decided to merge this stuff\n in pieces.\n- loads of cleanups and prep patches spurred by the above. Especially vlv\n is a real frankenstein chip, but also hsw is stretching our driver\u0027s\n code design. Expect more to come in this area for 3.5.\n- more gmbus fixes, cleanups and improvements by Daniel Kurtz. Again,\n there are more patches needed (and some already queued up), but I wanted\n to split this a bit for better testing.\n- pwrite/pread rework and retuning. This series has been in the works for\n a few months already and a lot of i-g-t tests have been created for it.\n Now it\u0027s finally ready to be merged. Note that one patch in this series\n touches include/pagemap.h, that patch is acked-by akpm.\n- reduce mappable pressure and relocation throughput improvements from\n Chris.\n- mmap offset exhaustion mitigation by Chris Wilson.\n- a start at figuring out which codepaths in our messy dri1/ums+gem/kms\n driver we actually need to support by bailing out of unsupported case.\n The driver now refuses to load without kms on gen6+ and disallows a few\n ioctls that userspace never used in certain cases. More of this will\n definitely come.\n- More decoupling of global gtt and ppgtt.\n- Improved dual-link lvds detection by Takashi Iwai.\n- Shut up the compiler + plus fix the fallout (Ben)\n- Inverted panel brightness handling (mostly Acer manages to break things\n in this way).\n- Small fixlets and adjustements and some minor things to help debugging.\n\nRegression-wise QA reported quite a few issues on ivb, but all of them\nturned out to be hw stability issues which are already fixed in\ndrm-intel-fixes (QA runs the nightly regression tests on -next alone,\nwithout -fixes automatically merged in). There\u0027s still one issue open on\nsnb, it looks like occlusion query writes are not quite as cache coherent\nas we\u0027ve expected. With some of the pwrite adjustements we can now\nreliably hit this. Kernel workaround for it is in the works.\"\n\n* \u0027drm-intel-next\u0027 of git://people.freedesktop.org/~danvet/drm-intel: (101 commits)\n drm/i915: VCS is not the last ring\n drm/i915: Add a dual link lvds quirk for MacBook Pro 8,2\n drm/i915: make quirks more verbose\n drm/i915: dump the DMA fetch addr register on pre-gen6\n drm/i915/sdvo: Include YRPB as an additional TV output type\n drm/i915: disallow gem init ioctl on ilk\n drm/i915: refuse to load on gen6+ without kms\n drm/i915: extract gt interrupt handler\n drm/i915: use render gen to switch ring irq functions\n drm/i915: rip out old HWSTAM missed irq WA for vlv\n drm/i915: open code gen6+ ring irqs\n drm/i915: ring irq cleanups\n drm/i915: add SFUSE_STRAP registers for digital port detection\n drm/i915: add WM_LINETIME registers\n drm/i915: add WRPLL clocks\n drm/i915: add LCPLL control registers\n drm/i915: add SSC offsets for SBI access\n drm/i915: add port clock selection support for HSW\n drm/i915: add S PLL control\n drm/i915: add PIXCLK_GATE register\n ...\n\nConflicts:\n\tdrivers/char/agp/intel-agp.h\n\tdrivers/char/agp/intel-gtt.c\n\tdrivers/gpu/drm/i915/i915_debugfs.c\n" }, { "commit": "3248877ea1796915419fba7c89315fdbf00cb56a", "tree": "4fab8743212004bc033e71e02a2e051b64001606", "parents": [ "f52b69f86e27903d6896ed5fa7cd280fec8de532" ], "author": { "name": "Dave Airlie", "email": "airlied@redhat.com", "time": "Fri Nov 25 15:21:02 2011 +0000" }, "committer": { "name": "Dave Airlie", "email": "airlied@redhat.com", "time": "Fri Mar 30 11:52:44 2012 +0100" }, "message": "drm: base prime/dma-buf support (v5)\n\nThis adds the basic drm dma-buf interface layer, called PRIME. This\ncommit doesn\u0027t add any driver support, it is simply and agreed upon starting\npoint so we can work towards merging driver support for the next merge window.\n\nCurrent drivers with work done are nouveau, i915, udl, exynos and omap.\n\nThe main APIs exposed to userspace allow translating a 32-bit object handle\nto a file descriptor, and a file descriptor to a 32-bit object handle.\n\nThe flags value is currently limited to O_CLOEXEC.\n\nAcknowledgements:\nDaniel Vetter: lots of review\nRob Clark: cleaned up lots of the internals and did lifetime review.\n\nv2: rename some functions after Chris preferred a green shed\nfix IS_ERR_OR_NULL -\u003e IS_ERR\nv3: Fix Ville pointed out using buffer + kmalloc\nv4: add locking as per ickle review\nv5: allow re-exporting the original dma-buf (Daniel)\n\nReviewed-by: Daniel Vetter \u003cdaniel.vetter@ffwll.ch\u003e\nReviewed-by: Rob Clark \u003crob.clark@linaro.org\u003e\nReviewed-by: Sumit Semwal \u003csumit.semwal@linaro.org\u003e\nReviewed-by: Inki Dae \u003cinki.dae@samsung.com\u003e\nAcked-by: Ben Widawsky \u003cbenjamin.widawsky@intel.com\u003e\nSigned-off-by: Dave Airlie \u003cairlied@redhat.com\u003e\n" }, { "commit": "6d5cd9cb1e32e4f4e4468704430b26bcb0bfb129", "tree": "8dbb4943c5bafc999421d395d8a1f656bbb35ca0", "parents": [ "dbf7bff074d5fdc87c61b1b41d8e809109cf0bf8" ], "author": { "name": "Daniel Vetter", "email": "daniel.vetter@ffwll.ch", "time": "Sun Mar 25 19:47:30 2012 +0200" }, "committer": { "name": "Daniel Vetter", "email": "daniel.vetter@ffwll.ch", "time": "Tue Mar 27 13:19:45 2012 +0200" }, "message": "drm: add helper to clflush a virtual address range\n\nUseful when the page is already mapped to copy date in/out.\n\nFor -stable because the next patch (fixing phys obj pwrite) needs this\nlittle helper function.\n\nTested-by: Chris Wilson \u003cchris@chris-wilson.co.uk\u003e\nReviewed-by: Chris Wilson \u003cchris@chris-wilson.co.uk\u003e\nCc: dri-devel@lists.freedesktop.org\nSigned-off-by: Daniel Vetter \u003cdaniel.vetter@ffwll.ch\u003e\n" }, { "commit": "2c07a21d6fb0be47fda696a618b726ea258ed1dd", "tree": "8ab0b7541ee4f9f75397d3da190426041dc08c6e", "parents": [ "cbc7e22151d99ed1dd7649d268ad3d81b9e6255a" ], "author": { "name": "Dave Airlie", "email": "airlied@redhat.com", "time": "Mon Feb 20 14:18:07 2012 +0000" }, "committer": { "name": "Dave Airlie", "email": "airlied@redhat.com", "time": "Thu Mar 15 13:35:33 2012 +0000" }, "message": "drm: add core support for unplugging a device (v2)\n\nTwo parts to this, one is simple unplug from sysfs for the device node.\n\nThe second adds an unplugged state, if we have device opens, we\njust set the unplugged state and return, if we have no device\nopens we drop the drm device.\n\nIf after a lastclose we discover we are unplugged we then\ndrop the drm device.\n\nv2: use an atomic for unplugged and wrap it for users,\nadd checks on open + mmap + ioctl entry points.\n\nSigned-off-by: Dave Airlie \u003cairlied@redhat.com\u003e\n" }, { "commit": "884a53ef43eb69dfd48408659b9606e581aee7ba", "tree": "7a881927509ba03381afa26e96496354d739438e", "parents": [ "54e88e065ef5e89de797de0c98e50f2ed1c174db" ], "author": { "name": "Sascha Hauer", "email": "s.hauer@pengutronix.de", "time": "Wed Feb 29 09:06:21 2012 +0100" }, "committer": { "name": "Dave Airlie", "email": "airlied@redhat.com", "time": "Wed Feb 29 10:18:29 2012 +0000" }, "message": "drm: remove unused code\n\nremove declared but unused functions from drmP.h, fix the comments\nwhere necessary. Also, remove drm_mem_info which is unused.\n\nSigned-off-by: Sascha Hauer \u003cs.hauer@pengutronix.de\u003e\nSigned-off-by: Dave Airlie \u003cairlied@redhat.com\u003e\n" }, { "commit": "598781d71119827b454fd75d46f84755bca6f0c6", "tree": "51ccb65b8e26b3347099af3f466ad0fedc6e1cb6", "parents": [ "15b63d35261ba3351d07e7937252f18bb6cbf814" ], "author": { "name": "Thomas Hellstrom", "email": "thellstrom@vmware.com", "time": "Tue Jan 24 18:54:21 2012 +0100" }, "committer": { "name": "Dave Airlie", "email": "airlied@redhat.com", "time": "Wed Jan 25 09:27:45 2012 +0000" }, "message": "drm: Fix authentication kernel crash\n\nIf the master tries to authenticate a client using drm_authmagic and\nthat client has already closed its drm file descriptor,\neither wilfully or because it was terminated, the\ncall to drm_authmagic will dereference a stale pointer into kmalloc\u0027ed memory\nand corrupt it.\n\nTypically this results in a hard system hang.\n\nThis patch fixes that problem by removing any authentication tokens\n(struct drm_magic_entry) open for a file descriptor when that file\ndescriptor is closed.\n\nSigned-off-by: Thomas Hellstrom \u003cthellstrom@vmware.com\u003e\nReviewed-by: Daniel Vetter \u003cdaniel.vetter@ffwll.ch\u003e\nCc: stable@vger.kernel.org\nSigned-off-by: Dave Airlie \u003cairlied@redhat.com\u003e\n" }, { "commit": "1a464cbb3d483f2f195b614cffa4aa1b910a0440", "tree": "af57dee6436532dbb546b8670e9e1f6910d489b5", "parents": [ "dbe950f201a8edd353b0bd9079e8d536ee4ce37c", "095f979a539245a46b9e5d600ec9c720b4d928e5" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Jan 10 11:04:36 2012 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Jan 10 11:04:36 2012 -0800" }, "message": "Merge branch \u0027drm-core-next\u0027 of git://people.freedesktop.org/~airlied/linux\n\n* \u0027drm-core-next\u0027 of git://people.freedesktop.org/~airlied/linux: (307 commits)\n drm/nouveau/pm: fix build with HWMON off\n gma500: silence gcc warnings in mid_get_vbt_data()\n drm/ttm: fix condition (and vs or)\n drm/radeon: double lock typo in radeon_vm_bo_rmv()\n drm/radeon: use after free in radeon_vm_bo_add()\n drm/sis|via: don\u0027t return stack garbage from free_mem ioctl\n drm/radeon/kms: remove pointless CS flags priority struct\n drm/radeon/kms: check if vm is supported in VA ioctl\n drm: introduce drm_can_sleep and use in intel/radeon drivers. (v2)\n radeon: Fix disabling PCI bus mastering on big endian hosts.\n ttm: fix agp since ttm tt rework\n agp: Fix multi-line warning message whitespace\n drm/ttm/dma: Fix accounting error when calling ttm_mem_global_free_page and don\u0027t try to free freed pages.\n drm/ttm/dma: Only call set_pages_array_wb when the page is not in WB pool.\n drm/radeon/kms: sync across multiple rings when doing bo moves v3\n drm/radeon/kms: Add support for multi-ring sync in CS ioctl (v2)\n drm/radeon: GPU virtual memory support v22\n drm: make DRM_UNLOCKED ioctls with their own mutex\n drm: no need to hold global mutex for static data\n drm/radeon/benchmark: common modes sweep ignores 640x480@32\n ...\n\nFix up trivial conflicts in radeon/evergreen.c and vmwgfx/vmwgfx_kms.c\n" }, { "commit": "cc1f71942944890c7e05fc55dc4427c94b63d4f1", "tree": "2e9e1b347adb6e4457a02da6e5c2fcbdda851a28", "parents": [ "3df96909b75835d487a9178761622b0cbd7310d4" ], "author": { "name": "Dave Airlie", "email": "airlied@redhat.com", "time": "Thu Jan 05 09:55:22 2012 +0000" }, "committer": { "name": "Dave Airlie", "email": "airlied@redhat.com", "time": "Fri Jan 06 10:01:35 2012 +0000" }, "message": "drm: introduce drm_can_sleep and use in intel/radeon drivers. (v2)\n\nSo we have a few places where the drm drivers would like to sleep to\nbe nice to the system, mainly in the modesetting paths, but we also\nhave two cases were atomic modesetting must take place, panic writing\nand kernel debugger. So provide a central inline to determine if a\nsleep or delay should be used and use this in the intel and radeon drivers.\n\nv2: drop intel_drv.h MSLEEP macro, nobody uses it.\n\nBased on patch from Michel Dänzer \u003cmichel.daenzer@amd.com\u003e\n\nBugzilla: https://bugs.freedesktop.org/show_bug.cgi?id\u003d43941\n\nReviewed-by: Daniel Vetter \u003cdaniel.vetter@ffwll.ch\u003e\nSigned-off-by: Dave Airlie \u003cairlied@redhat.com\u003e\n" }, { "commit": "1fbe6f625f69e48c4001051dc1431afc704acfaa", "tree": "826b741201a2e09a627ed350c6ff36935f5cff79", "parents": [ "0cecdd818cd79d092e36e70dfe3a71f2878d6b96", "384703b8e6cd4c8ef08512e596024e028c91c339" ], "author": { "name": "Dave Airlie", "email": "airlied@redhat.com", "time": "Tue Dec 20 14:43:53 2011 +0000" }, "committer": { "name": "Dave Airlie", "email": "airlied@redhat.com", "time": "Tue Dec 20 14:43:53 2011 +0000" }, "message": "Merge tag \u0027v3.2-rc6\u0027 of /home/airlied/devel/kernel/linux-2.6 into drm-core-next\n\nMerge in the upstream tree to bring in the mainline fixes.\n\nConflicts:\n\tdrivers/gpu/drm/exynos/exynos_drm_fbdev.c\n\tdrivers/gpu/drm/nouveau/nouveau_sgdma.c\n" }, { "commit": "42b2aa86c6670347a2a07e6d7af0e0ecc8fdbff9", "tree": "6f8fb2a1efb3e84bf281658befe06dc6a7fb026b", "parents": [ "a13b032776379fa6e2bfccf798969ca51e5fb052" ], "author": { "name": "Justin P. Mattock", "email": "justinmattock@gmail.com", "time": "Mon Nov 28 20:31:00 2011 -0800" }, "committer": { "name": "Jiri Kosina", "email": "jkosina@suse.cz", "time": "Fri Dec 02 14:57:31 2011 +0100" }, "message": "treewide: Fix typos in various parts of the kernel, and fix some comments.\n\nThe below patch fixes some typos in various parts of the kernel, as well as fixes some comments.\nPlease let me know if I missed anything, and I will try to get it changed and resent.\n\nSigned-off-by: Justin P. Mattock \u003cjustinmattock@gmail.com\u003e\nAcked-by: Randy Dunlap \u003crdunlap@xenotime.net\u003e\nSigned-off-by: Jiri Kosina \u003cjkosina@suse.cz\u003e\n" }, { "commit": "e08e96de986ceb2c6b683df0bd0c4ddd4f91dcfd", "tree": "632e9e5dc117204b0f1e78f57be6abdc6f4750f3", "parents": [ "d68752cf7bb92eafbbe6a0df0d0fab67e87523f6" ], "author": { "name": "Arjan van de Ven", "email": "arjan@infradead.org", "time": "Mon Oct 31 07:28:57 2011 -0700" }, "committer": { "name": "Dave Airlie", "email": "airlied@redhat.com", "time": "Fri Nov 11 11:14:47 2011 +0000" }, "message": "drm: Make the per-driver file_operations struct const\n\nFrom fdf1fdebaa00f81de18c227f32f8074c8b352d50 Mon Sep 17 00:00:00 2001\nFrom: Arjan van de Ven \u003carjan@linux.intel.com\u003e\nDate: Sun, 30 Oct 2011 19:06:07 -0700\nSubject: [PATCH] drm: Make the per-driver file_operations struct const\n\nThe DRM layer keeps a copy of struct file_operations inside its\nbig driver struct... which prevents it from being consistent and static.\nFor consistency (and the general security objective of having such things\nstatic), it\u0027s desirable to get this fixed.\n\nThis patch splits out the file_operations field to its own struct,\nwhich is then \"static const\", and just stick a pointer to this into\nthe driver struct, making it more consistent with how the rest of the\nkernel does this.\n\nSigned-off-by: Arjan van de Ven \u003carjan@linux.intel.com\u003e\nSigned-off-by: Dave Airlie \u003cairlied@redhat.com\u003e\n" }, { "commit": "b3e067c0b276197b59046d7095b01b99f98b2821", "tree": "90a260a3a560e0f06398db84ebe3feb27d569128", "parents": [ "3b9832f662d195755e7308f92368d44458268457" ], "author": { "name": "Marcin Slusarz", "email": "marcin.slusarz@gmail.com", "time": "Wed Nov 09 22:20:35 2011 +0100" }, "committer": { "name": "Dave Airlie", "email": "airlied@redhat.com", "time": "Fri Nov 11 11:05:19 2011 +0000" }, "message": "drm: serialize access to list of debugfs files\n\nNouveau, when configured with debugfs, creates debugfs files for every\nchannel, so structure holding list of files needs to be protected from\nsimultaneous changes by multiple threads.\n\nWithout this patch it\u0027s possible to hit kernel oops in\ndrm_debugfs_remove_files just by running a couple of xterms with\nlooped glxinfo.\n\nSigned-off-by: Marcin Slusarz \u003cmarcin.slusarz@gmail.com\u003e\nReviewed-by: Daniel Vetter \u003cdaniel.vetter@ffwll.ch\u003e\nSigned-off-by: Dave Airlie \u003cairlied@redhat.com\u003e\n" }, { "commit": "32aaeffbd4a7457bf2f7448b33b5946ff2a960eb", "tree": "faf7ad871d87176423ff9ed1d1ba4d9c688fc23f", "parents": [ "208bca0860406d16398145ddd950036a737c3c9d", "67b84999b1a8b1af5625b1eabe92146c5eb42932" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sun Nov 06 19:44:47 2011 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sun Nov 06 19:44:47 2011 -0800" }, "message": "Merge branch \u0027modsplit-Oct31_2011\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/paulg/linux\n\n* \u0027modsplit-Oct31_2011\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/paulg/linux: (230 commits)\n Revert \"tracing: Include module.h in define_trace.h\"\n irq: don\u0027t put module.h into irq.h for tracking irqgen modules.\n bluetooth: macroize two small inlines to avoid module.h\n ip_vs.h: fix implicit use of module_get/module_put from module.h\n nf_conntrack.h: fix up fallout from implicit moduleparam.h presence\n include: replace linux/module.h with \"struct module\" wherever possible\n include: convert various register fcns to macros to avoid include chaining\n crypto.h: remove unused crypto_tfm_alg_modname() inline\n uwb.h: fix implicit use of asm/page.h for PAGE_SIZE\n pm_runtime.h: explicitly requires notifier.h\n linux/dmaengine.h: fix implicit use of bitmap.h and asm/page.h\n miscdevice.h: fix up implicit use of lists and types\n stop_machine.h: fix implicit use of smp.h for smp_processor_id\n of: fix implicit use of errno.h in include/linux/of.h\n of_platform.h: delete needless include \u003clinux/module.h\u003e\n acpi: remove module.h include from platform/aclinux.h\n miscdevice.h: delete unnecessary inclusion of module.h\n device_cgroup.h: delete needless include \u003clinux/module.h\u003e\n net: sch_generic remove redundant use of \u003clinux/module.h\u003e\n net: inet_timewait_sock doesnt need \u003clinux/module.h\u003e\n ...\n\nFix up trivial conflicts (other header files, and removal of the ab3550 mfd driver) in\n - drivers/media/dvb/frontends/dibx000_common.c\n - drivers/media/video/{mt9m111.c,ov6650.c}\n - drivers/mfd/ab3550-core.c\n - include/linux/dmaengine.h\n" }, { "commit": "b9075fa968a0a4347aef35e235e2995c0e57dddd", "tree": "cf9f9716784e790d8a43339653256d9cf9178ff3", "parents": [ "ae29bc92da01a2e9d278a9a58c3b307d41cc0254" ], "author": { "name": "Joe Perches", "email": "joe@perches.com", "time": "Mon Oct 31 17:11:33 2011 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon Oct 31 17:30:54 2011 -0700" }, "message": "treewide: use __printf not __attribute__((format(printf,...)))\n\nStandardize the style for compiler based printf format verification.\nStandardized the location of __printf too.\n\nDone via script and a little typing.\n\n$ grep -rPl --include\u003d*.[ch] -w \"__attribute__\" * | \\\n grep -vP \"^(tools|scripts|include/linux/compiler-gcc.h)\" | \\\n xargs perl -n -i -e \u0027local $/; while (\u003c\u003e) { s/\\b__attribute__\\s*\\(\\s*\\(\\s*format\\s*\\(\\s*printf\\s*,\\s*(.+)\\s*,\\s*(.+)\\s*\\)\\s*\\)\\s*\\)/__printf($1, $2)/g ; print; }\u0027\n\n[akpm@linux-foundation.org: revert arch bits]\nSigned-off-by: Joe Perches \u003cjoe@perches.com\u003e\nCc: \"Kirill A. Shutemov\" \u003ckirill@shutemov.name\u003e\nSigned-off-by: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "de47725421ad5627a5c905f4e40bb844ebc06d29", "tree": "bc23b0405d4a79dcc866a8b2877f128ee0ea9ffc", "parents": [ "eb5589a8f0dab7e29021344228856339e6a1249c" ], "author": { "name": "Paul Gortmaker", "email": "paul.gortmaker@windriver.com", "time": "Thu May 26 13:46:22 2011 -0400" }, "committer": { "name": "Paul Gortmaker", "email": "paul.gortmaker@windriver.com", "time": "Mon Oct 31 19:32:32 2011 -0400" }, "message": "include: replace linux/module.h with \"struct module\" wherever possible\n\nThe \u003clinux/module.h\u003e pretty much brings in the kitchen sink along\nwith it, so it should be avoided wherever reasonably possible in\nterms of being included from other commonly used \u003clinux/something.h\u003e\nfiles, as it results in a measureable increase on compile times.\n\nThe worst culprit was probably device.h since it is used everywhere.\nThis file also had an implicit dependency/usage of mutex.h which was\nmasked by module.h, and is also fixed here at the same time.\n\nThere are over a dozen other headers that simply declare the\nstruct instead of pulling in the whole file, so follow their lead\nand simply make it a few more.\n\nMost of the implicit dependencies on module.h being present by\nthese headers pulling it in have been now weeded out, so we can\nfinally make this change with hopefully minimal breakage.\n\nSigned-off-by: Paul Gortmaker \u003cpaul.gortmaker@windriver.com\u003e\n" }, { "commit": "75ef8b3b9c0b76eb5a16cd838cb99a7deecceb85", "tree": "1d6a3762bbc157fe3fc65982f42452c97d539d4f", "parents": [ "302a8e8b06d312dcb3b718dfeb42aa912b5f426b" ], "author": { "name": "Rob Clark", "email": "rob@ti.com", "time": "Wed Aug 10 08:09:07 2011 -0500" }, "committer": { "name": "Dave Airlie", "email": "airlied@redhat.com", "time": "Tue Aug 30 11:06:06 2011 +0100" }, "message": "drm/gem: add functions for mmap offset creation\n\nSigned-off-by: Rob Clark \u003crob@ti.com\u003e\nSigned-off-by: Dave Airlie \u003cairlied@redhat.com\u003e\n" }, { "commit": "62cb70118c4efabb3c0a6f962168ddcad4344eef", "tree": "68c8877c9fd761435082b84ae53c579e2a79fb93", "parents": [ "04fee895ef98ffbb91a941b53a92d6949bb6d1c4" ], "author": { "name": "Alan Cox", "email": "alan@linux.intel.com", "time": "Tue Jun 07 14:17:51 2011 +0100" }, "committer": { "name": "Dave Airlie", "email": "airlied@redhat.com", "time": "Mon Jul 25 12:07:15 2011 +0100" }, "message": "drm/gem: add support for private objects\n\nThese small changes should allow GEM to be used with non shmem objects as\nwell as shmem objects. In the GMA500 case it allows the base framebuffer to\nappear as a GEM object and thus acquire a handle and work with KMS.\n\nFor i915 it ought to be trivial to get back the wasted memory but putting the\nsystem fb back into stolen RAM and in general I can imagine it allowing the\nuse of GEM and thus KMS with all the older cards that have their framebuffer\nfirmly placed in video RAM.\n\nSigned-off-by: Alan Cox \u003calan@linux.intel.com\u003e\nTested-by: Rob Clark \u003crob@ti.com\u003e\nSigned-off-by: Dave Airlie \u003cairlied@redhat.com\u003e\n" }, { "commit": "58b6542b50ded4243c26c251c0507e5f658642f6", "tree": "f2cf26ee85607daf86983b3d10871e186a0c7dde", "parents": [ "d52589b785404c944e734ecc4e1d42326197613c" ], "author": { "name": "Jon Mason", "email": "jdmason@kudzu.us", "time": "Mon Jun 27 16:07:50 2011 +0000" }, "committer": { "name": "Dave Airlie", "email": "airlied@redhat.com", "time": "Wed Jul 13 08:14:52 2011 +0100" }, "message": "DRM: remove drm_pci_device_is_pcie\n\ndrm_pci_device_is_pcie duplicates the funcationality of pci_is_pcie.\nConvert callers of the former to the latter. This has the side benefit\nof removing an unnecessary search in the PCI configuration space due to\nusing a saved PCIe capability offset.\n\n[airlied: update for new callsite]\n\nSigned-off-by: Jon Mason \u003cjdmason@kudzu.us\u003e\nSigned-off-by: Dave Airlie \u003cairlied@redhat.com\u003e\n" }, { "commit": "304eda32920b5e23f6b9bc12eb40c7dc52a464ba", "tree": "c36e760a7ea45158999fe541134bff7841af94c5", "parents": [ "a377e187df725fe7e62d2cec59ec290c5a605d93" ], "author": { "name": "Ben Skeggs", "email": "bskeggs@redhat.com", "time": "Thu Jun 09 00:24:59 2011 +0000" }, "committer": { "name": "Dave Airlie", "email": "airlied@redhat.com", "time": "Tue Jun 21 12:32:33 2011 +1000" }, "message": "drm/gem: add hooks to notify driver when object handle is created/destroyed\n\nNouveau is going to use these hooks to map/unmap objects from a client\u0027s\nprivate GPU address space.\n\nSigned-off-by: Ben Skeggs \u003cbskeggs@redhat.com\u003e\nSigned-off-by: Dave Airlie \u003cairlied@redhat.com\u003e\n" }, { "commit": "1794d257fa7bab3ea5162f8abdca749996b65343", "tree": "ea8d035a218a0cb0ee83443b3c25bd8df25567e2", "parents": [ "bbb0aef5cfe95fe9b51a7eeba4a440b69037b01f" ], "author": { "name": "Chris Wilson", "email": "chris@chris-wilson.co.uk", "time": "Sun Apr 17 07:43:32 2011 +0100" }, "committer": { "name": "Dave Airlie", "email": "airlied@redhat.com", "time": "Thu Apr 28 14:56:23 2011 +1000" }, "message": "drm: Export the command-line mode parser\n\nIn the absence of configuration data for providing the fixed mode for\na panel, I would like to be able to pass such modes along a separate\nmodule paramenter. To do so, I then need to parse a modeline from a\nstring, which drm is already capable of. Export that capability to the\ndrivers.\n\nSigned-off-by: Chris Wilson \u003cchris@chris-wilson.co.uk\u003e\nSigned-off-by: Dave Airlie \u003cairlied@redhat.com\u003e\n" }, { "commit": "bbb0aef5cfe95fe9b51a7eeba4a440b69037b01f", "tree": "858fdc7ee2b358827888f278fdfd0dddfbacc64b", "parents": [ "5ad3d8831f0c97257460c11ddcc1cc0466c762d4" ], "author": { "name": "Joe Perches", "email": "joe@perches.com", "time": "Sun Apr 17 20:35:52 2011 -0700" }, "committer": { "name": "Dave Airlie", "email": "airlied@redhat.com", "time": "Thu Apr 28 14:53:21 2011 +1000" }, "message": "drm: Verify debug message arguments\n\nAdd __attribute__((format (printf, 4, 5))) to drm_ut_debug_printk\nand fix fallout.\n\nSigned-off-by: Joe Perches \u003cjoe@perches.com\u003e\nSigned-off-by: Dave Airlie \u003cairlied@redhat.com\u003e\n" }, { "commit": "5ad3d8831f0c97257460c11ddcc1cc0466c762d4", "tree": "8ab86a7b1c0ebfcfdbf24270ac1f54ed1bed8a6e", "parents": [ "cb49ba0bb18632faa7c5ce1dcb095eaa70821c1d" ], "author": { "name": "Joe Perches", "email": "joe@perches.com", "time": "Sun Apr 17 20:35:51 2011 -0700" }, "committer": { "name": "Dave Airlie", "email": "airlied@redhat.com", "time": "Thu Apr 28 14:53:02 2011 +1000" }, "message": "drm: Create and use drm_err\n\nReduce drm text size ~1% by using drm_err and\nprintf extension %pV to emit error messages.\n\nRemove unused macro DRM_MEM_ERROR.\n\n$ size drivers/gpu/drm/built-in.o*\n text\t data\t bss\t dec\t hex\tfilename\n 361159\t 9663\t 256\t 371078\t 5a986\tdrivers/gpu/drm/built-in.o.new\n 365416\t 9663\t 256\t 375335\t 5ba27\tdrivers/gpu/drm/built-in.o.old\n\nSigned-off-by: Joe Perches \u003cjoe@perches.com\u003e\nSigned-off-by: Dave Airlie \u003cairlied@redhat.com\u003e\n" }, { "commit": "25985edcedea6396277003854657b5f3cb31a628", "tree": "f026e810210a2ee7290caeb737c23cb6472b7c38", "parents": [ "6aba74f2791287ec407e0f92487a725a25908067" ], "author": { "name": "Lucas De Marchi", "email": "lucas.demarchi@profusion.mobi", "time": "Wed Mar 30 22:57:33 2011 -0300" }, "committer": { "name": "Lucas De Marchi", "email": "lucas.demarchi@profusion.mobi", "time": "Thu Mar 31 11:26:23 2011 -0300" }, "message": "Fix common misspellings\n\nFixes generated by \u0027codespell\u0027 and manually reviewed.\n\nSigned-off-by: Lucas De Marchi \u003clucas.demarchi@profusion.mobi\u003e\n" }, { "commit": "34db18abd376b2075c760c38f0b861aed379415d", "tree": "c4174e39a2f445f17c25ab206d45c66217bbbf85", "parents": [ "e73f88af66fcc50083fae4b7e1c39b469179a97a", "47ae63e0c2e5fdb582d471dc906eb29be94c732f" ], "author": { "name": "Dave Airlie", "email": "airlied@redhat.com", "time": "Mon Mar 14 14:15:13 2011 +1000" }, "committer": { "name": "Dave Airlie", "email": "airlied@redhat.com", "time": "Mon Mar 14 14:15:13 2011 +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: (755 commits)\n drm/i915: Only wait on a pending flip if we intend to write to the buffer\n drm/i915/dp: Sanity check eDP existence\n drm/i915: Rebind the buffer if its alignment constraints changes with tiling\n drm/i915: Disable GPU semaphores by default\n drm/i915: Do not overflow the MMADDR write FIFO\n Revert \"drm/i915: fix corruptions on i8xx due to relaxed fencing\"\n drm/i915: Don\u0027t save/restore hardware status page address register\n drm/i915: don\u0027t store the reg value for HWS_PGA\n drm/i915: fix memory corruption with GM965 and \u003e4GB RAM\n Linux 2.6.38-rc7\n Revert \"TPM: Long default timeout fix\"\n drm/i915: Re-enable GPU semaphores for SandyBridge mobile\n drm/i915: Replace vblank PM QoS with \"Interrupt-Based AGPBUSY#\"\n Revert \"drm/i915: Use PM QoS to prevent C-State starvation of gen3 GPU\"\n drm/i915: Allow relocation deltas outside of target bo\n drm/i915: Silence an innocuous compiler warning for an unused variable\n fs/block_dev.c: fix new kernel-doc warning\n ACPI: Fix build for CONFIG_NET unset\n mm: \u003casm-generic/pgtable.h\u003e must include \u003clinux/mm_types.h\u003e\n x86: Use u32 instead of long to set reset vector back to 0\n ...\n\nConflicts:\n\tdrivers/gpu/drm/i915/i915_gem.c\n" }, { "commit": "9f35421e09c494c36079d7cf5724ae9f832431d7", "tree": "1c9ab806a43a30df918e9e12505823a387779e34", "parents": [ "e1e84017f95504348308085ae7cd0bfe268caf10" ], "author": { "name": "Ben Skeggs", "email": "bskeggs@redhat.com", "time": "Mon Feb 21 11:17:35 2011 +1000" }, "committer": { "name": "Dave Airlie", "email": "airlied@redhat.com", "time": "Fri Mar 04 14:47:30 2011 +1000" }, "message": "drm/core: add ioctl to query device/driver capabilities\n\nWe\u0027re coming to see a need to have a set of generic capability checks in\nthe core DRM, in addition to the driver-specific ioctls that already\nexist.\n\nThis patch defines an ioctl to do as such, but does not yet define any\ncapabilities.\n\n[airlied: drop the driver callback for now.]\n\nSigned-off-by: Ben Skeggs \u003cbskeggs@redhat.com\u003e\nSigned-off-by: Dave Airlie \u003cairlied@redhat.com\u003e\n" }, { "commit": "1922756124ddd53846877416d92ba4a802bc658f", "tree": "22b5b5e5457d5eab364cd2c860814b29874e56f7", "parents": [ "3c0556e9673f79e386b27768e27d18b3ce29e40e" ], "author": { "name": "Dave Airlie", "email": "airlied@redhat.com", "time": "Thu Feb 24 08:35:06 2011 +1000" }, "committer": { "name": "Dave Airlie", "email": "airlied@redhat.com", "time": "Mon Feb 28 15:24:35 2011 +1000" }, "message": "drm: fix unsigned vs signed comparison issue in modeset ctl ioctl.\n\nThis fixes CVE-2011-1013.\n\nReported-by: Matthiew Herrb (OpenBSD X.org team)\nCc: stable@kernel.org\nSigned-off-by: Dave Airlie \u003cairlied@redhat.com\u003e\n" }, { "commit": "a250b9fdc53a286d32e22f21170382a46b3a3ef5", "tree": "46bca176ce307f951d3e154b7a41ddd43fdee0ac", "parents": [ "8410ea3b95d105a5be5db501656f44bbb91197c1" ], "author": { "name": "Dave Airlie", "email": "airlied@gmail.com", "time": "Wed Dec 15 07:13:55 2010 +1000" }, "committer": { "name": "Dave Airlie", "email": "airlied@redhat.com", "time": "Mon Feb 07 13:09:42 2011 +1000" }, "message": "drm: add usb framework\n\nThis adds an initial framework to plug USB graphics devices\ninto the drm/kms subsystem.\n\nI\u0027ve started writing a displaylink driver using this interface.\n\nSigned-off-by: Dave Airlie \u003cairlied@redhat.com\u003e\n" }, { "commit": "8410ea3b95d105a5be5db501656f44bbb91197c1", "tree": "6cd27f207e50c13ba2f4a78d6323bc23f751e380", "parents": [ "ff72145badb834e8051719ea66e024784d000cb4" ], "author": { "name": "Dave Airlie", "email": "airlied@gmail.com", "time": "Wed Dec 15 03:16:38 2010 +1000" }, "committer": { "name": "Dave Airlie", "email": "airlied@redhat.com", "time": "Mon Feb 07 13:09:36 2011 +1000" }, "message": "drm: rework PCI/platform driver interface.\n\nThis abstracts the pci/platform interface out a step further,\nwe can go further but this is far enough for now to allow USB\nto be plugged in.\n\nThe drivers now just call the init code directly for their\ndevice type.\n\nSigned-off-by: Dave Airlie \u003cairlied@redhat.com\u003e\n" }, { "commit": "ff72145badb834e8051719ea66e024784d000cb4", "tree": "39dc5fc512e3e0836713de9defb91ea8b4033aa2", "parents": [ "1f692a14cbfbeb11f9a9c16f25c8ecb8ab50d3d5" ], "author": { "name": "Dave Airlie", "email": "airlied@redhat.com", "time": "Mon Feb 07 12:16:14 2011 +1000" }, "committer": { "name": "Dave Airlie", "email": "airlied@redhat.com", "time": "Mon Feb 07 12:16:14 2011 +1000" }, "message": "drm: dumb scanout create/mmap for intel/radeon (v3)\n\nThis is just an idea that might or might not be a good idea,\nit basically adds two ioctls to create a dumb and map a dumb buffer\nsuitable for scanout. The handle can be passed to the KMS ioctls to create\na framebuffer.\n\nIt looks to me like it would be useful in the following cases:\na) in development drivers - we can always provide a shadowfb fallback.\nb) libkms users - we can clean up libkms a lot and avoid linking\nto libdrm_*.\nc) plymouth via libkms is a lot easier.\n\nUserspace bits would be just calls + mmaps. We could probably\nmark these handles somehow as not being suitable for acceleartion\nso as top stop people who are dumber than dumb.\n\nSigned-off-by: Dave Airlie \u003cairlied@redhat.com\u003e\n" }, { "commit": "78c6e170badd22c86a5b50a7eb038a02024b8f03", "tree": "481dba4a9d30cf25ee25cda443a17cb6e209668c", "parents": [ "021a8455bedb01750fa8047c8576e19d5af9a99f" ], "author": { "name": "Chris Wilson", "email": "chris@chris-wilson.co.uk", "time": "Mon Jan 31 10:48:04 2011 +0000" }, "committer": { "name": "Chris Wilson", "email": "chris@chris-wilson.co.uk", "time": "Mon Jan 31 12:38:47 2011 +0000" }, "message": "drm/i915: Suppress spurious vblank interrupts\n\nHugh Dickins found that characters in xterm were going missing and oft\ndelayed. Being the curious type, he managed to associate this with the\nnew high-precision vblank patches; disabling these he found, restored\nthe orderliness of his characters.\n\nThe oddness begins when one realised that Hugh was not using vblanks at\nall on his system (fvwm and some xterms). Instead, all he had to go on\nwere warning of a pipe underrun, curiously enough at around 60Hz. He\npoked and found that in addition to the underrun warning, the hardware\nwas flagging the start of a new frame, a vblank, which in turn was\nkicking off the pending vblank processing code.\n\nThere is little we can do for the underruns on Hugh\u0027s machine, a\nCrestline [965GM], which must have its FIFO watermarks set to 8.\nHowever, we do not need to process the vblank if we know that they are\ndisabled...\n\nReported-by: Hugh Dickins \u003chughd@google.com\u003e\nSigned-off-by: Chris Wilson \u003cchris@chris-wilson.co.uk\u003e\n" }, { "commit": "5bcf719b7db0f9366cedaf102b081f99b1c325ae", "tree": "6929d42e1d61a3b1bd7b130a37a80b99718e14aa", "parents": [ "8d608aa6295242fe4c4b6105b8c59c6a5b232d89" ], "author": { "name": "Dave Airlie", "email": "airlied@redhat.com", "time": "Tue Dec 07 09:20:40 2010 +1000" }, "committer": { "name": "Dave Airlie", "email": "airlied@redhat.com", "time": "Wed Jan 05 13:45:30 2011 +1000" }, "message": "drm/switcheroo: track state of switch in drivers.\n\nWe need to track the state of the switch in drivers, so that after s/r\nwe don\u0027t resume the card we\u0027ve explicitly switched off before. Also\ndon\u0027t allow a userspace open to occur if we\u0027ve switched the gpu off.\n\nSigned-off-by: Dave Airlie \u003cairlied@redhat.com\u003e\n" }, { "commit": "d8c58fabd75021cdd99abcd96513cb088d41092b", "tree": "f6554ecfb27c0d50f5ae6acae3a7077282813cab", "parents": [ "9c04f015ebc2cc2cca5a4a576deb82a311578edc", "b08ebe7e776e5be0271ed1e1bbb384e1f29dd117" ], "author": { "name": "Chris Wilson", "email": "chris@chris-wilson.co.uk", "time": "Thu Dec 16 21:02:15 2010 +0000" }, "committer": { "name": "Chris Wilson", "email": "chris@chris-wilson.co.uk", "time": "Thu Dec 16 21:02:15 2010 +0000" }, "message": "Merge remote branch \u0027airlied/drm-core-next\u0027 into drm-intel-next\n" }, { "commit": "4af72e2865a23ac090884a421bd1a8b19e247a22", "tree": "a4188f9feed58258a13d8b00c907c19c5045c85e", "parents": [ "40ce6575102b23e432932b5ce41c44bf7cc5023b" ], "author": { "name": "Daniel Vetter", "email": "daniel.vetter@ffwll.ch", "time": "Fri Nov 05 18:13:43 2010 +0100" }, "committer": { "name": "Chris Wilson", "email": "chris@chris-wilson.co.uk", "time": "Tue Nov 23 20:14:44 2010 +0000" }, "message": "drm: kill drm_agp_chipset_flush\n\nNo longer used.\n\nCc: Dave Airlie \u003cairlied@gmail.com\u003e\nSigned-off-by: Daniel Vetter \u003cdaniel.vetter@ffwll.ch\u003e\nSigned-off-by: Chris Wilson \u003cchris@chris-wilson.co.uk\u003e\n" }, { "commit": "27641c3f003e7f3b6585c01d8a788883603eb262", "tree": "e26eb639c4b5f429d30033d598544f82479d1ea3", "parents": [ "3561d43fd289f590fdae672e5eb831b8d5cf0bf6" ], "author": { "name": "Mario Kleiner", "email": "mario.kleiner@tuebingen.mpg.de", "time": "Sat Oct 23 04:20:23 2010 +0200" }, "committer": { "name": "Dave Airlie", "email": "airlied@redhat.com", "time": "Mon Nov 22 11:45:05 2010 +1000" }, "message": "drm/vblank: Add support for precise vblank timestamping.\n\nThe DRI2 swap \u0026 sync implementation needs precise\nvblank counts and precise timestamps corresponding\nto those vblank counts. For conformance to the OpenML\nOML_sync_control extension specification the DRM\ntimestamp associated with a vblank count should\ncorrespond to the start of video scanout of the first\nscanline of the video frame following the vblank\ninterval for that vblank count.\n\nTherefore we need to carry around precise timestamps\nfor vblanks. Currently the DRM and KMS drivers generate\ntimestamps ad-hoc via do_gettimeofday() in some\nplaces. The resulting timestamps are sometimes not\nvery precise due to interrupt handling delays, they\ndon\u0027t conform to OML_sync_control and some are wrong,\nas they aren\u0027t taken synchronized to the vblank.\n\nThis patch implements support inside the drm core\nfor precise and robust timestamping. It consists\nof the following interrelated pieces.\n\n1. Vblank timestamp caching:\n\nA per-crtc ringbuffer stores the most recent vblank\ntimestamps corresponding to vblank counts.\n\nThe ringbuffer can be read out lock-free via the\naccessor function:\n\nstruct timeval timestamp;\nvblankcount \u003d drm_vblank_count_and_time(dev, crtcid, \u0026timestamp).\n\nThe function returns the current vblank count and\nthe corresponding timestamp for start of video\nscanout following the vblank interval. It can be\nused anywhere between enclosing drm_vblank_get(dev, crtcid)\nand drm_vblank_put(dev,crtcid) statements. It is used\ninside the drmWaitVblank ioctl and in the vblank event\nqueueing and handling. It should be used by kms drivers for\ntimestamping of bufferswap completion.\n\nThe timestamp ringbuffer is reinitialized each time\nvblank irq\u0027s get reenabled in drm_vblank_get()/\ndrm_update_vblank_count(). It is invalidated when\nvblank irq\u0027s get disabled.\n\nThe ringbuffer is updated inside drm_handle_vblank()\nat each vblank irq.\n\n2. Calculation of precise vblank timestamps:\n\ndrm_get_last_vbltimestamp() is used to compute the\ntimestamp for the end of the most recent vblank (if\ninside active scanout), or the expected end of the\ncurrent vblank interval (if called inside a vblank\ninterval). The function calls into a new optional kms\ndriver entry point dev-\u003edriver-\u003eget_vblank_timestamp()\nwhich is supposed to provide the precise timestamp.\nIf a kms driver doesn\u0027t implement the entry point or\nif the call fails, a simple do_gettimeofday() timestamp\nis returned as crude approximation of the true vblank time.\n\nA new drm module parameter drm.timestamp_precision_usec\nallows to disable high precision timestamps (if set to\nzero) or to specify the maximum acceptable error in\nthe timestamps in microseconds.\n\nKms drivers could implement their get_vblank_timestamp()\nfunction in a gpu specific way, as long as returned\ntimestamps conform to OML_sync_control, e.g., by use\nof gpu specific hardware timestamps.\n\nOptionally, kms drivers can simply wrap and use the new\nutility function drm_calc_vbltimestamp_from_scanoutpos().\nThis function calls a new optional kms driver function\ndev-\u003edriver-\u003eget_scanout_position() which returns the\ncurrent horizontal and vertical video scanout position\nof the crtc. The scanout position together with the\ndrm_display_timing of the current video mode is used\nto calculate elapsed time relative to start of active scanout\nfor the current video frame. This elapsed time is subtracted\nfrom the current do_gettimeofday() time to get the timestamp\ncorresponding to start of video scanout. Currently\nnon-interlaced, non-doublescan video modes, with or\nwithout panel scaling are handled correctly. Interlaced/\ndoublescan modes are tbd in a future patch.\n\n3. Filtering of redundant vblank irq\u0027s and removal of\nsome race-conditions in the vblank irq enable/disable path:\n\nSome gpu\u0027s (e.g., Radeon R500/R600) send spurious vblank\nirq\u0027s outside the vblank if vblank irq\u0027s get reenabled.\nThese get detected by use of the vblank timestamps and\nfiltered out to avoid miscounting of vblanks.\n\nSome race-conditions between the vblank irq enable/disable\nfunctions, the vblank irq handler and the gpu itself (updating\nits hardware vblank counter in the \"wrong\" moment) are\nfixed inside vblank_disable_and_save() and\ndrm_update_vblank_count() by use of the vblank timestamps and\na new spinlock dev-\u003evblank_time_lock.\n\nThe time until vblank irq disable is now configurable via\na new drm module parameter drm.vblankoffdelay to allow\nexperimentation with timeouts that are much shorter than\nthe current 5 seconds and should allow longer vblank off\nperiods for better power savings.\n\nFollowup patches will use these new functions to\nimplement precise timestamping for the intel and radeon\nkms drivers.\n\nSigned-off-by: Mario Kleiner \u003cmario.kleiner@tuebingen.mpg.de\u003e\nSigned-off-by: Dave Airlie \u003cairlied@redhat.com\u003e\n" }, { "commit": "0f8c6d7ca9257d6a01671ab69b897860d3ae9bc0", "tree": "e06b567e620e17d5ce983610ef3721d860d0cf27", "parents": [ "13b2928933919c5344716d49620a52493a243f8c" ], "author": { "name": "Chris Wilson", "email": "chris@chris-wilson.co.uk", "time": "Mon Nov 01 12:38:44 2010 +0000" }, "committer": { "name": "Chris Wilson", "email": "chris@chris-wilson.co.uk", "time": "Mon Nov 01 12:38:44 2010 +0000" }, "message": "drm/i915: Move the invalidate|flush information out of the device struct\n\n... and into a local structure scoped for the single function in which\nit is used.\n\nSigned-off-by: Chris Wilson \u003cchris@chris-wilson.co.uk\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": "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": "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": "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": "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": "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": "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": "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": "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": "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": "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": "336f5899d287f06d8329e208fc14ce50f7ec9698", "tree": "9b762d450d5eb248a6ff8317badb7e223d93ed58", "parents": [ "a4ab2773205e8b94c18625455f85e3b6bb9d7ad6", "db217dece3003df0841bacf9556b5c06aa097dae" ], "author": { "name": "Tejun Heo", "email": "tj@kernel.org", "time": "Mon Apr 05 11:37:28 2010 +0900" }, "committer": { "name": "Tejun Heo", "email": "tj@kernel.org", "time": "Mon Apr 05 11:37:28 2010 +0900" }, "message": "Merge branch \u0027master\u0027 into export-slabh\n" }, { "commit": "5a0e3ad6af8660be21ca98a971cd00f331318c05", "tree": "5bfb7be11a03176a87296a43ac6647975c00a1d1", "parents": [ "ed391f4ebf8f701d3566423ce8f17e614cde9806" ], "author": { "name": "Tejun Heo", "email": "tj@kernel.org", "time": "Wed Mar 24 17:04:11 2010 +0900" }, "committer": { "name": "Tejun Heo", "email": "tj@kernel.org", "time": "Tue Mar 30 22:02:32 2010 +0900" }, "message": "include cleanup: Update gfp.h and slab.h includes to prepare for breaking implicit slab.h inclusion from percpu.h\n\npercpu.h is included by sched.h and module.h and thus ends up being\nincluded when building most .c files. percpu.h includes slab.h which\nin turn includes gfp.h making everything defined by the two files\nuniversally available and complicating inclusion dependencies.\n\npercpu.h -\u003e slab.h dependency is about to be removed. Prepare for\nthis change by updating users of gfp and slab facilities include those\nheaders directly instead of assuming availability. As this conversion\nneeds to touch large number of source files, the following script is\nused as the basis of conversion.\n\n http://userweb.kernel.org/~tj/misc/slabh-sweep.py\n\nThe script does the followings.\n\n* Scan files for gfp and slab usages and update includes such that\n only the necessary includes are there. ie. if only gfp is used,\n gfp.h, if slab is used, slab.h.\n\n* When the script inserts a new include, it looks at the include\n blocks and try to put the new include such that its order conforms\n to its surrounding. It\u0027s put in the include block which contains\n core kernel includes, in the same order that the rest are ordered -\n alphabetical, Christmas tree, rev-Xmas-tree or at the end if there\n doesn\u0027t seem to be any matching order.\n\n* If the script can\u0027t find a place to put a new include (mostly\n because the file doesn\u0027t have fitting include block), it prints out\n an error message indicating which .h file needs to be added to the\n file.\n\nThe conversion was done in the following steps.\n\n1. The initial automatic conversion of all .c files updated slightly\n over 4000 files, deleting around 700 includes and adding ~480 gfp.h\n and ~3000 slab.h inclusions. The script emitted errors for ~400\n files.\n\n2. Each error was manually checked. Some didn\u0027t need the inclusion,\n some needed manual addition while adding it to implementation .h or\n embedding .c file was more appropriate for others. This step added\n inclusions to around 150 files.\n\n3. The script was run again and the output was compared to the edits\n from #2 to make sure no file was left behind.\n\n4. Several build tests were done and a couple of problems were fixed.\n e.g. lib/decompress_*.c used malloc/free() wrappers around slab\n APIs requiring slab.h to be added manually.\n\n5. The script was run on all .h files but without automatically\n editing them as sprinkling gfp.h and slab.h inclusions around .h\n files could easily lead to inclusion dependency hell. Most gfp.h\n inclusion directives were ignored as stuff from gfp.h was usually\n wildly available and often used in preprocessor macros. Each\n slab.h inclusion directive was examined and added manually as\n necessary.\n\n6. percpu.h was updated not to include slab.h.\n\n7. Build test were done on the following configurations and failures\n were fixed. CONFIG_GCOV_KERNEL was turned off for all tests (as my\n distributed build env didn\u0027t work with gcov compiles) and a few\n more options had to be turned off depending on archs to make things\n build (like ipr on powerpc/64 which failed due to missing writeq).\n\n * x86 and x86_64 UP and SMP allmodconfig and a custom test config.\n * powerpc and powerpc64 SMP allmodconfig\n * sparc and sparc64 SMP allmodconfig\n * ia64 SMP allmodconfig\n * s390 SMP allmodconfig\n * alpha SMP allmodconfig\n * um on x86_64 SMP allmodconfig\n\n8. percpu.h modifications were reverted so that it could be applied as\n a separate patch and serve as bisection point.\n\nGiven the fact that I had only a couple of failures from tests on step\n6, I\u0027m fairly confident about the coverage of this conversion patch.\nIf there is a breakage, it\u0027s likely to be something in one of the arch\nheaders which should be easily discoverable easily on most builds of\nthe specific arch.\n\nSigned-off-by: Tejun Heo \u003ctj@kernel.org\u003e\nGuess-its-ok-by: Christoph Lameter \u003ccl@linux-foundation.org\u003e\nCc: Ingo Molnar \u003cmingo@redhat.com\u003e\nCc: Lee Schermerhorn \u003cLee.Schermerhorn@hp.com\u003e\n" }, { "commit": "72e942dd846f98e2d35aad5436d77a878ef05c5e", "tree": "bed31b516da9fd80058800caa6161b6e0f880595", "parents": [ "d424b925f7092b9d95e0a8556872349abe79d9b6" ], "author": { "name": "Dave Airlie", "email": "airlied@redhat.com", "time": "Tue Mar 09 06:33:26 2010 +0000" }, "committer": { "name": "Dave Airlie", "email": "airlied@redhat.com", "time": "Mon Mar 15 10:31:43 2010 +1000" }, "message": "drm/ttm: use drm calloc large and free large\n\nNow that the drm core can do this, lets just use it, split the code out\nso TTM doesn\u0027t have to drag all of drmP.h in.\n\nSigned-off-by: Dave Airlie \u003cairlied@redhat.com\u003e\n" }, { "commit": "c3ae90c099bb62387507e86da7cf799850444b08", "tree": "4f546a65e35fddea09a97fbfd28ce724ea86f7c2", "parents": [ "77c1ff3982c6b36961725dd19e872a1c07df7f3b" ], "author": { "name": "Luca Barbieri", "email": "luca@luca-barbieri.com", "time": "Tue Feb 09 05:49:11 2010 +0000" }, "committer": { "name": "Dave Airlie", "email": "airlied@redhat.com", "time": "Thu Feb 11 14:21:24 2010 +1000" }, "message": "drm: introduce drm_gem_object_[handle_]unreference_unlocked\n\nThis patch introduces the drm_gem_object_unreference_unlocked\nand drm_gem_object_handle_unreference_unlocked functions that\ndo not require holding struct_mutex.\n\ndrm_gem_object_unreference_unlocked calls the new\n-\u003egem_free_object_unlocked entry point if available, and\notherwise just takes struct_mutex and just calls -\u003egem_free_object\n\nSigned-off-by: Luca Barbieri \u003cluca@luca-barbieri.com\u003e\nSigned-off-by: Dave Airlie \u003cairlied@redhat.com\u003e\n" }, { "commit": "e6be8d9d17bd44061116f601fe2609b3ace7aa69", "tree": "85b8acc2fd4734724b9d5202016743461e02ee07", "parents": [ "29ebdf925c2c45f6531a953c6c5c8e4d3b4ac2dc" ], "author": { "name": "Zhenyu Wang", "email": "zhenyu.z.wang@intel.com", "time": "Tue Jan 05 11:25:05 2010 +0800" }, "committer": { "name": "Dave Airlie", "email": "airlied@redhat.com", "time": "Thu Jan 07 13:15:50 2010 +1000" }, "message": "drm: remove address mask param for drm_pci_alloc()\n\ndrm_pci_alloc() has input of address mask for setting pci dma\nmask on the device, which should be properly setup by drm driver.\nAnd leave it as a param for drm_pci_alloc() would cause confusion\nor mistake would corrupt the correct dma mask setting, as seen on\nintel hw which set wrong dma mask for hw status page. So remove\nit from drm_pci_alloc() function.\n\nSigned-off-by: Zhenyu Wang \u003czhenyuw@linux.intel.com\u003e\nSigned-off-by: Dave Airlie \u003cairlied@redhat.com\u003e\n" }, { "commit": "ed8b67040965e4fe695db333d5914e18ea5f146f", "tree": "6fd9f50130f7ccaccf8070f7821ea8eb6743854c", "parents": [ "dcd6dfcfe959bade75fbf49499775985d2cac5d5" ], "author": { "name": "Arnd Bergmann", "email": "arnd@arndb.de", "time": "Wed Dec 16 22:17:09 2009 +0000" }, "committer": { "name": "Dave Airlie", "email": "airlied@redhat.com", "time": "Fri Dec 18 11:22:31 2009 +1000" }, "message": "drm: convert drm_ioctl to unlocked_ioctl\n\ndrm_ioctl is called with the Big Kernel Lock held,\nwhich shows up very high in statistics on vfs_ioctl.\n\nMoving the lock into the drm_ioctl function itself\nmakes sure we blame the right subsystem and it gets\nus one step closer to eliminating the locked version\nof fops-\u003eioctl.\n\nSince drm_ioctl does not require the lock itself,\nwe only need to hold it while calling the specific\nhandler. The 32 bit conversion handlers do not\ninteract with any other code, so they don\u0027t need\nthe BKL here either and can just call drm_ioctl.\n\nAs a bonus, this cleans up all the other users\nof drm_ioctl which now no longer have to find\nthe inode or call lock_kernel.\n\n[airlied: squashed the non-driver bits\nof the second patch in here, this provides\nthe flag for drivers to use to select unlocked\nioctls - but doesn\u0027t modify any drivers].\n\nSigned-off-by: Arnd Bergmann \u003carnd@arndb.de\u003e\nCc: David Airlie \u003cairlied@linux.ie\u003e\nCc: dri-devel@lists.sourceforge.net\nCc: Frederic Weisbecker \u003cfweisbec@gmail.com\u003e\nCc: Thomas Gleixner \u003ctglx@linutronix.de\u003e\nSigned-off-by: Dave Airlie \u003cairlied@redhat.com\u003e\n" }, { "commit": "3ff99164f67aae78a2bd2313f65ad55bddb1ffea", "tree": "d6bba03616d1be6ab9e6d9e92641a6f4047e1e15", "parents": [ "1bd049fa895f9c6743f38b52ce14775f5a31ea63", "f2b115e69d46344ae7afcaad5823496d2a0d8650" ], "author": { "name": "Dave Airlie", "email": "airlied@redhat.com", "time": "Tue Dec 08 14:03:47 2009 +1000" }, "committer": { "name": "Dave Airlie", "email": "airlied@redhat.com", "time": "Tue Dec 08 14:03:47 2009 +1000" }, "message": "Merge remote branch \u0027anholt/drm-intel-next\u0027 into drm-linus\n\nThis merges the upstream Intel tree and fixes up numerous conflicts\ndue to patches merged into Linus tree later in -rc cycle.\n\nConflicts:\n\tdrivers/char/agp/intel-agp.c\n\tdrivers/gpu/drm/drm_dp_i2c_helper.c\n\tdrivers/gpu/drm/i915/i915_irq.c\n\tdrivers/gpu/drm/i915/i915_suspend.c\n" }, { "commit": "1a95916f5465ad6c91398f17924949db7e0b5c36", "tree": "e9293ebb277e8cb39dcd57d9c1c07c68a0c8d803", "parents": [ "862302ffe422378a5213f558fc5cdf62c37050a9" ], "author": { "name": "Kristian Høgsberg", "email": "krh@bitplanet.net", "time": "Wed Dec 02 12:13:48 2009 -0500" }, "committer": { "name": "Dave Airlie", "email": "airlied@redhat.com", "time": "Fri Dec 04 08:59:28 2009 +1000" }, "message": "drm: Add compatibility #ifdefs for *BSD\n\nThis let\u0027s use use the linux drm headers as the canonical source for\nlibdrm on all platforms.\n\nSigned-off-by: Kristian Høgsberg \u003ckrh@bitplanet.net\u003e\nSigned-off-by: Dave Airlie \u003cairlied@redhat.com\u003e\n" }, { "commit": "862302ffe422378a5213f558fc5cdf62c37050a9", "tree": "13557874eb479023e5a64f12990416045ea60818", "parents": [ "9340d8cfeacd16cef1cbe94527f7baaed7640669" ], "author": { "name": "Thomas Hellstrom", "email": "thellstrom@vmware.com", "time": "Wed Dec 02 18:15:25 2009 +0000" }, "committer": { "name": "Dave Airlie", "email": "airlied@redhat.com", "time": "Fri Dec 04 08:55:46 2009 +1000" }, "message": "drm: Add support for drm master_[set|drop] callbacks.\n\nThe vmwgfx driver has a per master rw lock around TTM, to guarantee \nmutual exclusion when needed.\n\nThis is typically when all evictable buffers are evicted due to\n\n1) vt switch\n2) master switch\n3) suspend / resume.\n\nIn the multi-master case, on master switch the new master takes the \npreviously active master lock in write mode, and then evicts all \nbuffers. Any clients to previous masters will then block on that lock \nwhen trying to validate a buffer. fbdev also acts as a virtual master\nwrt this.\n\nSigned-off-by: Thomas Hellstrom \u003cthellstrom@vmware.com\u003e\nSigned-off-by: Jakob Bornecrantz \u003cjakob@vmware.com\u003e\nSigned-off-by: Dave Airlie \u003cairlied@redhat.com\u003e\n" }, { "commit": "778c902640530371a169ad1c03566e7c51b09874", "tree": "4230fb7e4f79e00931c1efcf2b88cfec285ae7ff", "parents": [ "27dfaf4f5825a119305db1bc63bef30ed400e376" ], "author": { "name": "Li Peng", "email": "peng.li@linux.intel.com", "time": "Mon Nov 09 12:51:22 2009 +0800" }, "committer": { "name": "Eric Anholt", "email": "eric@anholt.net", "time": "Tue Dec 01 10:27:40 2009 -0800" }, "message": "drm/i915: Fix sync to vblank when VGA output is turned off\n\nIn current vblank-wait implementation, if we turn off VGA output,\ndrm_wait_vblank will still wait on the disabled pipe until timeout,\nbecause vblank on the pipe is assumed be enabled. This would cause\nslow system response on some system such as moblin.\n\nThis patch resolve the issue by adding a drm helper function\ndrm_vblank_off which explicitly clear vblank_enabled[crtc], wake up\nany waiting queue and save last vblank counter before turning off\ncrtc. It also slightly change drm_vblank_get to ensure that we will\nwill return immediately if trying to wait on a disabled pipe.\n\nSigned-off-by: Li Peng \u003cpeng.li@intel.com\u003e\nReviewed-by: Jesse Barnes \u003cjbarnes@virtuousgeek.org\u003e\n[anholt: hand-applied for conflicts with overlay changes]\nSigned-off-by: Eric Anholt \u003ceric@anholt.net\u003e\n" }, { "commit": "f40d6817a5c2bf84f5fe7b5d1a83f1e8f8669951", "tree": "1c515a34a60f65cbfd3cf1a387427d0a9fdf878f", "parents": [ "103a196f4224dc6872081305cf7f82ebf67aa7bd", "46557bef3f3834ac33031c7be27d39d90d507442" ], "author": { "name": "Eric Anholt", "email": "eric@anholt.net", "time": "Tue Dec 01 09:01:54 2009 -0800" }, "committer": { "name": "Eric Anholt", "email": "eric@anholt.net", "time": "Tue Dec 01 09:01:54 2009 -0800" }, "message": "Merge remote branch \u0027airlied/drm-next\u0027 into drm-intel-next\n" }, { "commit": "c8e0f93a381d1d76135e567f13a4418fce66fd95", "tree": "efa286f2e381d60b514c897cd148e5a824cce667", "parents": [ "5b8f0be0dce012d190a53d55240fe3fde6306476" ], "author": { "name": "Eric Anholt", "email": "eric@anholt.net", "time": "Sun Nov 22 03:49:37 2009 +0100" }, "committer": { "name": "Eric Anholt", "email": "eric@anholt.net", "time": "Wed Nov 25 06:36:21 2009 -0800" }, "message": "drm/i915: Replace a calloc followed by copying data over it with malloc.\n\nExecbufs involve quite a bit of payload, to the extent that cache misses\nshow up in the profiles here, and a suspicion that some of those cachelines\nmay get evicted and then reloaded in the subsequent copy.\n\nThis is still abstracted like drm_calloc_large since we want to check for\nsize overflow, and because we want to choose between kmalloc and vmalloc\non the fly. cairo\u0027s interface for malloc-with-calloc\u0027s-args was used as\nthe model.\n\nSigned-off-by: Eric Anholt \u003ceric@anholt.net\u003e\n" }, { "commit": "156822f7175d9ceb9d7e808502d3c5de8841e047", "tree": "1eb79f8e11c1ce4710dcdd83210d1acb5cd95b39", "parents": [ "420a457088669e055e767dfb8468909cd1799cf9" ], "author": { "name": "Andres Salomon", "email": "dilinger@collabora.co.uk", "time": "Tue Nov 17 14:41:23 2009 -0800" }, "committer": { "name": "Dave Airlie", "email": "airlied@redhat.com", "time": "Wed Nov 18 10:02:49 2009 +1000" }, "message": "drm: kill more unused DRM macros\n\nThere are a few more macros in drmP.h that are unused; DRM_GET_PRIV_SAREA,\nDRM_ARRAY_SIZE, and DRM_WAITCOUNT can go away completely.\n\nUnfortunately, DRM_COPY is still used in one place, but we can at least\nmove it to where it\u0027s used. It\u0027s an awful looking macro..\n\n[akpm: fix overeagerness]\nSigned-off-by: Andres Salomon \u003cdilinger@collabora.co.uk\u003e\nCc: Dave Airlie \u003cairlied@linux.ie\u003e\nSigned-off-by: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nSigned-off-by: Dave Airlie \u003cairlied@redhat.com\u003e\n" }, { "commit": "420a457088669e055e767dfb8468909cd1799cf9", "tree": "6cc3c7e467ff86ea86015ef1acf55019bff91cb7", "parents": [ "4a9216453c8537a7f43a3b1708509b9dd271dc9f" ], "author": { "name": "Andres Salomon", "email": "dilinger@collabora.co.uk", "time": "Tue Nov 17 14:41:23 2009 -0800" }, "committer": { "name": "Dave Airlie", "email": "airlied@redhat.com", "time": "Wed Nov 18 10:02:49 2009 +1000" }, "message": "drm: kill some unused DRM_PROC macros from drmP.h\n\ni915_gem_proc.c appears to have been the last user of the DRM_PROC_*\nmacros, and it has gone away. The macros should die as well.\n\nSigned-off-by: Andres Salomon \u003cdilinger@collabora.co.uk\u003e\nSigned-off-by: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nSigned-off-by: Dave Airlie \u003cairlied@redhat.com\u003e\n" } ], "next": "c9a9c5e02aedc1a2815877b0268f886d2640b771" }