Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

[PATCH] ps3: disable display flipping during mode changes

If ps3fb is available, we have to disable display flipping while changing the
audio or video mode.

Signed-off-by: Geert 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: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

authored by

Geert Uytterhoeven and committed by
Linus Torvalds
0465f790 310d8c11

+14 -1
+4 -1
drivers/ps3/ps3av_cmd.c
··· 22 22 #include <linux/kernel.h> 23 23 #include <linux/delay.h> 24 24 #include <asm/ps3av.h> 25 + #include <asm/ps3fb.h> 25 26 #include <asm/ps3.h> 26 27 27 28 #include "vuart.h" ··· 852 851 { 853 852 int res; 854 853 855 - /* avb packet */ 854 + ps3fb_flip_ctl(0); /* flip off */ 856 855 856 + /* avb packet */ 857 857 res = ps3av_do_pkt(PS3AV_CID_AVB_PARAM, send_len, sizeof(*avb), 858 858 &avb->send_hdr); 859 859 if (res < 0) ··· 866 864 res); 867 865 868 866 out: 867 + ps3fb_flip_ctl(1); /* flip on */ 869 868 return res; 870 869 } 871 870
+10
include/asm-powerpc/ps3fb.h
··· 41 41 __u32 num_frames; /* num of frame buffers */ 42 42 }; 43 43 44 + #ifdef __KERNEL__ 45 + 46 + #ifdef CONFIG_FB_PS3 47 + extern void ps3fb_flip_ctl(int on); 48 + #else 49 + static inline void ps3fb_flip_ctl(int on) {} 50 + #endif 51 + 52 + #endif /* __KERNEL__ */ 53 + 44 54 #endif /* _ASM_POWERPC_PS3FB_H_ */