[PATCH][LINUX] Dynamic modes support for PV xenfb (1of2)

[PATCH][LINUX] Dynamic modes support for PV xenfb (1of2)

[Pat Campbell]

[-- Attachment #1: Type: text/plain, Size: 671 bytes --]


Attached patch adds multiple frame buffer resolution support to 
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.  

xenkbd driver now checks feature-resize so that it can scale the 
absolute mouse position properly.

Corresponding backend IOEMU patch is required for functionality but 
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 <plc@novell.com>







[-- Attachment #2: xen-fbfront-resize.patch --]
[-- Type: text/plain, Size: 9631 bytes --]

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;
 
 	struct xenbus_device	*xbdev;
 };
@@ -130,13 +133,15 @@ struct xenfb_info
  * Oh well, we wont be updating the writes to this page anytime soon.
  */
 
+#define XENFB_PIXCLOCK  9025  /* Xorg "1280x1024" 110.80 to FB 1000000/110.80 */ 
 static int xenfb_fps = 20;
-static unsigned long xenfb_mem_len = XENFB_WIDTH * XENFB_HEIGHT * XENFB_DEPTH / 8;
+static unsigned long xenfb_mem_len = XENFB_MAX_WIDTH * XENFB_MAX_HEIGHT * XENFB_DEPTH / 8;
 
 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);
 
 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) = event;
 	wmb();			/* ensure ring contents visible */
+	info->page->out_prod = 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 = XENFB_TYPE_RESIZE;
+	event.resize.width = info->xres;
+	event.resize.height = info->yres;
+
+	prod = info->page->out_prod;
+	/* caller ensures !xenfb_queue_full() */
+	mb();           /* ensure ring space available */
+	XENFB_OUT_RING_REF(info->page, prod) = event;
+	wmb();          /* ensure ring contents visible */
 	info->page->out_prod = prod + 1;
 
 	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);
 }
 
+static void xenfb_resize_screen(struct xenfb_info *info)
+{
+	if (xenfb_queue_full(info))
+		return;
+
+	info->resize_dpy = 0;
+	xenfb_do_resize(info);
+	xenfb_refresh(info, 0, 0, info->xres, info->yres);
+}
+
 static int xenfb_thread(void *data)
 {
 	struct xenfb_info *info = data;
@@ -217,6 +251,9 @@ static int xenfb_thread(void *data)
 		if (info->dirty) {
 			info->dirty = 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;
 }
 
+static int
+xenfb_check_var(struct fb_var_screeninfo *var, struct fb_info *info)
+{
+	struct xenfb_info *xenfb_info;
+
+	xenfb_info = info->par;
+
+	if (!xenfb_info->feature_resize) {
+		if (var->xres == XENFB_WIDTH && var->yres == XENFB_HEIGHT) {
+			return 0;
+		}
+		return -EINVAL;
+	}
+	if (var->xres == 1024 && var->yres == 768) {
+		return 0;
+	}
+	if (var->xres == 800 && var->yres == 600) {
+		return 0;
+	}
+	if (var->xres == 640 && var->yres == 480) {
+		return 0;
+	}
+	return -EINVAL;
+}
+
+static int xenfb_set_par(struct fb_info *info)
+{
+	struct xenfb_info *xenfb_info;
+
+	xenfb_info = info->par;
+
+	if (xenfb_info->xres != info->var.xres || 
+			xenfb_info->yres != info->var.yres) {
+		xenfb_info->xres = info->var.xres;
+		xenfb_info->yres = info->var.yres;
+		xenfb_info->resize_dpy = 1;
+	}
+	return 0;
+}
+
 static struct fb_ops xenfb_fb_ops = {
 	.owner		= THIS_MODULE,
 	.fb_setcolreg	= xenfb_setcolreg,
@@ -420,6 +497,8 @@ static struct fb_ops xenfb_fb_ops = {
 	.fb_copyarea	= xenfb_copyarea,
 	.fb_imageblit	= xenfb_imageblit,
 	.fb_mmap	= xenfb_mmap,
+	.fb_check_var	= xenfb_check_var,
+	.fb_set_par     = xenfb_set_par,
 };
 
 static irqreturn_t xenfb_event_handler(int rq, void *dev_id,
@@ -451,16 +530,28 @@ static int __devinit xenfb_probe(struct 
 	struct xenfb_info *info;
 	struct fb_info *fb_info;
 	int ret;
+	int val;
 
 	info = kzalloc(sizeof(*info), GFP_KERNEL);
 	if (info == NULL) {
 		xenbus_dev_fatal(dev, -ENOMEM, "allocating info structure");
 		return -ENOMEM;
 	}
+
+	if (xenbus_scanf(XBT_NIL, dev->otherend, "feature-resize", "%d", &val) < 0)
+		val = 0;
+	info->feature_resize = val;
+	if (info->feature_resize)
+		xenfb_mem_len = XENFB_MAX_WIDTH * XENFB_MAX_HEIGHT * XENFB_DEPTH / 8;
+	else
+		xenfb_mem_len = XENFB_WIDTH * XENFB_HEIGHT * XENFB_DEPTH / 8;
+
 	dev->dev.driver_data = info;
 	info->xbdev = dev;
 	info->irq = -1;
 	info->x1 = info->y1 = INT_MAX;
+	info->xres = XENFB_WIDTH;
+	info->yres = 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 
 	fb_info->screen_base = info->fb;
 
 	fb_info->fbops = &xenfb_fb_ops;
-	fb_info->var.xres_virtual = fb_info->var.xres = info->page->width;
-	fb_info->var.yres_virtual = fb_info->var.yres = info->page->height;
+	fb_info->var.xres_virtual = fb_info->var.xres = info->xres;
+	fb_info->var.yres_virtual = fb_info->var.yres = info->yres;
 	fb_info->var.bits_per_pixel = info->page->depth;
+	fb_info->var.pixclock = XENFB_PIXCLOCK;
 
 	fb_info->var.red = (struct fb_bitfield){16, 8, 0};
 	fb_info->var.green = (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 = PAGE_SIZE/sizeof(unsigned long);
+	
 	for (i = 0; i < info->nr_pages; i++)
 		info->pages[i] = vmalloc_to_page(info->fb + i * PAGE_SIZE);
 
-	for (i = 0; i < info->nr_pages; i++)
-		info->mfns[i] = vmalloc_to_mfn(info->fb + i * PAGE_SIZE);
-
 	info->page->pd[0] = vmalloc_to_mfn(info->mfns);
 	info->page->pd[1] = 0;
+	for ( j = i = 0; i < info->nr_pages; i++) {
+		info->mfns[i] = vmalloc_to_mfn(info->fb + i * PAGE_SIZE);
+		if ( i && i % entries_per_pd == 0 ) {
+			j++;
+			info->page->pd[j] = vmalloc_to_mfn(&info->mfns[i]);
+		}
+	}
 	info->page->width = XENFB_WIDTH;
 	info->page->height = XENFB_HEIGHT;
 	info->page->depth = XENFB_DEPTH;
-	info->page->line_length = (info->page->depth / 8) * info->page->width;
+	if (info->feature_resize)
+		info->page->line_length = (info->page->depth / 8) * XENFB_MAX_WIDTH;
+	else
+		info->page->line_length = (info->page->depth / 8) * XENFB_WIDTH;
 	info->page->mem_length = xenfb_mem_len;
 	info->page->in_cons = info->page->in_prod = 0;
 	info->page->out_cons = info->page->out_prod = 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;
 
 	info = kzalloc(sizeof(*info), GFP_KERNEL);
 	if (!info) {
@@ -163,8 +164,17 @@ int __devinit xenkbd_probe(struct xenbus
 	for (i = BTN_LEFT; i <= BTN_TASK; i++)
 		set_bit(i, ptr->keybit);
 	ptr->relbit[0] = 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 = 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);
+	}
 
 	ret = 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 */
 };
 
+/*
+ * 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
 
 union xenfb_out_event
 {
     uint8_t type;
     struct xenfb_update update;
+    struct xenfb_resize resize;
     char pad[XENFB_OUT_EVENT_SIZE];
 };
 
@@ -111,8 +125,12 @@ struct xenfb_page
      * PAGE_SIZE / sizeof(*pd) bytes.  With PAGE_SIZE == 4096 and
      * sizeof(unsigned long) == 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 = 1280 pages required
+     *  PAGE_SIZE/64bit long = 512 pages per page directory
      */
-    unsigned long pd[2];
+    unsigned long pd[3];
 };
 
 /*
@@ -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

[-- Attachment #3: Type: text/plain, Size: 138 bytes --]

_______________________________________________
Xen-devel mailing list
Xen-devel@lists.xensource.com
http://lists.xensource.com/xen-devel

Re: [PATCH][LINUX] Dynamic modes support for PV xenfb (1of2)

[Daniel P. Berrange]

On Sun, Dec 30, 2007 at 11:45:11AM -0700, Pat Campbell wrote:
> +static int
> +xenfb_check_var(struct fb_var_screeninfo *var, struct fb_info *info)
> +{
> +	struct xenfb_info *xenfb_info;
> +
> +	xenfb_info = info->par;
> +
> +	if (!xenfb_info->feature_resize) {
> +		if (var->xres == XENFB_WIDTH && var->yres == XENFB_HEIGHT) {
> +			return 0;
> +		}
> +		return -EINVAL;
> +	}
> +	if (var->xres == 1024 && var->yres == 768) {
> +		return 0;
> +	}
> +	if (var->xres == 800 && var->yres == 600) {
> +		return 0;
> +	}
> +	if (var->xres == 640 && var->yres == 480) {
> +		return 0;
> +	}
> +	return -EINVAL;
> +}

This validates only 640x480, 800x600, and 1024x768, but further
down you made a change to enable 1280x1024:

>       * PAGE_SIZE / sizeof(*pd) bytes.  With PAGE_SIZE == 4096 and
>       * sizeof(unsigned long) == 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 = 1280 pages required
> +     *  PAGE_SIZE/64bit long = 512 pages per page directory
>       */
> -    unsigned long pd[2];
> +    unsigned long pd[3];


I think if we're going to the trouble of making sizes configurable
we should at the very least support all the common regular aspect and
widescreen modes, so that people can run the guest fullscreen at
native resolution. My curent physical graphics card + monitor for 
example supports the following choices via xrandr

  1680x1050 1280x800 1280x1024 1600x1024 1440x900 1400x1050 1360x768 
  1280x960 1280x768 1280x720 1152x864 1024x768 960x600 960x540 896x672
  840x525 832x624 800x600 800x512 720x450 680x384 640x512 640x480 
  640x400 640x384 640x360 576x432 512x384 416x312 400x300 320x240

I don't know if there is a definitive list of video modes, or if that
is a non-sensical question.  Could we just allow *any* mode that fits
in the amount of RAM allowed by the 'struct xenfb_page pd[3]' ? or
at the very least dramatically increase the set of modes we allow
in the validation tables to something like the list I just included
above.

>  };
>  
>  /*
> @@ -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

I think it'd be beter to get rid of these vars. They don't make any sense
when you have configurable modes. With a non-constrained aspect ratio for
the FB, there's no (w,h) pair that can usefully define limits. The limit
is just whatever fits in your RAM per aspect ratio.

Dan.
-- 
|=- Red Hat, Engineering, Emerging Technologies, Boston.  +1 978 392 2496 -=|
|=-           Perl modules: http://search.cpan.org/~danberr/              -=|
|=-               Projects: http://freshmeat.net/~danielpb/               -=|
|=-  GnuPG: 7D3B9505   F3C9 553F A1DA 4AC2 5648 23C1 B3DF F742 7D3B 9505  -=| 

Re: [PATCH][LINUX] Dynamic modes support for PV xenfb (1of2)

[Pat Campbell]

>>> On Wed, Jan 2, 2008 at 10:59 AM, in message <20080102175935.GE1237@redhat.com>,
"Daniel P. Berrange" <berrange@redhat.com> wrote: 
> On Sun, Dec 30, 2007 at 11:45:11AM - 0700, Pat Campbell wrote:
>> +static int
>> +xenfb_check_var(struct fb_var_screeninfo *var, struct fb_info *info)
>> +{
>> +	struct xenfb_info *xenfb_info;
>> +
>> +	xenfb_info = info- >par;
>> +
>> +	if (!xenfb_info- >feature_resize) {
>> +		if (var- >xres == XENFB_WIDTH && var- >yres == XENFB_HEIGHT) {
>> +			return 0;
>> +		}
>> +		return - EINVAL;
>> +	}
>> +	if (var- >xres == 1024 && var- >yres == 768) {
>> +		return 0;
>> +	}
>> +	if (var- >xres == 800 && var- >yres == 600) {
>> +		return 0;
>> +	}
>> +	if (var- >xres == 640 && var- >yres == 480) {
>> +		return 0;
>> +	}
>> +	return - EINVAL;
>> +}
> 
> This validates only 640x480, 800x600, and 1024x768, but further
> down you made a change to enable 1280x1024:

I will change check_var() to use this validation so we can support any 
resolution that the memory can hold with the constraint that the width
cannot exceed the scan line length.

if ( var->bits_per_pixerl == xenfb_info->page->depth && 
        var->xres <= XENFB_SCAN_LINE_LEN && 
         xenfb_mem_len >= (var->xres * var->yres * (xenfb_info->page->depth / 8))) {
   return 0;
}

We need to check xres against XENFB_SCAN_LINE_LEN as X initializes it's
frame buffer line length once in FBDevScreenInit().   Size changes via xrandr 
do not change the X servers line length value. 
 
> 
>>       * PAGE_SIZE / sizeof(*pd) bytes.  With PAGE_SIZE == 4096 and
>>       * sizeof(unsigned long) == 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 = 1280 pages required
>> +     *  PAGE_SIZE/64bit long = 512 pages per page directory
>>       */
>> -     unsigned long pd[2];
>> +    unsigned long pd[3];
> 
> 
> I think if we're going to the trouble of making sizes configurable
> we should at the very least support all the common regular aspect and
> widescreen modes, so that people can run the guest fullscreen at
> native resolution. My curent physical graphics card + monitor for 
> example supports the following choices via xrandr
> 
>   1680x1050 1280x800 1280x1024 1600x1024 1440x900 1400x1050 1360x768 
>   1280x960 1280x768 1280x720 1152x864 1024x768 960x600 960x540 896x672
>   840x525 832x624 800x600 800x512 720x450 680x384 640x512 640x480 
>   640x400 640x384 640x360 576x432 512x384 416x312 400x300 320x240
> 
> I don't know if there is a definitive list of video modes, or if that
> is a non- sensical question.  Could we just allow *any* mode that fits
> in the amount of RAM allowed by the 'struct xenfb_page pd[3]' ? or
> at the very least dramatically increase the set of modes we allow
> in the validation tables to something like the list I just included
> above.
> 
>>  };
>>  
>>  /*
>> @@ - 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
> 
> I think it'd be beter to get rid of these vars. They don't make any sense
> when you have configurable modes. With a non- constrained aspect ratio for
> the FB, there's no (w,h) pair that can usefully define limits. The limit
> is just whatever fits in your RAM per aspect ratio.

Agreed.  

For reasons stated above will add:
 #define XENFB_SCAN_LINE_LEN 1280  

> 
> Dan.