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

Commit 0465f790 authored by Geert Uytterhoeven's avatar Geert Uytterhoeven Committed by Linus Torvalds
Browse files

[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: 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 310d8c11

drivers/ps3/ps3av_cmd.c

+4 −1
Original line number Diff line number Diff line
@@ -22,6 +22,7 @@ 
#include <linux/kernel.h>

#include <linux/delay.h>

#include <asm/ps3av.h>

#include <asm/ps3fb.h>

#include <asm/ps3.h>



#include "vuart.h"
@@ -851,8 +852,9 @@ int ps3av_cmd_avb_param(struct ps3av_pkt_avb_param *avb, u32 send_len) 
{

	int res;



	/* avb packet */

	ps3fb_flip_ctl(0);	/* flip off */



	/* avb packet */

	res = ps3av_do_pkt(PS3AV_CID_AVB_PARAM, send_len, sizeof(*avb),

			   &avb->send_hdr);

	if (res < 0)
@@ -864,6 +866,7 @@ int ps3av_cmd_avb_param(struct ps3av_pkt_avb_param *avb, u32 send_len) 
			 res);



      out:

	ps3fb_flip_ctl(1);	/* flip on */

	return res;

}

include/asm-powerpc/ps3fb.h

+10 −0
Original line number Diff line number Diff line
@@ -41,4 +41,14 @@ struct ps3fb_ioctl_res { 
	__u32 num_frames; /* num of frame buffers */

};



#ifdef __KERNEL__



#ifdef CONFIG_FB_PS3

extern void ps3fb_flip_ctl(int on);

#else

static inline void ps3fb_flip_ctl(int on) {}

#endif



#endif /* __KERNEL__ */



#endif /* _ASM_POWERPC_PS3FB_H_ */