)]}' { "log": [ { "commit": "39060a07781b4930656752943cf5d66376d0533c", "tree": "352af8897fc6a198f6f7157ec9637a23e003270d", "parents": [ "a81b31e9fc98e067b7e7f1244861c97e44268e2d" ], "author": { "name": "Dave Airlie", "email": "airlied@redhat.com", "time": "Fri Aug 05 10:56:29 2011 +0100" }, "committer": { "name": "Dave Airlie", "email": "airlied@redhat.com", "time": "Fri Aug 05 10:56:29 2011 +0100" }, "message": "Revert \"drm/i915: Try enabling RC6 by default (again)\"\n\nThis reverts commit 4e20fa65a3ea789510eed1a15deb9e8aab2b8202.\n\nFrancesco Allertsen still has a broken configuration.\n\nSigned-off-by: Dave Airlie \u003cairlied@redhat.com\u003e\n" }, { "commit": "a81b31e9fc98e067b7e7f1244861c97e44268e2d", "tree": "51381172d92fdc005e670964c57be4f6d4974c6b", "parents": [ "d522d9cc5bdd41214084383fc3e6d882f6916a78" ], "author": { "name": "Thomas Reim", "email": "reimth@gmail.com", "time": "Fri Jul 29 14:29:00 2011 +0000" }, "committer": { "name": "Dave Airlie", "email": "airlied@redhat.com", "time": "Thu Aug 04 14:40:43 2011 +0100" }, "message": "drm/radeon: Extended DDC Probing for ECS A740GM-M DVI-D Connector\n\n ECS A740GM-M with ATI RADEON 2100 sends data to i2c bus\n for a DVI connector that is not implemented/existent on the board.\n\n Fix by applying extented DDC probing for this connector.\n\n Requires [PATCH] drm/radeon: Extended DDC Probing for Connectors\n with Improperly Wired DDC Lines\n\n Tested for kernel 2.6.38 on Asus ECS A740GM-M board\n\n BugLink: http://bugs.launchpad.net/bugs/810926\n\nCc: \u003cstable@kernel.org\u003e\nSigned-off-by: Thomas Reim \u003creimth@gmail.com\u003e\nReviewed-by: Alex Deucher \u003calexdeucher@gmail.com\u003e\nAcked-by: Stephen Michaels \u003cStephen.Micheals@gmail.com\u003e\nSigned-off-by: Dave Airlie \u003cairlied@redhat.com\u003e\n" }, { "commit": "d522d9cc5bdd41214084383fc3e6d882f6916a78", "tree": "f2431df3317186c234899a991fbbfde3b80dfb14", "parents": [ "e384fab8c6f3ca88600bcb2ebdf0eb2f90864fab" ], "author": { "name": "Thomas Reim", "email": "reimth@gmail.com", "time": "Fri Jul 29 14:28:59 2011 +0000" }, "committer": { "name": "Dave Airlie", "email": "airlied@redhat.com", "time": "Thu Aug 04 14:40:24 2011 +0100" }, "message": "drm/radeon: Log Subsystem Vendor and Device Information\n\n Log PCI subsystem vendor and subsystem device ID in addition to\n PCI vendor and device ID during kernel mode initialisation. This helps\n to better identify radeon devices of third-party vendors, e. g. for\n bug analysis.\n\n Tested for kernel 2.6.35, 2.6.38 and 3.0 on Asus M2A-VM HDMI board\n\nCc: \u003cstable@kernel.org\u003e\nSigned-off-by: Thomas Reim \u003creimth@gmail.com\u003e\nReviewed-by: Alex Deucher \u003calexdeucher@gmail.com\u003e\nAcked-by: Stephen Michaels \u003cStephen.Micheals@gmail.com\u003e\nSigned-off-by: Dave Airlie \u003cairlied@redhat.com\u003e\n" }, { "commit": "e384fab8c6f3ca88600bcb2ebdf0eb2f90864fab", "tree": "10477faf78310c3fb3fd4bbb9a81df9215b487d9", "parents": [ "051963d4832ed61e5ae74f5330b0a94489e101b9" ], "author": { "name": "Thomas Reim", "email": "reimth@gmail.com", "time": "Fri Jul 29 14:28:58 2011 +0000" }, "committer": { "name": "Dave Airlie", "email": "airlied@redhat.com", "time": "Thu Aug 04 14:39:50 2011 +0100" }, "message": "drm/radeon: Extended DDC Probing for Connectors with Improperly Wired DDC Lines (here: Asus M2A-VM HDMI)\n\n Some integrated ATI Radeon chipset implementations with add-on HDMI card\n (e. g. Asus M2A-VM HDMI) indicate the availability of a DDC even\n when the add-on card is not plugged in or HDMI is disabled in BIOS setup.\n In this case, drm_get_edid() and drm_edid_block_valid() periodically\n dump data and kernel errors into system log files and onto terminals.\n For these connectors DDC probing is extended by a check for a correct\n EDID header. Only in case a valid EDID header is also found, the\n (HDMI or DVI) connector will be used by the Radeon driver. This prevents\n the kernel driver from useless flooding of logs and terminal sessions with\n EDID dumps and error messages.\n This patch adds a flag \u0027requires_extended_probe\u0027 to the radeon_connector\n structure. In function radeon_connector_needs_extended_probe() this flag\n can be set on a chipset family/vendor/connector type specific basis.\n In addition, function radeon_ddc_probe() has been adapted to perform\n extended DDC probing if required by the connector\u0027s flag.\n Requires function drm_edid_header_is_valid() in DRM module provided by\n [PATCH] drm: Separate EDID Header Check from EDID Block Check.\n\n Tested for kernel 2.6.35, 2.6.38 and 3.0 on Asus M2A-VM HDMI board\n\n BugLink: https://bugzilla.redhat.com/show_bug.cgi?id\u003d668196\n BugLink: http://bugs.launchpad.net/bugs/7228066\n\nCc: \u003cstable@kernel.org\u003e\nSigned-off-by: Thomas Reim \u003creimth@gmail.com\u003e\nReviewed-by: Alex Deucher \u003calexdeucher@gmail.com\u003e\nAcked-by: Stephen Michaels \u003cStephen.Micheals@gmail.com\u003e\nSigned-off-by: Dave Airlie \u003cairlied@redhat.com\u003e\n" }, { "commit": "051963d4832ed61e5ae74f5330b0a94489e101b9", "tree": "4ade8f3af4f6ec99d8f76048707072708f5877e7", "parents": [ "5037f8acf448dd0de9868dc7410f45879d3d1a1b" ], "author": { "name": "Thomas Reim", "email": "reimth@gmail.com", "time": "Fri Jul 29 14:28:57 2011 +0000" }, "committer": { "name": "Dave Airlie", "email": "airlied@redhat.com", "time": "Thu Aug 04 14:39:35 2011 +0100" }, "message": "drm: Separate EDID Header Check from EDID Block Check\n\n Provides function drm_edid_header_is_valid() for EDID header check\n and replaces EDID header check part of function drm_edid_block_valid()\n by a call of drm_edid_header_is_valid().\n This is a prerequisite to extend DDC probing, e. g. in function\n radeon_ddc_probe() for Radeon devices, by a central EDID header check.\n\n Tested for kernel 2.6.35, 2.6.38 and 3.0\n\nCc: \u003cstable@kernel.org\u003e\nSigned-off-by: Thomas Reim \u003creimth@gmail.com\u003e\nReviewed-by: Alex Deucher \u003calexdeucher@gmail.com\u003e\nAcked-by: Stephen Michaels \u003cStephen.Micheals@gmail.com\u003e\nSigned-off-by: Dave Airlie \u003cairlied@redhat.com\u003e\n" }, { "commit": "5037f8acf448dd0de9868dc7410f45879d3d1a1b", "tree": "b437939f0fa2c0207bbc0100ebea3ef93d63d276", "parents": [ "e1c44acc8cabda6b38864f25e809b306c4d2d790" ], "author": { "name": "Joonyoung Shim", "email": "jy0922.shim@samsung.com", "time": "Thu Aug 04 05:41:01 2011 +0000" }, "committer": { "name": "Dave Airlie", "email": "airlied@redhat.com", "time": "Thu Aug 04 14:39:21 2011 +0100" }, "message": "drm: Add NULL check about irq functions\n\nThe struct drm_driver has some function pointers for irq. They are\ngpu specific and some functions aren\u0027t essential things. This can\nprevents creation of unnecessary dummy function for irq.\n\nSigned-off-by: Joonyoung Shim \u003cjy0922.shim@samsung.com\u003e\nSigned-off-by: Kyungmin Park \u003ckyungmin.park@samsung.com\u003e\nSigned-off-by: Dave Airlie \u003cairlied@redhat.com\u003e\n" }, { "commit": "e1c44acc8cabda6b38864f25e809b306c4d2d790", "tree": "42c6c31cf5e264e161e1d213b683c7ccceb09a98", "parents": [ "816985d4f96cda5159b6b65f3442964725030ae9" ], "author": { "name": "Joonyoung Shim", "email": "jy0922.shim@samsung.com", "time": "Thu Aug 04 05:41:00 2011 +0000" }, "committer": { "name": "Dave Airlie", "email": "airlied@redhat.com", "time": "Thu Aug 04 14:39:09 2011 +0100" }, "message": "drm: Fix irq install error handling\n\nThe registered irq should be unregistered by free_irq() if\nirq_postinstall() returns the error after request_irq() is called\nsuccessfully.\n\n[airlied: add vga switcheroo disable]\n\nSigned-off-by: Joonyoung Shim \u003cjy0922.shim@samsung.com\u003e\nSigned-off-by: Kyungmin Park \u003ckyungmin.park@samsung.com\u003e\nSigned-off-by: Dave Airlie \u003cairlied@redhat.com\u003e\n" }, { "commit": "816985d4f96cda5159b6b65f3442964725030ae9", "tree": "30339b75f344552ef362d7b9b7aa6739673d8efc", "parents": [ "69ad2ffe57a81c7b700e337f066b8b39c3655910" ], "author": { "name": "Bojan Prtvar", "email": "prtvar.b@gmail.com", "time": "Wed Aug 03 19:51:19 2011 +0000" }, "committer": { "name": "Dave Airlie", "email": "airlied@redhat.com", "time": "Thu Aug 04 14:39:06 2011 +0100" }, "message": "drm/radeon: fix potential NULL dereference in drivers/gpu/drm/radeon/atom.c\n\nkzalloc() can return NULL, so I added check for it\n\nSigned-off-by: Bojan Prtvar \u003cprtvar.b@gmail.com\u003e\nSigned-off-by: Dave Airlie \u003cairlied@redhat.com\u003e\n" }, { "commit": "69ad2ffe57a81c7b700e337f066b8b39c3655910", "tree": "ee963afbece5b5a3cefb211477f8ee875d288da5", "parents": [ "4d5cb60d3f6c396899a515e0e667d0f855ed66cc" ], "author": { "name": "Fernando Luis Vázquez Cao", "email": "fernando@oss.ntt.co.jp", "time": "Thu Jul 28 05:44:04 2011 +0000" }, "committer": { "name": "Dave Airlie", "email": "airlied@redhat.com", "time": "Thu Aug 04 14:39:04 2011 +0100" }, "message": "drm/radeon: clean reg header files\n\nReg header files are generated so they are not cleaned automagically.\nThey need to be added to the clean-files list.\n\nSigned-off-by: Fernando Luis Vazquez Cao \u003cfernando@oss.ntt.co.jp\u003e\nSigned-off-by: Dave Airlie \u003cairlied@redhat.com\u003e\n" }, { "commit": "4d5cb60d3f6c396899a515e0e667d0f855ed66cc", "tree": "1a468db9dfcb89f74b226dde7115d363704c0ea0", "parents": [ "0b576372e86c8e6bee01506651b21ec0fe8a1698" ], "author": { "name": "Emil Velikov", "email": "emil.l.velikov@gmail.com", "time": "Sat Jul 30 14:26:01 2011 +0000" }, "committer": { "name": "Dave Airlie", "email": "airlied@redhat.com", "time": "Thu Aug 04 14:38:52 2011 +0100" }, "message": "drm/debugfs: Initialise empty variable\n\n[airlied: move char declaration]\n\nSigned-off-by: Emil Velikov \u003cemil.l.velikov@gmail.com\u003e\nSigned-off-by: Dave Airlie \u003cairlied@redhat.com\u003e\n" }, { "commit": "0b576372e86c8e6bee01506651b21ec0fe8a1698", "tree": "ed86064dad2db36348ab9c8305a910fe5cc48cec", "parents": [ "c41b9ee901bb2c7e3eacfa7e171de50c15d61c0b", "07b7ddd9b7f17a567e3ac2b33a4dffcb2a4524e0" ], "author": { "name": "Dave Airlie", "email": "airlied@redhat.com", "time": "Thu Aug 04 14:22:24 2011 +0100" }, "committer": { "name": "Dave Airlie", "email": "airlied@redhat.com", "time": "Thu Aug 04 14:22:24 2011 +0100" }, "message": "Merge branch \u0027drm-intel-next\u0027 of ssh://master.kernel.org/pub/scm/linux/kernel/git/keithp/linux-2.6 into drm-fixes\n\n* \u0027drm-intel-next\u0027 of ssh://master.kernel.org/pub/scm/linux/kernel/git/keithp/linux-2.6: (42 commits)\n drm/i915: allow cache sharing policy control\n drm/i915/hdmi: HDMI source product description infoframe support\n drm/i915/hdmi: split infoframe setting from infoframe type code\n drm: track CEA version number if present\n drm/i915: Try enabling RC6 by default (again)\n Revert \"drm/i915/dp: Zero the DPCD data before connection probe\"\n drm/i915/dp: wait for previous AUX channel activity to clear\n drm/i915: don\u0027t use uninitialized EDID bpc values when picking pipe bpp\n drm/i915/pch: Save/restore PCH_PORT_HOTPLUG across suspend\n drm/i915: apply phase pointer override on SNB+ too\n drm/i915: Add quirk to disable SSC on Sony Vaio Y2\n drm/i915: provide more error output when mode sets fail\n drm/i915: add GPU max frequency control file\n i915: add Dell OptiPlex FX170 to intel_no_lvds\n drm/i915: Ignore GPU wedged errors while pinning scanout buffers\n drm/i915/hdmi: send AVI info frames on ILK+ as well\n drm/i915: fix CB tuning check for ILK+\n drm/i915: Flush other plane register writes\n drm/i915: flush plane control changes on ILK+ as well\n drm/i915: apply timing generator bug workaround on CPT and PPT\n ...\n" }, { "commit": "c41b9ee901bb2c7e3eacfa7e171de50c15d61c0b", "tree": "f4b636dada4060c12cd6e7dbfc9a964cd746e23f", "parents": [ "884988398f43378a170026184648ce8ff14dcc9f" ], "author": { "name": "Alex Deucher", "email": "alexander.deucher@amd.com", "time": "Sat Jul 30 18:12:24 2011 +0000" }, "committer": { "name": "Dave Airlie", "email": "airlied@redhat.com", "time": "Thu Aug 04 14:22:11 2011 +0100" }, "message": "drm/radeon/kms: add thermal chip quirk for asus 9600xt\n\nThe board has an lm63 compatible thermal chip, but no\nthermal chip entry in the vbios tables.\n\nFixes:\nhttps://bugs.freedesktop.org/show_bug.cgi?id\u003d39513\n\nSigned-off-by: Alex Deucher \u003calexander.deucher@amd.com\u003e\nSigned-off-by: Dave Airlie \u003cairlied@redhat.com\u003e\n" }, { "commit": "884988398f43378a170026184648ce8ff14dcc9f", "tree": "1c22c0d4ab91633a5893e7d7058ada2b8494b58e", "parents": [ "b8709894f248b569d7a0f32cc5e84fa14f7585f0" ], "author": { "name": "Dan Carpenter", "email": "error27@gmail.com", "time": "Wed Jul 27 09:53:40 2011 +0000" }, "committer": { "name": "Dave Airlie", "email": "airlied@redhat.com", "time": "Thu Aug 04 14:22:10 2011 +0100" }, "message": "drm/radeon: off by one in check_reg() functions\n\nThis off by one range check was copy and pasted a couple places.\nIt\u0027s not really harmful, but we should fix it anyway.\n\nSigned-off-by: Dan Carpenter \u003cerror27@gmail.com\u003e\nSigned-off-by: Dave Airlie \u003cairlied@redhat.com\u003e\n" }, { "commit": "b8709894f248b569d7a0f32cc5e84fa14f7585f0", "tree": "704c8b88ec2cc0219827c64be9d9785f5af34a4d", "parents": [ "288d5abec8314ae50fe6692f324b0444acae8486" ], "author": { "name": "Alex Deucher", "email": "alexander.deucher@amd.com", "time": "Wed Jul 27 04:17:25 2011 +0000" }, "committer": { "name": "Dave Airlie", "email": "airlied@redhat.com", "time": "Thu Aug 04 14:22:08 2011 +0100" }, "message": "drm/radeon/kms: fix version comment due to merge timing\n\nCompute cs support was actually added in 2.11.0 rather than\n2.10.0, but the patch was written prior. Update comment\nto match.\n\nSigned-off-by: Alex Deucher \u003calexander.deucher@amd.com\u003e\nSigned-off-by: Dave Airlie \u003cairlied@redhat.com\u003e\n" }, { "commit": "07b7ddd9b7f17a567e3ac2b33a4dffcb2a4524e0", "tree": "7a731bfd6992123f1809e121ef5d74e88be090c0", "parents": [ "c0864cb39c68696e80657360eba63da5e743b7aa" ], "author": { "name": "Jesse Barnes", "email": "jbarnes@virtuousgeek.org", "time": "Wed Aug 03 11:28:44 2011 -0700" }, "committer": { "name": "Keith Packard", "email": "keithp@keithp.com", "time": "Wed Aug 03 17:45:15 2011 -0700" }, "message": "drm/i915: allow cache sharing policy control\n\nExpose the SNB+ cache sharing policy register in debugfs. The new file,\ni915_cache_sharing, has 4 values, 0-3, with 0 being \"max uncore\nresources\" and 3 being the minimum. Exposing this control should make\nbenchmarking easier and help us choose a good default.\n\nSigned-off-by: Jesse Barnes \u003cjbarnes@virtuousgeek.org\u003e\nSigned-off-by: Keith Packard \u003ckeithp@keithp.com\u003e\n" }, { "commit": "c0864cb39c68696e80657360eba63da5e743b7aa", "tree": "b78746a6c542923e9d9aa6e829a7f34cc449871b", "parents": [ "45187ace97f7b3deb559b25348ccb7e301c158c9" ], "author": { "name": "Jesse Barnes", "email": "jbarnes@virtuousgeek.org", "time": "Wed Aug 03 09:22:56 2011 -0700" }, "committer": { "name": "Keith Packard", "email": "keithp@keithp.com", "time": "Wed Aug 03 17:43:15 2011 -0700" }, "message": "drm/i915/hdmi: HDMI source product description infoframe support\n\nSet an SPD infoframe if the sink supports it.\n\nSigned-off-by: Jesse Barnes \u003cjbarnes@virtuousgeek.org\u003e\nSigned-off-by: Keith Packard \u003ckeithp@keithp.com\u003e\n" }, { "commit": "45187ace97f7b3deb559b25348ccb7e301c158c9", "tree": "9538239971c5538b5edc5e777015e453b430a376", "parents": [ "ebec9a7bf11f843b0602b06c402f04bf4213b35a" ], "author": { "name": "Jesse Barnes", "email": "jbarnes@virtuousgeek.org", "time": "Wed Aug 03 09:22:55 2011 -0700" }, "committer": { "name": "Keith Packard", "email": "keithp@keithp.com", "time": "Wed Aug 03 17:43:13 2011 -0700" }, "message": "drm/i915/hdmi: split infoframe setting from infoframe type code\n\nThis makes it easier to add support for other infoframes (e.g. SPD,\nvendor specific).\n\nSigned-off-by: Jesse Barnes \u003cjbarnes@virtuousgeek.org\u003e\nSigned-off-by: Keith Packard \u003ckeithp@keithp.com\u003e\n" }, { "commit": "ebec9a7bf11f843b0602b06c402f04bf4213b35a", "tree": "dc99677c052f3a24bf55a87f9b88067f3de70102", "parents": [ "4e20fa65a3ea789510eed1a15deb9e8aab2b8202" ], "author": { "name": "Jesse Barnes", "email": "jbarnes@virtuousgeek.org", "time": "Wed Aug 03 09:22:54 2011 -0700" }, "committer": { "name": "Keith Packard", "email": "keithp@keithp.com", "time": "Wed Aug 03 17:43:10 2011 -0700" }, "message": "drm: track CEA version number if present\n\nDrivers need to know the CEA version number in addition to other display\ninfo (like whether the display is an HDMI sink) before enabling certain\nfeatures. So track the CEA version number in the display info\nstructure.\n\nSigned-off-by: Jesse Barnes \u003cjbarnes@virtuousgeek.org\u003e\nSigned-off-by: Keith Packard \u003ckeithp@keithp.com\u003e\n" }, { "commit": "4e20fa65a3ea789510eed1a15deb9e8aab2b8202", "tree": "28438a3ff1ba2affc85445e3af4147cab17c28b7", "parents": [ "3d208bef113657e27f8731921454d6da408b76c5" ], "author": { "name": "Keith Packard", "email": "keithp@keithp.com", "time": "Wed Aug 03 10:52:24 2011 -0700" }, "committer": { "name": "Keith Packard", "email": "keithp@keithp.com", "time": "Wed Aug 03 11:08:15 2011 -0700" }, "message": "drm/i915: Try enabling RC6 by default (again)\n\nJesse Barnes and I found a couple of issues where incorrect mode\nsetting would cause problems with RC6 enabled. We\u0027re hopeful that\nfixing those will resolve the outstanding issues with a few machines\nthat had trouble before 3.0 with rc6.\n\nCc: Pekka Enberg \u003cpenberg@kernel.org\u003e\nCc: Francesco Allertsen \u003cfallertsen@gmail.com\u003e\nCc: Ted Phelps \u003cphelps@gnusto.com\u003e\nCc: Gu Rui \u003cchaos.proton@gmail.com\u003e\nBugzilla: https://bugs.freedesktop.org/show_bug.cgi?id\u003d38567\nBugzilla: https://bugzilla.kernel.org/show_bug.cgi?id\u003d38332\nSigned-off-by: Keith Packard \u003ckeithp@keithp.com\u003e\n" }, { "commit": "3d208bef113657e27f8731921454d6da408b76c5", "tree": "8918890a296cefe35ada0bf813f6a30fdb8121b9", "parents": [ "62ac41a6e443ef26b9de862c6e20c088e2b04dde", "4edd17a25c99f34bd7a75c1daf31afe840237da8" ], "author": { "name": "Keith Packard", "email": "keithp@keithp.com", "time": "Wed Aug 03 10:41:19 2011 -0700" }, "committer": { "name": "Keith Packard", "email": "keithp@keithp.com", "time": "Wed Aug 03 10:41:19 2011 -0700" }, "message": "Merge branch \u0027drm-intel-fixes\u0027 into drm-intel-next\n" }, { "commit": "4edd17a25c99f34bd7a75c1daf31afe840237da8", "tree": "2f4d9a2b48672368576f835a59ce59526f103e88", "parents": [ "11bee43ebba0bfc92165c059f6e9869197ea8889" ], "author": { "name": "Keith Packard", "email": "keithp@keithp.com", "time": "Wed Aug 03 10:34:58 2011 -0700" }, "committer": { "name": "Keith Packard", "email": "keithp@keithp.com", "time": "Wed Aug 03 10:37:21 2011 -0700" }, "message": "Revert \"drm/i915/dp: Zero the DPCD data before connection probe\"\n\nThis reverts commit 97cdd7101079adc3c626d159c62d43de949516c8.\n\nClearing the dpcd data means that if the fetch fails, any previous\ndata will be lost. On eDP, this is no fun as we only fetch dpcd at\ninit time, so the memset will destroy that the next time through.\n" }, { "commit": "11bee43ebba0bfc92165c059f6e9869197ea8889", "tree": "6bc213dfd279525f0400524ac31641ed8fa7e172", "parents": [ "cda2bb78c24de7674eafa3210314dc75bed344a6" ], "author": { "name": "Jesse Barnes", "email": "jbarnes@virtuousgeek.org", "time": "Mon Aug 01 15:02:20 2011 -0700" }, "committer": { "name": "Keith Packard", "email": "keithp@keithp.com", "time": "Mon Aug 01 15:24:18 2011 -0700" }, "message": "drm/i915/dp: wait for previous AUX channel activity to clear\n\nBefore initiating a new read or write on the DP AUX channel, wait for\nany outstanding activity to complete. This may happen during normal\nretry behavior. If the wait fails (i.e. after 1ms the AUX channel is\nstill busy) dump a backtrace to make the caller easier to spot.\n\nv2: use msleep instead, and timeout after 3ms (only ever saw 1 retry\n with msleep in testing)\nv3: fix backtrace check to trigger if the 3ms wait times out\n\nFixes https://bugs.freedesktop.org/show_bug.cgi?id\u003d38136.\n\nSigned-off-by: Jesse Barnes \u003cjbarnes@virtuousgeek.org\u003e\nReviewed-by: Keith Packard \u003ckeithp@keithp.com\u003e\nSigned-off-by: Keith Packard \u003ckeithp@keithp.com\u003e\n" }, { "commit": "62ac41a6e443ef26b9de862c6e20c088e2b04dde", "tree": "fd6506f532fd23badd4ee6c541a78dbe40bd0fbe", "parents": [ "9b546e571b94cacccf1091cc9cc0bd8a6a207a66" ], "author": { "name": "Jesse Barnes", "email": "jbarnes@virtuousgeek.org", "time": "Thu Jul 28 12:55:14 2011 -0700" }, "committer": { "name": "Keith Packard", "email": "keithp@keithp.com", "time": "Mon Aug 01 14:45:27 2011 -0700" }, "message": "drm/i915: don\u0027t use uninitialized EDID bpc values when picking pipe bpp\n\nThe EDID parser will zero out the bpc value, and the driver needs to handle\nthat case. In our picker, we\u0027ll just ignore 0 values as far as bpp\npicking goes.\n\nFixes https://bugs.freedesktop.org/show_bug.cgi?id\u003d39323.\n\nSigned-off-by: Jesse Barnes \u003cjbarnes@virtuousgeek.org\u003e\nSigned-off-by: Keith Packard \u003ckeithp@keithp.com\u003e\n" }, { "commit": "9b546e571b94cacccf1091cc9cc0bd8a6a207a66", "tree": "fd50ef5eae6b8283e26926fa5d664f7e1cd88920", "parents": [ "2c1756b12edc19fdd75c833699cb752e1bbb641e", "cda2bb78c24de7674eafa3210314dc75bed344a6" ], "author": { "name": "Keith Packard", "email": "keithp@keithp.com", "time": "Fri Jul 29 16:24:10 2011 -0700" }, "committer": { "name": "Keith Packard", "email": "keithp@keithp.com", "time": "Fri Jul 29 16:24:10 2011 -0700" }, "message": "Merge branch \u0027drm-intel-fixes\u0027 into drm-intel-next\n" }, { "commit": "cda2bb78c24de7674eafa3210314dc75bed344a6", "tree": "267045f7fea7eb65291384cad42eedbc48c57d11", "parents": [ "291427f5fdadec6e4be2924172e83588880e1539" ], "author": { "name": "Adam Jackson", "email": "ajax@redhat.com", "time": "Tue Jul 26 16:53:06 2011 -0400" }, "committer": { "name": "Keith Packard", "email": "keithp@keithp.com", "time": "Fri Jul 29 16:23:31 2011 -0700" }, "message": "drm/i915/pch: Save/restore PCH_PORT_HOTPLUG across suspend\n\nAt least on a Lenovo X220 the HPD bits of this are enabled at boot but\ncleared after resume, which means plug interrupts stop working.\n\nThis also happens to fix DP displays re-lighting on resume. I\u0027m quite\ncertain that\u0027s an accident: the first DP link train inevitably fails on\nthat machine, and it\u0027s only serendipity that we\u0027re getting multiple plug\ninterrupts and the second train works. But I shall take my victories\nwhere I get them.\n\nSigned-off-by: Adam Jackson \u003cajax@redhat.com\u003e\nTested-by: Keith Packard \u003ckeithp@keithp.com\u003e\nReviewed-by: Keith Packard \u003ckeithp@keithp.com\u003e\nSigned-off-by: Keith Packard \u003ckeithp@keithp.com\u003e\n" }, { "commit": "291427f5fdadec6e4be2924172e83588880e1539", "tree": "ece070f9e711333be25d89fcd776ec2dba82a9ee", "parents": [ "070d329ae52e2fde341771d753a5b728145881f4" ], "author": { "name": "Jesse Barnes", "email": "jbarnes@virtuousgeek.org", "time": "Fri Jul 29 12:42:37 2011 -0700" }, "committer": { "name": "Keith Packard", "email": "keithp@keithp.com", "time": "Fri Jul 29 15:19:04 2011 -0700" }, "message": "drm/i915: apply phase pointer override on SNB+ too\n\nThese bits moved around on SNB and above.\n\nv2: again with the git send-email fail\nv3: add macros for getting per-pipe override \u0026 enable bits\nv4: enable phase sync pointer on SNB and IVB configs as well\n\nSigned-off-by: Jesse Barnes \u003cjbarnes@virtuousgeek.org\u003e\nSigned-off-by: Keith Packard \u003ckeithp@keithp.com\u003e\n" }, { "commit": "070d329ae52e2fde341771d753a5b728145881f4", "tree": "46356a8d768ef48709d35081697254c9ab0e6544", "parents": [ "013a41ec541d5daa0c9f2b5126d2e820902c052d" ], "author": { "name": "Michel Alexandre Salim", "email": "salimma@fedoraproject.org", "time": "Thu Jul 28 18:52:06 2011 +0200" }, "committer": { "name": "Keith Packard", "email": "keithp@keithp.com", "time": "Fri Jul 29 15:13:53 2011 -0700" }, "message": "drm/i915: Add quirk to disable SSC on Sony Vaio Y2\n\nUsing the new quirk added to support disabling SSC on Lenovo U160\n(#36656, commit 435793dfb8aec7b2e19f72d5bce8a22fd0b57839), also register\nthe Vaio as a special case and disable SSC for it.\n\nThis patch fixes #34437 on fdo bugzilla:\nhttps://bugs.freedesktop.org/show_bug.cgi?id\u003d34437\n\nSigned-off-by: Michel Alexandre Salim \u003csalimma@fedoraproject.org\u003e\nSigned-off-by: Keith Packard \u003ckeithp@keithp.com\u003e\n" }, { "commit": "013a41ec541d5daa0c9f2b5126d2e820902c052d", "tree": "29af246cd26868f2846f2a4b61e6a58ae5d0d5f5", "parents": [ "358733e9047cafcc185ca19b8c369c659ac0c4cf" ], "author": { "name": "Jesse Barnes", "email": "jbarnes@virtuousgeek.org", "time": "Tue Jul 19 15:38:56 2011 -0700" }, "committer": { "name": "Keith Packard", "email": "keithp@keithp.com", "time": "Fri Jul 29 15:09:06 2011 -0700" }, "message": "drm/i915: provide more error output when mode sets fail\n\nIf a mode set fails we may get a message from drm_crtc_helper if we\u0027re lucky,\nbut it won\u0027t tell us anything about *why* we failed to set a mode. So\nadd a few DRM_ERRORs for the cases that shouldn\u0027t happen so we can debug\nthings more easily.\n\nSigned-off-by: Jesse Barnes \u003cjbarnes@virtuousgeek.org\u003e\nSigned-off-by: Keith Packard \u003ckeithp@keithp.com\u003e\n" }, { "commit": "358733e9047cafcc185ca19b8c369c659ac0c4cf", "tree": "a4d3210cad82a3cc39d1a5b5ba8f0c6c6db0aa46", "parents": [ "b066254fee2b0b4d1323295f8ae34c9442222165" ], "author": { "name": "Jesse Barnes", "email": "jbarnes@virtuousgeek.org", "time": "Wed Jul 27 11:53:01 2011 -0700" }, "committer": { "name": "Keith Packard", "email": "keithp@keithp.com", "time": "Fri Jul 29 15:08:49 2011 -0700" }, "message": "drm/i915: add GPU max frequency control file\n\nMainly for use in debugging and benchmarking, this file allows the user\nto control the max frequency used by the GPU. Frequency may still vary\nbased on workload (if the frequency is set to higher than the minimum)\nbut won\u0027t go over the newly set value.\n\nSigned-off-by: Jesse Barnes \u003cjbarnes@virtuousgeek.org\u003e\nSigned-off-by: Keith Packard \u003ckeithp@keithp.com\u003e\n" }, { "commit": "b066254fee2b0b4d1323295f8ae34c9442222165", "tree": "4636dc9d90d815fd7b6a1a9405e7d73e5a73b8a3", "parents": [ "e0e3fb482105c65ce6f5480a86092e966a29ed79" ], "author": { "name": "Pieterjan Camerlynck", "email": "pieterjan.camerlynck@gmail.com", "time": "Tue Jul 26 16:23:54 2011 +0200" }, "committer": { "name": "Keith Packard", "email": "keithp@keithp.com", "time": "Fri Jul 29 15:08:49 2011 -0700" }, "message": "i915: add Dell OptiPlex FX170 to intel_no_lvds\n\nThe Dell OptiPlex FX170 claims to have LVDS, but doesn\u0027t.\n\nSigned-off-by: Pieterjan Camerlynck \u003cpieterjan.camerlynck@gmail.com\u003e\nSigned-off-by: Keith Packard \u003ckeithp@keithp.com\u003e\n" }, { "commit": "e0e3fb482105c65ce6f5480a86092e966a29ed79", "tree": "f19850467602a94720200a8e92b48c9997f74ef7", "parents": [ "b055c8f3ef9f7bc6ba415d900f298d7801a9d1d4" ], "author": { "name": "Keith Packard", "email": "keithp@keithp.com", "time": "Fri Jul 29 14:45:21 2011 -0700" }, "committer": { "name": "Keith Packard", "email": "keithp@keithp.com", "time": "Fri Jul 29 15:08:41 2011 -0700" }, "message": "drm/i915: Ignore GPU wedged errors while pinning scanout buffers\n\nFailing to pin a scanout buffer will most likely lead to a black\nscreen, so if the GPU is wedged, then just let the pin happen and hope\nthat things work out OK.\n\nSigned-off-by: Keith Packard \u003ckeithp@keithp.com\u003e\nReviewed-by: Chris Wilson \u003cchris@chris-wilson.co.uk\u003e\n" }, { "commit": "b055c8f3ef9f7bc6ba415d900f298d7801a9d1d4", "tree": "f9ac04a295263ca94a729ca1e923136c6e2538ec", "parents": [ "cb0e093162d7b6589c2217a00e2abfef686b32d6" ], "author": { "name": "Jesse Barnes", "email": "jbarnes@virtuousgeek.org", "time": "Fri Jul 08 11:31:57 2011 -0700" }, "committer": { "name": "Keith Packard", "email": "keithp@keithp.com", "time": "Fri Jul 29 10:08:47 2011 -0700" }, "message": "drm/i915/hdmi: send AVI info frames on ILK+ as well\n\nOn Ironlake and above, we have per-transcoder DIP registers, so use them\nfor sending DIPs like AVI infoframes on ILK and above.\n\nSigned-off-by: Jesse Barnes \u003cjbarnes@virtuousgeek.org\u003e\nSigned-off-by: Keith Packard \u003ckeithp@keithp.com\u003e\n" }, { "commit": "cb0e093162d7b6589c2217a00e2abfef686b32d6", "tree": "1319526a26322a0112b94f96ff25984986bbc6df", "parents": [ "d74362c9e45689d8d7e3d4bcf6681c4358ef4f2e" ], "author": { "name": "Jesse Barnes", "email": "jbarnes@virtuousgeek.org", "time": "Thu Jul 28 14:50:30 2011 -0700" }, "committer": { "name": "Keith Packard", "email": "keithp@keithp.com", "time": "Thu Jul 28 16:51:09 2011 -0700" }, "message": "drm/i915: fix CB tuning check for ILK+\n\nCB tuning is needed to handle potential process variations that might\ncause clock jitter for certain PLL settings. However, we were setting\nit incorrectly since we were using the wrong M value as a check (M1 when\nwe needed to use the whole M value). Fix it up, making my HDMI\nattached display a little prettier (used to have occasional dots crawl\nacross the display).\n\nSigned-off-by: Jesse Barnes \u003cjbarnes@virtuousgeek.org\u003e\nSigned-off-by: Keith Packard \u003ckeithp@keithp.com\u003e\n" }, { "commit": "2c1756b12edc19fdd75c833699cb752e1bbb641e", "tree": "2893f6f8b59bfea0e295877643dc29849a7d1a67", "parents": [ "cf96e46fcd147856fd8151fab91c410f0ec16c47", "d74362c9e45689d8d7e3d4bcf6681c4358ef4f2e" ], "author": { "name": "Keith Packard", "email": "keithp@keithp.com", "time": "Thu Jul 28 16:30:41 2011 -0700" }, "committer": { "name": "Keith Packard", "email": "keithp@keithp.com", "time": "Thu Jul 28 16:30:41 2011 -0700" }, "message": "Merge branch \u0027drm-intel-fixes\u0027 into drm-intel-next\n" }, { "commit": "d74362c9e45689d8d7e3d4bcf6681c4358ef4f2e", "tree": "fca86658c69f3a778e1eb39ca58b983c5b36140e", "parents": [ "2704cf5fbd248871a745d210733c6319959d2b0c" ], "author": { "name": "Keith Packard", "email": "keithp@keithp.com", "time": "Thu Jul 28 14:47:14 2011 -0700" }, "committer": { "name": "Keith Packard", "email": "keithp@keithp.com", "time": "Thu Jul 28 16:28:35 2011 -0700" }, "message": "drm/i915: Flush other plane register writes\n\nWrites to the plane control register are buffered in the chip until a\nwrite to the DSPADDR (pre-965) or DSPSURF (post-965) register occurs.\n\nThis patch adds flushes in:\n\n\tintel_enable_plane\n\tgen6_init_clock_gating\n\tivybridge_init_clock_gating\n\nSigned-off-by: Keith Packard \u003ckeithp@keithp.com\u003e\n" }, { "commit": "2704cf5fbd248871a745d210733c6319959d2b0c", "tree": "063f36ca865e51c0ebf45f2bf42b0c9e67c9f03e", "parents": [ "3bcf603f6d5d18bd9d076dc280de71f48add4101" ], "author": { "name": "Jesse Barnes", "email": "jbarnes@virtuousgeek.org", "time": "Thu Jul 28 11:52:45 2011 -0700" }, "committer": { "name": "Keith Packard", "email": "keithp@keithp.com", "time": "Thu Jul 28 16:28:31 2011 -0700" }, "message": "drm/i915: flush plane control changes on ILK+ as well\n\nAfter writing to the plane control reg we need to write to the surface\nreg to trigger the double buffered register latch. On previous\nchipsets, writing to DSPADDR was enough, but on ILK+ DSPSURF is the reg\nthat triggers the double buffer latch.\n\nv2: write DSPADDR too to cover pre-965 chipsets\nv3: use flush_display_plane instead, that\u0027s what it\u0027s for\nv4: send the right patch\n\nSigned-off-by: Jesse Barnes \u003cjbarnes@virtuousgeek.org\u003e\nTested-by: Keith Packard \u003ckeithp@keithp.com\u003e\nReviewed-by: Keith Packard \u003ckeithp@keithp.com\u003e\nSigned-off-by: Keith Packard \u003ckeithp@keithp.com\u003e\n" }, { "commit": "3bcf603f6d5d18bd9d076dc280de71f48add4101", "tree": "6d1ed198fd759d3e7aeccd32bc8b5059785da26a", "parents": [ "120eced9efe7fdb5123db4ea47e9adee9b66284e" ], "author": { "name": "Jesse Barnes", "email": "jbarnes@virtuousgeek.org", "time": "Wed Jul 27 11:51:40 2011 -0700" }, "committer": { "name": "Keith Packard", "email": "keithp@keithp.com", "time": "Thu Jul 28 16:28:21 2011 -0700" }, "message": "drm/i915: apply timing generator bug workaround on CPT and PPT\n\nOn CougarPoint and PantherPoint PCH chips, the timing generator may fail\nto start after DP training completes. This is due to a bug in the\nFDI autotraining detect logic (which will stall the timing generator and\nre-enable it once training completes), so disable it to avoid silent DP\nmode setting failures.\n\nSigned-off-by: Jesse Barnes \u003cjbarnes@virtuousgeek.org\u003e\nSigned-off-by: Keith Packard \u003ckeithp@keithp.com\u003e\n" }, { "commit": "120eced9efe7fdb5123db4ea47e9adee9b66284e", "tree": "bedbd38ac1e7da9c6c5bf1a37afebb0bf7e327d1", "parents": [ "d2b996ac698aebb28557355857927b8b934bb4f9" ], "author": { "name": "Keith Packard", "email": "keithp@keithp.com", "time": "Wed Jul 27 01:21:40 2011 -0700" }, "committer": { "name": "Keith Packard", "email": "keithp@keithp.com", "time": "Thu Jul 28 16:27:39 2011 -0700" }, "message": "drm/i915: Set crtc DPMS mode to ON in intel_crtc_mode_set\n\nThis corrects the DPMS mode tracking so that the DPMS code will\nactually turn the CRTC off the next time the screen saves.\n\nSigned-off-by: Keith Packard \u003ckeithp@keithp.com\u003e\nReviewed-by: Jesse Barnes \u003cjbarnes@virtuousgeek.org\u003e\n" }, { "commit": "d2b996ac698aebb28557355857927b8b934bb4f9", "tree": "ed268be433cc7e6d8df0f958512e6cf65f78dbb2", "parents": [ "f0575e92974d328e8816ed89704c985a7d7d90ac" ], "author": { "name": "Keith Packard", "email": "keithp@keithp.com", "time": "Mon Jul 25 22:37:51 2011 -0700" }, "committer": { "name": "Keith Packard", "email": "keithp@keithp.com", "time": "Thu Jul 28 16:23:57 2011 -0700" }, "message": "Revert and fix \"drm/i915/dp: remove DPMS mode tracking from DP\"\n\nThis reverts commit 885a50147f00a8a80108904bf58a18af357717f3.\n\nWe actually *do* need to track DPMS state so that on hotplug, we don\u0027t\nretrain the link until DPMS is disabled.\n\nHowever, that code had avery small bug -- it wouldn\u0027t set the\ndpms_mode at mode set time, and so link retraining would not actually\noccur on monitor hotplug until the monitor had gone through a DPMS\noff/DPMS on cycle.\n\nSigned-off-by: Keith Packard \u003ckeithp@keithp.com\u003e\nTested-by: Andrew Lutomirski \u003cluto@mit.edu\u003e\n" }, { "commit": "f0575e92974d328e8816ed89704c985a7d7d90ac", "tree": "15bc2e0bf6bb8138685117432ddc72ac2bbf2568", "parents": [ "59f3e272d788305e16098f0b18309919c9216d67" ], "author": { "name": "Keith Packard", "email": "keithp@keithp.com", "time": "Mon Jul 25 22:12:43 2011 -0700" }, "committer": { "name": "Keith Packard", "email": "keithp@keithp.com", "time": "Thu Jul 28 15:47:22 2011 -0700" }, "message": "drm/i915: DP_PIPE_ENABLED must check transcoder on CPT\n\nDisplay port pipe selection on CPT is not done with a bit in the\noutput register, rather it is controlled by a couple of bits in the\nseparate transcoder register which indicate which display port output\nis connected to the transcoder.\n\nThis patch replaces the simplistic macro DP_PIPE_ENABLED with the\nrather more complicated function dp_pipe_enabled which checks the\noutput register to see if that is enabled, and then goes on to either\ncheck the output register pipe selection bit (on non-CPT) or the\ntranscoder DP selection bits (on CPT).\n\nBefore this patch, any time the mode of pipe A was changed, any\ndisplay port outputs on pipe B would get disabled as\nintel_disable_pch_ports would ensure that the mode setting operation\ncould occur on pipe A without interference from other outputs\nconnected to that pch port\n\nSigned-off-by: Keith Packard \u003ckeithp@keithp.com\u003e\nReviewed-by: Jesse Barnes \u003cjbarnes@virtuousgeek.org\u003e\nReviewed-by: Adam Jackson \u003cajax@redhat.com\u003e\n" }, { "commit": "59f3e272d788305e16098f0b18309919c9216d67", "tree": "735a07b8353f53c4bdcace04d5dc7fc37b3dd774", "parents": [ "26d61aad7a46115628341e9eb95433f30efef21a" ], "author": { "name": "Keith Packard", "email": "keithp@keithp.com", "time": "Mon Jul 25 20:01:56 2011 -0700" }, "committer": { "name": "Keith Packard", "email": "keithp@keithp.com", "time": "Thu Jul 28 15:47:21 2011 -0700" }, "message": "drm/i915: In intel_dp_init, replace read of DPCD with intel_dp_get_dpcd\n\nEliminates an open-coded read and also gains the retry behaviour of\nintel_dp_get_dpcd, which seems like a good idea.\n\nSigned-off-by: Keith Packard \u003ckeithp@keithp.com\u003e\nReviewed-by: Jesse Barnes \u003cjbarnes@virtuousgeek.org\u003e\nReviewed-by: Adam Jackson \u003cajax@redhat.com\u003e\n" }, { "commit": "26d61aad7a46115628341e9eb95433f30efef21a", "tree": "105ffe9a744fc10a3d13b8a03129c4063987a8eb", "parents": [ "92fd8fd13b7570f6a8ba519c4e8ec98f10a86ce9" ], "author": { "name": "Keith Packard", "email": "keithp@keithp.com", "time": "Mon Jul 25 20:01:09 2011 -0700" }, "committer": { "name": "Keith Packard", "email": "keithp@keithp.com", "time": "Thu Jul 28 15:47:21 2011 -0700" }, "message": "drm/i915: Rename i915_dp_detect_common to intel_dp_get_dpcd\n\nThis describes the function better, allowing it to be used where the\nDPCD value is relevant.\n\nSigned-off-by: Keith Packard \u003ckeithp@keithp.com\u003e\nReviewed-by: Jesse Barnes \u003cjbarnes@virtuousgeek.org\u003e\nReviewed-by: Adam Jackson \u003cajax@redhat.com\u003e\n" }, { "commit": "92fd8fd13b7570f6a8ba519c4e8ec98f10a86ce9", "tree": "26a26be50952a5ba7c40d2a770f914f93d597cde", "parents": [ "40ee3381dd1010432acc13e907329029096c5bfc" ], "author": { "name": "Keith Packard", "email": "keithp@keithp.com", "time": "Mon Jul 25 19:50:10 2011 -0700" }, "committer": { "name": "Keith Packard", "email": "keithp@keithp.com", "time": "Thu Jul 28 15:47:20 2011 -0700" }, "message": "drm/i915: Use dp_detect_common in hotplug helper function\n\nThis uses the common dpcd reading routine, i915_dp_detect_common,\ninstead of open-coding a call to intel_dp_aux_native_read. Besides\nreducing duplicated code, this also gains the read retries which\nmay be necessary when a cable is first plugged back in and the link\nneeds to be retrained.\n\nSigned-off-by: Keith Packard \u003ckeithp@keithp.com\u003e\nReviewed-by: Jesse Barnes \u003cjbarnes@virtuousgeek.org\u003e\nReviewed-by: Adam Jackson \u003cajax@redhat.com\u003e\n" }, { "commit": "40ee3381dd1010432acc13e907329029096c5bfc", "tree": "1002f4f5ed3dcf0dbfd66f21a01c612f874fdaea", "parents": [ "e85194641bec56179dcf5e1704ce5c6bf30340c6" ], "author": { "name": "Keith Packard", "email": "keithp@keithp.com", "time": "Thu Jul 28 15:31:19 2011 -0700" }, "committer": { "name": "Keith Packard", "email": "keithp@keithp.com", "time": "Thu Jul 28 15:41:51 2011 -0700" }, "message": "drm/i915: Fixup for \u0027Hold mode_config-\u003emutex during hotplug\u0027\n\ndrm_helper_hpd_irq_event queues another work proc to go and deliver\nthe user-space event, and that function also wants to hold the config\nmutex, so we shouldn\u0027t hold the mutex across the\ndrm_helper_hpd_irq_event call.\n\nSigned-off-by: Keith Packard \u003ckeithp@keithp.com\u003e\n" }, { "commit": "60063497a95e716c9a689af3be2687d261f115b4", "tree": "6ce0d68db76982c53df46aee5f29f944ebf2c320", "parents": [ "148817ba092f9f6edd35bad3c6c6b8e8f90fe2ed" ], "author": { "name": "Arun Sharma", "email": "asharma@fb.com", "time": "Tue Jul 26 16:09:06 2011 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Jul 26 16:49:47 2011 -0700" }, "message": "atomic: use \u003clinux/atomic.h\u003e\n\nThis allows us to move duplicated code in \u003casm/atomic.h\u003e\n(atomic_inc_not_zero() for now) to \u003clinux/atomic.h\u003e\n\nSigned-off-by: Arun Sharma \u003casharma@fb.com\u003e\nReviewed-by: Eric Dumazet \u003ceric.dumazet@gmail.com\u003e\nCc: Ingo Molnar \u003cmingo@elte.hu\u003e\nCc: David Miller \u003cdavem@davemloft.net\u003e\nCc: Eric Dumazet \u003ceric.dumazet@gmail.com\u003e\nAcked-by: Mike Frysinger \u003cvapier@gentoo.org\u003e\nSigned-off-by: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "757c26b804428ef10888b8e00f34994dbe361d3a", "tree": "4695afbf476ce9818bc01d34d4c266811365296c", "parents": [ "e08dc1325feaf49eec392ee52feb2974ec3f5155", "5a96a899bbdee86024ab9ea6d02b9e242faacbed" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Jul 26 09:21:09 2011 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Jul 26 09:21:09 2011 -0700" }, "message": "Merge branch \u0027drm-core-next\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/airlied/drm-2.6\n\n* \u0027drm-core-next\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/airlied/drm-2.6: (135 commits)\n drm/radeon/kms: fix DP training for DPEncoderService revision bigger than 1.1\n drm/radeon/kms: add missing vddci setting on NI+\n drm/radeon: Add a rmb() in IH processing\n drm/radeon: ATOM Endian fix for atombios_crtc_program_pll()\n drm/radeon: Fix the definition of RADEON_BUF_SWAP_32BIT\n drm/radeon: Do an MMIO read on interrupts when not uisng MSIs\n drm/radeon: Writeback endian fixes\n drm/radeon: Remove a bunch of useless _iomem casts\n drm/gem: add support for private objects\n DRM: clean up and document parsing of video\u003d parameter\n DRM: Radeon: Fix section mismatch.\n drm: really make debug levels match in edid failure code\n drm/radeon/kms: fix i2c map for rv250/280\n drm/nouveau/gr: disable fifo access and idle before suspend ctx unload\n drm/nouveau: pass flag to engine fini() method on suspend\n drm/nouveau: replace nv04_graph_fifo_access() use with direct reg bashing\n drm/nv40/gr: rewrite/split context takedown functions\n drm/nouveau: detect disabled device in irq handler and return IRQ_NONE\n drm/nouveau: ignore connector type when deciding digital/analog on DVI-I\n drm/nouveau: Add a quirk for Gigabyte NX86T\n ...\n" }, { "commit": "5a96a899bbdee86024ab9ea6d02b9e242faacbed", "tree": "af48e2ad77177f56d5448c89eaec95d5ccb5aff7", "parents": [ "4639dd21e759e32125adc7171abf6cb8140d54cf" ], "author": { "name": "Jerome Glisse", "email": "jglisse@redhat.com", "time": "Mon Jul 25 11:57:43 2011 -0400" }, "committer": { "name": "Dave Airlie", "email": "airlied@redhat.com", "time": "Tue Jul 26 12:30:55 2011 +0100" }, "message": "drm/radeon/kms: fix DP training for DPEncoderService revision bigger than 1.1\n\nDPEncoderService newer than 1.1 can\u0027t properly program the DP (display port)\nlink training. When facing such version use the DIGxEncoderControl method\ninstead. Fix DP link training on some R7XX.\n\nSigned-off-by: Jerome Glisse \u003cjglisse@redhat.com\u003e\nReviewed-by: Alex Deucher \u003calexander.deucher@amd.com\u003e\nCc: stable@kernel.org\nSigned-off-by: Dave Airlie \u003cairlied@redhat.com\u003e\n" }, { "commit": "4639dd21e759e32125adc7171abf6cb8140d54cf", "tree": "d7a63d9440ca523c328a7c4490c7ad64099f3e93", "parents": [ "964f664520a4c6a247e2c9ff8b4481631cf746df" ], "author": { "name": "Alex Deucher", "email": "alexander.deucher@amd.com", "time": "Mon Jul 25 18:50:08 2011 -0400" }, "committer": { "name": "Dave Airlie", "email": "airlied@redhat.com", "time": "Tue Jul 26 12:30:34 2011 +0100" }, "message": "drm/radeon/kms: add missing vddci setting on NI+\n\nNeed to add vddci setting to pm init as well as\nresume. Fixes hangs on load on some boards.\n\nFixes:\nhttps://bugs.freedesktop.org/show_bug.cgi?id\u003d38754\n\nSigned-off-by: Alex Deucher \u003calexander.deucher@amd.com\u003e\nCc: stable@kernel.org\nSigned-off-by: Dave Airlie \u003cairlied@redhat.com\u003e\n" }, { "commit": "45b583b10a8b438b970e95a7d1d4db22c9e35004", "tree": "14fa481598289df0459580c582b48a9d95db51f6", "parents": [ "154dd78d30b56ffb8b447f629bfcceb14150e5c4", "f19da2ce8ef5e49b8b8ea199c3601dd45d71b262" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon Jul 25 21:00:19 2011 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon Jul 25 21:00:19 2011 -0700" }, "message": "Merge \u0027akpm\u0027 patch series\n\n* Merge akpm patch series: (122 commits)\n drivers/connector/cn_proc.c: remove unused local\n Documentation/SubmitChecklist: add RCU debug config options\n reiserfs: use hweight_long()\n reiserfs: use proper little-endian bitops\n pnpacpi: register disabled resources\n drivers/rtc/rtc-tegra.c: properly initialize spinlock\n drivers/rtc/rtc-twl.c: check return value of twl_rtc_write_u8() in twl_rtc_set_time()\n drivers/rtc: add support for Qualcomm PMIC8xxx RTC\n drivers/rtc/rtc-s3c.c: support clock gating\n drivers/rtc/rtc-mpc5121.c: add support for RTC on MPC5200\n init: skip calibration delay if previously done\n misc/eeprom: add eeprom access driver for digsy_mtc board\n misc/eeprom: add driver for microwire 93xx46 EEPROMs\n checkpatch.pl: update $logFunctions\n checkpatch: make utf-8 test --strict\n checkpatch.pl: add ability to ignore various messages\n checkpatch: add a \"prefer __aligned\" check\n checkpatch: validate signature styles and To: and Cc: lines\n checkpatch: add __rcu as a sparse modifier\n checkpatch: suggest using min_t or max_t\n ...\n\nDid this as a merge because of (trivial) conflicts in\n - Documentation/feature-removal-schedule.txt\n - arch/xtensa/include/asm/uaccess.h\nthat were just easier to fix up in the merge than in the patch series.\n" }, { "commit": "f35119d6681300ba6d76da53cb1ebc2eed62e77a", "tree": "0dfd0d1bf9acf3e48791059b50bc68fff01c4db9", "parents": [ "f1c93e4946ae1cc268729451de6335a7e7d2bea9" ], "author": { "name": "Rakib Mullick", "email": "rakib.mullick@gmail.com", "time": "Mon Jul 25 17:12:56 2011 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon Jul 25 20:57:13 2011 -0700" }, "message": "drivers: use kzalloc/kcalloc instead of \u0027kmalloc+memset\u0027, where possible\n\nSigned-off-by: Rakib Mullick \u003crakib.mullick@gmail.com\u003e\nCc: Jeff Garzik \u003cjgarzik@pobox.com\u003e\nCc: David Airlie \u003cairlied@linux.ie\u003e\nCc: Tejun Heo \u003ctj@kernel.org\u003e\nCc: Joe Perches \u003cjoe@perches.com\u003e\nSigned-off-by: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "cf96e46fcd147856fd8151fab91c410f0ec16c47", "tree": "0d0c3612cc70e6d886464b2bdc7766d64e7af6c8", "parents": [ "887a82ee80b42bb14ba70f8138292023d5040b08", "e85194641bec56179dcf5e1704ce5c6bf30340c6" ], "author": { "name": "Keith Packard", "email": "keithp@keithp.com", "time": "Mon Jul 25 15:22:19 2011 -0700" }, "committer": { "name": "Keith Packard", "email": "keithp@keithp.com", "time": "Mon Jul 25 15:22:19 2011 -0700" }, "message": "Merge branch \u0027drm-intel-fixes\u0027 into drm-intel-next\n" }, { "commit": "e85194641bec56179dcf5e1704ce5c6bf30340c6", "tree": "0c3f8b1c049d2dfeaeb2c3221980c9c6a23a212d", "parents": [ "81055854d096959898fdc17ed11729eb019eff07" ], "author": { "name": "Adam Jackson", "email": "ajax@redhat.com", "time": "Thu Jul 21 17:48:38 2011 -0400" }, "committer": { "name": "Keith Packard", "email": "keithp@keithp.com", "time": "Mon Jul 25 15:19:19 2011 -0700" }, "message": "drm/i915/dp: Don\u0027t turn CPT DP ports on too early\n\nThe docs say the port has to come on in training pattern 1; at this\npoint, though, -\u003eDP is in normal mode. The intent here is to wait\nuntil the port is in fact sending data, but that doesn\u0027t happen since\nwe\u0027ve broken the sequence the hardware expects, and the vblank wait will\ntime out and kvetch in the log.\n\nSigned-off-by: Adam Jackson \u003cajax@redhat.com\u003e\nReviewed-by: Jesse Barnes \u003cjbarnes@virtuousgeek.org\u003e\nSigned-off-by: Keith Packard \u003ckeithp@keithp.com\u003e\n" }, { "commit": "81055854d096959898fdc17ed11729eb019eff07", "tree": "124436e10488dca26bba27f2ec548ec32e0f21d1", "parents": [ "302983e9059e9ef5de3ca7671918eeb237c5971e" ], "author": { "name": "Adam Jackson", "email": "ajax@redhat.com", "time": "Thu Jul 21 17:48:37 2011 -0400" }, "committer": { "name": "Keith Packard", "email": "keithp@keithp.com", "time": "Mon Jul 25 15:18:33 2011 -0700" }, "message": "drm/i915/dp: Explicitly disable symbol scrambling while training\n\nThe DP spec says training patterns 1 and 2 are to be sent non-scrambled,\nand the GPU docs claim that happens (or at least, there\u0027s no explicit\nscrambling control). But the sink may be confused if we don\u0027t\nexplicitly tell it what we\u0027re doing, so play it safe.\n\nSigned-off-by: Adam Jackson \u003cajax@redhat.com\u003e\nReviewed-by: Jesse Barnes \u003cjbarnes@virtuousgeek.org\u003e\nSigned-off-by: Keith Packard \u003ckeithp@keithp.com\u003e\n" }, { "commit": "302983e9059e9ef5de3ca7671918eeb237c5971e", "tree": "e8d6422887d4a36c10c86115fcbf8e209212d011", "parents": [ "a65e34c79c88895766ab1f8a5afa451eed26622b" ], "author": { "name": "Adam Jackson", "email": "ajax@redhat.com", "time": "Wed Jul 13 16:32:32 2011 -0400" }, "committer": { "name": "Keith Packard", "email": "keithp@keithp.com", "time": "Mon Jul 25 15:15:42 2011 -0700" }, "message": "drm/i915/pch: Fix integer math bugs in panel fitting\n\nConsider a 1600x900 panel, upscaling a 1360x768 mode, full-aspect. The\nold math would give you:\n\n scaled_width \u003d 1600 * 768; /* 1228800 */\n scaled_height \u003d 1360 * 900; /* 1224000 */\n if (scaled_width \u003e scaled_height) { /* pillarbox, and true */\n width \u003d 1224000 / 768; /* int(1593.75) \u003d 1593 */\n x \u003d (1600 - 1593 + 1) / 2; /* 4 */\n y \u003d 0;\n height \u003d 768;\n } /* ... */\n\nThis is broken. The total width of scanout would then be 1593 + 4 + 4,\nor 1601, which is wider than the panel itself. The hardware very\ndutifully implements this, and you end up with a black 45° diagonal from\nthe top-left corner to the bottom edge of the screen. It\u0027s a cool\neffect and all, but not what you wanted. Similar things happen for the\nletterbox case.\n\nThe problem is that you have an integer number of pixels, which means\nit\u0027s usually impossible to upscale equally on both axes. 1360/768 is\n1.7708, 1600/900 is 1.7777. Since we\u0027re constrained on the one axis,\nthe other one wants to come out as an even number of pixels (the panel\nis almost certainly even on both axes, and the x/y offsets will be\napplied on both sides). In the math above, if \u0027width\u0027 comes out even,\nrounding down is correct; if it\u0027s odd, you\u0027d rather round up. So just\nincrement width/height in those cases.\n\nTested on a Lenovo T500 (Ironlake).\n\nSigned-off-by: Adam Jackson \u003cajax@redhat.com\u003e\nTested-By: Daniel Manrique \u003cdaniel.manrique@canonical.com\u003e\nBugzilla: https://bugs.freedesktop.org/show_bug.cgi?id\u003d38851\nReviewed-by: Chris Wilson \u003cchris@chris-wilson.co.uk\u003e\nCc: stable@kernel.org\nSigned-off-by: Keith Packard \u003ckeithp@keithp.com\u003e\n" }, { "commit": "887a82ee80b42bb14ba70f8138292023d5040b08", "tree": "4a3c9fc0ddbdf9b07fbd260f4e013423ec1ce1f6", "parents": [ "df7976797fa9af161690dbf4dee81ed92cdc150f", "a65e34c79c88895766ab1f8a5afa451eed26622b" ], "author": { "name": "Keith Packard", "email": "keithp@keithp.com", "time": "Mon Jul 25 14:57:41 2011 -0700" }, "committer": { "name": "Keith Packard", "email": "keithp@keithp.com", "time": "Mon Jul 25 14:57:41 2011 -0700" }, "message": "Merge branch \u0027drm-intel-fixes\u0027 into drm-intel-next\n" }, { "commit": "a65e34c79c88895766ab1f8a5afa451eed26622b", "tree": "02ebb8818c40f44c248b5c322ee9c301af984dc6", "parents": [ "a2cab1b24a4ea75a68fa21bfb7d5b1a45121583c" ], "author": { "name": "Keith Packard", "email": "keithp@keithp.com", "time": "Mon Jul 25 10:04:56 2011 -0700" }, "committer": { "name": "Keith Packard", "email": "keithp@keithp.com", "time": "Mon Jul 25 14:54:22 2011 -0700" }, "message": "drm/i915: Hold mode_config-\u003emutex during hotplug processing\n\nHotplug detection is a mode setting operation and must hold the\nstruct_mutex or risk colliding with other mode setting operations.\n\nIn particular, the display port hotplug function attempts to re-train\nthe link if the monitor is supposed to be running when plugged back\nin. If that happens while mode setting is underway, the link will get\nscrambled, leaving it in an inconsistent state.\n\nThis is a special case -- usually the driver mode setting entry points\nare covered by the upper level DRM code, but in this case the function\nis invoked as a work function not under the control of DRM.\n\nSigned-off-by: Keith Packard \u003ckeithp@keithp.com\u003e\nCc: stable@kernel.org\nReviewed-by: Jesse Barnes \u003cjbarnes@virtuousgeek.org\u003e\n" }, { "commit": "d3ec4844d449cf7af9e749f73ba2052fb7b72fc2", "tree": "c515913e85f7e50878c83da2a88bc5a7269d087c", "parents": [ "0003230e8200699860f0b10af524dc47bf8aecad", "df2e301fee3c2c2a87592151397ad7699bb14c37" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon Jul 25 13:56:39 2011 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon Jul 25 13:56:39 2011 -0700" }, "message": "Merge branch \u0027for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial\n\n* \u0027for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial: (43 commits)\n fs: Merge split strings\n treewide: fix potentially dangerous trailing \u0027;\u0027 in #defined values/expressions\n uwb: Fix misspelling of neighbourhood in comment\n net, netfilter: Remove redundant goto in ebt_ulog_packet\n trivial: don\u0027t touch files that are removed in the staging tree\n lib/vsprintf: replace link to Draft by final RFC number\n doc: Kconfig: `to be\u0027 -\u003e `be\u0027\n doc: Kconfig: Typo: square -\u003e squared\n doc: Konfig: Documentation/power/{pm \u003d\u003e apm-acpi}.txt\n drivers/net: static should be at beginning of declaration\n drivers/media: static should be at beginning of declaration\n drivers/i2c: static should be at beginning of declaration\n XTENSA: static should be at beginning of declaration\n SH: static should be at beginning of declaration\n MIPS: static should be at beginning of declaration\n ARM: static should be at beginning of declaration\n rcu: treewide: Do not use rcu_read_lock_held when calling rcu_dereference_check\n Update my e-mail address\n PCIe ASPM: forcedly -\u003e forcibly\n gma500: push through device driver tree\n ...\n\nFix up trivial conflicts:\n - arch/arm/mach-ep93xx/dma-m2p.c (deleted)\n - drivers/gpio/gpio-ep93xx.c (renamed and context nearby)\n - drivers/net/r8169.c (just context changes)\n" }, { "commit": "a2cab1b24a4ea75a68fa21bfb7d5b1a45121583c", "tree": "89adf71ab7b590df8835718a8ed7bea792798259", "parents": [ "71ba9000e673d6171a52f2a8b14e0419087f7199" ], "author": { "name": "Adam Jackson", "email": "ajax@redhat.com", "time": "Tue Jul 12 17:38:05 2011 -0400" }, "committer": { "name": "Keith Packard", "email": "keithp@keithp.com", "time": "Mon Jul 25 10:35:07 2011 -0700" }, "message": "drm/i915/dp: Explicitly request 8/10 channel coding\n\nIt\u0027s not clear what a sink would do if you wrote zero to this register -\nwhich I guess would mean \"I don\u0027t support any channel encodings, good\nluck\" - but let\u0027s not find out.\n\nSigned-off-by: Adam Jackson \u003cajax@redhat.com\u003e\nReviewed-by: Keith Packard \u003ckeithp@keithp.com\u003e\nSigned-off-by: Keith Packard \u003ckeithp@keithp.com\u003e\n" }, { "commit": "71ba9000e673d6171a52f2a8b14e0419087f7199", "tree": "4976c78ebac00e607c34a62f048199e7694a0f79", "parents": [ "ac66ae8346fff704301e24ac55da1d76020660b2" ], "author": { "name": "Adam Jackson", "email": "ajax@redhat.com", "time": "Tue Jul 12 17:38:04 2011 -0400" }, "committer": { "name": "Keith Packard", "email": "keithp@keithp.com", "time": "Mon Jul 25 10:35:03 2011 -0700" }, "message": "drm/i915/dp: Retry DPCD fetch on G4X too\n\nSigned-off-by: Adam Jackson \u003cajax@redhat.com\u003e\nReviewed-by: Keith Packard \u003ckeithp@keithp.com\u003e\nSigned-off-by: Keith Packard \u003ckeithp@keithp.com\u003e\n" }, { "commit": "ac66ae8346fff704301e24ac55da1d76020660b2", "tree": "fb94a20bceeb2fff0d936700e980a7cf0e8b8b4b", "parents": [ "9de88e6e89a2222061af8e1448f6f346e3413fc8" ], "author": { "name": "Adam Jackson", "email": "ajax@redhat.com", "time": "Tue Jul 12 17:38:03 2011 -0400" }, "committer": { "name": "Keith Packard", "email": "keithp@keithp.com", "time": "Mon Jul 25 10:35:00 2011 -0700" }, "message": "drm/i915/dp: Better hexdump of DPCD\n\n%hx alone prints 0 as \"0\", not \"00\".\n\nSigned-off-by: Adam Jackson \u003cajax@redhat.com\u003e\nReviewed-by: Keith Packard \u003ckeithp@keithp.com\u003e\nSigned-off-by: Keith Packard \u003ckeithp@keithp.com\u003e\n" }, { "commit": "9de88e6e89a2222061af8e1448f6f346e3413fc8", "tree": "ae62b2d76b31634a0c4326922a9fa4de0fac277e", "parents": [ "1b9be9d09d85b3697418dc444db30d069203ff7d" ], "author": { "name": "Adam Jackson", "email": "ajax@redhat.com", "time": "Tue Jul 12 17:38:02 2011 -0400" }, "committer": { "name": "Keith Packard", "email": "keithp@keithp.com", "time": "Mon Jul 25 10:34:57 2011 -0700" }, "message": "drm/i915/dp: Read more DPCD registers on connection probe\n\nFor parity with radeon and nouveau, and also because I suspect we\u0027re\ngoing to need it to get format-conversion dongles right.\n\nSigned-off-by: Adam Jackson \u003cajax@redhat.com\u003e\nReviewed-by: Keith Packard \u003ckeithp@keithp.com\u003e\nSigned-off-by: Keith Packard \u003ckeithp@keithp.com\u003e\n" }, { "commit": "1b9be9d09d85b3697418dc444db30d069203ff7d", "tree": "396e509a8e1f6aeaa9c65625ad5de6c9d495fee5", "parents": [ "97cdd7101079adc3c626d159c62d43de949516c8" ], "author": { "name": "Adam Jackson", "email": "ajax@redhat.com", "time": "Tue Jul 12 17:38:01 2011 -0400" }, "committer": { "name": "Keith Packard", "email": "keithp@keithp.com", "time": "Mon Jul 25 10:34:49 2011 -0700" }, "message": "drm/i915/dp: Move DPCD dump to common code instead of PCH-only\n\nNo reason not to see this on g4x, after all.\n\nSigned-off-by: Adam Jackson \u003cajax@redhat.com\u003e\nReviewed-by: Keith Packard \u003ckeithp@keithp.com\u003e\nSigned-off-by: Keith Packard \u003ckeithp@keithp.com\u003e\n" }, { "commit": "97cdd7101079adc3c626d159c62d43de949516c8", "tree": "30244072dc9b7339024fc2681033430c59bb4fda", "parents": [ "9c54c0dd948d715ccfd79e97d852f80eeb53254a" ], "author": { "name": "Adam Jackson", "email": "ajax@redhat.com", "time": "Tue Jul 12 17:38:00 2011 -0400" }, "committer": { "name": "Keith Packard", "email": "keithp@keithp.com", "time": "Mon Jul 25 10:34:40 2011 -0700" }, "message": "drm/i915/dp: Zero the DPCD data before connection probe\n\nSigned-off-by: Adam Jackson \u003cajax@redhat.com\u003e\nReviewed-by: Keith Packard \u003ckeithp@keithp.com\u003e\nSigned-off-by: Keith Packard \u003ckeithp@keithp.com\u003e\n" }, { "commit": "964f664520a4c6a247e2c9ff8b4481631cf746df", "tree": "11bbb5e5f82b7ca236c0d40b76fd11f6efed634d", "parents": [ "f1bece7fde9820a99c14d4db46ef071000e4ba47" ], "author": { "name": "Benjamin Herrenschmidt", "email": "benh@kernel.crashing.org", "time": "Wed Jul 13 16:28:19 2011 +1000" }, "committer": { "name": "Dave Airlie", "email": "airlied@redhat.com", "time": "Mon Jul 25 12:42:39 2011 +0100" }, "message": "drm/radeon: Add a rmb() in IH processing\n\nWe should have a read memory barrier between reading the WPTR from\nmemory and reading ring entries based on that value (ie, we need to\nensure both loads are done in order by the CPU).\n\nIt could be argued that the MMIO reads in r600_ack_irq() might be\nenough to get that barrier but I prefer keeping an explicit one just\nin case.\n\n[airlied: fix evergreen + r/w mixup]\n\nSigned-off-by: Benjamin Herrenschmidt \u003cbenh@kernel.crashing.org\u003e\nReviewed-by: Alex Deucher \u003calexander.deucher@amd.com\u003e\nReviewed-by: Matt Turner \u003cmattst88@gmail.com\u003e\nSigned-off-by: Dave Airlie \u003cairlied@redhat.com\u003e\n" }, { "commit": "f1bece7fde9820a99c14d4db46ef071000e4ba47", "tree": "31a7e243cd9bf1f3c4a81e49b40682e5bef2151c", "parents": [ "edc02bffbdcd92086f5cc9d715143e51acfa90ee" ], "author": { "name": "Benjamin Herrenschmidt", "email": "benh@kernel.crashing.org", "time": "Wed Jul 13 16:28:15 2011 +1000" }, "committer": { "name": "Dave Airlie", "email": "airlied@redhat.com", "time": "Mon Jul 25 12:27:05 2011 +0100" }, "message": "drm/radeon: ATOM Endian fix for atombios_crtc_program_pll()\n\nv6 of the structure was programmed incorrectly:\n\n args.v6.ulCrtcPclkFreq.ulPixelClock \u003d cpu_to_le32(clock / 10);\n\nulPixelClock is a 24-bit bitfield. This statement would thus\ndo a 32-bit swap of (clock / 10) and drop the top 8 bits which\nare ... the LSB. Not what we want. Instead use masks \u0026 shifts.\n\nSigned-off-by: Benjamin Herrenschmidt \u003cbenh@kernel.crashing.org\u003e\nReviewed-by: Alex Deucher \u003calexander.deucher@amd.com\u003e\nSigned-off-by: Dave Airlie \u003cairlied@redhat.com\u003e\n" }, { "commit": "edc02bffbdcd92086f5cc9d715143e51acfa90ee", "tree": "f5974677d7e7b346bdfd8c60077b4b3a48959f08", "parents": [ "f6a5693976fbc8e9fe4dde3040820082593c1757" ], "author": { "name": "Benjamin Herrenschmidt", "email": "benh@kernel.crashing.org", "time": "Wed Jul 13 06:28:26 2011 +0000" }, "committer": { "name": "Dave Airlie", "email": "airlied@redhat.com", "time": "Mon Jul 25 12:17:58 2011 +0100" }, "message": "drm/radeon: Fix the definition of RADEON_BUF_SWAP_32BIT\n\n(Note that this is duplicated under various other names such\nas R600_BUF_SWAP_32BIT etc...). At least now all the definitions\nagree.\n\nSigned-off-by: Benjamin Herrenschmidt \u003cbenh@kernel.crashing.org\u003e\nSigned-off-by: Dave Airlie \u003cairlied@redhat.com\u003e\n" }, { "commit": "f6a5693976fbc8e9fe4dde3040820082593c1757", "tree": "dfbe75b52e4f7c8d5b8d12cd9a6433ea91bfe57f", "parents": [ "df07d6999e4e502ff474eeafe11ea0055f4cd68d" ], "author": { "name": "Benjamin Herrenschmidt", "email": "benh@kernel.crashing.org", "time": "Wed Jul 13 06:28:22 2011 +0000" }, "committer": { "name": "Dave Airlie", "email": "airlied@redhat.com", "time": "Mon Jul 25 12:16:25 2011 +0100" }, "message": "drm/radeon: Do an MMIO read on interrupts when not uisng MSIs\n\nWhen not using MSIs, there is no guarantee that DMA from the device\nhas been fully flushed to point where it\u0027s visible to the CPU when\ntaking an interrupt. To get this guarantee, we need to perform an\nMMIO read from the device, which will flush all outstanding DMAs\nfrom bridges between the device and the system.\n\nSigned-off-by: Benjamin Herrenschmidt \u003cbenh@kernel.crashing.org\u003e\nSigned-off-by: Dave Airlie \u003cairlied@redhat.com\u003e\n" }, { "commit": "df07d6999e4e502ff474eeafe11ea0055f4cd68d", "tree": "141b7203059cee94568e36505b3bc57376fc1689", "parents": [ "a0533fbf8778991f9a978656cff0d301322d37e2" ], "author": { "name": "Benjamin Herrenschmidt", "email": "benh@kernel.crashing.org", "time": "Wed Jul 13 06:28:17 2011 +0000" }, "committer": { "name": "Dave Airlie", "email": "airlied@redhat.com", "time": "Mon Jul 25 12:14:56 2011 +0100" }, "message": "drm/radeon: Writeback endian fixes\n\nThe writeback ring pointer and IH ring pointer are read using le32_to_cpu\nso we do not want the chip to byteswap them on big-endian.\n\nWe still want to byteswap the ring itself and the IBs, so we don\u0027t touch\nthat but we remove setting of the byteswap bits in CP_RB_RPTR_ADDR and\nIH_CNTL.\n\nIn general, for things like that where we control all the accessors easily,\nwe are better off doing the swap in SW rather than HW. Paradoxally, it does\nkeep the code closer to x86 and avoid using poorly tested HW features.\n\nI also changed the use of RADEON_ to R600_ in a couple of cases to be more\nconsistent with the surrounding code.\n\nSigned-off-by: Benjamin Herrenschmidt \u003cbenh@kernel.crashing.org\u003e\nReviewed-by: Michel Dänzer \u003cmichel@daenzer.net\u003e\nReviewed-by: Alex Deucher \u003calexander.deucher@amd.com\u003e\nSigned-off-by: Dave Airlie \u003cairlied@redhat.com\u003e\n" }, { "commit": "a0533fbf8778991f9a978656cff0d301322d37e2", "tree": "e0bfe4922e7418f174231b45bd4f3951ab240da3", "parents": [ "62cb70118c4efabb3c0a6f962168ddcad4344eef" ], "author": { "name": "Benjamin Herrenschmidt", "email": "benh@kernel.crashing.org", "time": "Wed Jul 13 06:28:12 2011 +0000" }, "committer": { "name": "Dave Airlie", "email": "airlied@redhat.com", "time": "Mon Jul 25 12:13:16 2011 +0100" }, "message": "drm/radeon: Remove a bunch of useless _iomem casts\n\nJust defining rdev-\u003ermmio properly in the first place should do\nthe trick. In some cases, the cast were also complete dups as\nthe original variable was already of the right type.\n\nSigned-off-by: Benjamin Herrenschmidt \u003cbenh@kernel.crashing.org\u003e\nSigned-off-by: Dave Airlie \u003cairlied@redhat.com\u003e\n" }, { "commit": "62cb70118c4efabb3c0a6f962168ddcad4344eef", "tree": "68c8877c9fd761435082b84ae53c579e2a79fb93", "parents": [ "04fee895ef98ffbb91a941b53a92d6949bb6d1c4" ], "author": { "name": "Alan Cox", "email": "alan@linux.intel.com", "time": "Tue Jun 07 14:17:51 2011 +0100" }, "committer": { "name": "Dave Airlie", "email": "airlied@redhat.com", "time": "Mon Jul 25 12:07:15 2011 +0100" }, "message": "drm/gem: add support for private objects\n\nThese small changes should allow GEM to be used with non shmem objects as\nwell as shmem objects. In the GMA500 case it allows the base framebuffer to\nappear as a GEM object and thus acquire a handle and work with KMS.\n\nFor i915 it ought to be trivial to get back the wasted memory but putting the\nsystem fb back into stolen RAM and in general I can imagine it allowing the\nuse of GEM and thus KMS with all the older cards that have their framebuffer\nfirmly placed in video RAM.\n\nSigned-off-by: Alan Cox \u003calan@linux.intel.com\u003e\nTested-by: Rob Clark \u003crob@ti.com\u003e\nSigned-off-by: Dave Airlie \u003cairlied@redhat.com\u003e\n" }, { "commit": "04fee895ef98ffbb91a941b53a92d6949bb6d1c4", "tree": "7f146f266d74d4a788309bc141c99282d68bd1c2", "parents": [ "ee2762916f5594e60d8789593f149ed83b560cf7" ], "author": { "name": "Rolf Eike Beer", "email": "eike-kernel@sf-tec.de", "time": "Wed Jun 15 11:27:02 2011 +0200" }, "committer": { "name": "Dave Airlie", "email": "airlied@redhat.com", "time": "Mon Jul 25 12:02:26 2011 +0100" }, "message": "DRM: clean up and document parsing of video\u003d parameter\n\nThe video\u003d parameter of the DRM drivers supports some additional flags that\nthe normal fb drivers do not have. They also allow to limit these flags to\nspecific outputs. Both things were previously undocumented.\n\nAlso the parsing of the line had some oddities:\n-A lot of misplaced options were silently ignored or partly rejected instead\n of stopping the parsing immediately\n-The \u0027R\u0027 option is documented to follow the \u0027M\u0027 option if specified. It is not\n documented that \u0027M\u0027 is needed to specify \u0027R\u0027 (also this is the case for normal\n fb drivers). In fact the code is correct for normal fb drivers but wrong for\n DRM ones.\n The old code allowed \u0027R\u0027 only _before_ \u0027M\u0027 (since it parses backwards) and only\n if \u0027M\u0027 is given at all which is not needed for the DRM drivers.\n-the margins option (\u0027m\u0027) was parsed but later ignored even if the later\n functions support it.\n-specifying multiple enable options at the same time did not lead to an error.\n-specifying something bogus for horizontal resolution (i.e. other things as\n digits) did not lead to an error but an invalid resolution was used.\n\nIf any errors are encountered the position of the faulting string is now\nprinted to the user and the complete mode is ignored. This gives much\nmore consistent error behaviour.\n\nI also removed some useless assignments and changed the local flag variables\nto be bool.\n\nSigned-off-by: Rolf Eike Beer \u003ceike-kernel@sf-tec.de\u003e\nSigned-off-by: Dave Airlie \u003cairlied@redhat.com\u003e\n" }, { "commit": "ee2762916f5594e60d8789593f149ed83b560cf7", "tree": "d08b370ef68df26a98500224d83e86ec4a5bcbc3", "parents": [ "0aff47f29337d1c23060eb1cea7801dfee0e0e4a" ], "author": { "name": "Ralf Baechle", "email": "ralf@linux-mips.org", "time": "Mon Jun 27 13:40:35 2011 +0000" }, "committer": { "name": "Dave Airlie", "email": "airlied@redhat.com", "time": "Mon Jul 25 12:01:56 2011 +0100" }, "message": "DRM: Radeon: Fix section mismatch.\n\nWARNING: drivers/gpu/drm/radeon/radeon.o(.text+0x5d1fc): Section mismatch in reference from the function radeon_get_clock_info() to the function .devinit.text:radeon_read_clocks_OF()\nThe function radeon_get_clock_info() references\nthe function __devinit radeon_read_clocks_OF().\nThis is often because radeon_get_clock_info lacks a __devinit\nannotation or the annotation of radeon_read_clocks_OF is wrong.\n\nSigned-off-by: Ralf Baechle \u003cralf@linux-mips.org\u003e\nCc: dri-devel@lists.freedesktop.org\nCc: linux-kernel@vger.kernel.org\nCc: linux-mips@linux-mips.org\nSigned-off-by: Dave Airlie \u003cairlied@redhat.com\u003e\n" }, { "commit": "0aff47f29337d1c23060eb1cea7801dfee0e0e4a", "tree": "768378765c78c61bcc514617b4326bb9323320c5", "parents": [ "6dd666333ddee39903d86f870d5c40d9f100e0cc" ], "author": { "name": "Tormod Volden", "email": "debian.tormod@gmail.com", "time": "Tue Jul 05 20:12:53 2011 +0000" }, "committer": { "name": "Dave Airlie", "email": "airlied@redhat.com", "time": "Mon Jul 25 12:01:55 2011 +0100" }, "message": "drm: really make debug levels match in edid failure code\n\nAlso disable the ascii dump and remove the literal printing of the\nKERN_ERR macro in the log:\n\n [drm:drm_edid_block_valid] *ERROR* Raw EDID:\n \u003c3\u003e00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 ................\n\nv2: Remove the trailing empty line as well.\n\nSigned-off-by: Tormod Volden \u003cdebian.tormod@gmail.com\u003e\nSigned-off-by: Dave Airlie \u003cairlied@redhat.com\u003e\n" }, { "commit": "6dd666333ddee39903d86f870d5c40d9f100e0cc", "tree": "6058d61a089d96f4bdbebd43b28985e7d0239865", "parents": [ "603f2e6d378948bf5e5ac04d98673761362a3b79" ], "author": { "name": "Alex Deucher", "email": "alexander.deucher@amd.com", "time": "Sat Jul 23 18:02:04 2011 +0000" }, "committer": { "name": "Dave Airlie", "email": "airlied@redhat.com", "time": "Mon Jul 25 11:51:45 2011 +0100" }, "message": "drm/radeon/kms: fix i2c map for rv250/280\n\nThose chips have crt2_ddc bus.\n\nFixes:\nhttps://bugzilla.kernel.org/show_bug.cgi?id\u003d39672\n\nSigned-off-by: Alex Deucher \u003calexander.deucher@amd.com\u003e\nCc: stable@kernel.org\nSigned-off-by: Dave Airlie \u003cairlied@redhat.com\u003e\n" }, { "commit": "603f2e6d378948bf5e5ac04d98673761362a3b79", "tree": "f511db8fe180b36e451ca6689c52ef5085612806", "parents": [ "e55b9422e186d208f162f056ee28b6eb6b9b81a9", "9962cc6eba013607d6199b723afca23301df7b47" ], "author": { "name": "Dave Airlie", "email": "airlied@redhat.com", "time": "Mon Jul 25 10:15:18 2011 +0100" }, "committer": { "name": "Dave Airlie", "email": "airlied@redhat.com", "time": "Mon Jul 25 10:15:18 2011 +0100" }, "message": "Merge branch \u0027drm-nouveau-next\u0027 of git://anongit.freedesktop.org/git/nouveau/linux-2.6 into drm-core-next\n\n* \u0027drm-nouveau-next\u0027 of git://anongit.freedesktop.org/git/nouveau/linux-2.6:\n drm/nouveau/gr: disable fifo access and idle before suspend ctx unload\n drm/nouveau: pass flag to engine fini() method on suspend\n drm/nouveau: replace nv04_graph_fifo_access() use with direct reg bashing\n drm/nv40/gr: rewrite/split context takedown functions\n drm/nouveau: detect disabled device in irq handler and return IRQ_NONE\n drm/nouveau: ignore connector type when deciding digital/analog on DVI-I\n drm/nouveau: Add a quirk for Gigabyte NX86T\n drm/nouveau: do not leak in nv20_graph_create\n drm/nv50/dp: fix hack to work for macbooks booted via EFI\n" }, { "commit": "9962cc6eba013607d6199b723afca23301df7b47", "tree": "2114c4aee75c09241f3935b02df0e1ff4113f171", "parents": [ "6c320fef5835240bf414b54e697e517a160663f4" ], "author": { "name": "Ben Skeggs", "email": "bskeggs@redhat.com", "time": "Wed Jul 20 11:44:52 2011 +1000" }, "committer": { "name": "Ben Skeggs", "email": "bskeggs@redhat.com", "time": "Mon Jul 25 09:43:38 2011 +1000" }, "message": "drm/nouveau/gr: disable fifo access and idle before suspend ctx unload\n\nSigned-off-by: Ben Skeggs \u003cbskeggs@redhat.com\u003e\n" }, { "commit": "6c320fef5835240bf414b54e697e517a160663f4", "tree": "791f610df2eef6e7534fb23099a29a41dd508329", "parents": [ "70ad25ab735a016c48183875f657d90d592b773d" ], "author": { "name": "Ben Skeggs", "email": "bskeggs@redhat.com", "time": "Wed Jul 20 11:22:33 2011 +1000" }, "committer": { "name": "Ben Skeggs", "email": "bskeggs@redhat.com", "time": "Mon Jul 25 09:43:22 2011 +1000" }, "message": "drm/nouveau: pass flag to engine fini() method on suspend\n\nIt may not be necessary to fail in certain cases (such as failing to idle)\non module unload, whereas on suspend it\u0027s important to ensure a consistent\nstate can be restored on resume.\n\nSigned-off-by: Ben Skeggs \u003cbskeggs@redhat.com\u003e\n" }, { "commit": "70ad25ab735a016c48183875f657d90d592b773d", "tree": "9596e372527faf3e924ae3bab421bbfb2bf8b8d8", "parents": [ "12a30e267c162145df3c104d0f4aabff7bce56a5" ], "author": { "name": "Ben Skeggs", "email": "bskeggs@redhat.com", "time": "Wed Jul 20 11:04:46 2011 +1000" }, "committer": { "name": "Ben Skeggs", "email": "bskeggs@redhat.com", "time": "Mon Jul 25 09:42:27 2011 +1000" }, "message": "drm/nouveau: replace nv04_graph_fifo_access() use with direct reg bashing\n\nSigned-off-by: Ben Skeggs \u003cbskeggs@redhat.com\u003e\n" }, { "commit": "12a30e267c162145df3c104d0f4aabff7bce56a5", "tree": "a2a27ca39bd22e73968f6df7e8fb164545611137", "parents": [ "9717f3d953f294bf416258f6b1f2d9512babd337" ], "author": { "name": "Ben Skeggs", "email": "bskeggs@redhat.com", "time": "Mon Jul 18 09:56:36 2011 +1000" }, "committer": { "name": "Ben Skeggs", "email": "bskeggs@redhat.com", "time": "Mon Jul 25 09:42:18 2011 +1000" }, "message": "drm/nv40/gr: rewrite/split context takedown functions\n\nIt\u0027s completely pointless to save the PGRAPH context when destroying a\nchannel, so don\u0027t bother.\n\nThis commit should also fix kernel.org bug 39422, where the DRM channel\nstate was incorrectly being saved because we left PGRAPH FIFO access\nenabled while running the ctxprog.\n\nSigned-off-by: Ben Skeggs \u003cbskeggs@redhat.com\u003e\n" }, { "commit": "9717f3d953f294bf416258f6b1f2d9512babd337", "tree": "6914328ea285b1c63e56bef70baf1fb684e7d863", "parents": [ "e19b20bbd291f13581975bd0bdc1d92ce2385cc4" ], "author": { "name": "Ben Skeggs", "email": "bskeggs@redhat.com", "time": "Tue Jul 12 15:42:45 2011 +1000" }, "committer": { "name": "Ben Skeggs", "email": "bskeggs@redhat.com", "time": "Mon Jul 25 09:42:09 2011 +1000" }, "message": "drm/nouveau: detect disabled device in irq handler and return IRQ_NONE\n\nSigned-off-by: Ben Skeggs \u003cbskeggs@redhat.com\u003e\n" }, { "commit": "e19b20bbd291f13581975bd0bdc1d92ce2385cc4", "tree": "f4c89e039114e1698632a86044a6b0394ee4acc3", "parents": [ "f0d07d6e89e1abe75748dd506dee3df8f6b86864" ], "author": { "name": "Ben Skeggs", "email": "bskeggs@redhat.com", "time": "Tue Jul 12 13:32:07 2011 +1000" }, "committer": { "name": "Ben Skeggs", "email": "bskeggs@redhat.com", "time": "Mon Jul 25 09:41:34 2011 +1000" }, "message": "drm/nouveau: ignore connector type when deciding digital/analog on DVI-I\n\nIf the connector table is lying, which it often does on the boards of a\nparticular manufacturer, we may end up doing the wrong thing. Listen\nto the encoder table instead, it\u0027s more reliable.\n\nSigned-off-by: Ben Skeggs \u003cbskeggs@redhat.com\u003e\n" }, { "commit": "f0d07d6e89e1abe75748dd506dee3df8f6b86864", "tree": "45823e894b4328cc9092a2368435f8c0b396a46d", "parents": [ "1541fa854273abee954ec4ca4ad65fe4ceb9e626" ], "author": { "name": "Emil Velikov", "email": "emil.l.velikov@gmail.com", "time": "Sun Jul 10 10:59:29 2011 +0100" }, "committer": { "name": "Ben Skeggs", "email": "bskeggs@redhat.com", "time": "Mon Jul 25 09:41:29 2011 +1000" }, "message": "drm/nouveau: Add a quirk for Gigabyte NX86T\n\nThe connector table lies, the card has DVI-I not HDMI\nFixes bug https://bugs.freedesktop.org/show_bug.cgi?id\u003d35675\n\nv2: Mention the bugreport\nSigned-off-by: Emil Velikov \u003cemil.l.velikov@gmail.com\u003e\nSigned-off-by: Ben Skeggs \u003cbskeggs@redhat.com\u003e\n" }, { "commit": "1541fa854273abee954ec4ca4ad65fe4ceb9e626", "tree": "01e83ad9133a11d78b73c3999906119c77d34204", "parents": [ "88c8431cbbccdb9ef7c13f0ba18022e2cb35c7f7" ], "author": { "name": "Jesper Juhl", "email": "jj@chaosbits.net", "time": "Mon Jul 04 09:46:53 2011 +1000" }, "committer": { "name": "Ben Skeggs", "email": "bskeggs@redhat.com", "time": "Mon Jul 25 09:40:52 2011 +1000" }, "message": "drm/nouveau: do not leak in nv20_graph_create\n\nIf we return due to an unknown chipset in\ndrivers/gpu/drm/nouveau/nv20_graph.c:nv20_graph_create() we\u0027ll leak the\nmemory allocated to \u0027pgraph\u0027.\n\nThis patch should fix the leak.\n\nSigned-off-by: Jesper Juhl \u003cjj@chaosbits.net\u003e\nReviewed-by: Marcin Slusarz \u003cmarcin.slusarz@gmail.com\u003e\nSigned-off-by: Ben Skeggs \u003cbskeggs@redhat.com\u003e\n" }, { "commit": "88c8431cbbccdb9ef7c13f0ba18022e2cb35c7f7", "tree": "152d8fe5a9c3c8b332481d41029d8b5b91f56110", "parents": [ "60f7ab06651db7d9916c0d9138ed3b12676e920d" ], "author": { "name": "Ben Skeggs", "email": "bskeggs@redhat.com", "time": "Thu Jun 30 09:03:36 2011 +1000" }, "committer": { "name": "Ben Skeggs", "email": "bskeggs@redhat.com", "time": "Mon Jul 25 09:40:41 2011 +1000" }, "message": "drm/nv50/dp: fix hack to work for macbooks booted via EFI\n\nSigned-off-by: Ben Skeggs \u003cbskeggs@redhat.com\u003e\n" }, { "commit": "df7976797fa9af161690dbf4dee81ed92cdc150f", "tree": "be6f04706d91cc80da4dbd3a5f5f2a174f1bdae3", "parents": [ "f0b69efc29b024747a88ce020dada425e3193d5a", "9c54c0dd948d715ccfd79e97d852f80eeb53254a" ], "author": { "name": "Keith Packard", "email": "keithp@keithp.com", "time": "Fri Jul 22 13:40:42 2011 -0700" }, "committer": { "name": "Keith Packard", "email": "keithp@keithp.com", "time": "Fri Jul 22 13:40:42 2011 -0700" }, "message": "Merge branch \u0027drm-intel-fixes\u0027 into drm-intel-next\n" }, { "commit": "9c54c0dd948d715ccfd79e97d852f80eeb53254a", "tree": "49f18f67a736684bfee4b6c7f38175cee7e27632", "parents": [ "f3234706a77bd6e1592ae71fb3268e04cb030dba" ], "author": { "name": "Jesse Barnes", "email": "jbarnes@virtuousgeek.org", "time": "Wed Jun 15 23:32:33 2011 +0200" }, "committer": { "name": "Keith Packard", "email": "keithp@keithp.com", "time": "Fri Jul 22 13:37:00 2011 -0700" }, "message": "drm/i915: load the LUT before pipe enable on ILK+\n\nPer the specs and to address\nhttps://bugs.freedesktop.org/show_bug.cgi?id\u003d36888.\n\nSigned-off-by: Jesse Barnes \u003cjbarnes@virtuousgeek.org\u003e\nCc: stable@kernel.org\nSigned-off-by: Keith Packard \u003ckeithp@keithp.com\u003e\n" }, { "commit": "f3234706a77bd6e1592ae71fb3268e04cb030dba", "tree": "6426ac38abc9091cfd988b79904d8bdaac94cdde", "parents": [ "842d452985300f4ec14c68cb86046e8a1a3b7251" ], "author": { "name": "Keith Packard", "email": "keithp@keithp.com", "time": "Fri Jul 22 10:44:39 2011 -0700" }, "committer": { "name": "Keith Packard", "email": "keithp@keithp.com", "time": "Fri Jul 22 13:36:52 2011 -0700" }, "message": "drm/i915: Initialize RCS ring status page address in intel_render_ring_init_dri\n\nPhysically-addressed hardware status pages are initialized early in\nthe driver load process by i915_init_phys_hws. For UMS environments,\nthe ring structure is not initialized until the X server starts. At\nthat point, the entire ring structure is re-initialized with all new\nvalues. Any values set in the ring structure (including\nring-\u003estatus_page.page_addr) will be lost when the ring is\nre-initialized.\n\nThis patch moves the initialization of the status_page.page_addr value\nto intel_render_ring_init_dri.\n\nSigned-off-by: Keith Packard \u003ckeithp@keithp.com\u003e\nCc: stable@kernel.org\n" }, { "commit": "f0b69efc29b024747a88ce020dada425e3193d5a", "tree": "c39f14bf91434cae760489c79b711f25cadf1aad", "parents": [ "a5071c2fd91f320bc40952df59517053a7346fa9" ], "author": { "name": "Keith Packard", "email": "keithp@keithp.com", "time": "Tue Jul 19 16:21:40 2011 -0700" }, "committer": { "name": "Keith Packard", "email": "keithp@keithp.com", "time": "Thu Jul 21 20:18:31 2011 -0700" }, "message": "drm/i915: Skip GPU wait for scanout pin while wedged\n\nFailing to pin a scanout buffer will most likely lead to a black\nscreen, so if the GPU is wedged, then just let the pin happen and hope\nthat things work out OK.\n\nv2: Just ignore any error from i915_gem_object_wait_rendering, as\nsuggested by Chris Wilson\n\nSigned-off-by: Keith Packard \u003ckeithp@keithp.com\u003e\n" }, { "commit": "a5071c2fd91f320bc40952df59517053a7346fa9", "tree": "2ca6e47bbf137d518753d25596373f28aaff7405", "parents": [ "28a4a163b561c39ac0c798d420e0927f29e9d4c8" ], "author": { "name": "Jesse Barnes", "email": "jbarnes@virtuousgeek.org", "time": "Tue Jul 19 15:38:56 2011 -0700" }, "committer": { "name": "Keith Packard", "email": "keithp@keithp.com", "time": "Thu Jul 21 20:18:24 2011 -0700" }, "message": "drm/i915: provide more error output when mode sets fail\n\nIf a mode set fails we may get a message from drm_crtc_helper if we\u0027re lucky,\nbut it won\u0027t tell us anything about *why* we failed to set a mode. So\nadd a few DRM_ERRORs for the cases that shouldn\u0027t happen so we can debug\nthings more easily.\n\nSigned-off-by: Jesse Barnes \u003cjbarnes@virtuousgeek.org\u003e\nSigned-off-by: Keith Packard \u003ckeithp@keithp.com\u003e\n" }, { "commit": "ad21b115772dfa146f19ec5d1db9de25973c483b", "tree": "457b129a39a3babdc2b0bb497e90915bfddcb12b", "parents": [ "b91da88fed84843313a1b6fd1b1c834a24bbcf9e", "e28f87116503f796aba4fb27d81e2c3d81966174" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Jul 21 11:07:18 2011 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Jul 21 11:07:18 2011 -0700" }, "message": "Merge branch \u0027drm-intel-fixes\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/keithp/linux-2.6\n\n* \u0027drm-intel-fixes\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/keithp/linux-2.6:\n drm/i915: Fix unfenced alignment on pre-G33 hardware\n drm/i915: Add quirk to disable SSC on Lenovo U160 LVDS\n" }, { "commit": "497888cf69bf607ac1fe061a6437e0a670b0022f", "tree": "ac0897eff214f09c89d5f4fbc3c03ef9d010a83c", "parents": [ "06b72d06d6b182bdaaaec686dbd8b602949521ee" ], "author": { "name": "Phil Carmody", "email": "ext-phil.2.carmody@nokia.com", "time": "Thu Jul 14 15:07:13 2011 +0300" }, "committer": { "name": "Jiri Kosina", "email": "jkosina@suse.cz", "time": "Thu Jul 21 14:10:00 2011 +0200" }, "message": "treewide: fix potentially dangerous trailing \u0027;\u0027 in #defined values/expressions\n\nAll these are instances of\n #define NAME value;\nor\n #define NAME(params_opt) value;\n\nThese of course fail to build when used in contexts like\n if(foo $OP NAME)\n while(bar $OP NAME)\nand may silently generate the wrong code in contexts such as\n foo \u003d NAME + 1; /* foo \u003d value; + 1; */\n bar \u003d NAME - 1; /* bar \u003d value; - 1; */\n baz \u003d NAME \u0026 quux; /* baz \u003d value; \u0026 quux; */\n\nReported on comp.lang.c,\nMessage-ID: \u003cab0d55fe-25e5-482b-811e-c475aa6065c3@c29g2000yqd.googlegroups.com\u003e\nInitial analysis of the dangers provided by Keith Thompson in that thread.\n\nThere are many more instances of more complicated macros having unnecessary\ntrailing semicolons, but this pile seems to be all of the cases of simple\nvalues suffering from the problem. (Thus things that are likely to be found\nin one of the contexts above, more complicated ones aren\u0027t.)\n\nSigned-off-by: Phil Carmody \u003cext-phil.2.carmody@nokia.com\u003e\nSigned-off-by: Jiri Kosina \u003cjkosina@suse.cz\u003e\n" }, { "commit": "e28f87116503f796aba4fb27d81e2c3d81966174", "tree": "9fb1ef4243707e686a3c1a512931942562267e64", "parents": [ "435793dfb8aec7b2e19f72d5bce8a22fd0b57839" ], "author": { "name": "Chris Wilson", "email": "chris@chris-wilson.co.uk", "time": "Mon Jul 18 13:11:49 2011 -0700" }, "committer": { "name": "Keith Packard", "email": "keithp@keithp.com", "time": "Mon Jul 18 14:02:06 2011 -0700" }, "message": "drm/i915: Fix unfenced alignment on pre-G33 hardware\n\nAlign unfenced buffers on older hardware to the power-of-two object\nsize. The docs suggest that it should be possible to align only to a\npower-of-two tile height, but using the already computed fence size is\neasier and always correct. We also have to make sure that we unbind\nmisaligned buffers upon tiling changes.\n\nIn order to prevent a repetition of this bug, we change the interface\nto the alignment computation routines to force the caller to provide\nthe requested alignment and size of the GTT binding rather than assume\nthe current values on the object.\n\nReported-and-tested-by: Sitosfe Wheeler \u003csitsofe@yahoo.com\u003e\nBugzilla: https://bugs.freedesktop.org/show_bug.cgi?id\u003d36326\nSigned-off-by: Chris Wilson \u003cchris@chris-wilson.co.uk\u003e\nCc: stable@kernel.org\nReviewed-by: Daniel Vetter \u003cdaniel.vetter@ffwll.ch\u003e\nSigned-off-by: Keith Packard \u003ckeithp@keithp.com\u003e\n" }, { "commit": "e55b9422e186d208f162f056ee28b6eb6b9b81a9", "tree": "1b72616db7d9b2f651b354b11e74287a4910c3b9", "parents": [ "28a4a163b561c39ac0c798d420e0927f29e9d4c8" ], "author": { "name": "Alex Deucher", "email": "alexdeucher@gmail.com", "time": "Fri Jul 15 19:53:52 2011 +0000" }, "committer": { "name": "Dave Airlie", "email": "airlied@redhat.com", "time": "Mon Jul 18 08:13:08 2011 +0100" }, "message": "drm/radeon/kms: add info query for backend map\n\nThe 3D driver need to get the pipe to backend\nmap to certain things. Add a query to get the\ninfo.\n\nSigned-off-by: Alex Deucher \u003calexdeucher@gmail.com\u003e\nSigned-off-by: Dave Airlie \u003cairlied@redhat.com\u003e\n" }, { "commit": "28a4a163b561c39ac0c798d420e0927f29e9d4c8", "tree": "37aa3c8b3a05e55bbfe2d61fd43a7500d1993adf", "parents": [ "d0254d56c72532b5d818d83c5e247fc627803f08" ], "author": { "name": "Rob Clark", "email": "rob@ti.com", "time": "Thu Jul 14 03:12:43 2011 +0000" }, "committer": { "name": "Dave Airlie", "email": "airlied@redhat.com", "time": "Fri Jul 15 06:52:58 2011 +0100" }, "message": "drm: platform multi-device support\n\nInclude the device id in the bus-id to give userspace a way to open\nthe correct \"cardN\" when there are multiple device instances.\n\nSigned-off-by: Rob Clark \u003crob@ti.com\u003e\nSigned-off-by: Dave Airlie \u003cairlied@redhat.com\u003e\n" }, { "commit": "435793dfb8aec7b2e19f72d5bce8a22fd0b57839", "tree": "fde7fd2e71f04c4b871140ba629b4d6f78639738", "parents": [ "d1ca1a004822983e2fc702d5382b4b9a5527cfbe" ], "author": { "name": "Keith Packard", "email": "keithp@keithp.com", "time": "Tue Jul 12 14:56:22 2011 -0700" }, "committer": { "name": "Keith Packard", "email": "keithp@keithp.com", "time": "Wed Jul 13 23:53:41 2011 -0700" }, "message": "drm/i915: Add quirk to disable SSC on Lenovo U160 LVDS\n\nWe\u0027ve tried several times to make this machine \u0027just work\u0027, but every\npatch that does causes many other machines to fail. This adds a quirk\nwhich special cases this hardware and forces ssc to be\ndisabled. There\u0027s no way to override this from the command line; that\nwould be a significantly more invasive change.\n\nThis patch fixes #36656 on fdo bugzilla:\nhttps://bugs.freedesktop.org/show_bug.cgi?id\u003d36656\n\nSigned-off-by: Keith Packard \u003ckeithp@keithp.com\u003e\nReferences: https://bugs.freedesktop.org/show_bug.cgi?id\u003d36656\nReviewed-by: Chris Wilson \u003cchris@chris-wilson.co.uk\u003e\n" }, { "commit": "d0254d56c72532b5d818d83c5e247fc627803f08", "tree": "60f5bd1c16c1598933a3c7451ccc77b0ff1938c8", "parents": [ "fcc485d6672952f0ec6d077ea92f703670075323" ], "author": { "name": "Michel Dänzer", "email": "michel.daenzer@amd.com", "time": "Wed Jul 13 15:18:10 2011 +0000" }, "committer": { "name": "Dave Airlie", "email": "airlied@redhat.com", "time": "Thu Jul 14 07:15:16 2011 +0100" }, "message": "drm/radeon: Don\u0027t clobber error return value in page flipping cleanup paths.\n\nSigned-off-by: Michel Dänzer \u003cmichel.daenzer@amd.com\u003e\nReviewed-by: Alex Deucher \u003calexander.deucher@amd.com\u003e\nSigned-off-by: Dave Airlie \u003cairlied@redhat.com\u003e\n" }, { "commit": "fcc485d6672952f0ec6d077ea92f703670075323", "tree": "74689c7a2cf5c73d15d29fa06a7263e5a8be9c4e", "parents": [ "5762a179b64cf37305d1d4d624e1b6ad9ee80602" ], "author": { "name": "Michel Dänzer", "email": "michel.daenzer@amd.com", "time": "Wed Jul 13 15:18:09 2011 +0000" }, "committer": { "name": "Dave Airlie", "email": "airlied@redhat.com", "time": "Thu Jul 14 07:14:42 2011 +0100" }, "message": "drm/radeon: Don\u0027t generate new fence for page flip.\n\nUse the fence of the new frontbuffer, if any.\n\nGenerating a new fence could cause us to wait for completely unrelated\nrendering to finish before performing the flip.\n\nSigned-off-by: Michel Dänzer \u003cmichel.daenzer@amd.com\u003e\nReviewed-by: Alex Deucher \u003calexander.deucher@amd.com\u003e\nSigned-off-by: Dave Airlie \u003cairlied@redhat.com\u003e\n" }, { "commit": "5762a179b64cf37305d1d4d624e1b6ad9ee80602", "tree": "2e9225e382204ee8069bd10e2aeb0b27feaf4b87", "parents": [ "cf056edbbe70393faa6edd2b7859a14467910946", "6e96e7757a0133a9a66fd9b86cd04b5e7b88122a" ], "author": { "name": "Dave Airlie", "email": "airlied@redhat.com", "time": "Thu Jul 14 06:45:23 2011 +0100" }, "committer": { "name": "Dave Airlie", "email": "airlied@redhat.com", "time": "Thu Jul 14 06:45:23 2011 +0100" }, "message": "Merge branch \u0027drm-intel-next\u0027 of ssh://master.kernel.org/pub/scm/linux/kernel/git/keithp/linux-2.6 into drm-core-next\n\n* \u0027drm-intel-next\u0027 of ssh://master.kernel.org/pub/scm/linux/kernel/git/keithp/linux-2.6: (52 commits)\n drm/i915: provide module parameter description\n drm/i915: add module parameter compiler hints\n drm/i915/bios: Avoid temporary allocation whilst searching for downclock\n drm/i915: Cache GT fifo count for SandyBridge\n i915: Fix opregion notifications\n drm/i915: TVDAC_STATE_CHG does not indicate successful load-detect\n drm/i915: Select correct pipe during TV detect\n drm/i915/ringbuffer: Idling requires waiting for the ring to be empty\n Revert \"drm/i915: enable rc6 by default\"\n drm/i915: Clean up i915_driver_load failure path\n drm/i915: Enable i915 frame buffer compression by default\n drm/i915: Share the common work of disabling active FBC before updating\n drm/i915: Perform intel_enable_fbc() from a delayed task\n drm/i915: Disable FBC across page-flipping\n drm/i915: Set persistent-mode for ILK/SNB framebuffer compression\n drm/i915: Use of a CPU fence is mandatory to update FBC regions upon CPU writes\n drm/i915: Remove vestigial pitch from post-gen2 FBC control routines\n drm/i915: Replace direct calls to vfunc.disable_fbc with intel_disable_fbc()\n drm/i915: Only export the generic intel_disable_fbc() interface\n drm/i915: Enable GPU reset on Ivybridge.\n ...\n" }, { "commit": "6e96e7757a0133a9a66fd9b86cd04b5e7b88122a", "tree": "b30818a40bd669f080c2c176cf9edd960551d492", "parents": [ "a35d9d3cf75604e9ef17faedd333bf2a66a513d8" ], "author": { "name": "Ben Widawsky", "email": "ben@bwidawsk.net", "time": "Wed Jul 13 14:38:18 2011 -0700" }, "committer": { "name": "Keith Packard", "email": "keithp@keithp.com", "time": "Wed Jul 13 19:33:53 2011 -0700" }, "message": "drm/i915: provide module parameter description\n\nSigned-off-by: Ben Widawsky \u003cben@bwidawsk.net\u003e\nSigned-off-by: Keith Packard \u003ckeithp@keithp.com\u003e\n" }, { "commit": "a35d9d3cf75604e9ef17faedd333bf2a66a513d8", "tree": "49bfbf935f3c93937a18a43389b0f5d502b79f20", "parents": [ "99834ea446d5c0da3f6cfa355fe4670840d45f79" ], "author": { "name": "Ben Widawsky", "email": "ben@bwidawsk.net", "time": "Wed Jul 13 14:38:17 2011 -0700" }, "committer": { "name": "Keith Packard", "email": "keithp@keithp.com", "time": "Wed Jul 13 19:28:55 2011 -0700" }, "message": "drm/i915: add module parameter compiler hints\n\nSigned-off-by: Ben Widawsky \u003cben@bwidawsk.net\u003e\nSigned-off-by: Keith Packard \u003ckeithp@keithp.com\u003e\n" } ], "next": "c835490196c42d9f225ee6873880f436d031df86" }