drivers/video/msm: update to new kernel

[sfrench/cifs-2.6.git] / drivers / video / msm / mdp_ppp.c

diff --git a/drivers/video/msm/mdp_ppp.c b/drivers/video/msm/mdp_ppp.c
index ba2c4673b648924230702777b588a980110219b7..4ff001f4cbbdd9f33a98803bf70755f562c2c1a7 100644 (file)
--- 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,