)]}' { "log": [ { "commit": "13bcf01b33e6e19a7fe7ff396f9ed02803e225ec", "tree": "a00c00316a83d6078e1b4dad1aee7c7baf8a331f", "parents": [ "ce495960ff33f96362cf81f0eb7c52d1a89f64be" ], "author": { "name": "Christopher Harvey", "email": "charvey@matrox.com", "time": "Thu Mar 07 10:42:25 2013 -0500" }, "committer": { "name": "Dave Airlie", "email": "airlied@redhat.com", "time": "Fri Mar 08 08:32:23 2013 +1000" }, "message": "drm: Documentation typo fixes\n\nSigned-off-by: Christopher Harvey \u003ccharvey@matrox.com\u003e\nSigned-off-by: Dave Airlie \u003cairlied@redhat.com\u003e\n" }, { "commit": "10a8512008655d5ce62f8c56323a6b5bd221c920", "tree": "a61d19544363a8acbc0792e96e1fa5adac6dff7a", "parents": [ "f142d3bd556c5e82e9bb3d33d07d6708702ea4ce" ], "author": { "name": "Thierry Reding", "email": "thierry.reding@avionic-design.de", "time": "Wed Nov 21 15:31:35 2012 +0100" }, "committer": { "name": "Thierry Reding", "email": "thierry.reding@avionic-design.de", "time": "Fri Feb 22 08:20:10 2013 +0100" }, "message": "drm: Add HDMI infoframe helpers\n\nAdd a generic helper to fill in an HDMI AVI infoframe with data\nextracted from a DRM display mode.\n\nSigned-off-by: Thierry Reding \u003cthierry.reding@avionic-design.de\u003e\nReviewed-by: Alex Deucher \u003calexander.deucher@amd.com\u003e\n" }, { "commit": "595887eb90b7e74a3e276b8f17d35236d85b0d37", "tree": "0c06f44d572ef36abb9b69bc19ed2dc2dea2fa7c", "parents": [ "a6b21831772db4088bca770dc99697356e82a7e2" ], "author": { "name": "Thierry Reding", "email": "thierry.reding@avionic-design.de", "time": "Wed Nov 21 15:00:47 2012 +0100" }, "committer": { "name": "Thierry Reding", "email": "thierry.reding@avionic-design.de", "time": "Fri Feb 22 08:20:03 2013 +0100" }, "message": "drm: Add some missing forward declarations\n\nThe drm_file and drm_clip_rect structures are used throughout the file\nbut they are never declared nor pulled in through an include. Add\nforward declarations to make them available.\n\nSigned-off-by: Thierry Reding \u003cthierry.reding@avionic-design.de\u003e\nReviewed-by: Alex Deucher \u003calexander.deucher@amd.com\u003e\n" }, { "commit": "18316c8c39a85c8b6e3db0a150b1bee5b6c4c053", "tree": "10fdeb50456771b21f5d8f9102b015c29e8b8a58", "parents": [ "c976cb37a95a8dcaf23d04d6487fbacc33d3c913" ], "author": { "name": "Thierry Reding", "email": "thierry.reding@avionic-design.de", "time": "Thu Dec 20 15:41:44 2012 +0100" }, "committer": { "name": "Thierry Reding", "email": "thierry.reding@avionic-design.de", "time": "Fri Feb 22 08:19:53 2013 +0100" }, "message": "drm: Remove duplicate drm_mode_cea_vic()\n\nThe same function had already been merged with a different name. Remove\nthe duplicate one but reuse some of its kerneldoc fragments for the\nexisting implementation.\n\nSigned-off-by: Thierry Reding \u003cthierry.reding@avionic-design.de\u003e\nReviewed-by: Alex Deucher \u003calexander.deucher@amd.com\u003e\n" }, { "commit": "ca18e1426bb2db987b67030256477c9571aebd09", "tree": "72e7cbe5f00f90390d00f5d3d4c9bdec79e48bbe", "parents": [ "74e1697478ffdee0e12e48db024a9b3677fd8cee", "0d4bbaf9f3e5b9f52150ddc5a4ee8b0ab83a440b" ], "author": { "name": "Dave Airlie", "email": "airlied@redhat.com", "time": "Thu Feb 21 09:31:47 2013 +1000" }, "committer": { "name": "Dave Airlie", "email": "airlied@redhat.com", "time": "Thu Feb 21 09:31:47 2013 +1000" }, "message": "Merge branch \u0027tilcdc-next\u0027 of git://people.freedesktop.org/~robclark/linux into drm-next\n\nKMS driver for TI LCD controller\n\n* \u0027tilcdc-next\u0027 of git://people.freedesktop.org/~robclark/linux:\n drm/tilcdc: add support for LCD panels (v5)\n drm/tilcdc: add encoder slave (v2)\n drm/i2c: nxp-tda998x (v3)\n drm/tilcdc: add TI LCD Controller DRM driver (v4)\n drm/nouveau: use i2c encoder helper wrappers\n drm: i2c encoder helper wrappers\n drm/cma: add debugfs helpers\n drm: small fix in drm_send_vblank_event()\n drm: Don\u0027t set the plane-\u003efb to NULL on successfull set_plane\n drm/cma-helper: fixup compilation\n\nConflicts:\n\tdrivers/gpu/drm/Kconfig\n\tdrivers/gpu/drm/Makefile\n\tdrivers/gpu/drm/drm_fb_cma_helper.c\n" }, { "commit": "b81e059ec5a7128622ab5d74d78e9b4f361b54ae", "tree": "65344a0adc351fd0a14a14d9fa50e93b69a5bb6e", "parents": [ "35f8badc1cf652381fa3f82c1fbea39f4dbe87fd", "210561ffd72d00eccf12c0131b8024d5436bae95" ], "author": { "name": "Dave Airlie", "email": "airlied@redhat.com", "time": "Wed Feb 20 11:40:49 2013 +1000" }, "committer": { "name": "Dave Airlie", "email": "airlied@redhat.com", "time": "Wed Feb 20 11:41:26 2013 +1000" }, "message": "Merge branch \u0027drm-intel-fixes\u0027 of git://people.freedesktop.org/~danvet/drm-intel into drm-next\n\nSo here\u0027s my promised pile of fixes for 3.9. I\u0027ve dropped the core prep\npatches for vt-switchless suspend/resume as discussed on irc. Highlights:\n- Fix dmar on g4x. Not really gfx related, but I\u0027m fed up with getting\n blamed for dmar crapouts.\n- Disable wc ptes updates on ilk when dmar is enabled (Chris). So again,\n dmar, but this time gfx related :(\n- Reduced range support for hsw, using the pipe CSC (Ville).\n- Fixup pll limits for gen3/4 (Patrick Jakobsson). The sdvo patch is\n already confirmed to fix 2 bug reports, so added cc: stable on that one.\n- Regression fix for 8bit fb console (Ville).\n- Preserve lane reversal bits on DDI/FDI ports (Damien).\n- Page flip vs. gpu hang fixes (Ville). Unfortuntely not quite all of\n them, need to decide what to do with the currently still in-flight ones.\n- Panel fitter regression fix from Mika Kuoppala (was accidentally left on\n on some pipes with the new modset code since 3.7). This also improves\n the modeset sequence and might help a few other unrelated issues with\n lvds.\n- Write backlight regs even harder ... another installement in our eternal\n fight against the BIOS and backlights.\n- Fixup lid notifier vs. suspend/resume races (Zhang Rui). Prep work for\n new ACPI stuff, but closing the race itself seems worthwile on its own.\n- A few other small fixes and tiny cleanups all over.\n\nLots of the patches are cc: stable since I\u0027ve stalled on a few\nnot-so-important fixes for 3.8 due to the grumpy noise Linus made.\n\n* \u0027drm-intel-fixes\u0027 of git://people.freedesktop.org/~danvet/drm-intel: (33 commits)\n intel/iommu: force writebuffer-flush quirk on Gen 4 Chipsets\n drm/i915: Disable WC PTE updates to w/a buggy IOMMU on ILK\n drm/i915: Implement pipe CSC based limited range RGB output\n drm/i915: inverted brightness quirk for Acer Aspire 4736Z\n drm/i915: Print the hw context status is debugfs\n drm/i915: Use HAS_L3_GPU_CACHE in i915_gem_l3_remap\n drm/i915: Fix PIPE_CONTROL DW/QW write through global GTT on IVB+\n drm/i915: Set i9xx sdvo clock limits according to specifications\n drm/i915: Set i9xx lvds clock limits according to specifications\n drm/i915: Preserve the DDI link reversal configuration\n drm/i915: Preserve the FDI line reversal override bit on CPT\n drm/i915: add missing \\n to UTS_RELEASE in the error_state\n drm: Use C8 instead of RGB332 when determining the format from depth/bpp\n drm: Fill depth/bits_per_pixel for C8 format\n drm/i915: don\u0027t clflush gem objects in stolen memory\n drm/i915: Don\u0027t wait for page flips if there was GPU reset\n drm/i915: Kill obj-\u003epending_flip\n drm/i915: Fix a typo in a intel_modeset_stage_output_state() comment\n drm/i915: remove bogus mutex_unlock from error-path\n drm/i915: Print the pipe control page GTT address\n ...\n" }, { "commit": "a7c47d6dc4a201b811e847e5449c8cffdc556deb", "tree": "e05562b96177a385386df338e53e31eaf47b5d80", "parents": [ "6f646095ec2f5d38a6429dd896cb2d5cbbb776dc" ], "author": { "name": "Rob Clark", "email": "robdclark@gmail.com", "time": "Tue Jan 08 17:50:48 2013 -0600" }, "committer": { "name": "Rob Clark", "email": "robdclark@gmail.com", "time": "Sun Feb 17 17:55:42 2013 -0500" }, "message": "drm: i2c encoder helper wrappers\n\nSimplify life for drivers using an encoder-slave, so that they can make\ntheir drm_encoder_helper_funcs const, rather than needing to dynamically\nallocate and populate them.\n\nSigned-off-by: Rob Clark \u003crobdclark@gmail.com\u003e\n" }, { "commit": "6f646095ec2f5d38a6429dd896cb2d5cbbb776dc", "tree": "41444767a379449c4e57f60dbee6d3bf2c670904", "parents": [ "21a245d2d62ef617978316203af032d499805cd2" ], "author": { "name": "Rob Clark", "email": "robdclark@gmail.com", "time": "Mon Dec 10 10:46:43 2012 -0600" }, "committer": { "name": "Rob Clark", "email": "robdclark@gmail.com", "time": "Sun Feb 17 17:55:42 2013 -0500" }, "message": "drm/cma: add debugfs helpers\n\nAdd helper to display fb\u0027s which can be used directly in drm_info_list:\n\nstatic struct drm_info_list foo_debugfs_list[] \u003d {\n\t\t...\n\t\t{ \"fb\", drm_fb_cma_debugfs_show, 0 },\n};\n\nto display information about CMA fb objects, as well as a\ndrm_gem_cma_describe() which can be used if the driver bothers to keep\na list of CMA GEM objects.\n\nSigned-off-by: Rob Clark \u003crobdclark@gmail.com\u003e\n" }, { "commit": "41907ddc1b71aaa4ef5290f46f0ec49d581d6aac", "tree": "5cb9829dfc0753d61713246f2cd60955827b19e8", "parents": [ "d46da4377689bd938795e53c4e2fb54dbcaeea44" ], "author": { "name": "Ben Widawsky", "email": "ben@bwidawsk.net", "time": "Fri Feb 08 11:32:47 2013 -0800" }, "committer": { "name": "Daniel Vetter", "email": "daniel.vetter@ffwll.ch", "time": "Fri Feb 15 10:30:38 2013 +0100" }, "message": "drm/i915: Fix gen2 mappable calculations\n\nWhen I refactored the code initially, I forgot that gen2 uses a\ndifferent bar for the CPU mappable aperture. The agp-less code knows\nnothing of generations less than 5, so we have to expand the gtt_probe\nfunction to include the mappable base and end.\n\nIt was originally broken by me:\ncommit baa09f5fd8a6d033ec075355dda99a65b7f6a0f3\nAuthor: Ben Widawsky \u003cben@bwidawsk.net\u003e\nDate: Thu Jan 24 13:49:57 2013 -0800\n\n drm/i915: Add probe and remove to the gtt ops\n\nReported-by: Chris Wilson \u003cchris@chris-wilson.co.uk\u003e\nSigned-off-by: Ben Widawsky \u003cben@bwidawsk.net\u003e\nSigned-off-by: Daniel Vetter \u003cdaniel.vetter@ffwll.ch\u003e\n" }, { "commit": "a065b46a01b25d7d364e01e75f7ec2bd9ed5d9cb", "tree": "a23152729fa5c8917a8b0b527a725febaee54da3", "parents": [ "1b1d5397058f06bc5bd87d43ed93f34b28546ea4" ], "author": { "name": "Daniel Vetter", "email": "daniel.vetter@ffwll.ch", "time": "Tue Feb 12 00:17:09 2013 +0100" }, "committer": { "name": "Daniel Vetter", "email": "daniel.vetter@ffwll.ch", "time": "Thu Feb 14 00:08:41 2013 +0100" }, "message": "drm/fb-helper: remove unused members of struct drm_fb_helper\n\nSpotted by Rob Clark.\n\nReviewed-by: Rob Clark \u003crobdclark@gmail.com\u003e\nSigned-off-by: Daniel Vetter \u003cdaniel.vetter@ffwll.ch\u003e\n" }, { "commit": "207fd32970b1def91b11ae28f6bebffc792db714", "tree": "75dd7d58e32b54395be26aba4381012251f65f55", "parents": [ "cd5428a5447cc6ca77ec6547d6f86834b205eac7" ], "author": { "name": "Daniel Vetter", "email": "daniel.vetter@ffwll.ch", "time": "Sun Jan 20 22:13:14 2013 +0100" }, "committer": { "name": "Daniel Vetter", "email": "daniel.vetter@ffwll.ch", "time": "Thu Feb 14 00:08:32 2013 +0100" }, "message": "drm/fb-helper: improve kerneldoc\n\nNow that the fbdev helper interface for drivers is trimmed down,\nupdate the kerneldoc for all the remaining exported functions.\n\nI\u0027ve tried to beat the DocBook a bit by reordering the function\nreferences a bit into a more sensible ordering. But that didn\u0027t work\nout at all. Hence just extend the in-code DOC: section a bit.\n\nAlso remove the LOCKING: sections - especially for the setup functions\nthey\u0027re totally bogus. But that\u0027s not a documentation problem, but\nsimply an artifact of the current rather hazardous locking around drm\ninit and even more so around fbdev setup ...\n\nv2: Some further improvements:\n- Also add documentation for drm_fb_helper_single_add_all_connectors,\n Dave Airlie didn\u0027t want me to kill this one from the fb helper\n interface.\n- Update docs for drm_fb_helper_fill_var/fix - they should be used\n from the driver\u0027s -\u003efb_probe callback to setup the fbdev info\n structure.\n- Clarify what the -\u003efb_probe callback should all do - it needs to\n setup both the fbdev info and allocate the drm framebuffer used as\n backing storage.\n- Add basic documentaation for the drm_fb_helper_funcs driver callback\n vfunc.\n\nv3: Implement clarifications Laurent Pinchart suggested in his review.\n\nv4: Fix another mispelling Laurent spotted.\n\nCc: Laurent Pinchart \u003claurent.pinchart@ideasonboard.com\u003e\nAcked-by: Laurent Pinchart \u003claurent.pinchart@ideasonboard.com\u003e\nSigned-off-by: Daniel Vetter \u003cdaniel.vetter@ffwll.ch\u003e\n" }, { "commit": "de1ace5b56d11db26abe69fd19754f91c326763f", "tree": "0eef3e87a7c474c15283c2f955a779478c7f17a1", "parents": [ "43c8a849a1e92fba6ea4493ed950d2a2e31ac87c" ], "author": { "name": "Daniel Vetter", "email": "daniel.vetter@ffwll.ch", "time": "Sun Jan 20 21:50:49 2013 +0100" }, "committer": { "name": "Daniel Vetter", "email": "daniel.vetter@ffwll.ch", "time": "Thu Feb 14 00:07:52 2013 +0100" }, "message": "drm/fb-helper: unexport drm_fb_helper_single_fb_probe\n\nNot called by anyone, and really, shouldn\u0027t be. Drivers are supposed\neither drm_fb_helper_initial_config or drm_fb_helper_hotplug_event.\nOriginally this was done differently, but is now consolidated in the\nhelper functions and no longer done by drivers directly.\n\nReviewed-by: Rob Clark \u003crobdclark@gmail.com\u003e\nSigned-off-by: Daniel Vetter \u003cdaniel.vetter@ffwll.ch\u003e\n" }, { "commit": "d21bf469d5301d025cd82997bb1529bcdc7086af", "tree": "f819eb34fd3f32ae79cca5421e6c688ed3d6f928", "parents": [ "6aed8ec3f76a22217c9ae183d32b1aa990bed069" ], "author": { "name": "Daniel Vetter", "email": "daniel.vetter@ffwll.ch", "time": "Sun Jan 20 18:09:52 2013 +0100" }, "committer": { "name": "Daniel Vetter", "email": "daniel.vetter@ffwll.ch", "time": "Thu Feb 14 00:07:50 2013 +0100" }, "message": "drm/fb-helper: kill drm_fb_helper_restore\n\nIt\u0027s only used internally for the sysrq and panic handlers provided by\nthe drm fb helper implementation. Hence just inline it, kill the\nexport and remove the confusing kerneldoc. Driver\u0027s are supposed to\ncall drm_fb_helper_restore_fbdev_mode on lastclose.\n\nNote that locking is totally fubar - the sysrq case doesn\u0027t take any\nlocks at all. The panic handler probably shouldn\u0027t take any locks\nsince it\u0027ll only make things worse. Otoh it\u0027s probably better to\nswitch things over to the atomic modeset callbacks (and disable the\npanic handler for those drivers which don\u0027t implement it).\n\nBut that\u0027s both better done in separate patches.\n\nReviewed-by: Rob Clark \u003crobdclark@gmail.com\u003e\nSigned-off-by: Daniel Vetter \u003cdaniel.vetter@ffwll.ch\u003e\n" }, { "commit": "6aed8ec3f76a22217c9ae183d32b1aa990bed069", "tree": "429627e96391fd615275c1150d9482651696e623", "parents": [ "b9e5071386007729110e86fd2c55c687085624e3" ], "author": { "name": "Daniel Vetter", "email": "daniel.vetter@ffwll.ch", "time": "Sun Jan 20 17:32:21 2013 +0100" }, "committer": { "name": "Daniel Vetter", "email": "daniel.vetter@ffwll.ch", "time": "Thu Feb 14 00:07:50 2013 +0100" }, "message": "drm: review locking for drm_fb_helper_restore_fbdev_mode\n\n... it\u0027s required. Fix up exynos and the cma helper, and add a\ncorresponding WARN_ON to drm_fb_helper_restore_fbdev_mode.\n\nNote that tegra calls the fbdev cma helper restore function also from\nit\u0027s driver-load callback. Which is a bit against current practice,\nsince usually the call is only from -\u003elastclose, and initial setup is\ndone by drm_fb_helper_initial_config.\n\nAlso add the relevant drm DocBook entry.\n\nv2: Add promised WARN to restore_fbdev_mode.\n\nReviewed-by: Rob Clark \u003crobdclark@gmail.com\u003e\nSigned-off-by: Daniel Vetter \u003cdaniel.vetter@ffwll.ch\u003e\n" }, { "commit": "b9e5071386007729110e86fd2c55c687085624e3", "tree": "4720ecd2ee9be3f8c46e71d75119219db1692507", "parents": [ "85a7ce67f3ebfd5975ffd1febcabfe4999ca911d", "cc4c0c4de3c775be22072ec3251f2e581b63d9a0" ], "author": { "name": "Dave Airlie", "email": "airlied@redhat.com", "time": "Fri Feb 08 14:02:32 2013 +1000" }, "committer": { "name": "Dave Airlie", "email": "airlied@redhat.com", "time": "Fri Feb 08 14:02:32 2013 +1000" }, "message": "Merge branch \u0027for-airlied\u0027 of git://people.freedesktop.org/~mlankhorst/linux into drm-next\n\nTTM reservations changes, preparing for new reservation mutex system.\n\n* \u0027for-airlied\u0027 of git://people.freedesktop.org/~mlankhorst/linux:\n drm/ttm: unexport ttm_bo_wait_unreserved\n drm/nouveau: use ttm_bo_reserve_slowpath in validate_init, v2\n drm/ttm: use ttm_bo_reserve_slowpath_nolru in ttm_eu_reserve_buffers, v2\n drm/ttm: add ttm_bo_reserve_slowpath\n drm/ttm: cleanup ttm_eu_reserve_buffers handling\n drm/ttm: remove lru_lock around ttm_bo_reserve\n drm/nouveau: increase reservation sequence every retry\n drm/vmwgfx: always use ttm_bo_is_reserved\n" }, { "commit": "89177644a7b6306e6084a89eab7e290f4bfef397", "tree": "e8bac93d626a14df07b2d904797c5d0e86f6251a", "parents": [ "6504d0d9900a2c05ea1fbab2ec008bf442993d94" ], "author": { "name": "Aaron Plattner", "email": "aplattner@nvidia.com", "time": "Tue Jan 15 20:47:42 2013 +0000" }, "committer": { "name": "Dave Airlie", "email": "airlied@redhat.com", "time": "Fri Feb 08 13:39:08 2013 +1000" }, "message": "drm: add prime helpers\n\nInstead of reimplementing all of the dma_buf functionality in every driver,\ncreate helpers drm_prime_import and drm_prime_export that implement them in\nterms of new, lower-level hook functions:\n\n gem_prime_pin: callback when a buffer is created, used to pin buffers into GTT\n gem_prime_get_sg_table: convert a drm_gem_object to an sg_table for export\n gem_prime_import_sg_table: convert an sg_table into a drm_gem_object\n gem_prime_vmap, gem_prime_vunmap: map and unmap an object\n\nThese hooks are optional; drivers can opt in by using drm_gem_prime_import and\ndrm_gem_prime_export as the .gem_prime_import and .gem_prime_export fields of\nstruct drm_driver.\n\nv2:\n- Drop .begin_cpu_access. None of the drivers this code replaces implemented\n it. Having it here was a leftover from when I was trying to include i915 in\n this rework.\n- Use mutex_lock instead of mutex_lock_interruptible, as these three drivers\n did. This patch series shouldn\u0027t change that behavior.\n- Rename helpers to gem_prime_get_sg_table and gem_prime_import_sg_table.\n Rename struct sg_table* variables to \u0027sgt\u0027 for clarity.\n- Update drm.tmpl for these new hooks.\n\nv3:\n- Pass the vaddr down to the driver. This lets drivers that just call vunmap on\n the pointer avoid having to store the pointer in their GEM private structures.\n- Move documentation into a /** DOC */ comment in drm_prime.c and include it in\n drm.tmpl with a !P line. I tried to use !F lines to include documentation of\n the individual functions from drmP.h, but the docproc / kernel-doc scripts\n barf on that file, so hopefully this is good enough for now.\n- apply refcount fix from commit be8a42ae60addd8b6092535c11b42d099d6470ec\n (\"drm/prime: drop reference on imported dma-buf come from gem\")\n\nSigned-off-by: Aaron Plattner \u003caplattner@nvidia.com\u003e\nCc: Daniel Vetter \u003cdaniel.vetter@ffwll.ch\u003e\nCc: David Airlie \u003cairlied@linux.ie\u003e\nSigned-off-by: Dave Airlie \u003cairlied@redhat.com\u003e\n" }, { "commit": "73ccd6962fff19e53a7d4baaa17cf9311284ac9c", "tree": "3eb6fe56281e4de883587d71eabb2ffd53fc7a38", "parents": [ "ed914f69f8f979ea2b664abc4f1437235cf3db35", "0e3d50bfcbd338254795a700dcff429a96cba1a6" ], "author": { "name": "Dave Airlie", "email": "airlied@redhat.com", "time": "Fri Feb 08 13:27:28 2013 +1000" }, "committer": { "name": "Dave Airlie", "email": "airlied@redhat.com", "time": "Fri Feb 08 13:27:28 2013 +1000" }, "message": "Merge branch \u0027drm-next-3.9\u0027 of git://people.freedesktop.org/~agd5f/linux into drm-next\n\nAlex writes:\n- CS ioctl cleanup and unification. Unification of a lot of functionality\nthat was duplicated across multiple generates of hardware.\n- Add support for Oland GPUs\n- Deprecate UMS support. Mesa and the ddx dropped support for UMS and\napparently very few people still use it since the UMS CS ioctl was broken\nfor several kernels and no one reported it. It was fixed in 3.8/stable.\n- Rework GPU reset. Use the status registers to determine what blocks\nto reset. This better matches the recommended reset programming model.\nThis also allows us to properly reset blocks besides GFX and DMA.\n- Switch the VM set page code to use an IB rather than the ring. This\nfixes overflow issues when doing large page table updates using a small\nring like DMA.\n- Several small cleanups and bug fixes.\n\n* \u0027drm-next-3.9\u0027 of git://people.freedesktop.org/~agd5f/linux: (38 commits)\n drm/radeon/dce6: fix display powergating\n drm/radeon: add Oland pci ids\n drm/radeon: radeon-asic updates for Oland\n drm/radeon: add ucode loading support for Oland\n drm/radeon: fill in gpu init for Oland\n drm/radeon: add Oland chip family\n drm/radeon: switch back to using the DMA ring for VM PT updates\n drm/radeon: use IBs for VM page table updates v2\n drm/radeon: don\u0027t reset the MC on IGPs/APUs\n drm/radeon: use the reset mask to determine if rings are hung\n drm/radeon: halt engines before disabling MC (si)\n drm/radeon: halt engines before disabling MC (cayman/TN)\n drm/radeon: halt engines before disabling MC (evergreen)\n drm/radeon: halt engines before disabling MC (6xx/7xx)\n drm/radeon: use status regs to determine what to reset (si)\n drm/radeon: use status regs to determine what to reset (cayman)\n drm/radeon: use status regs to determine what to reset (evergreen)\n drm/radeon: use status regs to determine what to reset (6xx/7xx)\n drm/radeon: rework GPU reset on cayman/TN\n drm/radeon: rework GPU reset on cayman/TN\n ...\n" }, { "commit": "ed914f69f8f979ea2b664abc4f1437235cf3db35", "tree": "43d839d79d02f4a9415199a2db7a4b6cfeb281eb", "parents": [ "bb0f78dd7ded88082b2430c43c65bc821c4ea360", "edb37a95c58147f89713e6c5cd220fa8fdfb4833" ], "author": { "name": "Dave Airlie", "email": "airlied@redhat.com", "time": "Fri Feb 08 12:34:44 2013 +1000" }, "committer": { "name": "Dave Airlie", "email": "airlied@redhat.com", "time": "Fri Feb 08 12:34:44 2013 +1000" }, "message": "Merge tag \u0027of_videomode_helper\u0027 of git://git.pengutronix.de/git/str/linux into drm-next\n\nvideomode helpers for of + devicetree stuff, required for new kms drivers\n\n(not the fbdev maintainer).\n\n* tag \u0027of_videomode_helper\u0027 of git://git.pengutronix.de/git/str/linux:\n drm_modes: add of_videomode helpers\n drm_modes: add videomode helpers\n fbmon: add of_videomode helpers\n fbmon: add videomode helpers\n video: add of helper for display timings/videomode\n video: add display_timing and videomode\n viafb: rename display_timing to via_display_timing\n" }, { "commit": "cd17ef4114ad5c514b17e6a0bb02a309ab90b692", "tree": "9c162eaa96931597b83e165702e3483ba5c6bb1e", "parents": [ "67c964000236497e00c646472cd6b70b5c5109c8", "7d37beaaf3dbc6ff16f4d32a4dd6f8c557c6ab50" ], "author": { "name": "Dave Airlie", "email": "airlied@redhat.com", "time": "Fri Feb 08 11:08:10 2013 +1000" }, "committer": { "name": "Dave Airlie", "email": "airlied@redhat.com", "time": "Fri Feb 08 11:08:10 2013 +1000" }, "message": "Merge tag \u0027drm-intel-next-2013-02-01\u0027 of git://people.freedesktop.org/~danvet/drm-intel into drm-next\n\nDaniel writes:\n\"Probably the last feature pull for 3.9, there\u0027s some fixes outstanding\nthought that I\u0027d like to sneak in. And maybe 3.8 takes a bit longer ...\nAnyway, highlights of this pull:\n- Kill the horrible IS_DISPLAYREG hack to handle the mmio offset movements\n on vlv, big thanks to Ville.\n- Dynamic power well support for Haswell, shaves away a bit when only\n using the eDP port on pipe A (Paulo). Plus unclaimed register fixes\n uncovered by this.\n- Clarifications of the gpu hang/reset state transitions, hopefully fixing\n a few spurious -EIO deaths in userspace.\n- Haswell ELD fixes.\n- Some more (pp)gtt cleanups from Ben.\n- A few smaller things all over.\n\nPlus all the stuff from the previous rather small pull request:\n- Broadcast RBG improvements and reduced color range fixes from Ville.\n- Ben is on a \"kill legacy gtt code for good\" spree, first pile of patches\n included.\n- No-relocs and bo lut improvements for faster execbuf from Chris.\n- Some refactorings from Imre.\"\n\n* tag \u0027drm-intel-next-2013-02-01\u0027 of git://people.freedesktop.org/~danvet/drm-intel: (101 commits)\n GPU/i915: Fix acpi_bus_get_device() check in drivers/gpu/drm/i915/intel_opregion.c\n drm/i915: Set the SR01 \"screen off\" bit in i915_redisable_vga() too\n drm/i915: Kill IS_DISPLAYREG()\n drm/i915: Introduce i915_vgacntrl_reg()\n drm/i915: gen6_gmch_remove can be static\n drm/i915: dynamic Haswell display power well support\n drm/i915: check the power down well on assert_pipe()\n drm/i915: don\u0027t send DP \"idle\" pattern before \"normal\" on HSW PORT_A\n drm/i915: don\u0027t run hsw power well code on !hsw\n drm/i915: kill cargo-culted locking from power well code\n drm/i915: Only run idle processing from i915_gem_retire_requests_worker\n drm/i915: Fix CAGF for HSW\n drm/i915: Reclaim GTT space for failed PPGTT\n drm/i915: remove intel_gtt structure\n drm/i915: Add probe and remove to the gtt ops\n drm/i915: extract hw ppgtt setup/cleanup code\n drm/i915: pte_encode is gen6+\n drm/i915: vfuncs for ppgtt\n drm/i915: vfuncs for gtt_clear_range/insert_entries\n drm/i915: Error state should print /sys/kernel/debug\n ...\n" }, { "commit": "7271c7f999609787c4617c51750d39e447859e7d", "tree": "b2ed6d707b1686aef519c5bb1a40e0811ae11284", "parents": [ "e737a14cd1f30a0bca753ae32ebada10adf93c3b" ], "author": { "name": "Alex Deucher", "email": "alexander.deucher@amd.com", "time": "Thu Jul 26 18:48:01 2012 -0400" }, "committer": { "name": "Alex Deucher", "email": "alexander.deucher@amd.com", "time": "Fri Feb 01 19:35:02 2013 -0500" }, "message": "drm/radeon: add Oland pci ids\n\nSigned-off-by: Alex Deucher \u003calexander.deucher@amd.com\u003e\n" }, { "commit": "a54c0c279f3864171fe53c66e769d5a137c5c651", "tree": "08d17841b72e39afdc4ce601f46770824c12fe8a", "parents": [ "baa09f5fd8a6d033ec075355dda99a65b7f6a0f3" ], "author": { "name": "Ben Widawsky", "email": "ben@bwidawsk.net", "time": "Thu Jan 24 14:45:00 2013 -0800" }, "committer": { "name": "Daniel Vetter", "email": "daniel.vetter@ffwll.ch", "time": "Thu Jan 31 11:50:07 2013 +0100" }, "message": "drm/i915: remove intel_gtt structure\n\nWith the probe call in our dispatch table, we can now cut away the\nlast three remaining members in the intel_gtt shared struct and so\nremove it completely.\n\nv2: Rebased on top of Daniel\u0027s series\n\nSigned-off-by: Ben Widawsky \u003cben@bwidawsk.net\u003e\nReviewed-by: Damien Lespiau \u003cdamien.lespiau@intel.com\u003e\n[danvet: bikeshed commit message a bit.]\nSigned-off-by: Daniel Vetter \u003cdaniel.vetter@ffwll.ch\u003e\n" }, { "commit": "edb37a95c58147f89713e6c5cd220fa8fdfb4833", "tree": "f4f344a417e57d115e80f2bffc05d2b81c08986c", "parents": [ "ebc64e453857e93b230881f48126257be9aa8830" ], "author": { "name": "Steffen Trumtrar", "email": "s.trumtrar@pengutronix.de", "time": "Sun Oct 28 18:28:06 2012 +0100" }, "committer": { "name": "Steffen Trumtrar", "email": "s.trumtrar@pengutronix.de", "time": "Thu Jan 24 09:04:14 2013 +0100" }, "message": "drm_modes: add of_videomode helpers\n\nAdd helper to get drm_display_mode from devicetree.\n\nSigned-off-by: Steffen Trumtrar \u003cs.trumtrar@pengutronix.de\u003e\nReviewed-by: Thierry Reding \u003cthierry.reding@avionic-design.de\u003e\nAcked-by: Thierry Reding \u003cthierry.reding@avionic-design.de\u003e\nTested-by: Thierry Reding \u003cthierry.reding@avionic-design.de\u003e\nTested-by: Philipp Zabel \u003cp.zabel@pengutronix.de\u003e\nReviewed-by: Laurent Pinchart \u003claurent.pinchart@ideasonboard.com\u003e\nAcked-by: Laurent Pinchart \u003claurent.pinchart@ideasonboard.com\u003e\nTested-by: Afzal Mohammed \u003cAfzal@ti.com\u003e\nTested-by: Rob Clark \u003crobclark@gmail.com\u003e\nTested-by: Leela Krishna Amudala \u003cleelakrishna.a@gmail.com\u003e\n" }, { "commit": "ebc64e453857e93b230881f48126257be9aa8830", "tree": "8ccb80725d3c273f5579bc1539ca841acd35381f", "parents": [ "790890444f591145d3a00623af461c9006e17d51" ], "author": { "name": "Steffen Trumtrar", "email": "s.trumtrar@pengutronix.de", "time": "Wed Nov 14 11:22:52 2012 +0100" }, "committer": { "name": "Steffen Trumtrar", "email": "s.trumtrar@pengutronix.de", "time": "Thu Jan 24 09:04:09 2013 +0100" }, "message": "drm_modes: add videomode helpers\n\nAdd conversion from videomode to drm_display_mode\n\nSigned-off-by: Steffen Trumtrar \u003cs.trumtrar@pengutronix.de\u003e\nReviewed-by: Thierry Reding \u003cthierry.reding@avionic-design.de\u003e\nAcked-by: Thierry Reding \u003cthierry.reding@avionic-design.de\u003e\nTested-by: Thierry Reding \u003cthierry.reding@avionic-design.de\u003e\nTested-by: Philipp Zabel \u003cp.zabel@pengutronix.de\u003e\nReviewed-by: Laurent Pinchart \u003claurent.pinchart@ideasonboard.com\u003e\nAcked-by: Laurent Pinchart \u003claurent.pinchart@ideasonboard.com\u003e\nTested-by: Afzal Mohammed \u003cAfzal@ti.com\u003e\nTested-by: Rob Clark \u003crobclark@gmail.com\u003e\nTested-by: Leela Krishna Amudala \u003cleelakrishna.a@gmail.com\u003e\n" }, { "commit": "735dc0d1e29329ff34ec97f66e130cce481c9607", "tree": "cf946856ff1defac833e601a3e4a4d8e841ee73e", "parents": [ "bac4b7c3b5c0660c08dc4949fe40e08e20364ee3", "20c60c35de3285222b3476c3445c66bedf0c449c" ], "author": { "name": "Dave Airlie", "email": "airlied@redhat.com", "time": "Mon Jan 21 07:44:58 2013 +1000" }, "committer": { "name": "Dave Airlie", "email": "airlied@redhat.com", "time": "Mon Jan 21 07:44:58 2013 +1000" }, "message": "Merge branch \u0027drm-kms-locking\u0027 of git://people.freedesktop.org/~danvet/drm-intel into drm-next\n\nThe aim of this locking rework is that ioctls which a compositor should be\nmight call for every frame (set_cursor, page_flip, addfb, rmfb and\ngetfb/create_handle) should not be able to block on kms background\nactivities like output detection. And since each EDID read takes about\n25ms (in the best case), that always means we\u0027ll drop at least one frame.\n\nThe solution is to add per-crtc locking for these ioctls, and restrict\nbackground activities to only use the global lock. Change-the-world type\nof events (modeset, dpms, ...) need to grab all locks.\n\nTwo tricky parts arose in the conversion:\n- A lot of current code assumes that a kms fb object can\u0027t disappear while\n holding the global lock, since the current code serializes fb\n destruction with it. Hence proper lifetime management using the already\n created refcounting for fbs need to be instantiated for all ioctls and\n interfaces/users.\n\n- The rmfb ioctl removes the to-be-deleted fb from all active users. But\n unconditionally taking the global kms lock to do so introduces an\n unacceptable potential stall point. And obviously changing the userspace\n abi isn\u0027t on the table, either. Hence this conversion opportunistically\n checks whether the rmfb ioctl holds the very last reference, which\n guarantees that the fb isn\u0027t in active use on any crtc or plane (thanks\n to the conversion to the new lifetime rules using proper refcounting).\n Only if this is not the case will the code go through the slowpath and\n grab all modeset locks. Sane compositors will never hit this path and so\n avoid the stall, but userspace relying on these semantics will also not\n break.\n\nAll these cases are exercised by the newly added subtests for the i-g-t\nkms_flip, tested on a machine where a full detect cycle takes around 100\nms. It works, and no frames are dropped any more with these patches\napplied. kms_flip also contains a special case to exercise the\nabove-describe rmfb slowpath.\n\n* \u0027drm-kms-locking\u0027 of git://people.freedesktop.org/~danvet/drm-intel: (335 commits)\n drm/fb_helper: check whether fbcon is bound\n drm/doc: updates for new framebuffer lifetime rules\n drm: don\u0027t hold crtc mutexes for connector -\u003edetect callbacks\n drm: only grab the crtc lock for pageflips\n drm: optimize drm_framebuffer_remove\n drm/vmwgfx: add proper framebuffer refcounting\n drm/i915: dump refcount into framebuffer debugfs file\n drm: refcounting for crtc framebuffers\n drm: refcounting for sprite framebuffers\n drm: fb refcounting for dirtyfb_ioctl\n drm: don\u0027t take modeset locks in getfb ioctl\n drm: push modeset_lock_all into -\u003efb_create driver callbacks\n drm: nest modeset locks within fpriv-\u003efbs_lock\n drm: reference framebuffers which are on the idr\n drm: revamp framebuffer cleanup interfaces\n drm: create drm_framebuffer_lookup\n drm: revamp locking around fb creation/destruction\n drm: only take the crtc lock for -\u003ecursor_move\n drm: only take the crtc lock for -\u003ecursor_set\n drm: add per-crtc locks\n ...\n" }, { "commit": "362063619cf67c2c2fc2eb90951b2623cbb69a7c", "tree": "58af436089e986b742d4ec91e5ea57e4a4b2aeb5", "parents": [ "786b99ed13223d8ac58a937dd348aead45eb8191" ], "author": { "name": "Daniel Vetter", "email": "daniel.vetter@ffwll.ch", "time": "Mon Dec 10 20:42:17 2012 +0100" }, "committer": { "name": "Daniel Vetter", "email": "daniel.vetter@ffwll.ch", "time": "Sun Jan 20 22:17:00 2013 +0100" }, "message": "drm: revamp framebuffer cleanup interfaces\n\nWe have two classes of framebuffer\n- Created by the driver (atm only for fbdev), and the driver holds\n onto the last reference count until destruction.\n- Created by userspace and associated with a given fd. These\n framebuffers will be reaped when their assoiciated fb is closed.\n\nNow these two cases are set up differently, the framebuffers are on\ndifferent lists and hence destruction needs to clean up different\nthings. Also, for userspace framebuffers we remove them from any\ncurrent usage, whereas for internal framebuffers it is assumed that\nthe driver has done this already.\n\nLong story short, we need two different ways to cleanup such drivers.\nThree functions are involved in total:\n- drm_framebuffer_remove: Convenience function which removes the fb\n from all active usage and then drops the passed-in reference.\n- drm_framebuffer_unregister_private: Will remove driver-private\n framebuffers from relevant lists and drop the corresponding\n references. Should be called for driver-private framebuffers before\n dropping the last reference (or like for a lot of the drivers where\n the fbdev is embedded someplace else, before doing the cleanup\n manually).\n- drm_framebuffer_cleanup: Final cleanup for both classes of fbs,\n should be called by the driver\u0027s -\u003edestroy callback once the last\n reference is gone.\n\nThis patch just rolls out the new interfaces and updates all drivers\n(by adding calls to drm_framebuffer_unregister_private at all the\nright places)- no functional changes yet. Follow-on patches will move\ndrm core code around and update the lifetime management for\nframebuffers, so that we are no longer required to keep framebuffers\nalive by locking mode_config.mutex.\n\nI\u0027ve also updated the kerneldoc already.\n\nvmwgfx seems to again be a bit special, at least I haven\u0027t figured out\nhow the fbdev support in that driver works. It smells like it\u0027s\nexternal though.\n\nv2: The i915 driver creates another private framebuffer in the\nload-detect code. Adjust its cleanup code, too.\n\nReviewed-by: Rob Clark \u003crob@ti.com\u003e\nSigned-off-by: Daniel Vetter \u003cdaniel.vetter@ffwll.ch\u003e\n" }, { "commit": "786b99ed13223d8ac58a937dd348aead45eb8191", "tree": "d2fed735d5be17d37d02a2a30260c766c079cf43", "parents": [ "4b096ac10da0b63f09bd123b86fed8deb80646ce" ], "author": { "name": "Daniel Vetter", "email": "daniel.vetter@ffwll.ch", "time": "Sun Dec 02 21:53:40 2012 +0100" }, "committer": { "name": "Daniel Vetter", "email": "daniel.vetter@ffwll.ch", "time": "Sun Jan 20 22:16:59 2013 +0100" }, "message": "drm: create drm_framebuffer_lookup\n\nAnd replace all fb lookups with it. Also add a WARN to\ndrm_mode_object_find since that is now no longer the blessed interface\nto look up an fb. And add kerneldoc to both functions.\n\nThis only updates all callsites, but immediately drops the acquired\nrefence again. Hence all callers still rely on the fact that a mode fb\ncan\u0027t disappear while they\u0027re holding the struct mutex. Subsequent\npatches will instate proper use of refcounts, and then rework the rmfb\nand unref code to no longer serialize fb destruction with the\nmode_config lock. We don\u0027t want that since otherwise a compositor\nmight end up stalling for a few frames in rmfb.\n\nv2: Don\u0027t use kref_get_unless_zero - Greg KH doesn\u0027t like that kind of\ninterface.\n\nReviewed-by: Rob Clark \u003crob@ti.com\u003e\nSigned-off-by: Daniel Vetter \u003cdaniel.vetter@ffwll.ch\u003e\n" }, { "commit": "4b096ac10da0b63f09bd123b86fed8deb80646ce", "tree": "3d252a1b2ed182beb769796fb99eb68693176bfa", "parents": [ "dac35663cef4ca7f572d430bb54b14be8f03cb10" ], "author": { "name": "Daniel Vetter", "email": "daniel.vetter@ffwll.ch", "time": "Mon Dec 10 21:19:18 2012 +0100" }, "committer": { "name": "Daniel Vetter", "email": "daniel.vetter@ffwll.ch", "time": "Sun Jan 20 22:16:58 2013 +0100" }, "message": "drm: revamp locking around fb creation/destruction\n\nWell, at least step 1. The goal here is that framebuffer objects can\nsurvive outside of the mode_config lock, with just a reference held\nas protection. The first step to get there is to introduce a special\nfb_lock which protects fb lookup, creation and destruction, to make\nthem appear atomic.\n\nThis new fb_lock can nest within the mode_config lock. But the idea is\n(once the reference counting part is completed) that we only quickly\ntake that fb_lock to lookup a framebuffer and grab a reference,\nwithout any other locks involved.\n\nvmwgfx is the only driver which does framebuffer lookups itself, also\nwrap those calls to drm_mode_object_find with the new lock.\n\nAlso protect the fb_list walking in i915 and omapdrm with the new lock.\n\nAs a slight complication there\u0027s also the list of user-created fbs\nattached to the file private. The problem now is that at fclose() time\nwe need to walk that list, eventually do a modeset call to remove the\nfb from active usage (and are required to be able to take the\nmode_config lock), but in the end we need to grab the new fb_lock to\nremove the fb from the list. The easiest solution is to add another\nmutex to protect this per-file list.\n\nCurrently that new fbs_lock nests within the modeset locks and so\nappears redudant. But later patches will switch around this sequence\nso that taking the modeset locks in the fb destruction path is\noptional in the fastpath. Ultimately the goal is that addfb and rmfb\ndo not require the mode_config lock, since otherwise they have the\npotential to introduce stalls in the pageflip sequence of a compositor\n(if the compositor e.g. switches to a fullscreen client or if it\nenables a plane). But that requires a few more steps and hoops to jump\nthrough.\n\nNote that framebuffer creation/destruction is now double-protected -\nonce by the fb_lock and in parts by the idr_lock. The later would be\nunnecessariy if framebuffers would have their own idr allocator. But\nthat\u0027s material for another patch (series).\n\nv2: Properly initialize the fb-\u003efilp_head list in _init, otherwise the\nnewly added WARN to check whether the fb isn\u0027t on a fpriv list any\nmore will fail for driver-private objects.\n\nv3: Fixup two error-case unlock bugs spotted by Richard Wilbur.\n\nReviewed-by: Rob Clark \u003crob@ti.com\u003e\nSigned-off-by: Daniel Vetter \u003cdaniel.vetter@ffwll.ch\u003e\n" }, { "commit": "29494c174dc4793ebd236aa522a2a1ed73b7180e", "tree": "a9ae7208969e1c632b0a8bf92fb92876d8f3f232", "parents": [ "d5d2636ed7990b93c7216f6a4d323f6b0eee08af" ], "author": { "name": "Daniel Vetter", "email": "daniel.vetter@ffwll.ch", "time": "Sun Dec 02 02:18:25 2012 +0100" }, "committer": { "name": "Daniel Vetter", "email": "daniel.vetter@ffwll.ch", "time": "Sun Jan 20 22:16:54 2013 +0100" }, "message": "drm: add per-crtc locks\n\n*drumroll*\n\nThe basic idea is to protect per-crtc state which can change without\ntouching the output configuration with separate mutexes, i.e. all the\ninput side state to a crtc like framebuffers, cursor settings or plane\nconfiguration. Holding such a crtc lock gives a read-lock on all the\nother crtc state which can be changed by e.g. a modeset.\n\nAll non-crtc state is still protected by the mode_config mutex.\nCallers that need to change modeset state of a crtc (e.g. dpms or\nset_mode) need to grab both the mode_config lock and nested within any\ncrtc locks.\n\nNote that since there can only ever be one holder of the mode_config\nlock we can grab the subordinate crtc locks in any order (if we need\nto grab more than one of them). Lockdep can handle such nesting with\nthe mutex_lock_nest_lock call correctly.\n\nWith this functions that only touch connectors/encoders but not crtcs\nonly need to take the mode_config lock. The biggest such case is the\noutput probing, which means that we can now pageflip and move cursors\nwhile the output probe code is reading an edid.\n\nMost cases neatly fall into the three buckets:\n- Only touches connectors and similar output state and so only needs\n the mode_config lock.\n- Touches the global configuration and so needs all locks.\n- Only touches the crtc input side and so only needs the crtc lock.\n\nBut a few cases that need special consideration:\n\n- Load detection which requires a crtc. The mode_config lock already\n prevents a modeset change, so we can use any unused crtc as we like\n to do load detection. The only thing to consider is that such\n temporary state changes don\u0027t leak out to userspace through ioctls\n that only take the crtc look (like a pageflip). Hence the load\n detect code needs to grab the crtc of any output pipes it touches\n (but only if it touches state used by the pageflip or cursor\n ioctls).\n\n- Atomic pageflip when moving planes. The first case is sane hw, where\n planes have a fixed association with crtcs - nothing needs to be\n done there. More insane^Wflexible hw needs to have plane-\u003ecrtc\n mapping which is separately protect with a lock that nests within\n the crtc lock. If the plane is unused we can just assign it to the\n current crtc and continue. But if a plane is already in use by\n another crtc we can\u0027t just reassign it.\n\n Two solution present themselves: Either go back to a slow-path which\n takes all modeset locks, potentially incure quite a hefty delay. Or\n simply disallowing such changes in one atomic pageflip - in general\n the vblanks of two crtcs are not synced, so there\u0027s no sane way to\n atomically flip such plane changes accross more than one crtc. I\u0027d\n heavily favour the later approach, going as far as mandating it as\n part of the ABI of such a new a nuclear pageflip.\n\n And if we _really_ want such semantics, we can always get them by\n introducing another pageflip mutex between the mode_config.mutex and\n the individual crtc locks. Pageflips crossing more than one crtc\n would then need to take that lock first, to lock out concurrent\n multi-crtc pageflips.\n\n- Optimized global modeset operations: We could just take the\n mode_config lock and then lazily lock all crtc which are affected by\n a modeset operation. This has the advantage that pageflip could\n continue unhampered on unaffected crtc. But if e.g. global resources\n like plls need to be reassigned and so affect unrelated crtcs we can\n still do that - nested locking works in any order.\n\nThis patch just adds the locks and takes them in drm_modeset_lock_all,\nno real locking changes yet.\n\nv2: Need to initialize the new lock in crtc_init and lock it righ\naway, for otherwise the modeset_unlock_all below will try to unlock a\nnot-locked mutex.\n\nReviewed-by: Rob Clark \u003crob@ti.com\u003e\nSigned-off-by: Daniel Vetter \u003cdaniel.vetter@ffwll.ch\u003e\n" }, { "commit": "848499032504b1defdebdcf930aa70bd01a45ac1", "tree": "54e84b73e68ce68ece6ef9adfa888afbb6ec8ed9", "parents": [ "2d13b6796e420ed00389b7399a5d5ac7b1fed436" ], "author": { "name": "Daniel Vetter", "email": "daniel.vetter@ffwll.ch", "time": "Sun Dec 02 00:28:11 2012 +0100" }, "committer": { "name": "Daniel Vetter", "email": "daniel.vetter@ffwll.ch", "time": "Sun Jan 20 22:16:38 2013 +0100" }, "message": "drm: add drm_modeset_lock|unlock_all\n\nThis is the first step towards introducing the new modeset locking\nscheme. The plan is to put helper functions into place at all the\nright places step-by-step, so that the final patch to switch on the\nnew locking scheme doesn\u0027t need to touch every single driver.\n\nThis helper here will serve as the shotgun solutions for all places\nwhere a more fine-grained locking isn\u0027t (yet) implemented.\n\nv2: Fixup kerneldoc for unlock_all.\n\nReviewed-by: Rob Clark \u003crob@ti.com\u003e\nSigned-off-by: Daniel Vetter \u003cdaniel.vetter@ffwll.ch\u003e\n" }, { "commit": "2d13b6796e420ed00389b7399a5d5ac7b1fed436", "tree": "8889af1340e267331fd7969d7f949ac9d6661019", "parents": [ "af26ef3b3978349cfbd864163a6ebb4906b733b5" ], "author": { "name": "Daniel Vetter", "email": "daniel.vetter@ffwll.ch", "time": "Tue Dec 11 13:47:23 2012 +0100" }, "committer": { "name": "Daniel Vetter", "email": "daniel.vetter@ffwll.ch", "time": "Sun Jan 20 15:57:58 2013 +0100" }, "message": "drm: encapsulate crtc-\u003eset_config calls\n\nWith refcounting we need to adjust framebuffer refcounts at each\ncallsite - much easier to do if they all call the same little helper\nfunction.\n\nReviewed-by: Rob Clark \u003crob@ti.com\u003e\nSigned-off-by: Daniel Vetter \u003cdaniel.vetter@ffwll.ch\u003e\n" }, { "commit": "8faf6b18a2a6bece008de1e6bb80f0c608e58483", "tree": "e30089b80dc9706a4842c9d53094a4f9ecadb2e4", "parents": [ "7d1f9aeff1ee4a20b1aeb377dd0f579fe9647619" ], "author": { "name": "Daniel Vetter", "email": "daniel.vetter@ffwll.ch", "time": "Sat Dec 01 23:43:11 2012 +0100" }, "committer": { "name": "Daniel Vetter", "email": "daniel.vetter@ffwll.ch", "time": "Sun Jan 20 15:29:04 2013 +0100" }, "message": "drm: review locking rules in drm_crtc.c\n\n- config_cleanup was confused: It claimed that callers need to hold\n the modeset lock, but the connector|encoder_cleanup helpers grabbed\n that themselves (note that crtc_cleanup did _not_ grab the modeset\n lock). Which resulted in all drivers _not_ hodling the lock. Since\n this is for single-threaded cleanup code, drop the requirement from\n docs and also drop the lock_grabbing from all _cleanup functions.\n\n- Kill the LOCKING section in the doctype, since clearly we\u0027re not\n good enough to keep them up-to-date. And misleading locking\n documentation is worse than useless (see e.g. the comment in the\n vmgfx driver about the cleanup mess). And since for most functions\n the very first line either grabs the lock or has a WARN_ON(!locked)\n the documentation doesn\u0027t really add anything.\n\n- Instead put in some effort into explaining the only two special\n cases a bit better: config_init and config_cleanup are both called\n from single-threaded setup/teardown code, so don\u0027t do any locking.\n It\u0027s the driver\u0027s job though to enforce this.\n\n- Where lacking, add a WARN_ON(!is_locked). Not many places though,\n since locking around fbdev setup/teardown is through-roughly screwed\n up, and so will break almost every single WARN annotation I\u0027ve tried\n to add.\n\n- Add a drm_modeset_is_locked helper - the Grate Modset Locking Rework\n will use the compiler to assist in the big reorg by renaming the\n mode lock, so start encapsulating things. Unfortunately this ended\n up in the \"wrong\" header file since it needs the definition of\n struct drm_device.\n\nv2: Drop most WARNS again - we hit them all over the place, mostly in\nthe setup and teardown sequences. And trying to fix it up leads to\nnice deadlocks, since the locking in the setup code is really\ninconsistent.\n\nReviewed-by: Rob Clark \u003crob@ti.com\u003e\nSigned-off-by: Daniel Vetter \u003cdaniel.vetter@ffwll.ch\u003e\n" }, { "commit": "e5c653777986b40e2986d2c918847fddbcba3a34", "tree": "3d1ec01de02c7770bbee08e2daf0b0edf67f35e6", "parents": [ "8d2e630899165d413ae8a2adc36846ac0b71bada" ], "author": { "name": "Ben Widawsky", "email": "ben@bwidawsk.net", "time": "Fri Jan 18 12:30:34 2013 -0800" }, "committer": { "name": "Daniel Vetter", "email": "daniel.vetter@ffwll.ch", "time": "Sun Jan 20 13:11:12 2013 +0100" }, "message": "agp/intel: Add gma_bus_addr\n\nIt is no longer used in the i915 code, so isolate it from the shared\nstruct.\n\nThis was originally part of:\ncommit 0e275518f325418d559c05327775bff894b237f7\nAuthor: Ben Widawsky \u003cben@bwidawsk.net\u003e\nDate: Mon Jan 14 13:35:33 2013 -0800\n\n agp/intel: decouple more of the agp-i915 sharing\n\n Reviewed-by: Rodrigo Vivi \u003crodrigo.vivi@gmail.com\u003e\n Signed-off-by: Ben Widawsky \u003cben@bwidawsk.net\u003e\n\nThat commit had some other hunks which can\u0027t be used due to issues\nDaniel found in previous commits.\n\nSigned-off-by: Ben Widawsky \u003cben@bwidawsk.net\u003e\n[danvet: drop squash notice from the commit since it\u0027s imo ok to keep\nthis one separate.]\nSigned-off-by: Daniel Vetter \u003cdaniel.vetter@ffwll.ch\u003e\n" }, { "commit": "8d2e630899165d413ae8a2adc36846ac0b71bada", "tree": "f2df0bedcdedca4a63ecb40402680d6099f40fa3", "parents": [ "9c61a32d31a55c8c6e590d83ae5645e14fde09f2" ], "author": { "name": "Ben Widawsky", "email": "ben@bwidawsk.net", "time": "Fri Jan 18 12:30:33 2013 -0800" }, "committer": { "name": "Daniel Vetter", "email": "daniel.vetter@ffwll.ch", "time": "Sun Jan 20 13:11:12 2013 +0100" }, "message": "drm/i915: Needs_dmar, not\n\nThe reasoning behind our code taking two paths depending upon whether or\nnot we may have been configured for IOMMU isn\u0027t clear to me. It should\nalways be safe to use the pci mapping functions as they are designed to\nabstract the decision we were handling in i915.\n\nAside from simpler code, removing another member for the intel_gtt\nstruct is a nice motivation.\n\nI ran this by Chris, and he wasn\u0027t concerned about the extra kzalloc,\nand memory references vs. page_to_phys calculation in the case without\nIOMMU.\n\nv2: Update commit message\n\nv3: Remove needs_dmar addition from Zhenyu upstream\n\nThis reverts (and then other stuff)\ncommit 20652097dadd9a7fb4d652f25466299974bc78f9\nAuthor: Zhenyu Wang \u003czhenyuw@linux.intel.com\u003e\nDate: Thu Dec 13 23:47:47 2012 +0800\n\n drm/i915: Fix missed needs_dmar setting\n\nReviewed-by: Rodrigo Vivi \u003crodrigo.vivi@gmail.com\u003e (v2)\nCc: Zhenyu Wang \u003czhenyuw@linux.intel.com\u003e\nSigned-off-by: Ben Widawsky \u003cben@bwidawsk.net\u003e\n[danvet: Squash in follow-up fix to remove the bogus hunk which\ndeleted the dma_mask configuration for gen6+.]\nSigned-off-by: Daniel Vetter \u003cdaniel.vetter@ffwll.ch\u003e\n" }, { "commit": "9c61a32d31a55c8c6e590d83ae5645e14fde09f2", "tree": "3e0b76fa2c8b3a598b80e546821f659fae2530e2", "parents": [ "a81cc00c11ab6816fbcb7dd99a60b50e71765d25" ], "author": { "name": "Ben Widawsky", "email": "ben@bwidawsk.net", "time": "Fri Jan 18 12:30:32 2013 -0800" }, "committer": { "name": "Daniel Vetter", "email": "daniel.vetter@ffwll.ch", "time": "Sun Jan 20 13:11:11 2013 +0100" }, "message": "drm/i915: Remove scratch page from shared\n\nWe already had a mapping in both (minus the phys_addr in AGP).\n\nReviewed-by: Rodrigo Vivi \u003crodrigo.vivi@gmail.com\u003e\nSigned-off-by: Ben Widawsky \u003cben@bwidawsk.net\u003e\nSigned-off-by: Daniel Vetter \u003cdaniel.vetter@ffwll.ch\u003e\n" }, { "commit": "a81cc00c11ab6816fbcb7dd99a60b50e71765d25", "tree": "506c92848c259bfa397e69d805508511e2024458", "parents": [ "abedc077b45eff0b5a8630af8431ad5d59213582" ], "author": { "name": "Ben Widawsky", "email": "ben@bwidawsk.net", "time": "Fri Jan 18 12:30:31 2013 -0800" }, "committer": { "name": "Daniel Vetter", "email": "daniel.vetter@ffwll.ch", "time": "Sun Jan 20 13:11:11 2013 +0100" }, "message": "drm/i915: Cut out the infamous ILK w/a from AGP layer\n\nAnd, move it to where the rest of the logic is.\n\nThere is some slight functionality changes. There was extra paranoid\nchecks in AGP code making sure we never do idle maps on gen2 parts. That\nwas not duplicated as the simple PCI id check should do the right thing.\n\nv2: use IS_GEN5 \u0026\u0026 IS_MOBILE check instead. For now, this is the same as\nIS_IRONLAKE_M but is more future proof. The workaround docs hint that\nmore than one platform may be effected, but we\u0027ve never seen such a\nplatform in the wild. (Rodrigo, Daniel)\n\nReviewed-by: Rodrigo Vivi \u003crodrigo.vivi@gmail.com\u003e (v1)\nCc: Dave Airlie \u003cairlied@redhat.com\u003e\nSigned-off-by: Ben Widawsky \u003cben@bwidawsk.net\u003e\nSigned-off-by: Daniel Vetter \u003cdaniel.vetter@ffwll.ch\u003e\n" }, { "commit": "b1edd6a6ecd436af33f210a5c75e0249466fd200", "tree": "12ea6bb801282488ecd38f6a4001867b26289515", "parents": [ "55bc60db5988c8366751d3d04dd690698a53412c" ], "author": { "name": "Ville Syrjälä", "email": "ville.syrjala@linux.intel.com", "time": "Thu Jan 17 16:31:30 2013 +0200" }, "committer": { "name": "Daniel Vetter", "email": "daniel.vetter@ffwll.ch", "time": "Sun Jan 20 13:09:44 2013 +0100" }, "message": "drm/edid: Add drm_rgb_quant_range_selectable()\n\ndrm_rgb_quant_range_selectable() will report whether the monitor\nclaims to support for RGB quantization range selection.\n\nThe information can be found in the CEA Video capability block.\n\nv2: s/quantzation/quantization/ in the comment\n\nReviewed-by: Paulo Zanoni \u003cpaulo.r.zanoni@intel.com\u003e\nSigned-off-by: Ville Syrjälä \u003cville.syrjala@linux.intel.com\u003e\nAcked-by: David Airlie \u003cairlied@linux.ie\u003e\nSigned-off-by: Daniel Vetter \u003cdaniel.vetter@ffwll.ch\u003e\n" }, { "commit": "b5cc6c0387b2f8d269c1df1e68c97c958dd22fed", "tree": "697f2335b3a10f55e0ea226dcd044ee4ff3f0f7f", "parents": [ "9931faca02c604c22335f5a935a501bb2ace6e20", "c0c36b941b6f0be6ac74f340040cbb29d6a0b06c" ], "author": { "name": "Dave Airlie", "email": "airlied@redhat.com", "time": "Thu Jan 17 20:34:08 2013 +1000" }, "committer": { "name": "Dave Airlie", "email": "airlied@redhat.com", "time": "Thu Jan 17 20:34:08 2013 +1000" }, "message": "Merge tag \u0027drm-intel-next-2012-12-21\u0027 of git://people.freedesktop.org/~danvet/drm-intel into drm-next\n\nDaniel writes:\n- seqno wrap fixes and debug infrastructure from Mika Kuoppala and Chris\n Wilson\n- some leftover kill-agp on gen6+ patches from Ben\n- hotplug improvements from Damien\n- clear fb when allocated from stolen, avoids dirt on the fbcon (Chris)\n- Stolen mem support from Chris Wilson, one of the many steps to get to\n real fastboot support.\n- Some DDI code cleanups from Paulo.\n- Some refactorings around lvds and dp code.\n- some random little bits\u0026pieces\n\n* tag \u0027drm-intel-next-2012-12-21\u0027 of git://people.freedesktop.org/~danvet/drm-intel: (93 commits)\n drm/i915: Return the real error code from intel_set_mode()\n drm/i915: Make GSM void\n drm/i915: Move GSM mapping into dev_priv\n drm/i915: Move even more gtt code to i915_gem_gtt\n drm/i915: Make next_seqno debugs entry to use i915_gem_set_seqno\n drm/i915: Introduce i915_gem_set_seqno()\n drm/i915: Always clear semaphore mboxes on seqno wrap\n drm/i915: Initialize hardware semaphore state on ring init\n drm/i915: Introduce ring set_seqno\n drm/i915: Missed conversion to gtt_pte_t\n drm/i915: Bug on unsupported swizzled platforms\n drm/i915: BUG() if fences are used on unsupported platform\n drm/i915: fixup overlay stolen memory leak\n drm/i915: clean up PIPECONF bpc #defines\n drm/i915: add intel_dp_set_signal_levels\n drm/i915: remove leftover display.update_wm assignment\n drm/i915: check for the PCH when setting pch_transcoder\n drm/i915: Clear the stolen fb before enabling\n drm/i915: Access to snooped system memory through the GTT is incoherent\n drm/i915: Remove stale comment about intel_dp_detect()\n ...\n\nConflicts:\n\tdrivers/gpu/drm/i915/intel_display.c\n" }, { "commit": "cc4c0c4de3c775be22072ec3251f2e581b63d9a0", "tree": "3c0a42c628c0388681687e68c420f3a2721d89ed", "parents": [ "c354c893dd57aac11f5d96ada7c47a20fe090a6e" ], "author": { "name": "Maarten Lankhorst", "email": "maarten.lankhorst@canonical.com", "time": "Tue Jan 15 14:57:28 2013 +0100" }, "committer": { "name": "Maarten Lankhorst", "email": "maarten.lankhorst@canonical.com", "time": "Tue Jan 15 16:49:39 2013 +0100" }, "message": "drm/ttm: unexport ttm_bo_wait_unreserved\n\nAll legitimate users of this function outside ttm_bo.c are gone, now\nit\u0027s only an implementation detail.\n\nSigned-off-by: Maarten Lankhorst \u003cmaarten.lankhorst@canonical.com\u003e\nReviewed-by: Jerome Glisse \u003cjglisse@redhat.com\u003e\n" }, { "commit": "5e45d7dfd74100d622f9cdc70bfd1f9fae1671de", "tree": "b12de2542f55d332a73fcd7d863bd2e45fd7d4ef", "parents": [ "7a1863084c9d90ce4b67d645bf9b0f1612e68f62" ], "author": { "name": "Maarten Lankhorst", "email": "maarten.lankhorst@canonical.com", "time": "Tue Jan 15 14:57:05 2013 +0100" }, "committer": { "name": "Maarten Lankhorst", "email": "maarten.lankhorst@canonical.com", "time": "Tue Jan 15 14:57:05 2013 +0100" }, "message": "drm/ttm: add ttm_bo_reserve_slowpath\n\nInstead of dropping everything, waiting for the bo to be unreserved\nand trying over, a better strategy would be to do a blocking wait.\n\nThis can be mapped a lot better to a mutex_lock-like call.\n\nSigned-off-by: Maarten Lankhorst \u003cmaarten.lankhorst@canonical.com\u003e\nReviewed-by: Jerome Glisse \u003cjglisse@redhat.com\u003e\n" }, { "commit": "63d0a4195560362e2e00a3ad38fc331d34e1da9b", "tree": "64df3550af24b6f583c17aac878a9f1fb6fa85eb", "parents": [ "979ee290ff0a543352243145dc3654af5a856ab8" ], "author": { "name": "Maarten Lankhorst", "email": "maarten.lankhorst@canonical.com", "time": "Tue Jan 15 14:56:37 2013 +0100" }, "committer": { "name": "Maarten Lankhorst", "email": "maarten.lankhorst@canonical.com", "time": "Tue Jan 15 14:56:37 2013 +0100" }, "message": "drm/ttm: remove lru_lock around ttm_bo_reserve\n\nThere should no longer be assumptions that reserve will always succeed\nwith the lru lock held, so we can safely break the whole atomic\nreserve/lru thing. As a bonus this fixes most lockdep annotations for\nreservations.\n\nSigned-off-by: Maarten Lankhorst \u003cmaarten.lankhorst@canonical.com\u003e\nReviewed-by: Jerome Glisse \u003cjglisse@redhat.com\u003e\n" }, { "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": "06e5598fce5ce89fe8bf081398296e5b08d993dd", "tree": "3c00031aed1df894613b53c3900192dd677ec367", "parents": [ "d7e5008f7c2077d856e40a3af746f1a47028b5f2" ], "author": { "name": "Ben Widawsky", "email": "benjamin.widawsky@intel.com", "time": "Tue Dec 18 10:31:26 2012 -0800" }, "committer": { "name": "Daniel Vetter", "email": "daniel.vetter@ffwll.ch", "time": "Thu Dec 20 16:28:42 2012 +0100" }, "message": "drm/i915: Move GSM mapping into dev_priv\n\nThis removes an unused field from the AGP structure and moves it into\nthe dev_priv structure (with a slightly better name). This builds upon\nthe kill-agp series already merged.\n\nGSM is a well defined term in the bspec:\nGSM: Graphics Stolen Memory\n\nGTT stolen space is defined for storage of the GFX GTT entries in\nphysical memory. IA can not access GSM directly , it can only access via\nGTTMMADR. GT can access GSM directly or through GTTMMADR.\n\nThis is not the entire stolen space.\n\nSigned-off-by: Ben Widawsky \u003cben@bwidawsk.net\u003e\nReviewed-by: Mika Kuoppala \u003cmika.kuoppala@intel.com\u003e\nSigned-off-by: Daniel Vetter \u003cdaniel.vetter@ffwll.ch\u003e\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": "9e8944ab564f2e3dde90a518cd32048c58918608", "tree": "25a2dffcd1cfa8d01c50d03d8791817bafd05574", "parents": [ "5973c7ee519e2a240c68b290a1836bdb25ed3701" ], "author": { "name": "Chris Wilson", "email": "chris@chris-wilson.co.uk", "time": "Thu Nov 15 11:32:17 2012 +0000" }, "committer": { "name": "Daniel Vetter", "email": "daniel.vetter@ffwll.ch", "time": "Fri Nov 30 23:20:54 2012 +0100" }, "message": "drm: Introduce an iterator over holes in the drm_mm range manager\n\nThis will be used i915 in forthcoming patches in order to measure the\nlargest contiguous chunk of memory available for enabling chipset\nfeatures.\n\nv2: Try to make the macro marginally safer and more readable by not\ndepending upon the drm_mm_hole_node_end() being non-zero. Note that we\nneed to open code list_for_each() in order to update the hole_start,\nhole_end variable on each iteration and keep the macro sane.\n\nv3: Tidy up few BUG_ONs that fell foul of adding additional tests to\ndrm_mm_hole_node_start().\n\nSigned-off-by: Chris Wilson \u003cchris@chris-wilson.co.uk\u003e\nCc: Dave Airlie \u003cairlied@redhat.com\u003e\nAcked-by: Dave Airlie \u003cairlied@redhat.com\u003e\nCc: dri-devel@lists.freedesktop.org\nReviewed-by: Ben Widawsky \u003cben@bwidawsk.net\u003e\nSigned-off-by: Daniel Vetter \u003cdaniel.vetter@ffwll.ch\u003e\n" }, { "commit": "5973c7ee519e2a240c68b290a1836bdb25ed3701", "tree": "3d9138cd36bb494eeeda9b6db3b50b12f870e809", "parents": [ "acd15b6cc20f85bcef9e08b6ed4f142c34791c32" ], "author": { "name": "Chris Wilson", "email": "chris@chris-wilson.co.uk", "time": "Thu Nov 15 11:32:16 2012 +0000" }, "committer": { "name": "Daniel Vetter", "email": "daniel.vetter@ffwll.ch", "time": "Fri Nov 30 23:20:09 2012 +0100" }, "message": "drm: Introduce drm_mm_create_block()\n\nTo be used later by i915 to preallocate exact blocks of space from the\nrange manager.\n\nSigned-off-by: Chris Wilson \u003cchris@chris-wilson.co.uk\u003e\nCc: Dave Airlie \u003cairlied@redhat.com\u003e\nAcked-by: Dave Airlie \u003cairlied@redhat.com\u003e\nCc: dri-devel@lists.freedesktop.org\nSigned-off-by: Daniel Vetter \u003cdaniel.vetter@ffwll.ch\u003e\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" } ], "next": "fbff4690b8f23289797b18ad8939e19525c403d1" }