drivers/video/msm: update to new kernel

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>

authored by

Pavel Machek and committed by

Linus Torvalds 16 years ago 69fd8d24 d62668e1

+3 -38

5 changed files

expand all

drivers

video

msm

mddi.c

mddi_client_nt35399.c

mddi_client_toshiba.c

mdp.c

mdp_ppp.c

drivers/video/msm/mddi.c

··· 24 24 #include <linux/spinlock.h> 25 25 #include <linux/clk.h> 26 26 #include <linux/io.h> 27 + #include <linux/sched.h> 27 28 #include <mach/msm_iomap.h> 28 29 #include <mach/irqs.h> 29 30 #include <mach/board.h>

drivers/video/msm/mddi_client_nt35399.c

··· 19 19 #include <linux/kernel.h> 20 20 #include <linux/platform_device.h> 21 21 #include <linux/interrupt.h> 22 + #include <linux/sched.h> 22 23 #include <linux/gpio.h> 23 24 #include <mach/msm_fb.h> 24 25

drivers/video/msm/mddi_client_toshiba.c

··· 20 20 #include <linux/platform_device.h> 21 21 #include <linux/interrupt.h> 22 22 #include <linux/gpio.h> 23 + #include <linux/sched.h> 23 24 #include <mach/msm_fb.h> 24 25 25 26

-18

drivers/video/msm/mdp.c

··· 22 22 #include <linux/wait.h> 23 23 #include <linux/clk.h> 24 24 #include <linux/file.h> 25 - #ifdef CONFIG_ANDROID_PMEM 26 - #include <linux/android_pmem.h> 27 - #endif 28 25 #include <linux/major.h> 29 26 30 27 #include <mach/msm_iomap.h> ··· 259 262 struct file *file; 260 263 unsigned long vstart; 261 264 262 - #ifdef CONFIG_ANDROID_PMEM 263 - if (!get_pmem_file(img->memory_id, start, &vstart, len, filep)) 264 - return 0; 265 - #endif 266 - 267 265 file = fget_light(img->memory_id, &put_needed); 268 266 if (file == NULL) 269 267 return -1; ··· 275 283 276 284 void put_img(struct file *src_file, struct file *dst_file) 277 285 { 278 - #ifdef CONFIG_ANDROID_PMEM 279 - if (src_file) 280 - put_pmem_file(src_file); 281 - if (dst_file) 282 - put_pmem_file(dst_file); 283 - #endif 284 286 } 285 287 286 288 int mdp_blit(struct mdp_device *mdp_dev, struct fb_info *fb, ··· 306 320 if (unlikely(get_img(&req->dst, fb, &dst_start, &dst_len, &dst_file))) { 307 321 printk(KERN_ERR "mpd_ppp: could not retrieve dst image from " 308 322 "memory\n"); 309 - #ifdef CONFIG_ANDROID_PMEM 310 - put_pmem_file(src_file); 311 - #endif 312 323 return -EINVAL; 313 324 } 314 325 mutex_lock(&mdp_mutex); ··· 482 499 /* register mdp device */ 483 500 mdp->mdp_dev.dev.parent = &pdev->dev; 484 501 mdp->mdp_dev.dev.class = mdp_class; 485 - snprintf(mdp->mdp_dev.dev.bus_id, BUS_ID_SIZE, "mdp%d", pdev->id); 486 502 487 503 /* if you can remove the platform device you'd have to implement 488 504 * this:

-20

drivers/video/msm/mdp_ppp.c

··· 16 16 #include <linux/file.h> 17 17 #include <linux/delay.h> 18 18 #include <linux/msm_mdp.h> 19 - #include <linux/android_pmem.h> 20 19 #include <mach/msm_fb.h> 21 20 22 21 #include "mdp_hw.h" ··· 578 579 static void flush_imgs(struct mdp_blit_req *req, struct mdp_regs *regs, 579 580 struct file *src_file, struct file *dst_file) 580 581 { 581 - #ifdef CONFIG_ANDROID_PMEM 582 - uint32_t src0_len, src1_len, dst0_len, dst1_len; 583 - 584 - /* flush src images to memory before dma to mdp */ 585 - get_len(&req->src, &req->src_rect, regs->src_bpp, &src0_len, 586 - &src1_len); 587 - flush_pmem_file(src_file, req->src.offset, src0_len); 588 - if (IS_PSEUDOPLNR(req->src.format)) 589 - flush_pmem_file(src_file, req->src.offset + src0_len, 590 - src1_len); 591 - 592 - /* flush dst images */ 593 - get_len(&req->dst, &req->dst_rect, regs->dst_bpp, &dst0_len, 594 - &dst1_len); 595 - flush_pmem_file(dst_file, req->dst.offset, dst0_len); 596 - if (IS_PSEUDOPLNR(req->dst.format)) 597 - flush_pmem_file(dst_file, req->dst.offset + dst0_len, 598 - dst1_len); 599 - #endif 600 582 } 601 583 602 584 static void get_chroma_addr(struct mdp_img *img, struct mdp_rect *rect,

Configure Feed

Configure Feed