)]}' { "log": [ { "commit": "82ba789f48de669fd0bbc84c326f07571d078572", "tree": "8c99366d7e66497b2ee4cfa35b8eb91d253fc541", "parents": [ "ecf02a607bd801e742d7bb35c6e40f7ca15edf03", "93927ca52a55c23e0a6a305e7e9082e8411ac9fa" ], "author": { "name": "Dave Airlie", "email": "airlied@gmail.com", "time": "Fri Jan 11 07:47:25 2013 +1000" }, "committer": { "name": "Dave Airlie", "email": "airlied@gmail.com", "time": "Fri Jan 11 07:52:48 2013 +1000" }, "message": "Merge branch \u0027drm-intel-fixes\u0027 of git://people.freedesktop.org/~danvet/drm-intel\n\nDaniel writes:\n\"Pretty much all just major fixes:\n- 2 pieces of duct-tape for the ilk bug.\n- Sprite regression fixes from Chris.\n- OOPS fix for a div-by-zero from Chris, regression due to the modeset\n rework in 3.7, now brought to light by a benign change in 3.8.\n- Fix interrupted bo pinning, used to work around CS coherency issues on\n i830/i845 (kernel also has a w/a newly in 3.8, but pinning is more efficient if\n possible).\"\n" }, { "commit": "901593f2bf221659a605bdc1dcb11376ea934163", "tree": "4cee7420d2045c53974af51288372e2fe7e35ab0", "parents": [ "3490ea5de6ac4af309c3df8a26a5cca61306334c" ], "author": { "name": "Chris Wilson", "email": "chris@chris-wilson.co.uk", "time": "Wed Dec 19 16:51:06 2012 +0000" }, "committer": { "name": "Daniel Vetter", "email": "daniel.vetter@ffwll.ch", "time": "Tue Jan 08 11:52:02 2013 +0100" }, "message": "drm: Only evict the blocks required to create the requested hole\n\nAvoid clobbering adjacent blocks if they happen to expire earlier and\namalgamate together to form the requested hole.\n\nIn passing this fixes a regression from\ncommit ea7b1dd44867e9cd6bac67e7c9fc3f128b5b255c\nAuthor: Daniel Vetter \u003cdaniel.vetter@ffwll.ch\u003e\nDate: Fri Feb 18 17:59:12 2011 +0100\n\n drm: mm: track free areas implicitly\n\nwhich swaps the end address for size (with a potential overflow) and\neffectively causes the eviction code to clobber almost all earlier\nbuffers above the evictee.\n\nv2: Check the original hole not the adjusted as the coloring may confuse\nus when later searching for the overlapping nodes. Also make sure that\nwe do apply the range restriction and color adjustment in the same\norder for both scanning, searching and insertion.\n\nv3: Send the version that was actually tested.\n\nNote that this seems to be ducttape of decent quality ot paper over\nsome of our unbind related gpu hangs reported since 3.7. It is not\nfully effective though, and certainly doesn\u0027t fix the underlying bug.\n\nSigned-off-by: Chris Wilson \u003cchris@chris-wilson.co.uk\u003e\nCc: Daniel Vetter \u003cdaniel.vetter@ffwll.ch\u003e\n[danvet: Added note plus bugzilla link and tested-by.]\nCc: stable@vger.kernel.org\nBugzilla: https://bugs.freedesktop.org/show_bug.cgi?id\u003d55984\nTested-by: Norbert Preining \u003cpreining@logic.at\u003e\nAcked-by: Dave Airlie \u003cairlied@gmail.com\nSigned-off-by: Daniel Vetter \u003cdaniel.vetter@ffwll.ch\u003e\n" }, { "commit": "d81aecb5e680311e1f3fd71e49e6a4072d2374d2", "tree": "06e5e0ce2d531d775695aac739bc5a29475cf188", "parents": [ "c704f1b47d6cb4b61b2e120030088c2a7cefcc13" ], "author": { "name": "Inki Dae", "email": "daeinki@gmail.com", "time": "Tue Dec 18 02:30:17 2012 +0900" }, "committer": { "name": "Inki Dae", "email": "inki.dae@samsung.com", "time": "Fri Jan 04 15:54:32 2013 +0900" }, "message": "drm/exynos: change file license to GPL\n\nThis patch changes file license to GPL\n\nMost of exynos files had been copied from some random\nfile and not updated correctly. So this patch corrects\nthe file license.\n\nSigned-off-by: Inki Dae \u003cinki.dae@samsung.com\u003e\nSigned-off-by: Kyungmin Park \u003ckyungmin.park@samsung.com\u003e\n" }, { "commit": "8be0e5c427c18a59ce261c496ae2193cbcbafffd", "tree": "26dac80685ba46246642b901460a5042ac4e187c", "parents": [ "b1d778b970ce52e02ca6a7f34ba167fe95bc1cc4", "da494d7ca5e0a1afca3480826b5060e15c951e80" ], "author": { "name": "Dave Airlie", "email": "airlied@redhat.com", "time": "Sun Dec 30 13:54:12 2012 +1000" }, "committer": { "name": "Dave Airlie", "email": "airlied@redhat.com", "time": "Sun Dec 30 13:54:12 2012 +1000" }, "message": "Merge branch \u0027drm-intel-fixes\u0027 of git://people.freedesktop.org/~danvet/drm-intel into drm-next\n\nSome fixes for 3.8:\n- Watermark fixups from Chris Wilson (4 pieces).\n- 2 snb workarounds, seem to be recently added to our internal DB.\n- workaround for the infamous i830/i845 hang, seems now finally solid!\n Based on Chris\u0027 fix for SNA, now also for UXA/mesa\u0026old SNA.\n- Some more fixlets for shrinker-pulls-the-rug issues (Chris\u0026me).\n- Fix dma-buf flags when exporting (you).\n- Disable the VGA plane if it\u0027s enabled on lid open - similar fix in\n spirit to the one I\u0027ve sent you last weeek, BIOS\u0027 really like to mess\n with the display when closing the lid (awesome debug work from Krzysztof\n Mazur).\n\n* \u0027drm-intel-fixes\u0027 of git://people.freedesktop.org/~danvet/drm-intel:\n drm/i915: disable shrinker lock stealing for create_mmap_offset\n drm/i915: optionally disable shrinker lock stealing\n drm/i915: fix flags in dma buf exporting\n i915: ensure that VGA plane is disabled\n drm/i915: Preallocate the drm_mm_node prior to manipulating the GTT drm_mm manager\n drm: Export routines for inserting preallocated nodes into the mm manager\n drm/i915: don\u0027t disable disconnected outputs\n drm/i915: Implement workaround for broken CS tlb on i830/845\n drm/i915: Implement WaSetupGtModeTdRowDispatch\n drm/i915: Implement WaDisableHiZPlanesWhenMSAAEnabled\n drm/i915: Prefer CRTC \u0027active\u0027 rather than \u0027enabled\u0027 during WM computations\n drm/i915: Clear self-refresh watermarks when disabled\n drm/i915: Double the cursor self-refresh latency on Valleyview\n drm/i915: Fixup cursor latency used for IVB lp3 watermarks\n" }, { "commit": "b81034506fc9b879cb726feb01342be0cdbe6e25", "tree": "5fba979473159b2786b77cea622cce9581454760", "parents": [ "b0a2658acb5bf9ca86b4aab011b7106de3af0add" ], "author": { "name": "Chris Wilson", "email": "chris@chris-wilson.co.uk", "time": "Fri Dec 07 20:37:06 2012 +0000" }, "committer": { "name": "Daniel Vetter", "email": "daniel.vetter@ffwll.ch", "time": "Tue Dec 18 21:55:25 2012 +0100" }, "message": "drm: Export routines for inserting preallocated nodes into the mm manager\n\nRequired by i915 in order to avoid the allocation in the middle of\nmanipulating the drm_mm lists.\n\nUse a pair of stubs to preserve the existing EXPORT_SYMBOLs for\nbackporting; to be removed later.\n\nCc: Dave Airlie \u003cairlied@redhat.com\u003e\nCc: dri-devel@lists.freedesktop.org\nSigned-off-by: Chris Wilson \u003cchris@chris-wilson.co.uk\u003e\nReviewed-by: Jani Nikula \u003cjani.nikula@intel.com\u003e\n[danvet: bikeshedded-away the atomic parameter, it\u0027s not yet used\nanywhere.]\nAcked-by: Dave Airlie \u003cairlied@gmail.com\u003e\nSigned-off-by: Daniel Vetter \u003cdaniel.vetter@ffwll.ch\u003e\n" }, { "commit": "55bde6b1442fed8af67b92d21acce67db454c9f9", "tree": "ab52a043257fe7952b45ee9fda1db7a9c8ff0f9f", "parents": [ "2f3f24061c5c489074ad492bf694a5a76ebd8fc5", "20652097dadd9a7fb4d652f25466299974bc78f9" ], "author": { "name": "Dave Airlie", "email": "airlied@redhat.com", "time": "Sun Dec 16 06:05:03 2012 +0000" }, "committer": { "name": "Dave Airlie", "email": "airlied@redhat.com", "time": "Sun Dec 16 06:05:03 2012 +0000" }, "message": "Merge branch \u0027drm-intel-fixes\u0027 of git://people.freedesktop.org/~danvet/drm-intel into drm-next\n\nDaniel writes:\nA few leftover fixes for 3.8:\n- VIC support for hdmi infoframes with the associated drm helper, fixes\n some black TVs (Paulo Zanoni)\n- Modeset state check (and fixup if the BIOS messed with the hw) for\n lid-open. modeset-rework fallout. Somehow the original reporter went\n awol, so this stalled for way too long until we\u0027ve found a new\n victim^Wreporter with broken BIOS.\n- seqno wrap fixes from Mika and Chris.\n- Some minor fixes all over from various people.\n- Another race fix in the pageflip vs. unpin code from Chris.\n- hsw vga resume support and a few more fdi link fixes (only used for vga\n on hsw) from Paulo.\n- Regression fix for DMAR from Zhenyu Wang - I\u0027ve scavenged memory from my\n DMAR for a while and it broke right away :(\n- Regression fix from Takashi Iwai for ivb lvds - some w/a needs to be\n (partially) moved back into place. Note that these are regressions in\n -next.\n- One more fix for ivb 3 pipe support - it now actually seems to work.\n\n* \u0027drm-intel-fixes\u0027 of git://people.freedesktop.org/~danvet/drm-intel: (25 commits)\n drm/i915: Fix missed needs_dmar setting\n drm/i915: Fix shifted screen on top of LVDS on IVY laptop\n drm/i915: disable cpt phase pointer fdi rx workaround\n drm/i915: set the LPT FDI RX polarity reversal bit when needed\n drm/i915: add lpt_init_pch_refclk\n drm/i915: add support for mPHY destination on intel_sbi_{read, write}\n drm/i915: reject modes the LPT FDI receiver can\u0027t handle\n drm/i915: fix hsw_fdi_link_train \"retry\" code\n drm/i915: Close race between processing unpin task and queueing the flip\n drm/i915: fixup l3 parity sysfs access check\n drm/i915: Clear the existing watermarks for g4x when modifying the cursor sr\n drm/i915: do not access BLC_PWM_CTL2 on pre-gen4 hardware\n drm/i915: Don\u0027t allow ring tail to reach the same cacheline as head\n drm/i915: Decouple the object from the unbound list before freeing pages\n drm/i915: Set sync_seqno properly after seqno wrap\n drm/i915: Include the last semaphore sync point in the error-state\n drm/i915: Rearrange code to only have a single method for waiting upon the ring\n drm/i915: Simplify flushing activity on the ring\n drm/i915: Preallocate next seqno before touching the ring\n drm/i915: force restore on lid open\n ...\n" }, { "commit": "16102edb49b6cc7fbb68b10c04a42b78fbceb3ed", "tree": "97c4c28c5fb058bb94b304eae3be0efa1decdc46", "parents": [ "c12e2617b25535014a766a0bc3e05134ef817b82" ], "author": { "name": "Eunchul Kim", "email": "chulspro.kim@samsung.com", "time": "Fri Dec 14 17:58:55 2012 +0900" }, "committer": { "name": "Inki Dae", "email": "daeinki@gmail.com", "time": "Sat Dec 15 02:38:53 2012 +0900" }, "message": "drm/exynos: add fimc ipp driver\n\nFIMC is stand for Fully Interfactive Mobile Camera and\nsupports image scaler/rotator/crop/flip/csc and input/output DMA operations\nand also supports writeback and display output operations.\n\nThis driver is registered to IPP subsystem framework to be used by user side\nand user can control the FIMC hardware through some interfaces of IPP subsystem\nframework.\n\nChangelog v6:\n- fix build warning.\n\nChangelog v1 ~ v5:\n- add comments, code fixups and cleanups.\n\nSigned-off-by: Eunchul Kim \u003cchulspro.kim@samsung.com\u003e\nSigned-off-by: Jinyoung Jeon \u003cjy0.jeon@samsung.com\u003e\nSigned-off-by: Inki Dae \u003cinki.dae@samsung.com\u003e\nSigned-off-by: Kyungmin Park \u003ckyungmin.park@samsung.com\u003e\n" }, { "commit": "97a875cbdf89a4638eea57c2b456c7cc4e3e8b21", "tree": "286ff23a3f8e389ec4fa1a6f3b58cbee4fc8e9fe", "parents": [ "e7ab20197be3ee5fd75441e1cff0c7cdfea5bf1a" ], "author": { "name": "Maarten Lankhorst", "email": "m.b.lankhorst@gmail.com", "time": "Wed Nov 28 11:25:44 2012 +0000" }, "committer": { "name": "Dave Airlie", "email": "airlied@redhat.com", "time": "Mon Dec 10 20:21:30 2012 +1000" }, "message": "drm/ttm: remove no_wait_reserve, v3\n\nAll items on the lru list are always reservable, so this is a stupid\nthing to keep. Not only that, it is used in a way which would\nguarantee deadlocks if it were ever to be set to block on reserve.\n\nThis is a lot of churn, but mostly because of the removal of the\nargument which can be nested arbitrarily deeply in many places.\n\nNo change of code in this patch except removal of the no_wait_reserve\nargument, the previous patch removed the use of no_wait_reserve.\n\nv2:\n - Warn if -EBUSY is returned on reservation, all objects on the list\n should be reservable. Adjusted patch slightly due to conflicts.\nv3:\n - Focus on no_wait_reserve removal only.\n\nSigned-off-by: Maarten Lankhorst \u003cmaarten.lankhorst@canonical.com\u003e\nReviewed-by: Thomas Hellstrom \u003cthellstrom@vmware.com\u003e\nSigned-off-by: Dave Airlie \u003cairlied@redhat.com\u003e\n" }, { "commit": "1a1494def7eacbd25db05185aa2e81ef90892460", "tree": "40911f075b1fe527c6d20bf8c3070d4cdca11e97", "parents": [ "8de9e417757fb9f130f55a38f4ee7027b60de1c7", "71bfe916ebe6d026cd3d0e41c398574fc1228e03" ], "author": { "name": "Dave Airlie", "email": "airlied@redhat.com", "time": "Sat Dec 08 13:17:07 2012 +1000" }, "committer": { "name": "Dave Airlie", "email": "airlied@redhat.com", "time": "Mon Dec 10 20:03:58 2012 +1000" }, "message": "Merge branch \u0027drm-next-3.8\u0027 of git://people.freedesktop.org/~agd5f/linux into drm-next\n\nAlex writes:\nPretty minor -next pull request. We some additional new bits waiting\ninternally for release. Hopefully Monday we can get at least some of\nthem out. The others will probably take a few more weeks.\n\nHighlights of the current request:\n- ELD registers for passing audio information to the sound hardware\n- Handle GPUVM page faults more gracefully\n- Misc fixes\n\nMerge radeon test\n* \u0027drm-next-3.8\u0027 of git://people.freedesktop.org/~agd5f/linux: (483 commits)\n drm/radeon: bump driver version for new info ioctl requests\n drm/radeon: fix eDP clk and lane setup for scaled modes\n drm/radeon: add new INFO ioctl requests\n drm/radeon/dce32+: use fractional fb dividers for high clocks\n drm/radeon: use cached memory when evicting for vram on non agp\n drm/radeon: add a CS flag END_OF_FRAME\n drm/radeon: stop page faults from hanging the system (v2)\n drm/radeon/dce4/5: add registers for ELD handling\n drm/radeon/dce3.2: add registers for ELD handling\n radeon: fix pll/ctrc mapping on dce2 and dce3 hardware\n Linux 3.7-rc7\n powerpc/eeh: Do not invalidate PE properly\n Revert \"drm/i915: enable rc6 on ilk again\"\n ALSA: hda - Fix build without CONFIG_PM\n of/address: sparc: Declare of_iomap as an extern function for sparc again\n PM / QoS: fix wrong error-checking condition\n bnx2x: remove redundant warning log\n vxlan: fix command usage in its doc\n 8139cp: revert \"set ring address before enabling receiver\"\n MPI: Fix compilation on MIPS with GCC 4.4 and newer\n ...\n\nConflicts:\n\tdrivers/gpu/drm/exynos/exynos_drm_encoder.c\n\tdrivers/gpu/drm/exynos/exynos_drm_fbdev.c\n\tdrivers/gpu/drm/nouveau/core/engine/disp/nv50.c\n" }, { "commit": "584955632841c069678833f3320b4f6d21a8215e", "tree": "8b4103346b551022624ed1b1cc05f05676ad8b34", "parents": [ "2db83827dc7679c1f4925bb116e1f7deb13192e2" ], "author": { "name": "Rob Clark", "email": "rob@ti.com", "time": "Thu Oct 11 20:50:56 2012 -0500" }, "committer": { "name": "Rob Clark", "email": "robdclark@gmail.com", "time": "Fri Nov 30 10:30:48 2012 -0600" }, "message": "drm: remove legacy drm_connector_property fxns\n\nReplace references to and remove the connector property fxns, which\nhave been superseded with the more general object property fxns:\n\n + drm_connector_attach_property -\u003e drm_object_attach_property\n + drm_connector_property_set_value -\u003e drm_object_property_set_value\n + drm_connector_property_get_value -\u003e drm_object_property_get_value\n\nSigned-off-by: Rob Clark \u003crob@ti.com\u003e\n" }, { "commit": "374a868a726eb8a1cb28ba88805e51ce34222f8d", "tree": "c6d63768af759869d9b196571d5a5c74640ccd2e", "parents": [ "2ff4aeac39dbdcac934694413767f09a27965e11" ], "author": { "name": "Paulo Zanoni", "email": "paulo.r.zanoni@intel.com", "time": "Fri Nov 23 12:09:26 2012 -0200" }, "committer": { "name": "Daniel Vetter", "email": "daniel.vetter@ffwll.ch", "time": "Thu Nov 29 11:42:37 2012 +0100" }, "message": "drm: add drm_mode_cea_vic\n\nThis function returns the VIC of the mode. This value can be used when\ncreating AVI InfoFrames.\n\nCc: Thierry Reding \u003cthierry.reding@avionic-design.de\u003e\nBugzilla: https://bugzilla.kernel.org/show_bug.cgi?id\u003d50371\nSigned-off-by: Paulo Zanoni \u003cpaulo.r.zanoni@intel.com\u003e\nReviewed-by: Thierry Reding \u003cthierry.reding@avionic-design.de\u003e\nAcked-by: Dave Airlie \u003cairlied@gmail.com\u003e\nSigned-off-by: Daniel Vetter \u003cdaniel.vetter@ffwll.ch\u003e\n" }, { "commit": "28164fdad85ec806f30c76fe98ed0e3abc91d2d7", "tree": "9f4b888180bd2dd26cb54f5252b7be0a60037acd", "parents": [ "d0ddc0338af8265e65bd5e4ca72e3d8e61e41d8d" ], "author": { "name": "Daniel Vetter", "email": "daniel.vetter@ffwll.ch", "time": "Thu Nov 01 14:45:18 2012 +0100" }, "committer": { "name": "Dave Airlie", "email": "airlied@redhat.com", "time": "Wed Nov 28 20:26:53 2012 +1000" }, "message": "drm/doc: add new dp helpers into drm DocBook\n\nI didn\u0027t bother with documenting the really trivial new \"extract\nsomething from dpcd\" helpers, but the i2c over aux ch is now\ndocumented a bit.\n\nv2: Clarify the comment for i2c_dp_aux_add_bus a bit.\n\nv3: Fix more spelling fail spotted by Laurent Pinchart.\n\nAcked-by: Laurent Pinchart \u003claurent.pinchart@ideasonboard.com\u003e\nSigned-off-by: Daniel Vetter \u003cdaniel.vetter@ffwll.ch\u003e\nSigned-off-by: Dave Airlie \u003cairlied@redhat.com\u003e\n" }, { "commit": "384cc2f9688994dfd505011ba3b08e0a702030b0", "tree": "9d7f8d1f3a68d88442d35cd13a67563571147f29", "parents": [ "7e8d9da32ea02f02a23f998cd2013408a4fe49bb" ], "author": { "name": "Thomas Hellstrom", "email": "thellstrom@vmware.com", "time": "Tue Nov 20 12:16:47 2012 +0000" }, "committer": { "name": "Dave Airlie", "email": "airlied@redhat.com", "time": "Wed Nov 28 18:36:05 2012 +1000" }, "message": "drm: Add a hash-tab rcu-safe API\n\nWhile hashtab should now be RCU-safe, Add a drm_ht_xxx_api for consumers\nto use to make it obvious what locking mechanism is used.\n\nDocument the way the rcu-safe interface should be used.\n\nDon\u0027t use rcu-safe list traversal in modify operations where we should use\na spinlock / mutex anyway.\n\nSigned-off-by: Thomas Hellstrom \u003cthellstrom@vmware.com\u003e\nSigned-off-by: Dave Airlie \u003cairlied@redhat.com\u003e\n" }, { "commit": "0181bd5dea2ed0696f84591a92da0b6a1f1a2e62", "tree": "0b2deab0b55334bb3942419911a901ae714b3a6b", "parents": [ "45171002b01b2e2ec4f991eca81ffd8430fd0aec" ], "author": { "name": "Alex Deucher", "email": "alexander.deucher@amd.com", "time": "Wed Nov 21 18:37:38 2012 -0500" }, "committer": { "name": "Alex Deucher", "email": "alexander.deucher@amd.com", "time": "Wed Nov 21 18:37:38 2012 -0500" }, "message": "drm/radeon: add new SI pci id\n\nSigned-off-by: Alex Deucher \u003calexander.deucher@amd.com\u003e\nCc: stable@vger.kernel.org\n" }, { "commit": "654aa79259a19f0d5e3cf9cb20aff56dc3b041b7", "tree": "406029f079300aac57d3463cf952b68d122619e9", "parents": [ "6c1e963cc5771c93d4ed7aa8bdd4322a7c918e9b" ], "author": { "name": "Maarten Lankhorst", "email": "maarten.lankhorst@canonical.com", "time": "Tue Nov 06 14:39:43 2012 +0100" }, "committer": { "name": "Dave Airlie", "email": "airlied@redhat.com", "time": "Tue Nov 20 16:17:35 2012 +1000" }, "message": "drm/ttm: alter cpu_writers to return -EBUSY in ttm_execbuf_util reservations\n\nThis is similar to other platforms that don\u0027t allow command submission\nto buffers locked on the cpu.\n\nSigned-off-by: Maarten Lankhorst \u003cmaarten.lankhorst@canonical.com\u003e\nReviewed-by: Thomas Hellstrom \u003cthellstrom@vmware.com\u003e\nSigned-off-by: Dave Airlie \u003cairlied@redhat.com\u003e\n" }, { "commit": "cdad05216c2b2edfe92a9f87d6ae51aab277f3b2", "tree": "1ba899709b77745acec655d0a8eea3f08c97a885", "parents": [ "4b20db3de8dab005b07c74161cb041db8c5ff3a7" ], "author": { "name": "Thomas Hellstrom", "email": "thellstrom@vmware.com", "time": "Tue Nov 06 11:31:50 2012 +0000" }, "committer": { "name": "Dave Airlie", "email": "airlied@redhat.com", "time": "Tue Nov 20 16:15:05 2012 +1000" }, "message": "drm/ttm, drm/vmwgfx: Use RCU locking for object lookups v3\n\nThe mostly used lookup+get put+potential_destroy path of TTM objects\nis converted to use RCU locks. This will substantially decrease the amount\nof locked bus cycles during normal operation.\nSince we use kfree_rcu to free the objects, no rcu synchronization is needed\nat module unload time.\n\nv2: Don\u0027t touch include/linux/kref.h\nv3: Adapt to kref_get_unless_zero return value change\n\nSigned-off-by: Thomas Hellstrom \u003cthellstrom@vmware.com\u003e\nSigned-off-by: Dave Airlie \u003cairlied@redhat.com\u003e\n" }, { "commit": "dedfdffd448aea2543b59fd504b92b8212ab3b7d", "tree": "0a564865acb120e412e5718742ca7a6a481de98a", "parents": [ "b03640b1de2eb349c2453d060d0bd0b0486e29b8" ], "author": { "name": "Maarten Lankhorst", "email": "maarten.lankhorst@canonical.com", "time": "Fri Oct 12 15:04:00 2012 +0000" }, "committer": { "name": "Dave Airlie", "email": "airlied@redhat.com", "time": "Tue Nov 20 16:10:10 2012 +1000" }, "message": "drm/ttm: remove sync_arg from driver functions\n\nSigned-off-by: Maarten Lankhorst \u003cmaarten.lankhorst@canonical.com\u003e\nReviewed-By: Thomas Hellstrom \u003cthellstrom@vmware.com\u003e\nSigned-off-by: Dave Airlie \u003cairlied@redhat.com\u003e\n" }, { "commit": "b03640b1de2eb349c2453d060d0bd0b0486e29b8", "tree": "87e84dbc9495a2cd0385af12a6fa171f7711f16a", "parents": [ "5fb4ef0e36b4c6ecc7fb025aaacb3b63b1114e87" ], "author": { "name": "Maarten Lankhorst", "email": "maarten.lankhorst@canonical.com", "time": "Fri Oct 12 15:03:11 2012 +0000" }, "committer": { "name": "Dave Airlie", "email": "airlied@redhat.com", "time": "Tue Nov 20 16:10:02 2012 +1000" }, "message": "drm/ttm: remove sync_obj_arg from ttm_bo_move_accel_cleanup\n\nSigned-off-by: Maarten Lankhorst \u003cmaarten.lankhorst@canonical.com\u003e\nReviewed-By: Thomas Hellstrom \u003cthellstrom@vmware.com\u003e\nSigned-off-by: Dave Airlie \u003cairlied@redhat.com\u003e\n" }, { "commit": "5fb4ef0e36b4c6ecc7fb025aaacb3b63b1114e87", "tree": "425e7b5c48bbe54769925ad5c48cf3d9de74e088", "parents": [ "be013367fd6fbab52ddf6f76c243f4109090c890" ], "author": { "name": "Maarten Lankhorst", "email": "maarten.lankhorst@canonical.com", "time": "Fri Oct 12 15:02:19 2012 +0000" }, "committer": { "name": "Dave Airlie", "email": "airlied@redhat.com", "time": "Tue Nov 20 16:09:55 2012 +1000" }, "message": "drm/ttm: remove sync_obj_arg member\n\nvmwgfx was its only user and always sets it to the same..\n\nSigned-off-by: Maarten Lankhorst \u003cmaarten.lankhorst@canonical.com\u003e\nReviewed-By: Thomas Hellstrom \u003cthellstrom@vmware.com\u003e\nSigned-off-by: Dave Airlie \u003cairlied@redhat.com\u003e\n" }, { "commit": "91926741ecd28dc246875a39a908c2f6aadb2542", "tree": "961aca6dcdb21fdaa85285bd35b255024bb54c8b", "parents": [ "830e2837f5f6811b77cf3aa72e63343a8e6e9ef6" ], "author": { "name": "Marcin Slusarz", "email": "marcin.slusarz@gmail.com", "time": "Tue Nov 06 21:49:54 2012 +0000" }, "committer": { "name": "Dave Airlie", "email": "airlied@redhat.com", "time": "Tue Nov 20 16:06:22 2012 +1000" }, "message": "drm/ttm: remove ttm_mem_global-\u003equeue\n\nIt\u0027s unused.\n\nSigned-off-by: Marcin Slusarz \u003cmarcin.slusarz@gmail.com\u003e\nReviewed-by: Thomas Hellstrom \u003cthellstrom@vmware.com\u003e\nSigned-off-by: Dave Airlie \u003cairlied@redhat.com\u003e\n" }, { "commit": "830e2837f5f6811b77cf3aa72e63343a8e6e9ef6", "tree": "34f33b1ae7c2dbbe99afedd97f99aaaa85155bca", "parents": [ "0b91c4a1cd7cc368763de2fe25b8ea64ea803c08" ], "author": { "name": "Marcin Slusarz", "email": "marcin.slusarz@gmail.com", "time": "Tue Nov 06 21:49:53 2012 +0000" }, "committer": { "name": "Dave Airlie", "email": "airlied@redhat.com", "time": "Tue Nov 20 16:06:21 2012 +1000" }, "message": "drm/ttm: remove ttm_bo_device-\u003enice_mode\n\nIt\u0027s unused.\n\nSigned-off-by: Marcin Slusarz \u003cmarcin.slusarz@gmail.com\u003e\nReviewed-by: Thomas Hellstrom \u003cthellstrom@vmware.com\u003e\nSigned-off-by: Dave Airlie \u003cairlied@redhat.com\u003e\n" }, { "commit": "0b91c4a1cd7cc368763de2fe25b8ea64ea803c08", "tree": "c8b2431490b76d516487ebd8ef83afb893ded476", "parents": [ "ef8cf3a1c523afa499d15856e7db3844ad59d1fb" ], "author": { "name": "Marcin Slusarz", "email": "marcin.slusarz@gmail.com", "time": "Tue Nov 06 21:49:51 2012 +0000" }, "committer": { "name": "Dave Airlie", "email": "airlied@redhat.com", "time": "Tue Nov 20 16:06:19 2012 +1000" }, "message": "drm/ttm: remove ttm_buffer_object-\u003ebuffer_start\n\nAll drivers set it to 0 and nothing uses it.\n\nSigned-off-by: Marcin Slusarz \u003cmarcin.slusarz@gmail.com\u003e\nReviewed-by: Thomas Hellstrom \u003cthellstrom@vmware.com\u003e\nSigned-off-by: Dave Airlie \u003cairlied@redhat.com\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": "905bc9ff6575f78aab24c0261e8785425b5a0397", "tree": "633d4f1b534dc859139a614425f528d5a536077d", "parents": [ "5e2cb2f6da72323877e5847512f8bd8d53c532f2" ], "author": { "name": "Daniel Vetter", "email": "daniel.vetter@ffwll.ch", "time": "Tue Oct 23 18:23:36 2012 +0000" }, "committer": { "name": "Dave Airlie", "email": "airlied@redhat.com", "time": "Tue Nov 20 15:51:17 2012 +1000" }, "message": "drm: don\u0027t start the poll engine in probe_single_connector\n\nActually there\u0027s a reason this stuff is there, and it\u0027s called\n\ncommit e58f637bb96d5a0ae0919b9998b891d1ba7e47c9\nAuthor: Chris Wilson \u003cchris@chris-wilson.co.uk\u003e\nDate: Fri Aug 20 09:13:36 2010 +0100\n\n drm/kms: Add a module parameter to disable polling\n\nThe idea has been that users can enable/disable polling at runtime. So\nthe quick hack has been to just re-enable the output polling if xrandr\nasks for the latest state of the connectors.\n\nThe problem with that hack is that when we force connectors to another\nstate than what would be detected, we nicely ping-pong:\n- Userspace calls probe, gets the forced state, but polling starts\n again.\n- Polling notices that the state is actually different, wakes up\n userspace.\n- Repeat.\n\nAs that commit already explains, the right fix would be to make the\nlocking more fine-grained, so that hotplug detection on one output\ndoes not interfere with cursor updates on another crtc.\n\nBut that is way too much work. So let\u0027s just safe this gross hack by\ncaching the last-seen state of drm_kms_helper_poll for that driver,\nand only fire up the poll engine again if it changed from off to on.\n\nv2: Fixup the edge detection of drm_kms_helper_poll.\n\nBugzilla: https://bugs.freedesktop.org/show_bug.cgi?id\u003d49907\nTested-by: Tvrtko Ursulin \u003ctvrtko.ursulin@onelan.co.uk\u003e\nSigned-off-by: Daniel Vetter \u003cdaniel.vetter@ffwll.ch\u003e\nReviewed-by: Alex Deucher \u003calexander.deucher@amd.com\u003e\nSigned-off-by: Dave Airlie \u003cairlied@redhat.com\u003e\n" }, { "commit": "69787f7da6b2adc4054357a661aaa1701a9ca76f", "tree": "0db5e474558eb7526a01a953acfba3f97e9a7681", "parents": [ "816da85a0990c2b52cfffa77637d1c770d6790e9" ], "author": { "name": "Daniel Vetter", "email": "daniel.vetter@ffwll.ch", "time": "Tue Oct 23 18:23:34 2012 +0000" }, "committer": { "name": "Dave Airlie", "email": "airlied@redhat.com", "time": "Tue Nov 20 15:50:57 2012 +1000" }, "message": "drm: run the hpd irq event code directly\n\nAll drivers already have a work item to run the hpd code, so we don\u0027t\nneed to launch a new one in the helper code. Dave Airlie mentioned\nthat the cancel+re-queue might paper over DP related hpd ping-pongs,\nhence why this is split out.\n\nSigned-off-by: Daniel Vetter \u003cdaniel.vetter@ffwll.ch\u003e\nReviewed-by: Alex Deucher \u003calexander.deucher@amd.com\u003e\nSigned-off-by: Dave Airlie \u003cairlied@redhat.com\u003e\n" }, { "commit": "816da85a0990c2b52cfffa77637d1c770d6790e9", "tree": "3e3bd2c22624db838a8456c167058b4e56b177fc", "parents": [ "3d3683f04a32da16df71e3b089da8f5a13059ef4" ], "author": { "name": "Daniel Vetter", "email": "daniel.vetter@ffwll.ch", "time": "Tue Oct 23 18:23:33 2012 +0000" }, "committer": { "name": "Dave Airlie", "email": "airlied@redhat.com", "time": "Tue Nov 20 15:50:42 2012 +1000" }, "message": "drm: handle HPD and polled connectors separately\n\nInstead of reusing the polling code for hpd handling, split them up.\nThis has a few consequences:\n- Don\u0027t touch HPD capable connectors in the poll loop.\n- Only touch HPD capable connectors in drm_helper_hpd_irq_event.\n- We could run the HPD handling directly (because all callers already\n use their own work item), but for easier bisect that happens in it\u0027s\n own patch.\n\nThe ultimate goal is that drivers grow some smarts about which\nconnectors have received a hotplug event and only call the detect code\nof that connector. But that\u0027s a second step.\n\nv2: s/hdp/hpd/, noticed by Adam Jackson. I can\u0027t type.\n\nv3: Split out the work item removal as requested by Dave Airlie. This\nresults in a temporary mode_config.hpd_irq_work item to keep things\nthe same.\n\nv4: In the hpd_irq_event handler don\u0027t bail out if other bits than HPD\nare set. This is useful where e.g. hpd is unreliably, but mostly\nworks. Drivers can then set both HPD and POLL flags, and users get the\nbest of both worlds: Quick hotplug feedback if the hpd works, but\nstill reliable detection with the polling. The poll loop already works\nthe same, and doesn\u0027t bail if HPD is set.\n\nSigned-off-by: Daniel Vetter \u003cdaniel.vetter@ffwll.ch\u003e\nReviewed-by: Alex Deucher \u003calexander.deucher@amd.com\u003e\nSigned-off-by: Dave Airlie \u003cairlied@redhat.com\u003e\n" }, { "commit": "3d3683f04a32da16df71e3b089da8f5a13059ef4", "tree": "8ca37f5e298e13c2fbed0ed20bfad9609dabe198", "parents": [ "c6eefa1750ec0308956895027c3a79eee2ef9726" ], "author": { "name": "Daniel Vetter", "email": "daniel.vetter@ffwll.ch", "time": "Tue Oct 23 18:23:32 2012 +0000" }, "committer": { "name": "Dave Airlie", "email": "airlied@redhat.com", "time": "Tue Nov 20 15:50:32 2012 +1000" }, "message": "drm: extract drm_kms_helper_hotplug_event\n\nUseful if drivers want to be slightly more clever about hotplug\nhandling.\n\nSigned-off-by: Daniel Vetter \u003cdaniel.vetter@ffwll.ch\u003e\nReviewed-by: Alex Deucher \u003calexander.deucher@amd.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": "a4799037c3234830e9feb1823d87f905fb4d080a", "tree": "aa6bd061fe5cf66a7251105873da5367e71353e4", "parents": [ "96081cdfae35c1e332be42d89dee278c72d8915d" ], "author": { "name": "Stephane Marchesin", "email": "marcheu@chromium.org", "time": "Fri Nov 09 16:21:05 2012 +0000" }, "committer": { "name": "Dave Airlie", "email": "airlied@redhat.com", "time": "Tue Nov 20 15:36:56 2012 +1000" }, "message": "drm: get cea video id code for a given display mode\n\nThis patch adds support for getting CEA Video ID Code for a given\ndisplay mode after matching with edid_cea_modes list. Its index in\nthe list added with one, gives the desired code.\n\nThis exported function will be used by hdmi drivers for composing\nAVI info frame data.\n\nSigned-off-by: Stephane Marchesin \u003cmarcheu@chromium.org\u003e\nSigned-off-by: Rahul Sharma \u003crahul.sharma@samsung.com\u003e\nSigned-off-by: Dave Airlie \u003cairlied@redhat.com\u003e\n" }, { "commit": "9fabd4eedeb904173d05cb1ced3c3e6b9d2e8137", "tree": "ff5ebc768e1c83446db6b899016e5560b41d36ca", "parents": [ "6380813c6e316455b944ba5f7b1515c98b837850", "6b8294a4d392c2c9f8867e8505511f3fc9419ba7" ], "author": { "name": "Dave Airlie", "email": "airlied@redhat.com", "time": "Tue Nov 20 09:22:35 2012 +1000" }, "committer": { "name": "Dave Airlie", "email": "airlied@redhat.com", "time": "Tue Nov 20 09:22:35 2012 +1000" }, "message": "Merge branch \u0027for-airlied\u0027 of git://people.freedesktop.org/~danvet/drm-intel into drm-next\n\nDaniel writes:\nHighlights of this -next round:\n- ivb fdi B/C fixes\n- hsw sprite/plane offset fixes from Damien\n- unified dp/hdmi encoder for hsw, finally external dp support on hsw\n (Paulo)\n- kill-agp and some other prep work in the gtt code from Ben\n- some fb handling fixes from Ville\n- massive pile of patches to align hsw VGA with the spec and make it\n actually work (Paulo)\n- pile of workarounds from Jesse, mostly for vlv, but also some other\n related platforms\n- start of a dev_priv reorg, that thing grew out of bounds and chaotic\n- small bits\u0026pieces all over the place, down to better error handling for\n load-detect on gen2 (Chris, Jani, Mika, Zhenyu, ...)\n\nOn top of the previous pile (just copypasta):\n- tons of hsw dp prep patches form Paulo\n- round scheduled work items and timers to nearest second (Chris)\n- some hw workarounds (Jesse\u0026Damien)\n- vlv dp support and related fixups (Vijay et al.)\n- basic haswell dp support, not yet wired up for external ports (Paulo)\n- edp support (Paulo)\n- tons of refactorings to prepare for the above (Paulo)\n- panel rework, unifiying code between lvds and edp panels (Jani)\n- panel fitter scaling modes (Jani + Yuly Novikov)\n- panel power improvements, should now work without the BIOS setting it up\n- extracting some dp helpers from radeon/i915 and move them to\n drm_dp_helper.c\n- randome pile of workarounds (Damien, Ben, ...)\n- some cleanups for the register restore code for suspend/resume\n- secure batchbuffer support, should enable tear-free blits on gen6+\n Chris)\n- random smaller fixlets and cleanups.\n\n* \u0027for-airlied\u0027 of git://people.freedesktop.org/~danvet/drm-intel: (231 commits)\n drm/i915: Restore physical HWS_PGA after resume\n drm/i915: Report amount of usable graphics memory in MiB\n drm/i915/i2c: Track users of GMBUS force-bit\n drm/i915: Allocate the proper size for contexts.\n drm/i915: Update load-detect failure paths for modeset-rework\n drm/i915: Clear unused fields of mode for framebuffer creation\n drm/i915: Always calculate 8xx WM values based on a 32-bpp framebuffer\n drm/i915: Fix sparse warnings in from AGP kill code\n drm/i915: Missed lock change with rps lock\n drm/i915: Move the remaining gtt code\n drm/i915: flush system agent TLBs on SNB\n drm/i915: Kill off now unused gen6+ AGP code\n drm/i915: Calculate correct stolen size for GEN7+\n drm/i915: Stop using AGP layer for GEN6+\n drm/i915: drop the double-OP_STOREDW usage in blt_ring_flush\n drm/i915: don\u0027t rewrite the GTT on resume v4\n drm/i915: protect RPS/RC6 related accesses (including PCU) with a new mutex\n drm/i915: put ring frequency and turbo setup into a work queue v5\n drm/i915: don\u0027t block resume on fb console resume v2\n drm/i915: extract l3_parity substruct from dev_priv\n ...\n" }, { "commit": "009946f89b7795699848a922fc2f7804390017d9", "tree": "84bcb82abee6b2527fff24a555e27ad60b24962f", "parents": [ "03752f5b7b77b95d83479885040950fba1250850" ], "author": { "name": "Ben Widawsky", "email": "ben@bwidawsk.net", "time": "Sun Nov 04 09:21:29 2012 -0800" }, "committer": { "name": "Daniel Vetter", "email": "daniel.vetter@ffwll.ch", "time": "Sun Nov 11 23:51:43 2012 +0100" }, "message": "drm/i915: Kill off now unused gen6+ AGP code\n\nv2: Accidently removed an ILK case in i9xx_setup (Nicely found by Chris)\n\nCC: Chris Wilson \u003cchris@chris-wilson.co.uk\u003e\nReviewed-by [v1] : Jesse Barnes \u003cjbarnes@virtuousgeek.org\u003e\nSigned-off-by: Ben Widawsky \u003cben@bwidawsk.net\u003e\nReviewed-by: Chris Wilson \u003cchris@chris-wilson.co.uk\u003e\nSigned-off-by: Daniel Vetter \u003cdaniel.vetter@ffwll.ch\u003e\n" }, { "commit": "e76e9aebcdbfebae8f4cd147e3c0f800d36e97f3", "tree": "94272c5f3ee021931bfe43136d81076b10a26c77", "parents": [ "b3fcabb15bb83202fb5e4e5b296711b91c4942a3" ], "author": { "name": "Ben Widawsky", "email": "ben@bwidawsk.net", "time": "Sun Nov 04 09:21:27 2012 -0800" }, "committer": { "name": "Daniel Vetter", "email": "daniel.vetter@ffwll.ch", "time": "Sun Nov 11 23:51:42 2012 +0100" }, "message": "drm/i915: Stop using AGP layer for GEN6+\n\nAs a quick hack we make the old intel_gtt structure mutable so we can\nfool a bunch of the existing code which depends on elements in that data\nstructure. We can/should try to remove this in a subsequent patch.\n\nThis should preserve the old gtt init behavior which upon writing these\npatches seems incorrect. The next patch will fix these things.\n\nThe one exception is VLV which doesn\u0027t have the preserved flush control\nwrite behavior. Since we want to do that for all GEN6+ stuff, we\u0027ll\nhandle that in a later patch. Mainstream VLV support doesn\u0027t actually\nexist yet anyway.\n\nv2: Update the comment to remove the \"voodoo\"\nCheck that the last pte written matches what we readback\n\nv3: actually kill cache_level_to_agp_type since most of the flags will\ndisappear in an upcoming patch\n\nv4: v3 was actually not what we wanted (Daniel)\nMake the ggtt bind assertions better and stricter (Chris)\nFix some uncaught errors at gtt init (Chris)\nSome other random stuff that Chris wanted\n\nv5: check for i\u003d\u003d0 in gen6_ggtt_bind_object to shut up gcc (Ben)\n\nSigned-off-by: Ben Widawsky \u003cben@bwidawsk.net\u003e\nReviewed-by [v4]: Chris Wilson \u003cchris@chris-wilson.co.uk\u003e\n[danvet: Make the cache_level -\u003e agp_flags conversion for pre-gen6 a\ntad more robust by mapping everything !\u003d CACHE_NONE to the cached agp\nflag - we have a 1:1 uncached mapping, but different modes of\ncacheable (at least on later generations). Suggested by Chris Wilson.]\nSigned-off-by: Daniel Vetter \u003cdaniel.vetter@ffwll.ch\u003e\n" }, { "commit": "cfc1a062063bb5b8e3fa2b007043dfc9e27b5a40", "tree": "af4aec7b23866d870a91d5a763f0307d09651e7d", "parents": [ "ab4d966c522f84b385d87f5ed2b622a7e4c22a6b" ], "author": { "name": "Daniel Vetter", "email": "daniel.vetter@ffwll.ch", "time": "Sat Oct 27 15:52:04 2012 +0200" }, "committer": { "name": "Daniel Vetter", "email": "daniel.vetter@ffwll.ch", "time": "Sun Nov 11 23:51:28 2012 +0100" }, "message": "drm: add helper to sort panels to the head of the connector list\n\nUserspace seems to like this, see\n\ncommit cb0953d734348e8862d6d7edc666cfb3bf6d8fae\nAuthor: Adam Jackson \u003cajax@redhat.com\u003e\nDate: Fri Jul 16 14:46:29 2010 -0400\n\n drm/i915: Initialize LVDS and eDP outputs before anything else\n\n This makes them sort to the front in X, which makes them likely to be\n the primary outputs if you haven\u0027t specified a preference in your DE,\n which is likely to be what you want.\n\n Signed-off-by: Adam Jackson \u003cajax@redhat.com\u003e\n Signed-off-by: Eric Anholt \u003ceric@anholt.net\u003e\n\nSorting the connector list after the fact is much easier than trying\nto be clever with the init sequence.\n\nAcked-by: Dave Airlie \u003cairlied@gmail.com\u003e\nReviewed-by: Adam Jackson \u003cajax@redhat.com\u003e\nAcked-by: Chris Wilson \u003cchris@chris-wilson.co.uk\u003e\nSigned-off-by: Daniel Vetter \u003cdaniel.vetter@ffwll.ch\u003e\n" }, { "commit": "a9dbfff1cbe5972ae0ef07b51530a70240ec9f2c", "tree": "641bf7ee8df65357cce60a12a9cebba797f3ba8d", "parents": [ "c4a56750ecbf2421ebd39f0fec562e1869a38d53" ], "author": { "name": "Maarten Lankhorst", "email": "maarten.lankhorst@canonical.com", "time": "Fri Oct 12 16:58:36 2012 +0200" }, "committer": { "name": "Dave Airlie", "email": "airlied@redhat.com", "time": "Wed Nov 07 10:44:38 2012 +1000" }, "message": "drm/ttm: add ttm_bo_is_reserved\n\nSigned-off-by: Maarten Lankhorst \u003cmaarten.lankhorst@canonical.com\u003e\nReviewed-by: Thomas Hellstrom \u003cthellstrom@vmware.com\u003e\nSigned-off-by: Dave Airlie \u003cairlied@redhat.com\u003e\n" }, { "commit": "0b3904ab2a48488e23332ac1ecd2d45961ec6718", "tree": "fa5cd54d13abcbbf81de3a61aab2ea65bd6c65f3", "parents": [ "b180b5d1c7ac930387734664802fc26fa788e26f" ], "author": { "name": "Ville Syrjälä", "email": "ville.syrjala@linux.intel.com", "time": "Thu Oct 25 18:05:05 2012 +0000" }, "committer": { "name": "Dave Airlie", "email": "airlied@redhat.com", "time": "Wed Nov 07 10:09:16 2012 +1000" }, "message": "drm: Constify some function arguments\n\nNone of drm_mode_debug_printmodeline(), drm_mode_equal(), drm_mode_width()\nor drm_mode_height() change the mode passed in, so make the arguments\nconst.\n\nSigned-off-by: Ville Syrjälä \u003cville.syrjala@linux.intel.com\u003e\nSigned-off-by: Dave Airlie \u003cairlied@redhat.com\u003e\n" }, { "commit": "b6aa22db7857ab7ed042d6c56b800bfc727cfdff", "tree": "9a1abb38fb995982d1e1dbc636919b8f7dfb8455", "parents": [ "b8e902f24fdd16c4373ddc37a4e150c4afe9c6db" ], "author": { "name": "Alex Deucher", "email": "alexander.deucher@amd.com", "time": "Tue Oct 16 12:51:45 2012 -0400" }, "committer": { "name": "Alex Deucher", "email": "alexander.deucher@amd.com", "time": "Tue Oct 23 10:23:49 2012 -0400" }, "message": "drm/radeon: add some new SI PCI ids\n\nSigned-off-by: Alex Deucher \u003calexander.deucher@amd.com\u003e\nCc: stable@vger.kernel.org\n" }, { "commit": "397fe15715ef1457d89f52666d0e249eb5eae64c", "tree": "7948bc52fa7ac208ddf2d1261e5c485dbb25ae52", "parents": [ "3b5c662e8f536ca47396116de82f08d771727076" ], "author": { "name": "Daniel Vetter", "email": "daniel.vetter@ffwll.ch", "time": "Mon Oct 22 22:56:43 2012 +0200" }, "committer": { "name": "Daniel Vetter", "email": "daniel.vetter@ffwll.ch", "time": "Mon Oct 22 22:56:43 2012 +0200" }, "message": "drm: extract drm_dp_max_lane_count helper\n\nReviewed-by: Alex Deucher \u003calexander.deucher@amd.com\u003e\nAcked-by: Dave Airlie \u003cairlied@gmail.com\u003e\nSigned-off-by: Daniel Vetter \u003cdaniel.vetter@ffwll.ch\u003e\n" }, { "commit": "3b5c662e8f536ca47396116de82f08d771727076", "tree": "18c5696ab98584d7331dadd9cb054b21f8e13d2a", "parents": [ "a7c9655fdd89fae1749c2e5beadae8b7d32093af" ], "author": { "name": "Daniel Vetter", "email": "daniel.vetter@ffwll.ch", "time": "Thu Oct 18 10:15:31 2012 +0200" }, "committer": { "name": "Daniel Vetter", "email": "daniel.vetter@ffwll.ch", "time": "Mon Oct 22 22:34:47 2012 +0200" }, "message": "drm: extract dp link bw helpers\n\nReviewed-by: Alex Deucher \u003calexander.deucher@amd.com\u003e\nAcked-by: Dave Airlie \u003cairlied@gmail.com\u003e\nSigned-off-by: Daniel Vetter \u003cdaniel.vetter@ffwll.ch\u003e\n" }, { "commit": "1a644cd47ca0c40a9210db170bd0630031c3a60b", "tree": "03144ce14e66c9b155369b5af92227ac8080e5f1", "parents": [ "0f037bdee1a12947a0c55b21a05f57793332bc07" ], "author": { "name": "Daniel Vetter", "email": "daniel.vetter@ffwll.ch", "time": "Thu Oct 18 15:32:40 2012 +0200" }, "committer": { "name": "Daniel Vetter", "email": "daniel.vetter@ffwll.ch", "time": "Mon Oct 22 22:34:46 2012 +0200" }, "message": "drm: extract dp link train delay functions from radeon\n\nThis requires a few changes since that dpcd value is above the\nrange currently cached by radeon. I\u0027ve check the dp specs, and\nabove 0xf there\u0027s a big gap and nothing that looks like we should\ncache it while a given device is plugged in. It\u0027s also the same value\nthat i915.ko uses.\n\nHence extend the various dpcd arrays in the radeon driver, use\nproper symbolic constants where applicable (one place overallocated\nthe dpcd array to 25 bytes). Then also drop the rd_interval cache -\nradeon_dp_link_train_init re-reads the dpcd block, so the values we\u0027ll\nconsume in train_cr and train_ce will always be fresh.\n\nTo avoid needless diff-churn, #define the old size of dpcd as the new\none and keep it around.\n\nv2: Alex Deucher noticed one place where I\u0027ve forgotten to replace 8\nwith DP_RECEIVER_CAP_SIZE.\n\nReviewed-by: Alex Deucher \u003calexander.deucher@amd.com\u003e\nAcked-by: Dave Airlie \u003cairlied@gmail.com\u003e\nSigned-off-by: Daniel Vetter \u003cdaniel.vetter@ffwll.ch\u003e\n" }, { "commit": "0f037bdee1a12947a0c55b21a05f57793332bc07", "tree": "200cae72c4681af7849422ac1ee3b5937de55603", "parents": [ "01916270b840f7f37b7daab936add1747d6afbbf" ], "author": { "name": "Daniel Vetter", "email": "daniel.vetter@ffwll.ch", "time": "Thu Oct 18 10:15:27 2012 +0200" }, "committer": { "name": "Daniel Vetter", "email": "daniel.vetter@ffwll.ch", "time": "Mon Oct 22 22:34:45 2012 +0200" }, "message": "drm: extract helpers to compute new training values from sink request\n\nSafe for the minor difference that the intel versions get an offset\ninto the link_status as an argument, both are the same again.\n\nReviewed-by: Alex Deucher \u003calexander.deucher@amd.com\u003e\nAcked-by: Dave Airlie \u003cairlied@gmail.com\u003e\nSigned-off-by: Daniel Vetter \u003cdaniel.vetter@ffwll.ch\u003e\n" }, { "commit": "01916270b840f7f37b7daab936add1747d6afbbf", "tree": "4090ed2c800ee0970442260c67f02599942045ac", "parents": [ "1ffdff134eb2d943bde3e4901ac48a9656a7e7a5" ], "author": { "name": "Daniel Vetter", "email": "daniel.vetter@ffwll.ch", "time": "Thu Oct 18 10:15:25 2012 +0200" }, "committer": { "name": "Daniel Vetter", "email": "daniel.vetter@ffwll.ch", "time": "Mon Oct 22 22:34:37 2012 +0200" }, "message": "drm: dp helper: extract drm_dp_clock_recovery_ok\n\nradeon and intel use the exact same definition.\n\nReviewed-by: Alex Deucher \u003calexander.deucher@amd.com\u003e\nAcked-by: Dave Airlie \u003cairlied@gmail.com\u003e\n\nv2: Kill 2 more helpers in intel_dp.c that I\u0027ve missed.\n\nSigned-off-by: Daniel Vetter \u003cdaniel.vetter@ffwll.ch\u003e\n" }, { "commit": "1ffdff134eb2d943bde3e4901ac48a9656a7e7a5", "tree": "a173f28a4d7f9b961645ed16f64857cf734b8113", "parents": [ "00ae9a456dd9a3e26db2265c0d25dec0d1e74b07" ], "author": { "name": "Daniel Vetter", "email": "daniel.vetter@ffwll.ch", "time": "Thu Oct 18 10:15:24 2012 +0200" }, "committer": { "name": "Daniel Vetter", "email": "daniel.vetter@ffwll.ch", "time": "Mon Oct 22 22:23:36 2012 +0200" }, "message": "drm: dp helper: extract drm_dp_channel_eq_ok\n\nradeon and intel use the exact same definition.\n\nReviewed-by: Alex Deucher \u003calexander.deucher@amd.com\u003e\nAcked-by: Dave Airlie \u003cairlied@gmail.com\u003e\nSigned-off-by: Daniel Vetter \u003cdaniel.vetter@ffwll.ch\u003e\n" }, { "commit": "64d7155cdfe5546ca0730daf7dd73ee52a74eeaf", "tree": "7d58409a555f89b8fb9c81012809c108b5d32b01", "parents": [ "0238047018d34946c08afc2f9e19053a3c25f0e1" ], "author": { "name": "David Howells", "email": "dhowells@redhat.com", "time": "Wed Oct 17 12:31:15 2012 +0100" }, "committer": { "name": "David Howells", "email": "dhowells@redhat.com", "time": "Wed Oct 17 12:31:15 2012 +0100" }, "message": "UAPI: Remove empty non-UAPI Kbuild files\n\nRemove non-UAPI Kbuild files that have become empty as a result of UAPI\ndisintegration. They used to have only header-y lines in them and those have\nnow moved to the Kbuild files in the corresponding uapi/ directories.\n\nPossibly these should not be removed but rather have a comment inserted to say\nthey are intentionally left blank. This would make it easier to add generated\nheader lines in future without having to restore the infrastructure.\n\nNote that at this point not all the UAPI disintegration parts have been merged,\nso it is likely that more empty Kbuild files will turn up.\n\nIt is probably necessary to make the files non-empty to prevent the patch\nprogram from automatically deleting them when it reduces them to nothing.\n\nSigned-off-by: David Howells \u003cdhowells@redhat.com\u003e\n" }, { "commit": "1f31c69dac71bebc0f00bc8534a6345782045501", "tree": "84797ce9d8c8b2c90130af5d6d4704e5df0dacee", "parents": [ "a5a0fc67435599d9d787a8d7153967a70fed968e", "f8f2ac9a76b0f80a6763ca316116a7bab8486997" ], "author": { "name": "Dave Airlie", "email": "airlied@redhat.com", "time": "Sun Oct 07 21:13:54 2012 +1000" }, "committer": { "name": "Dave Airlie", "email": "airlied@redhat.com", "time": "Sun Oct 07 21:13:54 2012 +1000" }, "message": "Merge branch \u0027drm-intel-fixes\u0027 of git://people.freedesktop.org/~danvet/drm-intel into drm-next\n\nDaniel writes:\n\nBigger -fixes pile, mostly because I\u0027ve included Ajax\u0027 DP dongle stuff,\nas discussed on irc. Otherwise just small things:\n- regression fix to finally make 6bpc auto-dither on dp work (Jani)\n- reinstate an snb ctx w/a that accidentally got lost in a rework (Chris)\n- fixup the DP train sequence, logic-goof-up uncovered by Coverty (Chris)\n- fix set_caching locking (Ben)\n- fix spurious segfault on con-current gtt mmap faulting (Dimitry and Mika)\n- some pageflip correctness fixes (still hunting down some issues, but\n these are the worst offenders of confused code that we\u0027ve tracked down\n thus far) from Chris and me\n- fixup swizzling settings on vlv (Jesse)\n- gt_mode w/a from Ben added, fixes snb gt1 rc6+hw ctx hangs.\n\n* \u0027drm-intel-fixes\u0027 of git://people.freedesktop.org/~danvet/drm-intel:\n drm/i915: Fix GT_MODE default value\n drm/i915: don\u0027t frob the vblank ts in finish_page_flip\n drm/i915: call drm_handle_vblank before finish_page_flip\n drm/i915: print warning if vmi915_gem_fault error is not handled\n drm/i915: EBUSY status handling added to i915_gem_fault().\n drm/i915: Try harder to complete DP training pattern 1\n drm/i915: set swizzling to none on VLV\n drm/dp: Make sink count DP 1.2 aware\n drm/dp: Document DP spec versions for various DPCD registers\n drm/i915/dp: Be smarter about connection sense for branch devices\n drm/i915/dp: Fetch downstream port info if needed during DPCD fetch\n drm/dp: Update DPCD defines\n drm: Export drm_probe_ddc()\n drm/i915: Flush the pending flips on the CRTC before modification\n drm/i915: Actually invalidate the TLB for the SandyBridge HW contexts w/a\n drm/i915: Fix set_caching locking\n drm/i915: use adjusted_mode instead of mode for checking the 6bpc force flag\n" }, { "commit": "a5a0fc67435599d9d787a8d7153967a70fed968e", "tree": "fd0015e62bd9b66af78e98e0c0a084596bfcaec4", "parents": [ "0dbe23218333bad3e75148f090fe670d8ca41ad6", "768c3059d87876ce124dafc40078718dc85cec65" ], "author": { "name": "Dave Airlie", "email": "airlied@redhat.com", "time": "Sun Oct 07 21:06:33 2012 +1000" }, "committer": { "name": "Dave Airlie", "email": "airlied@redhat.com", "time": "Sun Oct 07 21:06:33 2012 +1000" }, "message": "Merge branch \u0027exynos-drm-next\u0027 of git://git.infradead.org/users/kmpark/linux-samsung into drm-next\n\nInki writes:\n\"this patch set updates exynos drm framework and includes minor fixups.\nand this pull request except hdmi device tree support patch set posted\nby Rahul Sharma because that includes media side patch so for this\npatch set, we may have git pull one more time in addition, if we get\nan agreement with media guys. for this patch, you can refer to below link,\n http://comments.gmane.org/gmane.comp.video.dri.devel/74504\n\n this pull request adds hdmi device tree support\nand includes related patch set such as disabling of hdmi internal\ninterrupt, suppport for platform variants for hdmi and mixer,\nsupport to disable video processor based on platform type and\nremoval of drm common platform data. as you know, this patch\nset was delayed because it included an media side patch. so for this,\nwe got an ack from v4l2-based hdmi driver author, Tomasz Stanislawski.\"\n\n* \u0027exynos-drm-next\u0027 of git://git.infradead.org/users/kmpark/linux-samsung: (34 commits)\n drm: exynos: hdmi: remove drm common hdmi platform data struct\n drm: exynos: hdmi: add support for exynos5 hdmi\n drm: exynos: hdmi: replace is_v13 with version check in hdmi\n drm: exynos: hdmi: add support for exynos5 mixer\n drm: exynos: hdmi: add support to disable video processor in mixer\n drm: exynos: hdmi: add support for platform variants for mixer\n drm: exynos: hdmi: add support for exynos5 hdmiphy\n drm: exynos: hdmi: add support for exynos5 ddc\n drm: exynos: remove drm hdmi platform data struct\n drm: exynos: hdmi: turn off HPD interrupt in HDMI chip\n drm: exynos: hdmi: use s5p-hdmi platform data\n drm: exynos: hdmi: fix interrupt handling\n drm: exynos: hdmi: support for platform variants\n media: s5p-hdmi: add HPD GPIO to platform data\n drm/exynos: fix kcalloc size of g2d cmdlist node\n drm/exynos: fix to calculate CRTC shown via screen\n drm/exynos: fix display power call issue.\n drm/exynos: add platform_device_id table and driver data for drm fimd\n drm/exynos: Fix potential NULL pointer dereference\n drm/exynos: support drm_wait_vblank feature for VIDI\n ...\n\nConflicts:\n\tinclude/drm/exynos_drm.h\n" }, { "commit": "768c3059d87876ce124dafc40078718dc85cec65", "tree": "93f44ffe8396ddfb18aecbbabf2f6eb922a295bf", "parents": [ "22c4f428979521f3ba3398a1eb5c0be07396f357" ], "author": { "name": "Rahul Sharma", "email": "rahul.sharma@samsung.com", "time": "Thu Oct 04 20:48:56 2012 +0530" }, "committer": { "name": "Inki Dae", "email": "inki.dae@samsung.com", "time": "Fri Oct 05 19:15:16 2012 +0900" }, "message": "drm: exynos: hdmi: remove drm common hdmi platform data struct\n\nexynos-drm-hdmi need context pointers from hdmi and mixer. These\npointers were expected from the plf data. Cleaned this dependency\nby exporting i/f which are called by hdmi, mixer driver probes\nfor setting their context.\n\nSigned-off-by: Rahul Sharma \u003crahul.sharma@samsung.com\u003e\nSigned-off-by: Kyungmin Park \u003ckyungmin.park@samsung.com\u003e\nSigned-off-by: Inki Dae \u003cinki.dae@samsung.com\u003e\n" }, { "commit": "07e0e741896a6284fcc4d186dc68d0fd26b3366d", "tree": "da35c42e39e98c75e196a1ae414a08cd4262adcd", "parents": [ "5295e53d548ba592f54ef03c3444bac56f3d553d" ], "author": { "name": "Rahul Sharma", "email": "rahul.sharma@samsung.com", "time": "Thu Oct 04 20:48:48 2012 +0530" }, "committer": { "name": "Inki Dae", "email": "inki.dae@samsung.com", "time": "Fri Oct 05 19:15:00 2012 +0900" }, "message": "drm: exynos: remove drm hdmi platform data struct\n\nThis patch removes the drm hdmi platform data structure which is no\nlonger in use by drm hdmi driver after this patch set get merged. s5p\nhdmi platform data structure is used instead.\n\nSigned-off-by: Rahul Sharma \u003crahul.sharma@samsung.com\u003e\nSigned-off-by: Kyungmin Park \u003ckyungmin.park@samsung.com\u003e\nSigned-off-by: Inki Dae \u003cinki.dae@samsung.com\u003e\n" }, { "commit": "718dcedd7e87f448a1eeeda4d1a986284c243110", "tree": "48bd3730e4eea9c359d94ae4e990c2d9c574931b", "parents": [ "f3dfd599af993385b40fc7a1c947afc12729bc4d" ], "author": { "name": "David Howells", "email": "dhowells@redhat.com", "time": "Thu Oct 04 18:21:50 2012 +0100" }, "committer": { "name": "David Howells", "email": "dhowells@redhat.com", "time": "Thu Oct 04 18:21:50 2012 +0100" }, "message": "UAPI: (Scripted) Disintegrate include/drm\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: Michael Kerrisk \u003cmtk.manpages@gmail.com\u003e\nAcked-by: Paul E. McKenney \u003cpaulmck@linux.vnet.ibm.com\u003e\nAcked-by: Dave Jones \u003cdavej@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": "291257cf4cb0da1e32b672b88e73d22d845c8f93", "tree": "8da8e2b51c144842dc35d0ebe76f05a8d2769cec", "parents": [ "32aeab17457c13e6a448ba0f6f3c03d6705e5592" ], "author": { "name": "Inki Dae", "email": "inki.dae@samsung.com", "time": "Wed Sep 19 11:02:43 2012 +0900" }, "committer": { "name": "Inki Dae", "email": "inki.dae@samsung.com", "time": "Thu Oct 04 10:06:01 2012 +0900" }, "message": "drm/exynos: support drm_wait_vblank feature for VIDI\n\nthis patch adds drm_wait_vblank support to Virtual Display module\nso user can use DRM_IOCT_WAIT_VBLANK ioctl with this patch.\nfor this, you should set _DRM_VBLANK_EXYNOS_VIDI flags to\nvblwait-\u003erequest.type\n\nSigned-off-by: Inki Dae \u003cinki.dae@samsung.com\u003e\nSigned-off-by: Kyungmin Park \u003ckyungmin.park@samsung.com\u003e\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": "437589a74b6a590d175f86cf9f7b2efcee7765e7", "tree": "37bf8635b1356d80ef002b00e84f3faf3d555a63", "parents": [ "68d47a137c3bef754923bccf73fb639c9b0bbd5e", "72235465864d84cedb2d9f26f8e1de824ee20339" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Oct 02 11:11:09 2012 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Oct 02 11:11:09 2012 -0700" }, "message": "Merge branch \u0027for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/ebiederm/user-namespace\n\nPull user namespace changes from Eric Biederman:\n \"This is a mostly modest set of changes to enable basic user namespace\n support. This allows the code to code to compile with user namespaces\n enabled and removes the assumption there is only the initial user\n namespace. Everything is converted except for the most complex of the\n filesystems: autofs4, 9p, afs, ceph, cifs, coda, fuse, gfs2, ncpfs,\n nfs, ocfs2 and xfs as those patches need a bit more review.\n\n The strategy is to push kuid_t and kgid_t values are far down into\n subsystems and filesystems as reasonable. Leaving the make_kuid and\n from_kuid operations to happen at the edge of userspace, as the values\n come off the disk, and as the values come in from the network.\n Letting compile type incompatible compile errors (present when user\n namespaces are enabled) guide me to find the issues.\n\n The most tricky areas have been the places where we had an implicit\n union of uid and gid values and were storing them in an unsigned int.\n Those places were converted into explicit unions. I made certain to\n handle those places with simple trivial patches.\n\n Out of that work I discovered we have generic interfaces for storing\n quota by projid. I had never heard of the project identifiers before.\n Adding full user namespace support for project identifiers accounts\n for most of the code size growth in my git tree.\n\n Ultimately there will be work to relax privlige checks from\n \"capable(FOO)\" to \"ns_capable(user_ns, FOO)\" where it is safe allowing\n root in a user names to do those things that today we only forbid to\n non-root users because it will confuse suid root applications.\n\n While I was pushing kuid_t and kgid_t changes deep into the audit code\n I made a few other cleanups. I capitalized on the fact we process\n netlink messages in the context of the message sender. I removed\n usage of NETLINK_CRED, and started directly using current-\u003etty.\n\n Some of these patches have also made it into maintainer trees, with no\n problems from identical code from different trees showing up in\n linux-next.\n\n After reading through all of this code I feel like I might be able to\n win a game of kernel trivial pursuit.\"\n\nFix up some fairly trivial conflicts in netfilter uid/git logging code.\n\n* \u0027for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/ebiederm/user-namespace: (107 commits)\n userns: Convert the ufs filesystem to use kuid/kgid where appropriate\n userns: Convert the udf filesystem to use kuid/kgid where appropriate\n userns: Convert ubifs to use kuid/kgid\n userns: Convert squashfs to use kuid/kgid where appropriate\n userns: Convert reiserfs to use kuid and kgid where appropriate\n userns: Convert jfs to use kuid/kgid where appropriate\n userns: Convert jffs2 to use kuid and kgid where appropriate\n userns: Convert hpfs to use kuid and kgid where appropriate\n userns: Convert btrfs to use kuid/kgid where appropriate\n userns: Convert bfs to use kuid/kgid where appropriate\n userns: Convert affs to use kuid/kgid wherwe appropriate\n userns: On alpha modify linux_to_osf_stat to use convert from kuids and kgids\n userns: On ia64 deal with current_uid and current_gid being kuid and kgid\n userns: On ppc convert current_uid from a kuid before printing.\n userns: Convert s390 getting uid and gid system calls to use kuid and kgid\n userns: Convert s390 hypfs to use kuid and kgid where appropriate\n userns: Convert binder ipc to use kuids\n userns: Teach security_path_chown to take kuids and kgids\n userns: Add user namespace support to IMA\n userns: Convert EVM to deal with kuids and kgids in it\u0027s hmac computation\n ...\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": "232351777cd0fe2341f917d28bf130df2b44bf8a", "tree": "d87db183b51bc5bb848508e0436bed177c7fb2d0", "parents": [ "7883dc55e126d49770dda49864831f5998ad12fb" ], "author": { "name": "Adam Jackson", "email": "ajax@redhat.com", "time": "Thu Sep 20 16:42:45 2012 -0400" }, "committer": { "name": "Daniel Vetter", "email": "daniel.vetter@ffwll.ch", "time": "Tue Oct 02 18:06:07 2012 +0200" }, "message": "drm/dp: Make sink count DP 1.2 aware\n\nSigned-off-by: Adam Jackson \u003cajax@redhat.com\u003e\nReviewed-by: Paulo Zanoni \u003cpaulo.r.zanoni@intel.com\u003e\nSigned-off-by: Daniel Vetter \u003cdaniel.vetter@ffwll.ch\u003e\n" }, { "commit": "7883dc55e126d49770dda49864831f5998ad12fb", "tree": "148a1498cb440f089d2487d6d0dac4fa71cbb687", "parents": [ "caf9ab24e352102ec9dc6df82c78c3a9082109d6" ], "author": { "name": "Adam Jackson", "email": "ajax@redhat.com", "time": "Thu Sep 20 16:42:44 2012 -0400" }, "committer": { "name": "Daniel Vetter", "email": "daniel.vetter@ffwll.ch", "time": "Tue Oct 02 18:06:07 2012 +0200" }, "message": "drm/dp: Document DP spec versions for various DPCD registers\n\nNote with a comment anything newer than DP 1.1a.\n\nObviously this needs some work still...\n\nSigned-off-by: Adam Jackson \u003cajax@redhat.com\u003e\nAcked-by: Dave Airlie \u003cairlied@gmail.com\u003e\nSigned-off-by: Daniel Vetter \u003cdaniel.vetter@ffwll.ch\u003e\n" }, { "commit": "4e64753a0e697919be1ecc2d5fca1eb5b4358bf3", "tree": "a4fc8a38c1580ba7f5d427a0d0c143a1099406f7", "parents": [ "fbff4690b8f23289797b18ad8939e19525c403d1" ], "author": { "name": "Adam Jackson", "email": "ajax@redhat.com", "time": "Tue Sep 18 10:58:48 2012 -0400" }, "committer": { "name": "Daniel Vetter", "email": "daniel.vetter@ffwll.ch", "time": "Tue Oct 02 18:06:06 2012 +0200" }, "message": "drm/dp: Update DPCD defines\n\nSources: DP, eDP, and DP interop specs, and a VESA slideshow about DP\n1.2 for the MST bits.\n\nTested-by: Takashi Iwai \u003ctiwai@suse.de\u003e\nSigned-off-by: Adam Jackson \u003cajax@redhat.com\u003e\nAcked-by: Dave Airlie \u003cairlied@gmail.com\u003e\nReviewed-by: Paulo Zanoni \u003cpaulo.r.zanoni@intel.com\u003e\nReviewed-by: Jani Nikula \u003cjani.nikula@intel.com\u003e\nSigned-off-by: Daniel Vetter \u003cdaniel.vetter@ffwll.ch\u003e\n" }, { "commit": "fbff4690b8f23289797b18ad8939e19525c403d1", "tree": "34071e05e704fc04cab0a66d5d3762df1aaf867f", "parents": [ "5bb61643f6a70d48de9cfe91ad0fee0d618b6816" ], "author": { "name": "Adam Jackson", "email": "ajax@redhat.com", "time": "Tue Sep 18 10:58:47 2012 -0400" }, "committer": { "name": "Daniel Vetter", "email": "daniel.vetter@ffwll.ch", "time": "Tue Oct 02 18:06:05 2012 +0200" }, "message": "drm: Export drm_probe_ddc()\n\nTested-by: Takashi Iwai \u003ctiwai@suse.de\u003e\nSigned-off-by: Adam Jackson \u003cajax@redhat.com\u003e\nAcked-by: Dave Airlie \u003cairlied@gmail.com\u003e\nSigned-off-by: Daniel Vetter \u003cdaniel.vetter@ffwll.ch\u003e\n" }, { "commit": "7c80e128429d639742043f8fbdd7f1551c940ea3", "tree": "d387994498a91a65785ab7e0e559531c45395323", "parents": [ "f7eff60ea0e4e35732604e3591e2ff7b3ef41981" ], "author": { "name": "Rob Clark", "email": "rob@ti.com", "time": "Tue Sep 04 16:35:56 2012 +0000" }, "committer": { "name": "Dave Airlie", "email": "airlied@redhat.com", "time": "Tue Oct 02 22:16:07 2012 +1000" }, "message": "drm: support for rotated scanout\n\nFor drivers that can support rotated scanout, the extra parameter\nchecking in drm-core, while nice, tends to get confused. To solve\nthis drivers can set the crtc or plane invert_dimensions field so\nthat the dimension checking takes into account the rotation that\nthe driver is performing.\n\nv1: original\nv2: remove invert_dimensions from plane, at Ville\u0027s suggestion.\n Userspace can give rotated src coordinates, so invert_dimensions\n is not required for planes.\n\nSigned-off-by: Rob Clark \u003crob@ti.com\u003e\nReviewed-by: Ville Syrjälä \u003cville.syrjala@linux.intel.com\u003e\nSigned-off-by: Dave Airlie \u003cairlied@redhat.com\u003e\n" }, { "commit": "f7eff60ea0e4e35732604e3591e2ff7b3ef41981", "tree": "a9dd6031479ce9585d7d0af061aa165ed9c5d49b", "parents": [ "33cce6e9801f7d0184a636e9096a7cf7f8237ff9" ], "author": { "name": "Rob Clark", "email": "rob@ti.com", "time": "Wed Sep 05 21:48:38 2012 +0000" }, "committer": { "name": "Dave Airlie", "email": "airlied@redhat.com", "time": "Tue Oct 02 22:15:39 2012 +1000" }, "message": "drm: refcnt drm_framebuffer (v4.1)\n\nThis simplifies drm fb lifetime, and if the crtc/plane needs to hold\na ref to the fb when disabling a pipe until the next vblank, this\navoids the need to make disabling an overlay synchronous. This is a\nproblem that shows up when userspace is using a drm plane to\nimplement a hw cursor.. making overlay disable synchronous causes\na performance problem when x11 is rapidly enabling/disabling the\nhw cursor. But not making it synchronous opens up a race condition\nfor crashing if userspace turns around and immediately deletes the\nfb. Refcnt\u0027ing the fb makes it possible to solve this problem.\n\nv1: original\nv2: add drm_framebuffer_remove() which is called in all paths where\n fb-\u003efuncs-\u003edestroy() was directly called before. This cleans\n up the CRTCs/planes that the fb was attached to. You should\n only directly use drm_framebuffer_unreference() if you are also\n using drm_framebuffer_reference() to keep a ref to the fb.\nv3: add comment explaining the fb refcount\nv4: remove duplicate \u0027list_del(\u0026fb-\u003efilp_head)\u0027\n\n[airlied: v4.1: fix local rejection]\n\nSigned-off-by: Rob Clark \u003crob@ti.com\u003e\nSigned-off-by: Dave Airlie \u003cairlied@redhat.com\u003e\n" }, { "commit": "199adf40ae29a563ba0afe924e12802271defcc8", "tree": "aa7a2ef58b34145470ed9b0187bdc9e76ae7875d", "parents": [ "adf00b26d18e1b3570451296e03bcb20e4798cdd" ], "author": { "name": "Ben Widawsky", "email": "benjamin.widawsky@intel.com", "time": "Fri Sep 21 17:01:20 2012 -0700" }, "committer": { "name": "Daniel Vetter", "email": "daniel.vetter@ffwll.ch", "time": "Wed Sep 26 09:24:36 2012 +0200" }, "message": "drm/i915: s/cacheing/caching/\n\nSigned-off-by: Ben Widawsky \u003cben@bwidawsk.net\u003e\nSigned-off-by: Daniel Vetter \u003cdaniel.vetter@ffwll.ch\u003e\n" }, { "commit": "398b7a1b882a655ee84bd985f6c2ba89082404ae", "tree": "5eb9284a87ee2a45a10809cfbe3a66fea6ea53ae", "parents": [ "57df2ae9df6e335a98969cac5aafb09c4de10bb2", "979570e02981d4a8fc20b3cc8fd651856c98ee9d" ], "author": { "name": "Daniel Vetter", "email": "daniel.vetter@ffwll.ch", "time": "Mon Sep 24 18:07:48 2012 +0200" }, "committer": { "name": "Daniel Vetter", "email": "daniel.vetter@ffwll.ch", "time": "Mon Sep 24 18:17:12 2012 +0200" }, "message": "Merge tag \u0027v3.6-rc7\u0027 into drm-intel-next-queued\n\nManual backmerge of -rc7 to resolve a silent conflict leading to\ncompile failure in drivers/gpu/drm/i915/intel_hdmi.c.\n\nThis is due to the bugfix in -rc7:\n\ncommit b98b60167279df3acac9422c3c9820d9ebbcf9fb\nAuthor: Wang Xingchao \u003cxingchao.wang@intel.com\u003e\nDate: Thu Sep 13 07:43:22 2012 +0800\n\n drm/i915: HDMI - Clear Audio Enable bit for Hot Plug\n\nSince this code moved around a lot in -next git put that snippet at\nthe wrong spot. I\u0027ve tried to fix this by making the conflict explicit\nby merging a version for next with:\n\ncommit 3cce574f0190dd149472059fb69267cf83d290f9\nAuthor: Wang Xingchao \u003cxingchao.wang@intel.com\u003e\nDate: Thu Sep 13 11:19:00 2012 +0800\n\n drm/i915: HDMI - Clear Audio Enable bit for Hot Plug unconditionally\n\nBut that failed to solve the entire problem. To avoid pushing out\nfurther -nightly branch to our QA where this is broken, do the\nbackmerge and manually add the stuff git adds to -next from the patch\nin -fixes.\n\nNote that this doesn\u0027t show up in git\u0027s merge diff (and hence is also\nnot handled by git rerere), which adds to the reasons why I\u0027d like to\nfix this with a verbose backmerge. The git merge diff only shows a\nbunch of trivial conflicts of the \"code changed in lines next to each\nanother\" kind.\n\nSigned-off-by: Daniel Vetter \u003cdaniel.vetter@ffwll.ch\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": "8c0bd3c02d52eff11396e81b4d217ee668e03528", "tree": "0c236c45de9184a06e3610442c6090b958d8b7cc", "parents": [ "7facf16690dc4160e5ff605271704183ff56b2d9" ], "author": { "name": "Ben Widawsky", "email": "ben@bwidawsk.net", "time": "Tue Sep 11 17:13:05 2012 -0700" }, "committer": { "name": "Daniel Vetter", "email": "daniel.vetter@ffwll.ch", "time": "Thu Sep 20 14:22:55 2012 +0200" }, "message": "drm/i915: placeholder getparam\n\nThere are internal patches for a feature which require a parameter to\nquery whether support exists . These patches cannot be made external\nyet. In order to keep existing tests and userspace happy and free from\nconflicts, reserve a number for it.\n\nSigned-off-by: Ben Widawsky \u003cben@bwidawsk.net\u003e\nSigned-off-by: Daniel Vetter \u003cdaniel.vetter@ffwll.ch\u003e\n" }, { "commit": "ba623f6a5a419ac31806e77682da38a9f9b5b462", "tree": "51cdc671993fdd5e82409557ba333f05d42ecbe6", "parents": [ "2e3b3c42f06ff6801b3d7839757bbdb231619083" ], "author": { "name": "Laurent Pinchart", "email": "laurent.pinchart@ideasonboard.com", "time": "Fri May 18 23:47:40 2012 +0200" }, "committer": { "name": "Laurent Pinchart", "email": "laurent.pinchart@ideasonboard.com", "time": "Tue Sep 18 12:28:21 2012 +0200" }, "message": "drm: Add NV24 and NV42 pixel formats\n\nSigned-off-by: Laurent Pinchart \u003claurent.pinchart@ideasonboard.com\u003e\n" }, { "commit": "2e3b3c42f06ff6801b3d7839757bbdb231619083", "tree": "b047e7b4a69808a9a87865d71730c9fac0b39ade", "parents": [ "b9d474500546160dd6af35f60cd8bc20edd13807" ], "author": { "name": "Lars-Peter Clausen", "email": "lars@metafoo.de", "time": "Mon Jul 02 16:37:47 2012 +0200" }, "committer": { "name": "Laurent Pinchart", "email": "laurent.pinchart@ideasonboard.com", "time": "Tue Sep 18 12:28:21 2012 +0200" }, "message": "DRM: Add DRM KMS/FB CMA helper\n\nThis patchset introduces a set of helper function for implementing the KMS\nframebuffer layer for drivers which use the DRM GEM CMA helper function.\n\nSigned-off-by: Lars-Peter Clausen \u003clars@metafoo.de\u003e\nTested-by: Sascha Hauer \u003cs.hauer@pengutronix.de\u003e\nAcked-by: Sascha Hauer \u003cs.hauer@pengutronix.de\u003e\n[Make DRM_KMS_CMA_HELPER a boolean Kconfig option]\nSigned-off-by: Laurent Pinchart \u003claurent.pinchart@ideasonboard.com\u003e\n" }, { "commit": "b9d474500546160dd6af35f60cd8bc20edd13807", "tree": "47684d34316269a4955dfdad7b9972f3aac6ae9d", "parents": [ "0b2443ed4e07d7973e4554a2cc166bc35447b59e" ], "author": { "name": "Sascha Hauer", "email": "s.hauer@pengutronix.de", "time": "Wed Jun 27 15:30:18 2012 +0200" }, "committer": { "name": "Laurent Pinchart", "email": "laurent.pinchart@ideasonboard.com", "time": "Tue Sep 18 12:28:21 2012 +0200" }, "message": "DRM: Add DRM GEM CMA helper\n\nMany embedded drm devices do not have a IOMMU and no dedicated\nmemory for graphics. These devices use CMA (Contiguous Memory\nAllocator) backed graphics memory. This patch provides helper\nfunctions to be able to share the code. The code technically does\nnot depend on CMA as the backend allocator, the name has been chosen\nbecause CMA makes for a nice, short but still descriptive function\nprefix.\n\nSigned-off-by: Sascha Hauer \u003cs.hauer@pengutronix.de\u003e\nTested-by: Lars-Peter Clausen \u003clars@metafoo.de\u003e\n[Make DRM_GEM_CMA_HELPER a boolean Kconfig option]\nSigned-off-by: Laurent Pinchart \u003claurent.pinchart@ideasonboard.com\u003e\n" }, { "commit": "0b2443ed4e07d7973e4554a2cc166bc35447b59e", "tree": "a996dbd03a8480f6473a7ea2fdea3936760de853", "parents": [ "09e7dcf081b1100d1cdff57fa9eb25c3a834c9d6" ], "author": { "name": "Jerome Glisse", "email": "jglisse@redhat.com", "time": "Thu Aug 09 11:25:51 2012 -0400" }, "committer": { "name": "Dave Airlie", "email": "airlied@redhat.com", "time": "Mon Sep 17 11:16:40 2012 +1000" }, "message": "drm/edid: limit printk when facing bad edid\n\nLimit printing bad edid information at one time per connector.\nConnector that are connected to a bad monitor/kvm will likely\nstay connected to the same bad monitor/kvm and it makes no\nsense to keep printing the bad edid message.\n\nSigned-off-by: Jerome Glisse \u003cjglisse@redhat.com\u003e\nReviewed-by: Adam Jackson \u003cajax@redhat.com\u003e\nSigned-off-by: Dave Airlie \u003cairlied@redhat.com\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": "d9dd85dd4e18c255225bada181ffcee37f4ff9a6", "tree": "d7227089f23cf1858500ae264a41a59d144a4ac7", "parents": [ "ece82d624cd0ca783e3fa2377fbbce6dd01ec1b3" ], "author": { "name": "Ville Syrjälä", "email": "ville.syrjala@linux.intel.com", "time": "Fri Apr 20 18:26:10 2012 +0300" }, "committer": { "name": "Inki Dae", "email": "inki.dae@samsung.com", "time": "Thu Sep 13 12:38:10 2012 +0900" }, "message": "drm: Drop the NV12M and YUV420M formats\n\nThe NV12M/YUV420M formats are identical to the NV12/YUV420 formats.\nSo just remove these duplicated format names.\n\nThis might look like breaking the ABI, but the code has never actually\naccepted these formats, so nothing can be using them.\n\nSigned-off-by: Ville Syrjälä \u003cville.syrjala@linux.intel.com\u003e\nSigned-off-by: Inki Dae \u003cinki.dae@samsung.com\u003e\nSigned-off-by: Kyungmin Park \u003ckyungmin.park@samsung.com\u003e\n" }, { "commit": "65983bd605a12edd16a4f39f513aad65f1cad062", "tree": "bf8c84598565c26e251efb9cb591977446e7e76b", "parents": [ "93bb70e0c00f1be4cc857e4d8375c44058cce71e", "d7c3b937bdf45f0b844400b7bf6fd3ed50bac604" ], "author": { "name": "Dave Airlie", "email": "airlied@redhat.com", "time": "Mon Sep 03 12:05:01 2012 +1000" }, "committer": { "name": "Dave Airlie", "email": "airlied@redhat.com", "time": "Mon Sep 03 12:05:01 2012 +1000" }, "message": "Merge branch \u0027for-airlied\u0027 of git://people.freedesktop.org/~danvet/drm-intel into drm-next\n\nDaniel writes:\n\"New stuff for -next. Highlights:\n- prep patches for the modeset rework. Note that one of those patches\n touches the fb helper in the common drm code.\n- hasw hdmi audio support (Wang Xingchao)\n- improved instdone dumping for gen7 (Ben)\n- unbound tracking and a few follow-up patches from Chris\n- dma_buf-\u003ebegin/end_cpu_access plus fix for drm/udl (Dave)\n- improve mmio error reporting for hsw\n- prep patch for WQ_NON_REENTRANT removal (Tejun Heo)\n\"\n\n* \u0027for-airlied\u0027 of git://people.freedesktop.org/~danvet/drm-intel: (41 commits)\n drm/i915: Remove __GFP_NO_KSWAPD\n drm/i915: disable rc6 on ilk when vt-d is enabled\n drm/i915: Avoid unbinding due to an interrupted pin_and_fence during execbuffer\n drm/i915: Use new INSTDONE registers (Gen7+)\n drm/i915: Add new INSTDONE registers\n drm/i915: Extract reading INSTDONE\n drm/i915: Use a non-blocking wait for set-to-domain ioctl\n drm/i915: Juggle code order to ease flow of the next patch\n drm/i915: Use cpu relocations if the object is in the GTT but not mappable\n drm/i915: Extract general object init routine\n drm/i915: Protect private gem objects from truncate (such as imported dmabuf)\n drm/i915: Only pwrite through the GTT if there is space in the aperture\n i915: use alloc_ordered_workqueue() instead of explicit UNBOUND w/ max_active \u003d 1\n drm/i915: Find unclaimed MMIO writes.\n drm/i915: Add ERR_INT to gen7 error state\n drm/i915: Cantiga+ cannot handle a hsync front porch of 0\n drm/i915: fix reassignment of variable \"intel_dp-\u003eDP\"\n drm/i915: Try harder to allocate an mmap_offset\n drm/i915: Show pin count in debugfs\n drm/i915: Show (count, size) of purgeable objects in i915_gem_objects\n ...\n" }, { "commit": "93bb70e0c00f1be4cc857e4d8375c44058cce71e", "tree": "7b6a11844e00b3f4bf8281c7a799e61494220819", "parents": [ "6f314ebbaa2667d67a7206ba78f28e46cf47eda5", "c182ae42cc3611f7b3fa803c0bcab6e5d29bea63" ], "author": { "name": "Dave Airlie", "email": "airlied@redhat.com", "time": "Mon Aug 27 16:22:20 2012 +1000" }, "committer": { "name": "Dave Airlie", "email": "airlied@redhat.com", "time": "Mon Aug 27 16:22:20 2012 +1000" }, "message": "Merge branch \u0027master\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux into drm-next\n\nThere was some merge conflicts in -next and they weren\u0027t so pretty, so\nbackmerge now to avoid them.\n\nConflicts:\n\tdrivers/gpu/drm/i915/i915_gem.c\n\tdrivers/gpu/drm/i915/intel_modes.c\n" }, { "commit": "fc7b8127dcfd9c4c373eb5295b2da492cec40a8e", "tree": "b70688fdce6d93536ad34f81758db0316d4f2d51", "parents": [ "04cf55e1fa5ff0c83756b803a47cb6bd0b39f38b" ], "author": { "name": "Huacai Chen", "email": "chenhuacai@gmail.com", "time": "Sat Aug 11 09:32:18 2012 +0000" }, "committer": { "name": "Dave Airlie", "email": "airlied@redhat.com", "time": "Fri Aug 24 09:41:10 2012 +1000" }, "message": "drm: Define SAREA_MAX for Loongson (PageSize \u003d 16KB).\n\nSigned-off-by: Huacai Chen \u003cchenhc@lemote.com\u003e\nSigned-off-by: Hongliang Tao \u003ctaohl@lemote.com\u003e\nSigned-off-by: Hua Yan \u003cyanh@lemote.com\u003e\nCc: dri-devel@lists.freedesktop.org\nSigned-off-by: Dave Airlie \u003cairlied@redhat.com\u003e\n" }, { "commit": "7c4eaca4162d0b5ad4fb39f974d7ffd71b9daa09", "tree": "1b1851a45b209cdc24489866326bc987c0c22315", "parents": [ "22f5d115a2b087c977128f84ee557ad71530330e" ], "author": { "name": "Jakob Bornecrantz", "email": "jakob@vmware.com", "time": "Thu Aug 16 08:29:03 2012 +0000" }, "committer": { "name": "Dave Airlie", "email": "airlied@redhat.com", "time": "Fri Aug 24 09:38:40 2012 +1000" }, "message": "drm: Check for invalid cursor flags\n\nSigned-off-by: Jakob Bornecrantz \u003cjakob@vmware.com\u003e\nCc: stable@vger.kernel.org\nSigned-off-by: Dave Airlie \u003cairlied@redhat.com\u003e\n" }, { "commit": "22f5d115a2b087c977128f84ee557ad71530330e", "tree": "19ef3050d451e01237e2649ecadbffc96ff7bb60", "parents": [ "fea7a08acb13524b47711625eebea40a0ede69a0" ], "author": { "name": "Ville Syrjälä", "email": "ville.syrjala@linux.intel.com", "time": "Tue Aug 14 10:53:38 2012 +0000" }, "committer": { "name": "Dave Airlie", "email": "airlied@redhat.com", "time": "Fri Aug 24 09:38:31 2012 +1000" }, "message": "drm: Initialize object type when using DRM_MODE() macro\n\nDRM_MODE() macro doesn\u0027t initialize the type of the base drm object.\nWhen a copy is made of the mode, the object type is overwritten with\nzero, and the the object can no longer be found by\ndrm_mode_object_find() due to the type check failing.\n\nSigned-off-by: Ville Syrjälä \u003cville.syrjala@linux.intel.com\u003e\nSigned-off-by: Dave Airlie \u003cairlied@redhat.com\u003e\n" }, { "commit": "451023dc32d4542c21b52ad1692e6e01cb75b099", "tree": "9380bd992f953d0a7403b3894bd1d946b6fbca91", "parents": [ "993dcb05e47e357ade19c41f60b39085eeba8787" ], "author": { "name": "Jani Nikula", "email": "jani.nikula@intel.com", "time": "Wed Aug 15 09:32:39 2012 +0000" }, "committer": { "name": "Dave Airlie", "email": "airlied@redhat.com", "time": "Fri Aug 24 09:37:36 2012 +1000" }, "message": "drm: remove the raw_edid field from struct drm_display_info\n\nNeither the drm core nor any of the drivers really need the raw_edid field\nof struct drm_display_info for anything. Instead of being useful, it\ncreates confusion about who is responsible for freeing the memory it points\nto and setting the field to NULL afterwards, leading to memory leaks and\ndangling pointers.\n\nRemove the raw_edid field, and fix drivers as necessary.\n\nReported-by: Russell King \u003clinux@arm.linux.org.uk\u003e\nSigned-off-by: Jani Nikula \u003cjani.nikula@intel.com\u003e\nAcked-by: Inki Dae \u003cinki.dae@samsung.com\u003e\nSigned-off-by: Dave Airlie \u003cairlied@redhat.com\u003e\n" }, { "commit": "04ccfe77f132b973659f11954443214659014072", "tree": "57aacebe4a016f5eef73943976bd7602c2d80b78", "parents": [ "f5869a8308f77e3dfdc2e3640842b285aa788ff8" ], "author": { "name": "Damien Lespiau", "email": "damien.lespiau@intel.com", "time": "Fri Aug 17 14:20:02 2012 +0000" }, "committer": { "name": "Dave Airlie", "email": "airlied@redhat.com", "time": "Wed Aug 22 09:27:27 2012 +1000" }, "message": "drm: Remove two unused fields from struct drm_display_mode\n\nSigned-off-by: Damien Lespiau \u003cdamien.lespiau@intel.com\u003e\nReviewed-by: Jani Nikula \u003cjani.nikula@intel.com\u003e\nSigned-off-by: Dave Airlie \u003cairlied@redhat.com\u003e\n" }, { "commit": "ec6f1bb90c9865d4a5af01b1c643bcf020d88706", "tree": "ba4ab858b7d96ea08ace354332eb9c79bafb65eb", "parents": [ "0826874a664f9e9479d50fda23923b87a50cda0d" ], "author": { "name": "Dave Airlie", "email": "airlied@redhat.com", "time": "Thu Aug 16 10:15:34 2012 +1000" }, "committer": { "name": "Daniel Vetter", "email": "daniel.vetter@ffwll.ch", "time": "Fri Aug 17 10:10:06 2012 +0200" }, "message": "drm/i915: implement dma buf begin_cpu_access (v2)\n\nIn order for udl vmap to work properly, we need to push the object\ninto the CPU domain before we start copying the data to the USB device.\n\nThis along with the udl change avoids userspace explicit mapping to\nbe used.\n\nv2: add a flag for userspace to query to know if Intel kernel driver can\ndeal with the vmap flushing properly. In theory udl would need a flag also,\nbut I intend to push the patches very close to each other and other drivers\nshould do the right thing from the start.\n\nI\u0027ve added a test to my intel-gpu-tools prime branch, however testing\nthis is a bit messy since the only way to get udl to vmap is to rendering\nsomething. I\u0027ve tested this with real code as well to make sure it works.\n\nSigned-off-by: Dave Airlie \u003cairlied@redhat.com\u003e\n[danvet: resolved conflict, which required reallocating the PARAM\nnumber to 21.]\nSigned-off-by: Daniel Vetter \u003cdaniel.vetter@ffwll.ch\u003e\n" }, { "commit": "a22ddff8bedfe33eeb1330bbb7ef1fbe007a42c4", "tree": "61a2eb7fa62f5af10c2b913ca429e6b068b0eb2d", "parents": [ "20d5a540e55a29daeef12706f9ee73baf5641c16", "d9875690d9b89a866022ff49e3fcea892345ad92" ], "author": { "name": "Daniel Vetter", "email": "daniel.vetter@ffwll.ch", "time": "Fri Aug 17 08:57:56 2012 +0200" }, "committer": { "name": "Daniel Vetter", "email": "daniel.vetter@ffwll.ch", "time": "Fri Aug 17 09:01:08 2012 +0200" }, "message": "Merge tag \u0027v3.6-rc2\u0027 into drm-intel-next\n\nBackmerge Linux 3.6-rc2 to resolve a few funny conflicts before we put\neven more madness on top:\n\n- drivers/gpu/drm/i915/i915_irq.c: Just a spurious WARN removed in\n -fixes, that has been changed in a variable-rename in -next, too.\n\n- drivers/gpu/drm/i915/intel_ringbuffer.c: -next remove scratch_addr\n (since all their users have been extracted in another fucntion),\n -fixes added another user for a hw workaroudn.\n\nSigned-off-by: Daniel Vetter \u003cdaniel.vetter@ffwll.ch\u003e\n" }, { "commit": "6759a0a7a0496dbbd4fb062c6a76d61c55d0fbd9", "tree": "e16a78229435a2277d11f55ad8dd07780ce7499c", "parents": [ "b51ad12a36234c1f6707c9c54a414cfca23f3cdb" ], "author": { "name": "Marek Olšák", "email": "maraeo@gmail.com", "time": "Thu Aug 09 16:34:17 2012 +0200" }, "committer": { "name": "Alex Deucher", "email": "alexander.deucher@amd.com", "time": "Mon Aug 13 10:50:56 2012 -0400" }, "message": "drm/radeon/kms: implement timestamp userspace query (v2)\n\nReturns a snapshot of the GPU clock counter. Needed\nfor certain OpenGL extensions.\n\nv2: agd5f\n- address Jerome\u0027s comments\n- add function documentation\n\nSigned-off-by: Marek Olšák \u003cmaraeo@gmail.com\u003e\nReviewed-by: Jerome Glisse \u003cjglisse@redhat.com\u003e\nSigned-off-by: Alex Deucher \u003calexander.deucher@amd.com\u003e\n" }, { "commit": "2f292004dd1fb005788dc0a9cdd5559812ed866e", "tree": "d357b99c40c188497055b766491f6fced0b8118a", "parents": [ "ecd67955fd4c8e66e4df312098989d5fa7da624c" ], "author": { "name": "Alex Deucher", "email": "alexander.deucher@amd.com", "time": "Mon Aug 06 10:03:59 2012 -0400" }, "committer": { "name": "Alex Deucher", "email": "alexander.deucher@amd.com", "time": "Mon Aug 13 10:50:53 2012 -0400" }, "message": "drm/radeon: add some new SI pci ids\n\nSigned-off-by: Alex Deucher \u003calexander.deucher@amd.com\u003e\nCc: stable@vger.kernel.org\n" }, { "commit": "2fedbff948cf5bc1e9977b7bc885aae45bd32f74", "tree": "2fb434867abb4bff322fd8e34a7ce9039a9e820f", "parents": [ "6c6cf5aa9c583478b19e23149feaa92d01fb8c2d" ], "author": { "name": "Chris Wilson", "email": "chris@chris-wilson.co.uk", "time": "Wed Aug 08 10:23:22 2012 +0100" }, "committer": { "name": "Daniel Vetter", "email": "daniel.vetter@ffwll.ch", "time": "Wed Aug 08 14:29:12 2012 +0200" }, "message": "drm/i915: Add I915_GEM_PARAM_HAS_SEMAPHORES\n\nUserspace tries to estimate the cost of ring switching based on whether\nthe GPU and GEM supports semaphores. (If we have multiple rings and no\nsemaphores, userspace assumes that the cost of switching rings between\nbatches is exorbitant and will endeavour to keep the next batch on the\nactive ring - as a coarse approximation to tracking both destination and\nsource surfaces.) Currently userspace has to guess whether semaphores\nexist based on the chipset generation and the module parameter,\ni915.semaphores. This is a crude and inaccurate guess as the defaults\ninternally depend upon other chipset features being enabled or disabled,\nnor does it extend well into the future. By exporting a HAS_SEMAPHORES\nparameter, we can easily query the driver and obtain an accurate answer.\n\nSigned-off-by: Chris Wilson \u003cchris@chris-wilson.co.uk\u003e\nSigned-off-by: Daniel Vetter \u003cdaniel.vetter@ffwll.ch\u003e\n" }, { "commit": "00ae67cf26fad3889e71e3bdbec012b1f938dc0e", "tree": "577465229758f7095b4cc132f7f3e0badd8a806c", "parents": [ "4070d212eb54ec9f204646d95c17d95ad812a008" ], "author": { "name": "Joonyoung Shim", "email": "jy0922.shim@samsung.com", "time": "Wed Jun 27 14:27:06 2012 +0900" }, "committer": { "name": "Inki Dae", "email": "inki.dae@samsung.com", "time": "Fri Jul 27 11:13:54 2012 +0900" }, "message": "drm/exynos: add property for plane zpos\n\nThe exynos drm driver used a specific ioctl - DRM_EXYNOS_PLANE_SET_ZPOS\nto set zpos of plane. It can be substitute to property of plane. This\npatch adds a property for plane zpos and removes\nDRM_EXYNOS_PLANE_SET_ZPOS ioctl.\n\nSigned-off-by: Joonyoung Shim \u003cjy0922.shim@samsung.com\u003e\nSigned-off-by: Kyungmin Park \u003ckyungmin.park@samsung.com\u003e\nSigned-off-by: Inki Dae \u003cinki.dae@samsung.com\u003e\n" }, { "commit": "e6994aeedcee4f71998d89d2c10c5baa419ebeac", "tree": "8b298417e51e2fc2dd2e191b26d504f648ffd91b", "parents": [ "42d6ab4839799b2f246748ce663d6b023f02bb73" ], "author": { "name": "Chris Wilson", "email": "chris@chris-wilson.co.uk", "time": "Tue Jul 10 10:27:08 2012 +0100" }, "committer": { "name": "Daniel Vetter", "email": "daniel.vetter@ffwll.ch", "time": "Thu Jul 26 12:56:25 2012 +0200" }, "message": "drm/i915: Export ability of changing cache levels to userspace\n\nBy selecting the cache level (essentially whether or not the CPU snoops\nany updates to the bo, and on more recent machines whether it resides\ninside the CPU\u0027s last-level-cache) a userspace driver is able to then\nmanage all of its memory within buffer objects, if it so desires. This\nenables the userspace driver to accelerate uploads and more importantly\ndownloads from the GPU and to able to mix CPU and GPU rendering/activity\nefficiently.\n\nSigned-off-by: Chris Wilson \u003cchris@chris-wilson.co.uk\u003e\n[danvet: Added code comment about where we plan to stuff platform\nspecific cacheing control bits in the ioctl struct.]\nSigned-off-by: Daniel Vetter \u003cdaniel.vetter@ffwll.ch\u003e\n" }, { "commit": "2536f7dc42556f63ee45b14e7d2d9696200f317a", "tree": "8d920a5a95a561db6fa5933953ee5b5dff140c12", "parents": [ "fcedac670c3da0d17aaa5db1708694971e8024a9", "715855457e6bc93e148caf8cb3b5dcabbf605b0d" ], "author": { "name": "Dave Airlie", "email": "airlied@redhat.com", "time": "Thu Jul 26 10:35:44 2012 +1000" }, "committer": { "name": "Dave Airlie", "email": "airlied@redhat.com", "time": "Thu Jul 26 10:35:44 2012 +1000" }, "message": "Merge branch \u0027drm-nouveau-fixes\u0027 of git://anongit.freedesktop.org/git/nouveau/linux-2.6 into drm-next\n\n* \u0027drm-nouveau-fixes\u0027 of git://anongit.freedesktop.org/git/nouveau/linux-2.6:\n drm/nouveau: init vblank requests list\n drm/nv50: extend vblank semaphore to generic dmaobj + offset pair\n drm/nouveau: mark most of our ioctls as deprecated, move to compat layer\n drm/nouveau: move current gpuobj code out of nouveau_object.c\n drm/nouveau/gem: fix object reference leak in a failure path\n drm/nv50: rename INVALID_QUERY_OR_TEXTURE error to INVALID_OPERATION\n drm/nv84: decode PCRYPT errors\n drm/nouveau: dcb table quirk for fdo#50830\n nouveau: Fix alignment requirements on src and dst addresses\n" }, { "commit": "2a259a3d84c4409918c5d094f0969da58283a947", "tree": "e261df7f7f038bbb9761c91ee5784a4fdfb0bfb5", "parents": [ "ce22af03da2cd700332a384e240378cae1355773" ], "author": { "name": "Ben Skeggs", "email": "bskeggs@redhat.com", "time": "Tue May 08 10:24:27 2012 +1000" }, "committer": { "name": "Ben Skeggs", "email": "bskeggs@redhat.com", "time": "Thu Jul 26 10:28:15 2012 +1000" }, "message": "drm/nouveau: mark most of our ioctls as deprecated, move to compat layer\n\nThese will be replaced in the near future, the code isn\u0027t yet stable enough\nfor this merge window however.\n\nSigned-off-by: Ben Skeggs \u003cbskeggs@redhat.com\u003e\n" }, { "commit": "e9808edd98679680804dfbc42c5ee8f1aa91f617", "tree": "5c5538b47f12b16de8faf3809479aebe76c67692", "parents": [ "c0c7babc48c4f6943ed3070d04630ea3ac9272ee" ], "author": { "name": "Chris Wilson", "email": "chris@chris-wilson.co.uk", "time": "Wed Jul 04 12:25:08 2012 +0100" }, "committer": { "name": "Daniel Vetter", "email": "daniel.vetter@ffwll.ch", "time": "Wed Jul 25 18:23:50 2012 +0200" }, "message": "drm/i915: Return a mask of the active rings in the high word of busy_ioctl\n\nThe intention is to help select which engine to use for copies with\ninteroperating clients - such as a GL client making a request to the X\nserver to perform a SwapBuffers, which may require copying from the\nactive GL back buffer to the X front buffer.\n\nWe choose to report a mask of the active rings to future proof the\ninterface against any changes which may allow for the object to reside\nupon multiple rings.\n\nSigned-off-by: Chris Wilson \u003cchris@chris-wilson.co.uk\u003e\n[danvet: bikeshed away the write ring mask and add the explanation\nChris sent in a follow-up mail why we decided to use masks.]\nSigned-off-by: Daniel Vetter \u003cdaniel.vetter@ffwll.ch\u003e\n" }, { "commit": "c0c7babc48c4f6943ed3070d04630ea3ac9272ee", "tree": "86067dfb6b57953296e26dbf58ac8d13693c43f3", "parents": [ "2b860db67ff3ce886fcb35289a9283a041cce6a4" ], "author": { "name": "Ben Widawsky", "email": "ben@bwidawsk.net", "time": "Thu Jul 12 11:01:05 2012 -0700" }, "committer": { "name": "Daniel Vetter", "email": "daniel.vetter@ffwll.ch", "time": "Wed Jul 25 18:23:49 2012 +0200" }, "message": "drm/i915: add register read IOCTL\n\nThe interface\u0027s immediate purpose is to do synchronous timestamp queries\nas required by GL_TIMESTAMP. The GPU has a register for reading the\ntimestamp but because that would normally require root access through\nlibpciaccess, the IOCTL can provide this service instead.\n\nCurrently the implementation whitelists only the render ring timestamp\nregister, because that is the only thing we need to expose at this time.\n\nv2: make size implicit based on the register offset\nAdd a generation check\n\nReviewed-by: Eric Anholt \u003ceric@anholt.net\u003e\nCc: Jacek Lawrynowicz \u003cjacek.lawrynowicz@intel.com\u003e\nSigned-off-by: Ben Widawsky \u003cben@bwidawsk.net\u003e\n[danvet: fixup the ioctl numerb:]\nSigned-off-by: Daniel Vetter \u003cdaniel.vetter@ffwll.ch\u003e\n" }, { "commit": "2b860db67ff3ce886fcb35289a9283a041cce6a4", "tree": "ae4991ef0ccaf2020024ee7b8c2eb794b1b1f931", "parents": [ "7434a255a5cf42819b7e42377f18aaa02f6be52b" ], "author": { "name": "Daniel Vetter", "email": "daniel.vetter@ffwll.ch", "time": "Wed Jul 18 20:03:05 2012 +0200" }, "committer": { "name": "Daniel Vetter", "email": "daniel.vetter@ffwll.ch", "time": "Wed Jul 25 18:23:49 2012 +0200" }, "message": "drm/i915: Reserve ioctl numbers for set/get_caching\n\nI\u0027m planing to merge this next week for 3.7, but I\u0027d like to avoid\nstupid conflicts with the exsting userspace when merging the new\nreg_read ioctl (which doesn\u0027t have userspace yet, but this caching\ninterface has).\n\nHeader extracted from Chris Wilson\u0027s patch, but fix up the copy\u0026pasted\ncomment in the interface struct.\n\nSigned-off-by: Chris Wilson \u003cchris@chris-wilson.co.uk\u003e\nSigned-off-by: Daniel Vetter \u003cdaniel.vetter@ffwll.ch\u003e\n" }, { "commit": "b97ce28e9f6d65a800e5c2ee3a2a99c7795bef65", "tree": "3db885773e7e1aa79b08a08e787f420f5cb2473b", "parents": [ "e6b0b6a82f9c93fe3dd060ae54719456474a74a3" ], "author": { "name": "Ilija Hadzic", "email": "ihadzic@research.bell-labs.com", "time": "Tue Jul 24 15:30:36 2012 +1000" }, "committer": { "name": "Dave Airlie", "email": "airlied@redhat.com", "time": "Tue Jul 24 15:30:36 2012 +1000" }, "message": "drm/ttm: remove stale declaration and field\n\nPatch 649bf3ca77343e3be1e0af8e21356fa569b1abd9 has completely\nremoved ttm_backend structure. Remove lingering declaration\nand related (now stale) field in ttm_tt structure,\n\nCC: Jerome Glisse \u003cjglisse at redhat.com\u003e\nSigned-off-by: Ilija Hadzic \u003cihadzic at research.bell-labs.com\u003e\nSigned-off-by: Dave Airlie \u003cairlied@redhat.com\u003e\n" }, { "commit": "83bc5fd29afff5898cadf87fb29eb9260eecc63e", "tree": "3e30342aa5203f4a0789d7968f89446e8fd19dd5", "parents": [ "26587e69946249dc8327c5912d86320c3f63b2c5" ], "author": { "name": "Daniel Vetter", "email": "daniel.vetter@ffwll.ch", "time": "Sun Jun 24 19:57:24 2012 +0200" }, "committer": { "name": "Dave Airlie", "email": "airlied@redhat.com", "time": "Thu Jul 19 22:51:58 2012 -0400" }, "message": "drm/sis: fixup sis_mm ioctl structs\n\nUserspace uses long in quite a few places more than the kernel. Which\ngives me neat proof that I\u0027m the only guy on this side of the galaxy\nwho ever tried to run glxgears on a 64bit machine with sis graphics on\nlinux.\n\nNote that the longs in drm_sis_mem_t aren\u0027t aligned properly, so this\nwon\u0027t even work with 32bit userspace on 64bit kernel as-is. Hence the\npatch can\u0027t break that, either.\n\nNope, I\u0027m not nuts enough to write the 32bit ioctl compat layer for\nthis and test it with some wine app. Even though hunting the ebay\ndungeons for a sis card actually supported by the mesa drivers casts\nsome doubts on this ...\n\nSigned-off-by: Daniel Vetter \u003cdaniel.vetter@ffwll.ch\u003e\nSigned-off-by: Dave Airlie \u003cairlied@redhat.com\u003e\n" }, { "commit": "26587e69946249dc8327c5912d86320c3f63b2c5", "tree": "29e5246518be0dd45e4fe5e6b4d532fde2614325", "parents": [ "67cb4b4dd4b3bb38626a841200638a4e953ea3fd" ], "author": { "name": "Daniel Vetter", "email": "daniel.vetter@ffwll.ch", "time": "Wed Oct 26 01:03:05 2011 +0200" }, "committer": { "name": "Dave Airlie", "email": "airlied@redhat.com", "time": "Thu Jul 19 22:51:12 2012 -0400" }, "message": "drm: kill i915/i830 ids from drm_pciids.h\n\nSigned-off-by: Daniel Vetter \u003cdaniel.vetter@ffwll.ch\u003e\nSigned-off-by: Dave Airlie \u003cairlied@redhat.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": "e811f5ae19043b2ac2c28e147a4274038e655598", "tree": "ca2e6a30df60d0f53042df78934f406383e839bc", "parents": [ "59fd415ded4aa9ac2f80ca3ac36e3a014c7e552e" ], "author": { "name": "Laurent Pinchart", "email": "laurent.pinchart@ideasonboard.com", "time": "Tue Jul 17 17:56:50 2012 +0200" }, "committer": { "name": "Dave Airlie", "email": "airlied@redhat.com", "time": "Thu Jul 19 21:52:38 2012 -0400" }, "message": "drm: Make the .mode_fixup() operations mode argument a const pointer\n\nThe passed mode must not be modified by the operation, make it const.\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": "59fd415ded4aa9ac2f80ca3ac36e3a014c7e552e", "tree": "f5f5a84ffb110989a500789a231935aca907fd17", "parents": [ "d3904754f2a67c503e262f938353cba491525320" ], "author": { "name": "Daniel Vetter", "email": "daniel.vetter@ffwll.ch", "time": "Wed Jul 11 16:28:08 2012 +0200" }, "committer": { "name": "Dave Airlie", "email": "airlied@redhat.com", "time": "Thu Jul 19 21:27:51 2012 -0400" }, "message": "drm: remove the list_head from drm_mode_set\n\nIt\u0027s unused. At it confused me quite a bit until I\u0027ve discovered that.\n\nCc: dri-devel@lists.freedesktop.org\nSigned-off-by: Daniel Vetter \u003cdaniel.vetter@ffwll.ch\u003e\nSigned-off-by: Dave Airlie \u003cairlied@redhat.com\u003e\n" }, { "commit": "6b9d89b4365ab52bc26f8259122f422e93d87821", "tree": "4084be89a72fe6d0575477e986ca2ff5e4b0e5f0", "parents": [ "49099c4991da3c94773f888aea2e9d27b8a7c6d1" ], "author": { "name": "Chris Wilson", "email": "chris@chris-wilson.co.uk", "time": "Tue Jul 10 11:15:23 2012 +0100" }, "committer": { "name": "Dave Airlie", "email": "airlied@gmail.com", "time": "Mon Jul 16 05:59:37 2012 +1000" }, "message": "drm: Add colouring to the range allocator\n\nIn order to support snoopable memory on non-LLC architectures (so that\nwe can bind vgem objects into the i915 GATT for example), we have to\navoid the prefetcher on the GPU from crossing memory domains and so\nprevent allocation of a snoopable PTE immediately following an uncached\nPTE. To do that, we need to extend the range allocator with support for\ntracking and segregating different node colours.\n\nThis will be used by i915 to segregate memory domains within the GTT.\n\nv2: Now with more drm_mm helpers and less driver interference.\n\nSigned-off-by: Chris Wilson \u003cchris@chris-wilson.co.uk\u003e\nCc: Dave Airlie \u003cairlied@redhat.com\nCc: Benjamin Herrenschmidt \u003cbenh@kernel.crashing.org\u003e\nCc: Ben Skeggs \u003cbskeggs@redhat.com\u003e\nCc: Jerome Glisse \u003cjglisse@redhat.com\u003e\nCc: Alex Deucher \u003calexander.deucher@amd.com\u003e\nReviewed-by: Daniel Vetter \u003cdaniel.vetter@ffwll.ch\u003e\nSigned-off-by: Dave Airlie \u003cairlied@gmail.com\u003e\n" } ], "next": "7b0cfee1a24efdfe0235bac62e53f686fe8a8e24" }