From patchwork Tue Sep 13 10:00:02 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Tormod Volden X-Patchwork-Id: 114478 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from chlorine.canonical.com (chlorine.canonical.com [91.189.94.204]) by ozlabs.org (Postfix) with ESMTP id A7401B71BD for ; Tue, 13 Sep 2011 22:25:36 +1000 (EST) Received: from localhost ([127.0.0.1] helo=chlorine.canonical.com) by chlorine.canonical.com with esmtp (Exim 4.71) (envelope-from ) id 1R3S2w-00082S-MI; Tue, 13 Sep 2011 12:25:02 +0000 Received: from mail-bw0-f49.google.com ([209.85.214.49]) by chlorine.canonical.com with esmtp (Exim 4.71) (envelope-from ) id 1R3Pmc-0008Cr-Tg for kernel-team@lists.ubuntu.com; Tue, 13 Sep 2011 10:00:02 +0000 Received: by bkat2 with SMTP id t2so396141bka.8 for ; Tue, 13 Sep 2011 03:00:02 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=mime-version:date:message-id:subject:from:to:content-type :content-transfer-encoding; bh=p47gzX9hmPKdaxvfLObeBZ7TKnobWWJ5kxBGSvAdMLk=; b=l54I6/xt0szh0zmBrK181nGHUtxm0TTYCTMoZi7ZObh0BqPrq2J9jckzvWl0c9Z0qF CZRSdTb/RQde4EgjzG0pqNr91drQ/OI8p15bRcYSTxPpQK7f4iRVdJx1OmCmX3n9gRLM S0r6CfCoQqOeJ+isphCeu/d7MXezlunKMuCzc= MIME-Version: 1.0 Received: by 10.204.146.155 with SMTP id h27mr1553912bkv.353.1315908002357; Tue, 13 Sep 2011 03:00:02 -0700 (PDT) Received: by 10.204.176.202 with HTTP; Tue, 13 Sep 2011 03:00:02 -0700 (PDT) Date: Tue, 13 Sep 2011 12:00:02 +0200 Message-ID: Subject: [Oneiric][PATCH from 3.0.5~] savagedb: Fix typo causing regression in savage4 series From: Tormod Volden To: Ubuntu kernel team X-Mailman-Approved-At: Tue, 13 Sep 2011 12:25:01 +0000 X-BeenThere: kernel-team@lists.ubuntu.com X-Mailman-Version: 2.1.13 Precedence: list List-Id: Kernel team discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: kernel-team-bounces@lists.ubuntu.com Errors-To: kernel-team-bounces@lists.ubuntu.com Hi, Can you please cherry-pick this patch which fixes a 3.0 regression in the savagefb driver? The patch is in the p-kernel http://kernel.ubuntu.com/git?p=ubuntu/ubuntu-p.git;a=commitdiff;h=4b00e4b3940eabb38adeec0823751820fe2d6fda and is also scheduled for 3.0.5, but at this point (and the kernel.org outage) I guess 3.0.5 will not end up in Oneiric. I am adding the patch here, but I guess cherry-pick might be better in case my mailer messes up the whitespace. Best regards, Tormod PS. I filed a bug for this before I understood that I should rather use the mailing list, but I will close it: https://bugs.edge.launchpad.net/ubuntu/+source/linux/+bug/848773 ---------- Forwarded message ---------- From:   Date: Tue, Aug 30, 2011 at 12:17 AM Subject: Patch "savagedb: Fix typo causing regression in savage4 series" has been added to the 3.0-stable tree This is a note to let you know that I've just added the patch titled    savagedb: Fix typo causing regression in savage4 series to the 3.0-stable tree which can be found at:    http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary The filename of the patch is:     savagedb-fix-typo-causing-regression-in-savage4-series.patch and it can be found in the queue-3.0 subdirectory. If you, or anyone else, feels it should not be added to the stable tree, please let know about it. From 4b00e4b3940eabb38adeec0823751820fe2d6fda Mon Sep 17 00:00:00 2001 From: John Stanley Date: Wed, 3 Aug 2011 20:41:00 -0400 Subject: savagedb: Fix typo causing regression in savage4 series  video chip detection From: John Stanley commit 4b00e4b3940eabb38adeec0823751820fe2d6fda upstream. Two additional savage4 variants were added, but the S3_SAVAGE4_SERIES macro was incompletely modified, resulting in a false positive detection of a savage4 card regardless of which savage card is actually present. For non-savage4 series cards, such as a Savage/IX-MV card, this results in garbled video and/or a hard-hang at boot time.  Fix this by changing an '||' to an '&&' in the S3_SAVAGE4_SERIES macro. Signed-off-by: John P. Stanley Reviewed-by: Tormod Volden [ The macros have incomplete parenthesis too, but whatever ..  -Linus ] Signed-off-by: Linus Torvalds Signed-off-by: Greg Kroah-Hartman ---  drivers/video/savage/savagefb.h |    2 +-  1 file changed, 1 insertion(+), 1 deletion(-)  #define S3_SAVAGE_MOBILE_SERIES(chip)  ((chip==S3_SAVAGE_MX) || (chip==S3_SUPERSAVAGE)) --- a/drivers/video/savage/savagefb.h +++ b/drivers/video/savage/savagefb.h @@ -55,7 +55,7 @@  #define S3_SAVAGE3D_SERIES(chip)  ((chip>=S3_SAVAGE3D) && (chip<=S3_SAVAGE_MX)) -#define S3_SAVAGE4_SERIES(chip)   ((chip>=S3_SAVAGE4) || (chip<=S3_PROSAVAGEDDR)) +#define S3_SAVAGE4_SERIES(chip)   ((chip>=S3_SAVAGE4) && (chip<=S3_PROSAVAGEDDR))