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

Commit 13a5e30c authored by Geoff Levand's avatar Geoff Levand Committed by Paul Mackerras
Browse files

[POWERPC] PS3: Rework AV settings driver 



Make the PS3 ps3av driver a loadable module.
  - Replace static data with kmalloc()'ed.
      o Allocate struct ps3av dynamically, as it contains data used as vuart
        receive/transmit buffers
      o Move static recv_buf from ps3av_do_pkt() to struct ps3av
  - Move ps3av_vuart_{read,write}() from drivers/ps3/ps3av_cmd.c to
    drivers/ps3/ps3av.c and make them static as they're used in that file only.
  - Make device a PS3 system-bus device.
  - Update copyright formatting.
  - Make two new routines ps3av_register_flip_ctl() and ps3av_flip_ctl() to
    support late binding of the frame buffer flip control routine.

Signed-off-by: default avatarGeert Uytterhoeven <Geert.Uytterhoeven@sonycom.com>
Signed-off-by: default avatarGeoff Levand <geoffrey.levand@am.sony.com>
Signed-off-by: default avatarPaul Mackerras <paulus@samba.org>
parent 66c63b84

drivers/ps3/Makefile

+2 −1
Original line number Diff line number Diff line 
obj-$(CONFIG_PS3_VUART) += vuart.o

obj-$(CONFIG_PS3_PS3AV) += ps3av.o ps3av_cmd.o

obj-$(CONFIG_PS3_PS3AV) += ps3av_mod.o

ps3av_mod-objs		+= ps3av.o ps3av_cmd.o

obj-$(CONFIG_PPC_PS3) += sys-manager-core.o

obj-$(CONFIG_PS3_SYS_MANAGER) += sys-manager.o

drivers/ps3/ps3av.c

+198 −174

File changed.

Preview size limit exceeded, changes collapsed.

drivers/ps3/ps3av_cmd.c

+2 −33
Original line number Diff line number Diff line
@@ -868,7 +868,7 @@ int ps3av_cmd_avb_param(struct ps3av_pkt_avb_param *avb, u32 send_len) 
{

	int res;



	ps3fb_flip_ctl(0);	/* flip off */

	ps3av_flip_ctl(0);	/* flip off */



	/* avb packet */

	res = ps3av_do_pkt(PS3AV_CID_AVB_PARAM, send_len, sizeof(*avb),
@@ -882,7 +882,7 @@ int ps3av_cmd_avb_param(struct ps3av_pkt_avb_param *avb, u32 send_len) 
			 res);



      out:

	ps3fb_flip_ctl(1);	/* flip on */

	ps3av_flip_ctl(1);	/* flip on */

	return res;

}
@@ -1003,34 +1003,3 @@ void ps3av_cmd_av_monitor_info_dump(const struct ps3av_pkt_av_get_monitor_info * 
		| PS3AV_CMD_AV_LAYOUT_176 \

		| PS3AV_CMD_AV_LAYOUT_192)

/************************* vuart ***************************/



#define POLLING_INTERVAL  25	/* in msec */



int ps3av_vuart_write(struct ps3_vuart_port_device *dev, const void *buf,

		      unsigned long size)

{

	int error = ps3_vuart_write(dev, buf, size);

	return error ? error : size;

}



int ps3av_vuart_read(struct ps3_vuart_port_device *dev, void *buf,

		     unsigned long size, int timeout)

{

	int error;

	int loopcnt = 0;



	timeout = (timeout + POLLING_INTERVAL - 1) / POLLING_INTERVAL;

	while (loopcnt++ <= timeout) {

		error = ps3_vuart_read(dev, buf, size);

		if (!error)

			return size;

		if (error != -EAGAIN) {

			printk(KERN_ERR "%s: ps3_vuart_read failed %d\n",

			       __func__, error);

			return error;

		}

		msleep(POLLING_INTERVAL);

	}

	return -EWOULDBLOCK;

}

include/asm-powerpc/ps3av.h

+18 −18
Original line number Diff line number Diff line 
/*

 * Copyright (C) 2006 Sony Computer Entertainment Inc.

 * Copyright 2006, 2007 Sony Corporation

 *  PS3 AV backend support.

 *

 * 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 the Free Software Foundation; version 2 of the License.

 *  Copyright (C) 2007 Sony Computer Entertainment Inc.

 *  Copyright 2007 Sony Corp.

 *

 * This program is distributed in the hope that it will be useful, but

 * WITHOUT ANY WARRANTY; without even the implied warranty of

 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU

 * General Public License for more details.

 *  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

 *  the Free Software Foundation; version 2 of the License.

 *

 * You should have received a copy of the GNU General Public License along

 * with this program; if not, write to the Free Software Foundation, Inc.,

 * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.

 *  This program is distributed in the hope that it will be useful,

 *  but WITHOUT ANY WARRANTY; without even the implied warranty of

 *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the

 *  GNU General Public License for more details.

 *

 *  You should have received a copy of the GNU General Public License

 *  along with this program; if not, write to the Free Software

 *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA

 */



#ifndef _ASM_POWERPC_PS3AV_H_

#define _ASM_POWERPC_PS3AV_H_
@@ -704,12 +707,6 @@ static inline void ps3av_cmd_av_monitor_info_dump(const struct ps3av_pkt_av_get_ 
extern int ps3av_cmd_video_get_monitor_info(struct ps3av_pkt_av_get_monitor_info *,

					    u32);



struct ps3_vuart_port_device;

extern int ps3av_vuart_write(struct ps3_vuart_port_device *dev,

			     const void *buf, unsigned long size);

extern int ps3av_vuart_read(struct ps3_vuart_port_device *dev, void *buf,

			    unsigned long size, int timeout);



extern int ps3av_set_video_mode(u32, int);

extern int ps3av_set_audio_mode(u32, u32, u32, u32, u32);

extern int ps3av_get_auto_mode(int);
@@ -722,5 +719,8 @@ extern int ps3av_video_mute(int); 
extern int ps3av_audio_mute(int);

extern int ps3av_dev_open(void);

extern int ps3av_dev_close(void);

extern void ps3av_register_flip_ctl(void (*flip_ctl)(int on, void *data),

				    void *flip_data);

extern void ps3av_flip_ctl(int on);



#endif	/* _ASM_POWERPC_PS3AV_H_ */