]> err.no Git - linux-2.6/commit
[PATCH] ppc32: Fix AGP and sleep again
authorBenjamin Herrenschmidt <benh@kernel.crashing.org>
Sat, 16 Apr 2005 22:24:19 +0000 (15:24 -0700)
committerLinus Torvalds <torvalds@ppc970.osdl.org>
Sat, 16 Apr 2005 22:24:19 +0000 (15:24 -0700)
commit0c541b4406a68e74d94ddb667c69d9e03bce8681
tree869506b6c3f7c00ac13f2aa80c35fb5e229cc329
parent7a648b9ec09f32606fe0f27fb9d095311cf968ca
[PATCH] ppc32: Fix AGP and sleep again

My previous patch that added sleep support for uninorth-agp and some AGP
"off" stuff in radeonfb and aty128fb is breaking some configs.  More
specifically, it has problems with rage128 setups since the DRI code for
these in X doesn't properly re-enable AGP on wakeup or console switch
(unlike the radeon DRM).

This patch fixes the problem for pmac once for all by using a different
approach.  The AGP driver "registers" special suspend/resume callbacks with
some arch code that the fbdev's can later on call to suspend and resume
AGP, making sure it's resumed back in the same state it was when suspended.
 This is platform specific for now.  It would be too complicated to try to
do a generic implementation of this at this point due to all sort of weird
things going on with AGP on other architectures.  We'll re-work that whole
problem cleanly once we finally merge fbdev's and DRI.

In the meantime, please apply this patch which brings back some r128 based
laptops into working condition as far as system sleep is concerned.

Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
arch/ppc/platforms/pmac_feature.c
arch/ppc64/kernel/pmac_feature.c
drivers/char/agp/uninorth-agp.c
drivers/video/aty/aty128fb.c
drivers/video/aty/radeon_pm.c
include/asm-ppc/pmac_feature.h