adulau/aha
1
0
Fork 0
mirror of https://github.com/adulau/aha.git synced 2024-12-27 19:26:25 +00:00
Code Issues Projects Releases Packages Wiki Activity

drivers/video/msm: update to new kernel

Browse source 
TASK_INTERRUPTIBLE and friends are now only available after including
<linux/sched.h>, so include it when needed.

bus_id is no longer available/necessary, so remove that.

Android pmem driver is not available in mainline, so remove its hooks
from drivers/video.

Signed-off-by: Pavel Machek <pavel@ucw.cz>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
This commit is contained in:
Pavel Machek 2009-11-11 14:26:51 -08:00 committed by Linus Torvalds
parent d62668e1dd
commit 69fd8d2467
5 changed files with 3 additions and 38 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
drivers/video/msm/mddi.c
View file

@ -24,6 +24,7 @@
#include <linux/spinlock.h> #include <linux/spinlock.h>
#include <linux/clk.h> #include <linux/clk.h>
#include <linux/io.h> #include <linux/io.h>
#include <linux/sched.h>
#include <mach/msm_iomap.h> #include <mach/msm_iomap.h>
#include <mach/irqs.h> #include <mach/irqs.h>
#include <mach/board.h> #include <mach/board.h>

1
drivers/video/msm/mddi_client_nt35399.c
View file

@ -19,6 +19,7 @@
#include <linux/kernel.h> #include <linux/kernel.h>
#include <linux/platform_device.h> #include <linux/platform_device.h>
#include <linux/interrupt.h> #include <linux/interrupt.h>
#include <linux/sched.h>
#include <linux/gpio.h> #include <linux/gpio.h>
#include <mach/msm_fb.h> #include <mach/msm_fb.h>

1
drivers/video/msm/mddi_client_toshiba.c
View file

@ -20,6 +20,7 @@
#include <linux/platform_device.h> #include <linux/platform_device.h>
#include <linux/interrupt.h> #include <linux/interrupt.h>
#include <linux/gpio.h> #include <linux/gpio.h>
#include <linux/sched.h>
#include <mach/msm_fb.h> #include <mach/msm_fb.h>

18
drivers/video/msm/mdp.c
View file

@ -22,9 +22,6 @@
#include <linux/wait.h> #include <linux/wait.h>
#include <linux/clk.h> #include <linux/clk.h>
#include <linux/file.h> #include <linux/file.h>
#ifdef CONFIG_ANDROID_PMEM
#include <linux/android_pmem.h>
#endif
#include <linux/major.h> #include <linux/major.h>
#include <mach/msm_iomap.h> #include <mach/msm_iomap.h>
@ -262,11 +259,6 @@ int get_img(struct mdp_img *img, struct fb_info *info,
struct file *file; struct file *file;
unsigned long vstart; unsigned long vstart;
#ifdef CONFIG_ANDROID_PMEM
if (!get_pmem_file(img->memory_id, start, &vstart, len, filep))
return 0;
#endif
file = fget_light(img->memory_id, &put_needed); file = fget_light(img->memory_id, &put_needed);
if (file == NULL) if (file == NULL)
return -1; return -1;
@ -283,12 +275,6 @@ int get_img(struct mdp_img *img, struct fb_info *info,
void put_img(struct file *src_file, struct file *dst_file) void put_img(struct file *src_file, struct file *dst_file)
{ {
#ifdef CONFIG_ANDROID_PMEM
if (src_file)
put_pmem_file(src_file);
if (dst_file)
put_pmem_file(dst_file);
#endif
} }
int mdp_blit(struct mdp_device *mdp_dev, struct fb_info *fb, int mdp_blit(struct mdp_device *mdp_dev, struct fb_info *fb,
@ -320,9 +306,6 @@ int mdp_blit(struct mdp_device *mdp_dev, struct fb_info *fb,
if (unlikely(get_img(&req->dst, fb, &dst_start, &dst_len, &dst_file))) { if (unlikely(get_img(&req->dst, fb, &dst_start, &dst_len, &dst_file))) {
printk(KERN_ERR "mpd_ppp: could not retrieve dst image from " printk(KERN_ERR "mpd_ppp: could not retrieve dst image from "
"memory\n"); "memory\n");
#ifdef CONFIG_ANDROID_PMEM
put_pmem_file(src_file);
#endif
return -EINVAL; return -EINVAL;
} }
mutex_lock(&mdp_mutex); mutex_lock(&mdp_mutex);
@ -499,7 +482,6 @@ int mdp_probe(struct platform_device *pdev)
/* register mdp device */ /* register mdp device */
mdp->mdp_dev.dev.parent = &pdev->dev; mdp->mdp_dev.dev.parent = &pdev->dev;
mdp->mdp_dev.dev.class = mdp_class; mdp->mdp_dev.dev.class = mdp_class;
snprintf(mdp->mdp_dev.dev.bus_id, BUS_ID_SIZE, "mdp%d", pdev->id);
/* if you can remove the platform device you'd have to implement /* if you can remove the platform device you'd have to implement
* this: * this:

20
drivers/video/msm/mdp_ppp.c
View file

@ -16,7 +16,6 @@
#include <linux/file.h> #include <linux/file.h>
#include <linux/delay.h> #include <linux/delay.h>
#include <linux/msm_mdp.h> #include <linux/msm_mdp.h>
#include <linux/android_pmem.h>
#include <mach/msm_fb.h> #include <mach/msm_fb.h>
#include "mdp_hw.h" #include "mdp_hw.h"
@ -579,25 +578,6 @@ static int valid_src_dst(unsigned long src_start, unsigned long src_len,
static void flush_imgs(struct mdp_blit_req *req, struct mdp_regs *regs, static void flush_imgs(struct mdp_blit_req *req, struct mdp_regs *regs,
struct file *src_file, struct file *dst_file) struct file *src_file, struct file *dst_file)
{ {
#ifdef CONFIG_ANDROID_PMEM
uint32_t src0_len, src1_len, dst0_len, dst1_len;
/* flush src images to memory before dma to mdp */
get_len(&req->src, &req->src_rect, regs->src_bpp, &src0_len,
&src1_len);
flush_pmem_file(src_file, req->src.offset, src0_len);
if (IS_PSEUDOPLNR(req->src.format))
flush_pmem_file(src_file, req->src.offset + src0_len,
src1_len);
/* flush dst images */
get_len(&req->dst, &req->dst_rect, regs->dst_bpp, &dst0_len,
&dst1_len);
flush_pmem_file(dst_file, req->dst.offset, dst0_len);
if (IS_PSEUDOPLNR(req->dst.format))
flush_pmem_file(dst_file, req->dst.offset + dst0_len,
dst1_len);
#endif
} }
static void get_chroma_addr(struct mdp_img *img, struct mdp_rect *rect, static void get_chroma_addr(struct mdp_img *img, struct mdp_rect *rect,