Commit:     4b95320fc4d21b0ff2f8604305dd6c851aff6096
Parent:     7b37b064c294af350c462f77d7a9a44485a93684
Author:     Wang Zhenyu <[EMAIL PROTECTED]>
AuthorDate: Wed Jan 17 11:07:54 2007 +0800
Committer:  Dave Jones <[EMAIL PROTECTED]>
CommitDate: Wed Jan 17 00:26:30 2007 -0500

    [AGPGART] intel_agp: restore graphics device's pci space early in resume
    Currently in resuming path graphics device's pci space restore is
    behind host bridge, so resume function wrongly accesses graphics
    device's space. This makes resuming failure which crashed X.
    here's a patch to restore device's pci space early, which makes
    resuming ok with X.
    Signed-off-by: Wang Zhenyu <[EMAIL PROTECTED]>
    Signed-off-by: Dave Jones <[EMAIL PROTECTED]>
 drivers/char/agp/intel-agp.c |    9 +++++++++
 1 files changed, 9 insertions(+), 0 deletions(-)

diff --git a/drivers/char/agp/intel-agp.c b/drivers/char/agp/intel-agp.c
index ab0a9c0..a3011de 100644
--- a/drivers/char/agp/intel-agp.c
+++ b/drivers/char/agp/intel-agp.c
@@ -1955,6 +1955,15 @@ static int agp_intel_resume(struct pci_dev *pdev)
+       /* We should restore our graphics device's config space,
+        * as host bridge (00:00) resumes before graphics device (02:00),
+        * then our access to its pci space can work right.
+        */
+       if (intel_i810_private.i810_dev)
+               pci_restore_state(intel_i810_private.i810_dev);
+       if (intel_i830_private.i830_dev)
+               pci_restore_state(intel_i830_private.i830_dev);
        if (bridge->driver == &intel_generic_driver)
        else if (bridge->driver == &intel_850_driver)
To unsubscribe from this list: send the line "unsubscribe git-commits-head" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at

Reply via email to