Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 48074
b: refs/heads/master
c: 0465f79
h: refs/heads/master
v: v3
  • Loading branch information
Geert Uytterhoeven authored and Linus Torvalds committed Feb 12, 2007
1 parent c459f74 commit 3b2205b
Show file tree
Hide file tree
Showing 3 changed files with 15 additions and 2 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 310d8c11126d21e417206c874c6382c44ece1baa
refs/heads/master: 0465f790e06d6dbc07d9b569b74ee8154dfca280
5 changes: 4 additions & 1 deletion trunk/drivers/ps3/ps3av_cmd.c
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down Expand Up @@ -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)
Expand All @@ -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;
}

Expand Down
10 changes: 10 additions & 0 deletions trunk/include/asm-powerpc/ps3fb.h
Original file line number Diff line number Diff line change
Expand Up @@ -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_ */

0 comments on commit 3b2205b

Please sign in to comment.