From: "Pat Campbell" Subject: [PATCH][LINUX] Dynamic modes support for PV xenfb (1of2) Date: Sun, 30 Dec 2007 11:45:11 -0700 Message-ID: <4777846E.3E48.0018.0@novell.com> Mime-Version: 1.0 Content-Type: multipart/mixed; boundary="=__Part98BEA527.0__=" Return-path: List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Sender: xen-devel-bounces@lists.xensource.com Errors-To: xen-devel-bounces@lists.xensource.com To: xen-devel@lists.xensource.com List-Id: xen-devel@lists.xenproject.org --=__Part98BEA527.0__= Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: quoted-printable Content-Disposition: inline Attached patch adds multiple frame buffer resolution support to=20 the PV xenfb frame buffer driver. Code is essentially the same as I sent in the previous RFC except the frame buffer size is now 800x600 if the backend does not support feature-resize, same memory footprint. =20 xenkbd driver now checks feature-resize so that it can scale the=20 absolute mouse position properly. Corresponding backend IOEMU patch is required for functionality but=20 this patch is not dependent on it. Change is compatible with older backend implementations. Please apply to tip of linux-2.6.18-xen Signed- off- by: Pat Campbell --=__Part98BEA527.0__= Content-Type: text/plain; name="xen-fbfront-resize.patch" Content-Transfer-Encoding: quoted-printable Content-Disposition: attachment; filename="xen-fbfront-resize.patch" diff -r 61c96456a3e1 drivers/xen/fbfront/xenfb.c --- a/drivers/xen/fbfront/xenfb.c Thu Dec 20 16:58:14 2007 +0000 +++ b/drivers/xen/fbfront/xenfb.c Fri Dec 28 08:06:55 2007 -0700 @@ -62,6 +62,9 @@ struct xenfb_info struct xenfb_page *page; unsigned long *mfns; int update_wanted; /* XENFB_TYPE_UPDATE wanted = */ + int feature_resize; /* Backend has resize = feature */ + int resize_dpy; + int xres, yres; =20 struct xenbus_device *xbdev; }; @@ -130,13 +133,15 @@ struct xenfb_info * Oh well, we wont be updating the writes to this page anytime soon. */ =20 +#define XENFB_PIXCLOCK 9025 /* Xorg "1280x1024" 110.80 to FB 1000000/110= .80 */=20 static int xenfb_fps =3D 20; -static unsigned long xenfb_mem_len =3D XENFB_WIDTH * XENFB_HEIGHT * = XENFB_DEPTH / 8; +static unsigned long xenfb_mem_len =3D XENFB_MAX_WIDTH * XENFB_MAX_HEIGHT = * XENFB_DEPTH / 8; =20 static int xenfb_remove(struct xenbus_device *); static void xenfb_init_shared_page(struct xenfb_info *); static int xenfb_connect_backend(struct xenbus_device *, struct xenfb_info= *); static void xenfb_disconnect_backend(struct xenfb_info *); +static void xenfb_refresh(struct xenfb_info *info, int x1, int y1, int w, = int h); =20 static void xenfb_do_update(struct xenfb_info *info, int x, int y, int w, int h) @@ -155,6 +160,25 @@ static void xenfb_do_update(struct xenfb mb(); /* ensure ring space available */ XENFB_OUT_RING_REF(info->page, prod) =3D event; wmb(); /* ensure ring contents visible */ + info->page->out_prod =3D prod + 1; + + notify_remote_via_irq(info->irq); +} + +static void xenfb_do_resize(struct xenfb_info *info) +{ + union xenfb_out_event event; + __u32 prod; + + event.type =3D XENFB_TYPE_RESIZE; + event.resize.width =3D info->xres; + event.resize.height =3D info->yres; + + prod =3D info->page->out_prod; + /* caller ensures !xenfb_queue_full() */ + mb(); /* ensure ring space available */ + XENFB_OUT_RING_REF(info->page, prod) =3D event; + wmb(); /* ensure ring contents visible */ info->page->out_prod =3D prod + 1; =20 notify_remote_via_irq(info->irq); @@ -209,6 +233,16 @@ static void xenfb_update_screen(struct x xenfb_do_update(info, x1, y1, x2 - x1, y2 - y1); } =20 +static void xenfb_resize_screen(struct xenfb_info *info) +{ + if (xenfb_queue_full(info)) + return; + + info->resize_dpy =3D 0; + xenfb_do_resize(info); + xenfb_refresh(info, 0, 0, info->xres, info->yres); +} + static int xenfb_thread(void *data) { struct xenfb_info *info =3D data; @@ -217,6 +251,9 @@ static int xenfb_thread(void *data) if (info->dirty) { info->dirty =3D 0; xenfb_update_screen(info); + } + if (info->resize_dpy) { + xenfb_resize_screen(info); } wait_event_interruptible(info->wq, kthread_should_stop() || info->dirty); @@ -413,6 +450,46 @@ static int xenfb_mmap(struct fb_info *fb return 0; } =20 +static int +xenfb_check_var(struct fb_var_screeninfo *var, struct fb_info *info) +{ + struct xenfb_info *xenfb_info; + + xenfb_info =3D info->par; + + if (!xenfb_info->feature_resize) { + if (var->xres =3D=3D XENFB_WIDTH && var->yres =3D=3D = XENFB_HEIGHT) { + return 0; + } + return -EINVAL; + } + if (var->xres =3D=3D 1024 && var->yres =3D=3D 768) { + return 0; + } + if (var->xres =3D=3D 800 && var->yres =3D=3D 600) { + return 0; + } + if (var->xres =3D=3D 640 && var->yres =3D=3D 480) { + return 0; + } + return -EINVAL; +} + +static int xenfb_set_par(struct fb_info *info) +{ + struct xenfb_info *xenfb_info; + + xenfb_info =3D info->par; + + if (xenfb_info->xres !=3D info->var.xres ||=20 + xenfb_info->yres !=3D info->var.yres) { + xenfb_info->xres =3D info->var.xres; + xenfb_info->yres =3D info->var.yres; + xenfb_info->resize_dpy =3D 1; + } + return 0; +} + static struct fb_ops xenfb_fb_ops =3D { .owner =3D THIS_MODULE, .fb_setcolreg =3D xenfb_setcolreg, @@ -420,6 +497,8 @@ static struct fb_ops xenfb_fb_ops =3D { .fb_copyarea =3D xenfb_copyarea, .fb_imageblit =3D xenfb_imageblit, .fb_mmap =3D xenfb_mmap, + .fb_check_var =3D xenfb_check_var, + .fb_set_par =3D xenfb_set_par, }; =20 static irqreturn_t xenfb_event_handler(int rq, void *dev_id, @@ -451,16 +530,28 @@ static int __devinit xenfb_probe(struct=20 struct xenfb_info *info; struct fb_info *fb_info; int ret; + int val; =20 info =3D kzalloc(sizeof(*info), GFP_KERNEL); if (info =3D=3D NULL) { xenbus_dev_fatal(dev, -ENOMEM, "allocating info structure")= ; return -ENOMEM; } + + if (xenbus_scanf(XBT_NIL, dev->otherend, "feature-resize", "%d", = &val) < 0) + val =3D 0; + info->feature_resize =3D val; + if (info->feature_resize) + xenfb_mem_len =3D XENFB_MAX_WIDTH * XENFB_MAX_HEIGHT * = XENFB_DEPTH / 8; + else + xenfb_mem_len =3D XENFB_WIDTH * XENFB_HEIGHT * XENFB_DEPTH = / 8; + dev->dev.driver_data =3D info; info->xbdev =3D dev; info->irq =3D -1; info->x1 =3D info->y1 =3D INT_MAX; + info->xres =3D XENFB_WIDTH; + info->yres =3D XENFB_HEIGHT; spin_lock_init(&info->dirty_lock); mutex_init(&info->mm_lock); init_waitqueue_head(&info->wq); @@ -504,9 +595,10 @@ static int __devinit xenfb_probe(struct=20 fb_info->screen_base =3D info->fb; =20 fb_info->fbops =3D &xenfb_fb_ops; - fb_info->var.xres_virtual =3D fb_info->var.xres =3D info->page->wid= th; - fb_info->var.yres_virtual =3D fb_info->var.yres =3D info->page->hei= ght; + fb_info->var.xres_virtual =3D fb_info->var.xres =3D info->xres; + fb_info->var.yres_virtual =3D fb_info->var.yres =3D info->yres; fb_info->var.bits_per_pixel =3D info->page->depth; + fb_info->var.pixclock =3D XENFB_PIXCLOCK; =20 fb_info->var.red =3D (struct fb_bitfield){16, 8, 0}; fb_info->var.green =3D (struct fb_bitfield){8, 8, 0}; @@ -600,19 +692,30 @@ static void xenfb_init_shared_page(struc static void xenfb_init_shared_page(struct xenfb_info *info) { int i; - + int j; + int entries_per_pd; + + entries_per_pd =3D PAGE_SIZE/sizeof(unsigned long); +=09 for (i =3D 0; i < info->nr_pages; i++) info->pages[i] =3D vmalloc_to_page(info->fb + i * = PAGE_SIZE); =20 - for (i =3D 0; i < info->nr_pages; i++) - info->mfns[i] =3D vmalloc_to_mfn(info->fb + i * PAGE_SIZE);= - info->page->pd[0] =3D vmalloc_to_mfn(info->mfns); info->page->pd[1] =3D 0; + for ( j =3D i =3D 0; i < info->nr_pages; i++) { + info->mfns[i] =3D vmalloc_to_mfn(info->fb + i * PAGE_SIZE);= + if ( i && i % entries_per_pd =3D=3D 0 ) { + j++; + info->page->pd[j] =3D vmalloc_to_mfn(&info->mfns[i]= ); + } + } info->page->width =3D XENFB_WIDTH; info->page->height =3D XENFB_HEIGHT; info->page->depth =3D XENFB_DEPTH; - info->page->line_length =3D (info->page->depth / 8) * info->page->w= idth; + if (info->feature_resize) + info->page->line_length =3D (info->page->depth / 8) * = XENFB_MAX_WIDTH; + else + info->page->line_length =3D (info->page->depth / 8) * = XENFB_WIDTH; info->page->mem_length =3D xenfb_mem_len; info->page->in_cons =3D info->page->in_prod =3D 0; info->page->out_cons =3D info->page->out_prod =3D 0; diff -r 61c96456a3e1 drivers/xen/fbfront/xenkbd.c --- a/drivers/xen/fbfront/xenkbd.c Thu Dec 20 16:58:14 2007 +0000 +++ b/drivers/xen/fbfront/xenkbd.c Fri Dec 28 08:10:01 2007 -0700 @@ -111,6 +111,7 @@ int __devinit xenkbd_probe(struct xenbus int ret, i; struct xenkbd_info *info; struct input_dev *kbd, *ptr; + int val; =20 info =3D kzalloc(sizeof(*info), GFP_KERNEL); if (!info) { @@ -163,8 +164,17 @@ int __devinit xenkbd_probe(struct xenbus for (i =3D BTN_LEFT; i <=3D BTN_TASK; i++) set_bit(i, ptr->keybit); ptr->relbit[0] =3D BIT(REL_X) | BIT(REL_Y) | BIT(REL_WHEEL); - input_set_abs_params(ptr, ABS_X, 0, XENFB_WIDTH, 0, 0); - input_set_abs_params(ptr, ABS_Y, 0, XENFB_HEIGHT, 0, 0); + + if (xenbus_scanf(XBT_NIL, dev->otherend, "feature-resize", "%d", = &val) < 0) + val =3D 0; + if (val) { + input_set_abs_params(ptr, ABS_X, 0, XENFB_MAX_WIDTH, 0, = 0); + input_set_abs_params(ptr, ABS_Y, 0, XENFB_MAX_HEIGHT, 0, = 0); + } + else { + input_set_abs_params(ptr, ABS_X, 0, XENFB_WIDTH, 0, 0); + input_set_abs_params(ptr, ABS_Y, 0, XENFB_HEIGHT, 0, 0); + } =20 ret =3D input_register_device(ptr); if (ret) { diff -r 61c96456a3e1 include/xen/interface/io/fbif.h --- a/include/xen/interface/io/fbif.h Thu Dec 20 16:58:14 2007 +0000 +++ b/include/xen/interface/io/fbif.h Fri Dec 28 08:06:29 2007 -0700 @@ -50,12 +50,26 @@ struct xenfb_update int32_t height; /* rect height */ }; =20 +/* + * Framebuffer resize notification event + * Capable backend sets feature-resize in xenstore. + */ +#define XENFB_TYPE_RESIZE 3 + +struct xenfb_resize +{ + uint8_t type; /* XENFB_TYPE_RESIZE */ + int32_t width; /* xres */ + int32_t height; /* yres */ +}; + #define XENFB_OUT_EVENT_SIZE 40 =20 union xenfb_out_event { uint8_t type; struct xenfb_update update; + struct xenfb_resize resize; char pad[XENFB_OUT_EVENT_SIZE]; }; =20 @@ -111,8 +125,12 @@ struct xenfb_page * PAGE_SIZE / sizeof(*pd) bytes. With PAGE_SIZE =3D=3D 4096 and * sizeof(unsigned long) =3D=3D 4, that's 4 Megs. Two directory * pages should be enough for a while. + * + * Increased to 3 to support 1280x1024 resolution on a 64bit system + * (1280*1024*4)/PAGE_SIZE =3D 1280 pages required + * PAGE_SIZE/64bit long =3D 512 pages per page directory */ - unsigned long pd[2]; + unsigned long pd[3]; }; =20 /* @@ -120,6 +138,8 @@ struct xenfb_page * solution is found, but don't leak it to the backend. */ #ifdef __KERNEL__ +#define XENFB_MAX_WIDTH 1024 +#define XENFB_MAX_HEIGHT 768 #define XENFB_WIDTH 800 #define XENFB_HEIGHT 600 #define XENFB_DEPTH 32 --=__Part98BEA527.0__= Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Content-Disposition: inline _______________________________________________ Xen-devel mailing list Xen-devel@lists.xensource.com http://lists.xensource.com/xen-devel --=__Part98BEA527.0__=--