From patchwork Fri May 13 16:14:54 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andrew Lutomirski X-Patchwork-Id: 783502 Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) by demeter1.kernel.org (8.14.4/8.14.3) with ESMTP id p4DGKXjK028792 for ; Fri, 13 May 2011 16:21:03 GMT Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 83DA19EB09 for ; Fri, 13 May 2011 09:20:33 -0700 (PDT) X-Original-To: intel-gfx@lists.freedesktop.org Delivered-To: intel-gfx@lists.freedesktop.org X-Greylist: IP, sender and recipient auto-whitelisted, not delayed by milter-greylist-4.2.6 (demeter1.kernel.org [140.211.167.41]); Fri, 13 May 2011 16:21:03 +0000 (UTC) X-Greylist: delayed 301 seconds by postgrey-1.31 at gabe; Fri, 13 May 2011 09:20:14 PDT Received: from dmz-mailsec-scanner-2.mit.edu (DMZ-MAILSEC-SCANNER-2.MIT.EDU [18.9.25.13]) by gabe.freedesktop.org (Postfix) with ESMTP id 3A48E9E74C for ; Fri, 13 May 2011 09:20:13 -0700 (PDT) X-AuditID: 1209190d-b7bdeae0000004f8-dd-4dcd58d802ad Received: from mailhub-auth-4.mit.edu ( [18.7.62.39]) by dmz-mailsec-scanner-2.mit.edu (Symantec Messaging Gateway) with SMTP id 72.A4.01272.8D85DCD4; Fri, 13 May 2011 12:14:16 -0400 (EDT) Received: from outgoing.mit.edu (OUTGOING-AUTH.MIT.EDU [18.7.22.103]) by mailhub-auth-4.mit.edu (8.13.8/8.9.2) with ESMTP id p4DGFB2k022155; Fri, 13 May 2011 12:15:11 -0400 Received: from localhost (207-172-69-77.c3-0.smr-ubr3.sbo-smr.ma.static.cable.rcn.com [207.172.69.77]) (authenticated bits=0) (User authenticated as luto@ATHENA.MIT.EDU) by outgoing.mit.edu (8.13.6/8.12.4) with ESMTP id p4DGF4Hk025323 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES128-SHA bits=128 verify=NOT); Fri, 13 May 2011 12:15:09 -0400 (EDT) From: Andy Lutomirski To: Chris Wilson , Dave Airlie , Linus Torvalds Date: Fri, 13 May 2011 12:14:54 -0400 Message-Id: X-Mailer: git-send-email 1.7.5.1 In-Reply-To: References: X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFrrJIsWRmVeSWpSXmKPExsUixG6nrnsj4qyvwYOXBhZXby1gsui7cpTd 4ubDs6wWsydsZrJ41PeW3YHVY+UHLY+ds+6ye5yY8ZvF4373cSaP9/uusgWwRnHZpKTmZJal FunbJXBlzLi/g7lgOm/FqZ8LWBsY33J1MXJySAiYSPxsm8QIYYtJXLi3ng3EFhLYxygx4XdY FyMXkL2BUeLZp//sEM4zJonLLzeBdbAJqEh0LH3ABJIQEWhjlOi6eYYFJMEs4Cyxqm0mWJGw gIfE30nzmbsYOThYBFQlXja7g4R5BYIk7vxcywSxWUHiypV5YK2cAo4Se34fYoa4wkHi+M21 jBMY+RYwMqxilE3JrdLNTczMKU5N1i1OTszLSy3SNdLLzSzRS00p3cQICjVOSd4djO8OKh1i FOBgVOLhlXU96yvEmlhWXJl7iFGSg0lJlDcQGKhCfEn5KZUZicUZ8UWlOanFhxglOJiVRHin 8QLleFMSK6tSi/JhUtIcLErivDMl1X2FBNITS1KzU1MLUotgsjIcHEoSvFEgQwWLUtNTK9Iy c0oQ0kwcnCDDeYCGu4PU8BYXJOYWZ6ZD5E8x6nJ8fnToAKMQS15+XqqUOK88SJEASFFGaR7c HFiKeMUoDvSWMK8/SBUPML3ATXoFtIQJaMlP7zMgS0oSEVJSDYyLP229UZodtttBJLR1V4cr j9v535OP6s8xr03Xu3OBsW//7tfcKy8fvHlZtqdROMuRv16jw1AswMiVP1csvotD+xAjn2lV fbH4kzcTBdcdLO/50+n0Z5eL8IvLs1oap4Y/u6LiZte6omqp0dvNjy90LdhydatExU5eBqfO K4reP37OvfKOe7ISS3FGoqEWc1FxIgCc7Kf97AIAAA== Cc: intel-gfx@lists.freedesktop.org Subject: [Intel-gfx] [PATCH] drm/i915: Revert i915.semaphore=1 default from 47ae63e0 X-BeenThere: intel-gfx@lists.freedesktop.org X-Mailman-Version: 2.1.11 Precedence: list List-Id: Intel graphics driver community testing & development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: intel-gfx-bounces+patchwork-intel-gfx=patchwork.kernel.org@lists.freedesktop.org Errors-To: intel-gfx-bounces+patchwork-intel-gfx=patchwork.kernel.org@lists.freedesktop.org My Q67 / i7-2600 box has rev09 Sandy Bridge graphics. It hangs instantly when GNOME loads and it hangs so hard the reset button doesn't work. Setting i915.semaphore=0 fixes it. Semaphores were disabled in a1656b9090f7008d2941c314f5a64724bea2ae37 in 2.6.38 and were re-enabled by commit 47ae63e0c2e5fdb582d471dc906eb29be94c732f Merge: c59a333 467cffb Author: Chris Wilson Date: Mon Mar 7 12:32:44 2011 +0000 Merge branch 'drm-intel-fixes' into drm-intel-next Apply the trivial conflicting regression fixes, but keep GPU semaphores enabled. Conflicts: drivers/gpu/drm/i915/i915_drv.h drivers/gpu/drm/i915/i915_gem_execbuffer.c (It's worth noting that the offending change is i915_drv.c, which is not a conflict.) Signed-off-by: Andy Lutomirski Acked-by: Keith Packard --- This fixes a 2.6.39 regression that affects my Q67 box but not my SNB laptop. Send to Linus and airlied because 2.6.39 is apparently about to be released. drivers/gpu/drm/i915/i915_drv.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/drivers/gpu/drm/i915/i915_drv.c b/drivers/gpu/drm/i915/i915_drv.c index c34a8dd..32d1b3e 100644 --- a/drivers/gpu/drm/i915/i915_drv.c +++ b/drivers/gpu/drm/i915/i915_drv.c @@ -49,7 +49,7 @@ module_param_named(panel_ignore_lid, i915_panel_ignore_lid, int, 0600); unsigned int i915_powersave = 1; module_param_named(powersave, i915_powersave, int, 0600); -unsigned int i915_semaphores = 1; +unsigned int i915_semaphores = 0; module_param_named(semaphores, i915_semaphores, int, 0600); unsigned int i915_enable_rc6 = 0;