Merge tag 'fbdev-v4.12' of git://github.com/bzolnier/linux

[karo-tx-linux.git] / drivers / video / fbdev / xen-fbfront.c

diff --git a/drivers/video/fbdev/xen-fbfront.c b/drivers/video/fbdev/xen-fbfront.c
index 3ee309c50b2d015fb3d463dd88f6b99253beea12..46f63960fa9e6aa2913be8b804c1de24ce1245be 100644 (file)
--- a/drivers/video/fbdev/xen-fbfront.c
+++ b/drivers/video/fbdev/xen-fbfront.c
@@ -18,6 +18,8 @@
  * frame buffer.
  */
 
+#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
+
 #include <linux/console.h>
 #include <linux/kernel.h>
 #include <linux/errno.h>
@@ -380,10 +382,18 @@ static int xenfb_probe(struct xenbus_device *dev,
                        video[KPARAM_MEM] = val;
        }
 
+       video[KPARAM_WIDTH] = xenbus_read_unsigned(dev->otherend, "width",
+                                                  video[KPARAM_WIDTH]);
+       video[KPARAM_HEIGHT] = xenbus_read_unsigned(dev->otherend, "height",
+                                                   video[KPARAM_HEIGHT]);
+
        /* If requested res does not fit in available memory, use default */
        fb_size = video[KPARAM_MEM] * 1024 * 1024;
        if (video[KPARAM_WIDTH] * video[KPARAM_HEIGHT] * XENFB_DEPTH / 8
            > fb_size) {
+               pr_warn("display parameters %d,%d,%d invalid, use defaults\n",
+                       video[KPARAM_MEM], video[KPARAM_WIDTH],
+                       video[KPARAM_HEIGHT]);
                video[KPARAM_WIDTH] = XENFB_WIDTH;
                video[KPARAM_HEIGHT] = XENFB_HEIGHT;
                fb_size = XENFB_DEFAULT_FB_LEN;