aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/ps3/ps3av.c
diff options
context:
space:
mode:
authorGeert Uytterhoeven <Geert.Uytterhoeven@sonycom.com>2008-10-30 04:12:58 -0400
committerPaul Mackerras <paulus@samba.org>2008-11-19 00:03:54 -0500
commit9b82f3e61758ed897200f0244b63a77c1791bcba (patch)
treeed1a41b22151fabf4e096ca6b4bee8f1931599c7 /drivers/ps3/ps3av.c
parent486936cd93e99c802153b3f2f629c5ce62b8c0d4 (diff)
powerpc/ps3: Replace the flip_ctl logic in ps3av and ps3fb by a mutex
Introduce ps3_gpu_mutex to synchronizes GPU-related operations, like: - invoking the L1GPU_CONTEXT_ATTRIBUTE_FB_BLIT command using the lv1_gpu_context_attribute() hypervisor call, - handling the PS3AV_CID_AVB_PARAM packet in the PS3 A/V Settings driver. Signed-off-by: Geert Uytterhoeven <Geert.Uytterhoeven@sonycom.com> Signed-off-by: Geoff Levand <geoffrey.levand@am.sony.com> Signed-off-by: Paul Mackerras <paulus@samba.org>
Diffstat (limited to 'drivers/ps3/ps3av.c')
-rw-r--r--drivers/ps3/ps3av.c20
1 files changed, 0 insertions, 20 deletions
diff --git a/drivers/ps3/ps3av.c b/drivers/ps3/ps3av.c
index 06848b254d57..5324978b73fb 100644
--- a/drivers/ps3/ps3av.c
+++ b/drivers/ps3/ps3av.c
@@ -59,8 +59,6 @@ static struct ps3av {
59 struct ps3av_reply_hdr reply_hdr; 59 struct ps3av_reply_hdr reply_hdr;
60 u8 raw[PS3AV_BUF_SIZE]; 60 u8 raw[PS3AV_BUF_SIZE];
61 } recv_buf; 61 } recv_buf;
62 void (*flip_ctl)(int on, void *data);
63 void *flip_data;
64} *ps3av; 62} *ps3av;
65 63
66/* color space */ 64/* color space */
@@ -939,24 +937,6 @@ int ps3av_audio_mute(int mute)
939 937
940EXPORT_SYMBOL_GPL(ps3av_audio_mute); 938EXPORT_SYMBOL_GPL(ps3av_audio_mute);
941 939
942void ps3av_register_flip_ctl(void (*flip_ctl)(int on, void *data),
943 void *flip_data)
944{
945 mutex_lock(&ps3av->mutex);
946 ps3av->flip_ctl = flip_ctl;
947 ps3av->flip_data = flip_data;
948 mutex_unlock(&ps3av->mutex);
949}
950EXPORT_SYMBOL_GPL(ps3av_register_flip_ctl);
951
952void ps3av_flip_ctl(int on)
953{
954 mutex_lock(&ps3av->mutex);
955 if (ps3av->flip_ctl)
956 ps3av->flip_ctl(on, ps3av->flip_data);
957 mutex_unlock(&ps3av->mutex);
958}
959
960static int ps3av_probe(struct ps3_system_bus_device *dev) 940static int ps3av_probe(struct ps3_system_bus_device *dev)
961{ 941{
962 int res; 942 int res;