[patch 1/4] ps3fb: thread updates
flat view
STALE7176d
From: <hidden>
Date: 2007-02-15 15:46:24
Also in:
linuxppc-dev
ps3fb: Replace the kernel_thread by a proper kthread. Signed-off-by: Geert Uytterhoeven <redacted> --- drivers/video/ps3fb.c | 29 +++++++++++++++++++++++------ 1 files changed, 23 insertions(+), 6 deletions(-)
--- ps3-linux-2.6.20.orig/drivers/video/ps3fb.c
+++ ps3-linux-2.6.20/drivers/video/ps3fb.c@@ -32,6 +32,8 @@ #include <linux/ioctl.h> #include <linux/notifier.h> #include <linux/reboot.h> +#include <linux/freezer.h> +#include <linux/kthread.h> #include <asm/uaccess.h> #include <linux/fb.h>
@@ -139,6 +141,7 @@ struct ps3fb_priv { atomic_t ext_flip; /* on/off flip with vsync */ atomic_t f_count; /* fb_open count */ int is_blanked; + struct task_struct *task; }; static struct ps3fb_priv ps3fb;
@@ -805,12 +808,14 @@ static int ps3fb_ioctl(struct fb_info *i static int ps3fbd(void *arg) { - daemonize("ps3fbd"); - for (;;) { - down(&ps3fb.sem); - if (atomic_read(&ps3fb.ext_flip) == 0) + int error; + + do { + try_to_freeze(); + error = down_interruptible(&ps3fb.sem); + if (!error && !atomic_read(&ps3fb.ext_flip)) ps3fb_sync(0); /* single buffer */ - } + } while (!kthread_should_stop()); return 0; }
@@ -1050,9 +1055,17 @@ static int __init ps3fb_probe(struct pla "fb%d: PS3 frame buffer device, using %ld KiB of video memory\n", info->node, ps3fb_videomemory.size >> 10); - kernel_thread(ps3fbd, info, CLONE_KERNEL); + ps3fb.task = kthread_run(ps3fbd, info, "ps3fbd"); + if (IS_ERR(ps3fb.task)) { + retval = PTR_ERR(ps3fb.task); + ps3fb.task = NULL; + goto err_unregister_framebuffer; + } + return 0; +err_unregister_framebuffer: + unregister_framebuffer(info); err_fb_dealloc: fb_dealloc_cmap(&info->cmap); err_framebuffer_release:
@@ -1083,6 +1096,10 @@ void ps3fb_cleanup(void) { int status; + if (ps3fb.task) { + kthread_stop(ps3fb.task); + ps3fb.task = NULL; + } if (ps3fb.irq_no) { free_irq(ps3fb.irq_no, ps3fb.dev); ps3_free_irq(ps3fb.irq_no); --
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
-------------------------------------------------------------------------
Take Surveys. Earn Cash. Influence the Future of IT
Join SourceForge.net's Techsay panel and you'll get the chance to share your
opinions on IT & business topics through brief surveys-and earn cash
http://www.techsay.com/default.php?page=join.php&p=sourceforge&CID=DEVDEV