diff options
author | Thomas Koeller <thomas@koeller.dyndns.org> | 2006-01-09 20:53:48 -0800 |
---|---|---|
committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-01-10 08:01:52 -0800 |
commit | cae8a12f49972f040bae6707b7707cd93fe9c9ab (patch) | |
tree | c898f9bcd31ba14d0f646e191525cb6ef6a09976 /drivers/video/fbmem.c | |
parent | 74b4f04231b9755106d803ef73b11c3cf6978bcd (diff) | |
download | blackbird-op-linux-cae8a12f49972f040bae6707b7707cd93fe9c9ab.tar.gz blackbird-op-linux-cae8a12f49972f040bae6707b7707cd93fe9c9ab.zip |
[PATCH] non-linear frame buffer read/write access
While the code in fbmem.c allows for hooking read/write access to
non-linear frame buffers by means of fb_read and fb_write in struct fb_ops,
I could not find a way tho access the actual frame buffer memory from
within these routines. I therefore had to patch fbmem.c, to be able to
retrieve a pointer to struct fb_info from the 'file' argument to these
functions.
The second hunk of the patch is not strictly required, I only did that for
symmetry reasons (and the code is somewhat shorter).
Signed-off-by: Thomas Koeller <thomas@koeller.dyndns.org>
Acked-by: "Antonino A. Daplas" <adaplas@gmail.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'drivers/video/fbmem.c')
-rw-r--r-- | drivers/video/fbmem.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/drivers/video/fbmem.c b/drivers/video/fbmem.c index 83e259413115..32a9b69becc5 100644 --- a/drivers/video/fbmem.c +++ b/drivers/video/fbmem.c @@ -1234,6 +1234,7 @@ fb_open(struct inode *inode, struct file *file) return -ENODEV; if (!try_module_get(info->fbops->owner)) return -ENODEV; + file->private_data = info; if (info->fbops->fb_open) { res = info->fbops->fb_open(info,1); if (res) @@ -1245,11 +1246,9 @@ fb_open(struct inode *inode, struct file *file) static int fb_release(struct inode *inode, struct file *file) { - int fbidx = iminor(inode); - struct fb_info *info; + struct fb_info * const info = file->private_data; lock_kernel(); - info = registered_fb[fbidx]; if (info->fbops->fb_release) info->fbops->fb_release(info,1); module_put(info->fbops->owner); |