From patchwork Fri Nov 19 22:55:42 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mark Lord X-Patchwork-Id: 72324 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id E8D061007D2 for ; Sat, 20 Nov 2010 09:56:21 +1100 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1757437Ab0KSWzq (ORCPT ); Fri, 19 Nov 2010 17:55:46 -0500 Received: from ironport2-out.teksavvy.com ([206.248.154.181]:56738 "EHLO ironport2-out.pppoe.ca" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1757006Ab0KSWzo (ORCPT ); Fri, 19 Nov 2010 17:55:44 -0500 X-IronPort-Anti-Spam-Filtered: true X-IronPort-Anti-Spam-Result: ApIBABOP5kxLd/sX/2dsb2JhbAAHgz3MRZEHgSKDNnMEhFo X-IronPort-AV: E=Sophos;i="4.59,226,1288584000"; d="scan'208";a="83025527" Received: from rtr.ca (HELO [10.0.0.6]) ([75.119.251.23]) by ironport2-out.pppoe.ca with ESMTP/TLS/DHE-RSA-CAMELLIA256-SHA; 19 Nov 2010 17:55:42 -0500 Message-ID: <4CE7006E.4040102@teksavvy.com> Date: Fri, 19 Nov 2010 17:55:42 -0500 From: Mark Lord User-Agent: Mozilla/5.0 (X11; U; Linux i686; en-GB; rv:1.9.2.12) Gecko/20101027 Thunderbird/3.1.6 MIME-Version: 1.0 To: Alex Deucher CC: "Rafael J. Wysocki" , Linux SCSI List , Linux ACPI , Network Development , Linux Wireless List , Linux Kernel Mailing List , DRI , Florian Mickler , Andrew Morton , Kernel Testers List , Linus Torvalds , Linux PM List , Maciej Rutecki Subject: Re: 2.6.37-rc2-git4: Reported regressions 2.6.35 -> 2.6.36 References: <4CE5C919.7090504@teksavvy.com> In-Reply-To: Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org On 10-11-19 11:39 AM, Alex Deucher wrote: > On Thu, Nov 18, 2010 at 7:47 PM, Mark Lord wrote: > >> My non-Intel graphics notebook (has ATI X1400 graphics) also has a resume >> regression with 2.6.36. But it does work fine with 2.6.35 (and earlier, >> back many years). As a result, I'm stuck with 2.6.35 for the time being, >> and lack the time for a concerted debug effort on 2.6.36+ right now. >> > > Can you bisect? Does this patch help? > > diff --git a/drivers/gpu/drm/radeon/atom.c b/drivers/gpu/drm/radeon/atom.c > index 8e421f6..05efb5b 100644 > --- a/drivers/gpu/drm/radeon/atom.c > +++ b/drivers/gpu/drm/radeon/atom.c > @@ -112,6 +112,7 @@ static uint32_t atom_iio_execute(struct > atom_context *ctx, int base, > base += 3; > break; > case ATOM_IIO_WRITE: > + (void)ctx->card->ioreg_read(ctx->card, CU16(base + 1)); > ctx->card->ioreg_write(ctx->card, CU16(base + 1), temp); > base += 3; > break; It now comes back at resume time. But suffers long delays (also sometimes with 2.6.35) doing this: [drm:atom_op_jump] *ERROR* atombios stuck in loop for more than 5secs aborting [drm:atom_execute_table_locked] *ERROR* atombios stuck executing E576 (len 105, WS 12, PS 8) @ 0xE5C4 [drm:atom_op_jump] *ERROR* atombios stuck in loop for more than 5secs aborting [drm:atom_execute_table_locked] *ERROR* atombios stuck executing ECD2 (len 86, WS 4, PS 0) @ 0xED05 [drm:atom_op_jump] *ERROR* atombios stuck in loop for more than 5secs aborting [drm:atom_execute_table_locked] *ERROR* atombios stuck executing E576 (len 105, WS 12, PS 8) @ 0xE5C4 PM: resume of devices complete after 15718.253 msecs So I did this (local hack only, obviously NOT for mainline) to work around that issue: ws = CU8(base + ATOM_CT_WS_PTR); --- To unsubscribe from this list: send the line "unsubscribe netdev" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html --- linux-2.6.36/drivers/gpu/drm/radeon/atom.c 2010-10-20 16:30:22.000000000 -0400 +++ linux/drivers/gpu/drm/radeon/atom.c 2010-11-19 17:14:21.141807003 -0500 @@ -1150,6 +1151,7 @@ if (!base) return -EINVAL; + if (base == 0xe576 || base == 0xecd2) return 0; /* prevent freezes on Dell i9400 w/X1400 */ len = CU16(base + ATOM_CT_SIZE_PTR);