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

Commit d2b06a8b authored by Paul Mundt's avatar Paul Mundt
Browse files

video: Update pvr2fb for sq API changes. 



With the store queue API rework, we need to change the in-kernel
users too.

Signed-off-by: default avatarPaul Mundt <lethal@linux-sh.org>
parent f1517494

drivers/video/pvr2fb.c

+12 −10
Original line number Diff line number Diff line
@@ -187,7 +187,7 @@ static short do_blank = 0; /* (Un)Blank the screen */ 
static unsigned int is_blanked = 0;		/* Is the screen blanked? */



#ifdef CONFIG_SH_STORE_QUEUES

static struct sq_mapping *pvr2fb_map;

static unsigned long pvr2fb_map;

#endif



#ifdef CONFIG_SH_DMA
@@ -213,8 +213,10 @@ static irqreturn_t pvr2fb_interrupt(int irq, void *dev_id, struct pt_regs *fp); 
static int pvr2_init_cable(void);

static int pvr2_get_param(const struct pvr2_params *p, const char *s,

                            int val, int size);

#ifdef CONFIG_SH_DMA

static ssize_t pvr2fb_write(struct file *file, const char *buf,

			    size_t count, loff_t *ppos);

#endif



static struct fb_ops pvr2fb_ops = {

	.owner		= THIS_MODULE,
@@ -783,7 +785,7 @@ static int __init pvr2fb_common_init(void) 
		goto out_err;

	}



	fb_memset((unsigned long)fb_info->screen_base, 0, pvr2_fix.smem_len);

	fb_memset(fb_info->screen_base, 0, pvr2_fix.smem_len);



	pvr2_fix.ypanstep	= nopan  ? 0 : 1;

	pvr2_fix.ywrapstep	= nowrap ? 0 : 1;
@@ -829,10 +831,10 @@ static int __init pvr2fb_common_init(void) 
	printk(KERN_NOTICE "fb%d: registering with SQ API\n", fb_info->node);



	pvr2fb_map = sq_remap(fb_info->fix.smem_start, fb_info->fix.smem_len,

			      fb_info->fix.id);

			      fb_info->fix.id, pgprot_val(PAGE_SHARED));



	printk(KERN_NOTICE "fb%d: Mapped video memory to SQ addr 0x%lx\n",

	       fb_info->node, pvr2fb_map->sq_addr);

	       fb_info->node, pvr2fb_map);

#endif



	return 0;