From mboxrd@z Thu Jan 1 00:00:00 1970 From: Geert Uytterhoeven Subject: [PATCH 8/10] ps3: disable display flipping during mode changes Date: Thu, 8 Feb 2007 14:59:45 +0100 (CET) Message-ID: References: Reply-To: linux-fbdev-devel@lists.sourceforge.net Mime-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Return-path: Received: from sc8-sf-mx2-b.sourceforge.net ([10.3.1.92] helo=mail.sourceforge.net) by sc8-sf-list1-new.sourceforge.net with esmtp (Exim 4.43) id 1HF9oY-0001t0-1y for linux-fbdev-devel@lists.sourceforge.net; Thu, 08 Feb 2007 05:59:54 -0800 Received: from [80.88.33.193] (helo=vervifontaine.sonycom.com) by mail.sourceforge.net with esmtp (Exim 4.44) id 1HF9oW-00042X-3M for linux-fbdev-devel@lists.sourceforge.net; Thu, 08 Feb 2007 05:59:54 -0800 In-Reply-To: List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: linux-fbdev-devel-bounces@lists.sourceforge.net Errors-To: linux-fbdev-devel-bounces@lists.sourceforge.net To: Andrew Morton Cc: Paul Mackerras , James Simmons , Linux Frame Buffer Device Development , Linux/PPC Development If ps3fb is available, we have to disable display flipping while changing the audio or video mode. Signed-off-by: Geert Uytterhoeven --- drivers/ps3/ps3av_cmd.c | 5 ++++- include/asm-powerpc/ps3fb.h | 10 ++++++++++ 2 files changed, 14 insertions(+), 1 deletion(-) --- ps3-linux-2.6.20.orig/drivers/ps3/ps3av_cmd.c +++ ps3-linux-2.6.20/drivers/ps3/ps3av_cmd.c @@ -22,6 +22,7 @@ #include #include #include +#include #include #include "vuart.h" @@ -851,8 +852,9 @@ int ps3av_cmd_avb_param(struct ps3av_pkt { 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 res); out: + ps3fb_flip_ctl(1); /* flip on */ return res; } --- ps3-linux-2.6.20.orig/include/asm-powerpc/ps3fb.h +++ ps3-linux-2.6.20/include/asm-powerpc/ps3fb.h @@ -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_ */ 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 From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from vervifontaine.sonycom.com (unknown [80.88.33.193]) by ozlabs.org (Postfix) with ESMTP id 74B46DE96E for ; Fri, 9 Feb 2007 00:59:47 +1100 (EST) Date: Thu, 8 Feb 2007 14:59:45 +0100 (CET) From: Geert Uytterhoeven Sender: geert@sonytel.be To: Andrew Morton Subject: [PATCH 8/10] ps3: disable display flipping during mode changes In-Reply-To: Message-ID: References: MIME-Version: 1.0 Content-Type: TEXT/PLAIN; charset=US-ASCII Cc: Paul Mackerras , James Simmons , Linux Frame Buffer Device Development , Linux/PPC Development List-Id: Linux on PowerPC Developers Mail List List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , If ps3fb is available, we have to disable display flipping while changing the audio or video mode. Signed-off-by: Geert Uytterhoeven --- drivers/ps3/ps3av_cmd.c | 5 ++++- include/asm-powerpc/ps3fb.h | 10 ++++++++++ 2 files changed, 14 insertions(+), 1 deletion(-) --- ps3-linux-2.6.20.orig/drivers/ps3/ps3av_cmd.c +++ ps3-linux-2.6.20/drivers/ps3/ps3av_cmd.c @@ -22,6 +22,7 @@ #include #include #include +#include #include #include "vuart.h" @@ -851,8 +852,9 @@ int ps3av_cmd_avb_param(struct ps3av_pkt { 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 res); out: + ps3fb_flip_ctl(1); /* flip on */ return res; } --- ps3-linux-2.6.20.orig/include/asm-powerpc/ps3fb.h +++ ps3-linux-2.6.20/include/asm-powerpc/ps3fb.h @@ -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_ */ 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