From patchwork Tue Sep 13 10:00:02 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Subject: [Oneiric, from, 3.0.5~] savagedb: Fix typo causing regression in savage4 series Date: Tue, 13 Sep 2011 00:00:02 -0000 From: Tormod Volden X-Patchwork-Id: 114478 Message-Id: To: Ubuntu kernel team 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))