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.orig/arch/powerpc/platforms/ps3/htab.c
+++ ps3-linux-2.6.20/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
@@ -25,6 +25,7 @@
#include <asm/udbg.h>
#include <asm/ps3.h>
#include <asm/lv1call.h>
+#include <asm/ps3fb.h>
#include "platform.h"
@@ -234,6 +235,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.orig/include/asm-powerpc/ps3fb.h
+++ ps3-linux-2.6.20/include/asm-powerpc/ps3fb.h@@ -45,8 +45,10 @@ struct ps3fb_ioctl_res {
#ifdef CONFIG_FB_PS3
extern void ps3fb_flip_ctl(int on);
+extern void ps3fb_cleanup(void);
#else
static inline void ps3fb_flip_ctl(int on) {}
+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
-------------------------------------------------------------------------
Using Tomcat but need to do more? Need to support web services, security?
Get stuff done quickly with pre-integrated technology to make your job easier.
Download IBM WebSphere Application Server v.1.0.1 based on Apache Geronimo
http://sel.as-us.falkag.net/sel?cmd=lnk&kid=120709&bid=263057&dat=121642