From: "Pat Campbell" Subject: [RFC] Dynamic modes support for PV xenfb (included) Date: Wed, 19 Dec 2007 22:20:32 -0700 Message-ID: <476998DD.3E48.0018.0@novell.com> References: <476133BC0200001800606E1D@sinclair.provo.novell.com> <476999300200001800607A16@sinclair.provo.novell.com> Mime-Version: 1.0 Content-Type: multipart/mixed; boundary="=__Part0D2B2EB0.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 --=__Part0D2B2EB0.0__= Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: quoted-printable Content-Disposition: inline Hi, The attached files allow the PV framebuffer to be dynamically resized from 800x600 to 1024x768 and back. xen-fbfront-resize.patch is applied to tip of linux-2.6.18-xen xen-fbback-resize.patch is applied to tip of unstable-xen I have tested the patches on SuSE SLES 10:=20 x86_64 dom0 x86_64 domU OK x386 domU OK x386 dom0 x386 domU OK x86_64 domU Error: (4, 'Out of memory', xc_dom_boot_mem_init: can't allocate=20 low memory for domain) ( This is something else unrelated to my = patch I think ) I am NOT requesting commit to xen- unstable. This is just a posting=20 for code review and feedback. After the patches are applied to dom0 and your domU PV guest you will need to properly configure the domU X=20 server for display modes 800x600 and 1024x768. For testing I used "xrandr" to dynamically resize the domU=20 GUI session. >$ xrandr // show capabilities SZ: Pixels Physical Refresh *0 1024 x 768 ( 361mm x 291mm ) *73 1 800 x 600 ( 361mm x 291mm ) 73 Current rotation - normal Current reflection - none Rotations possible - normal Reflections possible - none >$ xrandr --size 800x600 //change to 800x600 >$ xrandr --size 1024x768 domU xorg.conf : SuSE sax2 is not able to configure a PV framebuffer properly so I hand crafted a new xorg.conf file for the PV guest. Below are the sections I changed. Section "Monitor" HorizSync 30-65 Identifier "Monitor[0]" ModelName "XEN PVFB" Option "DPMS" VendorName "XEN" VertRefresh 43-75 UseModes "Modes[0]" EndSection Section "Modes" Identifier "Modes[0]" Modeline "1024x768" 77.25 1024 1080 1192 1360 768 769 772 800 Modeline "800x600" 46.15 800 840 920 1040 600 601 604 625 EndSection Section "Screen" SubSection "Display" Depth 24 Modes "1024x768" "800x600"=20 EndSubSection Device "Device[0]" Identifier "Screen[0]" Monitor "Monitor[0]" EndSection Pat --=__Part0D2B2EB0.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 4344d531875b drivers/xen/fbfront/xenfb.c --- a/drivers/xen/fbfront/xenfb.c Wed Dec 12 10:53:30 2007 -0700 +++ b/drivers/xen/fbfront/xenfb.c Tue Dec 18 02:56:00 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,18 @@ 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 +#define XENFB_MAX_WIDTH 1024 +#define XENFB_MAX_HEIGHT 768 + 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 +163,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 +236,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 +254,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 +453,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 +500,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, @@ -461,6 +543,8 @@ static int __devinit xenfb_probe(struct=20 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 +588,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 +685,27 @@ 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; + info->page->line_length =3D (info->page->depth / 8) * XENFB_MAX_WID= TH; 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; @@ -710,6 +803,11 @@ static void xenfb_backend_changed(struct val =3D 0; if (val) info->update_wanted =3D 1; + if (xenbus_scanf(XBT_NIL, info->xbdev->otherend, + "feature-resize", "%d", &val) < 0) + val =3D 0; + if (val) + info->feature_resize =3D 1; break; =20 case XenbusStateClosing: diff -r 4344d531875b include/xen/interface/io/fbif.h --- a/include/xen/interface/io/fbif.h Wed Dec 12 10:53:30 2007 -0700 +++ b/include/xen/interface/io/fbif.h Tue Dec 18 02:54:23 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 --=__Part0D2B2EB0.0__= Content-Type: text/plain; name="xen-fbback-resize.patch" Content-Transfer-Encoding: quoted-printable Content-Disposition: attachment; filename="xen-fbback-resize.patch" diff -r 4553bc1087d9 tools/ioemu/hw/xenfb.c --- a/tools/ioemu/hw/xenfb.c Wed Dec 12 15:41:20 2007 +0000 +++ b/tools/ioemu/hw/xenfb.c Tue Dec 18 10:17:37 2007 -0700 @@ -267,6 +267,9 @@ struct xenfb *xenfb_new(int domid, Displ =20 fprintf(stderr, "FB: Waiting for KBD backend creation\n"); xenfb_wait_for_backend(&xenfb->kbd, xenfb_backend_created_kbd); + + /* Indicate we have the frame buffer resize feature */ + xenfb_xs_printf(xenfb->xsh, xenfb->fb.nodename, "feature-resize", = "1"); =20 return xenfb; =20 @@ -510,6 +513,13 @@ static void xenfb_on_fb_event(struct xen } xenfb_guest_copy(xenfb, x, y, w, h); break; + case XENFB_TYPE_RESIZE: + w =3D event->resize.width; + h =3D event->resize.height; + xenfb->width =3D w; + xenfb->height =3D h; + dpy_resize(xenfb->ds, xenfb->width, xenfb->height);= + break; } } mb(); /* ensure we're done with ring contents */ diff -r 4553bc1087d9 xen/include/public/io/fbif.h --- a/xen/include/public/io/fbif.h Wed Dec 12 15:41:20 2007 +0000 +++ b/xen/include/public/io/fbif.h Thu Dec 13 04:16:46 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 --=__Part0D2B2EB0.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 --=__Part0D2B2EB0.0__=--