[PATCH 9/10] ps3: cleanup ps3fb before clearing HPTE
From: Geert Uytterhoeven <hidden>
Date: 2007-01-30 17:03:10
Also in:
linux-fbdev
PS3: Cleanup the frame buffer device before clearing the HPTE mapping Signed-off-by: Geert Uytterhoeven <redacted> --- arch/powerpc/platforms/ps3/htab.c | 6 +++++- include/asm-powerpc/ps3fb.h | 2 ++ 2 files changed, 7 insertions(+), 1 deletion(-)
--- ps3-linux-2.6.20-rc6.orig/arch/powerpc/platforms/ps3/htab.c
+++ ps3-linux-2.6.20-rc6/arch/powerpc/platforms/ps3/htab.c@@ -2,7 +2,7 @@ * PS3 pagetable management routines. * * Copyright (C) 2006 Sony Computer Entertainment Inc. - * Copyright 2006 Sony Corp. + * Copyright 2006, 2007 Sony Corporation * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by
@@ -24,6 +24,7 @@ #include <asm/lmb.h> #include <asm/udbg.h> #include <asm/lv1call.h> +#include <asm/ps3fb.h> #include "platform.h"
@@ -233,6 +234,9 @@ static void ps3_hpte_invalidate(unsigned static void ps3_hpte_clear(void) { + /* Make sure to clean up the frame buffer device first */ + ps3fb_cleanup(); + lv1_unmap_htab(htab_addr); } --- ps3-linux-2.6.20-rc6.orig/include/asm-powerpc/ps3fb.h +++ ps3-linux-2.6.20-rc6/include/asm-powerpc/ps3fb.h
@@ -45,8 +45,10 @@ struct ps3fb_ioctl_res { #ifdef CONFIG_FB_PS3 extern void ps3fb_flip_ctl(int); +extern void ps3fb_cleanup(void); #else static inline void ps3fb_flip_ctl(int) {} +static inline void ps3fb_cleanup(void) {} #endif #endif /* __KERNEL__ */
Gr{oetje,eeting}s,
Geert
--
Geert Uytterhoeven -- Sony Network and Software Technology Center Europe (NSCE)
Geert.Uytterhoeven@sonycom.com ------- The Corporate Village, Da Vincilaan 7-D1
Voice +32-2-7008453 Fax +32-2-7008622 ---------------- B-1935 Zaventem, Belgium