Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 36dff96b authored by Geert Uytterhoeven's avatar Geert Uytterhoeven Committed by Linus Torvalds
Browse files

[PATCH] ps3: cleanup ps3fb before clearing HPTE 



PS3: Cleanup the frame buffer device before clearing the HPTE mapping

Signed-off-by: default avatarGeert Uytterhoeven <Geert.Uytterhoeven@sonycom.com>
Cc: James Simmons <jsimmons@infradead.org>
Cc: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Cc: Paul Mackerras <paulus@samba.org>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 0465f790

arch/powerpc/platforms/ps3/htab.c

+5 −1
Original line number Diff line number Diff line
@@ -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 long slot, unsigned long va, 


static void ps3_hpte_clear(void)

{

	/* Make sure to clean up the frame buffer device first */

	ps3fb_cleanup();



	lv1_unmap_htab(htab_addr);

}

include/asm-powerpc/ps3fb.h

+2 −0
Original line number Diff line number Diff line
@@ -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__ */