Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 69fd8d24 authored by Pavel Machek's avatar Pavel Machek Committed by Linus Torvalds
Browse files

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: default avatarPavel Machek <pavel@ucw.cz>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent d62668e1

drivers/video/msm/mddi.c

+1 −0
Original line number Original line Diff line number Diff line
@@ -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>

drivers/video/msm/mddi_client_nt35399.c

+1 −0
Original line number Original line Diff line number Diff line
@@ -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>

drivers/video/msm/mddi_client_toshiba.c

+1 −0
Original line number Original line Diff line number Diff line
@@ -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>

drivers/video/msm/mdp.c

+0 −18
Original line number Original line Diff line number Diff line
@@ -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:

drivers/video/msm/mdp_ppp.c

+0 −20
Original line number Original line Diff line number Diff line
@@ -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,