From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S261237AbVCAEVY (ORCPT ); Mon, 28 Feb 2005 23:21:24 -0500 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S261239AbVCAEVX (ORCPT ); Mon, 28 Feb 2005 23:21:23 -0500 Received: from gate.crashing.org ([63.228.1.57]:37817 "EHLO gate.crashing.org") by vger.kernel.org with ESMTP id S261237AbVCAEUu (ORCPT ); Mon, 28 Feb 2005 23:20:50 -0500 Subject: [PATCH] aty128fb: Disable AGP on suspend From: Benjamin Herrenschmidt To: Andrew Morton Cc: Linux Kernel list , Linux Fbdev development list Content-Type: text/plain Date: Tue, 01 Mar 2005 15:18:56 +1100 Message-Id: <1109650736.7670.9.camel@gaston> Mime-Version: 1.0 X-Mailer: Evolution 2.0.3 Content-Transfer-Encoding: 7bit Sender: linux-kernel-owner@vger.kernel.org X-Mailing-List: linux-kernel@vger.kernel.org Hi ! (for -mm only for now, need feedback from x86 users) This patch improves reliability of suspend/resume by making sure AGP is disabled on the Rage 128 chip before putting it into a suspend state. It works in conjunction with the uninorth-agp suspend patch, but should be harmless on machines with a different AGP bridge. Signed-off-by: Benjamin Herrenschmidt Index: linux-work/drivers/video/aty/aty128fb.c =================================================================== --- linux-work.orig/drivers/video/aty/aty128fb.c 2005-02-13 23:18:52.000000000 +1100 +++ linux-work/drivers/video/aty/aty128fb.c 2005-03-01 15:17:21.000000000 +1100 @@ -2334,6 +2334,7 @@ { struct fb_info *info = pci_get_drvdata(pdev); struct aty128fb_par *par = info->par; + u8 agp; /* We don't do anything but D2, for now we return 0, but * we may want to change that. How do we know if the BIOS @@ -2371,6 +2372,27 @@ par->asleep = 1; par->lock_blank = 1; + /* Disable AGP. The AGP host should have done it, but since ordering + * isn't always properly guaranteed in this specific case, let's make + * sure it's disabled on card side now. Ultimately, when merging fbdev + * and dri into some common infrastructure, this will be handled + * more nicely. The host bridge side will (or will not) be dealt with + * by the bridge AGP driver, we don't attempt to touch it here. + */ + agp = pci_find_capability(pdev, PCI_CAP_ID_AGP); + if (agp) { + u32 cmd; + + pci_read_config_dword(pdev, agp + PCI_AGP_COMMAND, &cmd); + if (cmd & PCI_AGP_COMMAND_AGP) { + printk(KERN_INFO "aty128fb: AGP was enabled, " + "disabling ...\n"); + cmd &= ~PCI_AGP_COMMAND_AGP; + pci_write_config_dword(pdev, agp + PCI_AGP_COMMAND, + cmd); + } + } + /* We need a way to make sure the fbdev layer will _not_ touch the * framebuffer before we put the chip to suspend state. On 2.4, I * used dummy fb ops, 2.5 need proper support for this at the