summaryrefslogtreecommitdiffstats
path: root/drivers/video/msm/mdp_ppp.c
diff options
context:
space:
mode:
authorPavel Machek <pavel@ucw.cz>2009-11-11 14:26:51 -0800
committerLinus Torvalds <torvalds@linux-foundation.org>2009-11-12 07:26:00 -0800
commit69fd8d24673a8f4f8be5db7f84b5dc9e4ff354c8 (patch)
treefc8c2fa48255b1ff43ccbb6996c73a0eb9230832 /drivers/video/msm/mdp_ppp.c
parentd62668e1dd830a81ef73ec73386b420cb2a9ca62 (diff)
downloadblackbird-op-linux-69fd8d24673a8f4f8be5db7f84b5dc9e4ff354c8.tar.gz
blackbird-op-linux-69fd8d24673a8f4f8be5db7f84b5dc9e4ff354c8.zip
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>
Diffstat (limited to 'drivers/video/msm/mdp_ppp.c')
-rw-r--r--drivers/video/msm/mdp_ppp.c20
1 files changed, 0 insertions, 20 deletions
diff --git a/drivers/video/msm/mdp_ppp.c b/drivers/video/msm/mdp_ppp.c
index ba2c4673b648..4ff001f4cbbd 100644
--- a/drivers/video/msm/mdp_ppp.c
+++ b/drivers/video/msm/mdp_ppp.c
@@ -16,7 +16,6 @@
#include <linux/file.h>
#include <linux/delay.h>
#include <linux/msm_mdp.h>
-#include <linux/android_pmem.h>
#include <mach/msm_fb.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,
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,
OpenPOWER on IntegriCloud