video/console: Add dmi quirk table for x86 systems which need fbcon rotation

Some x86 clamshell design devices use portrait tablet screens and a
display engine which cannot rotate in hardware, so we need to rotate
the fbcon to compensate.

This commit adds a DMI based quirk table which is initially populated with
4 such devices: The Asus T100HA, GPD Pocket, the GPD win and the I.T.Works
TW891, so that the console comes up in the right orientation on these
devices OOTB.

Unfortunately these (cheap) devices also typically have quite generic DMI
data, so we match on a combination of DMI data, screen resolution and a
list of known BIOS dates to avoid false positives.

Suggested-by: Jean Delvare <jdelvare@suse.de>
Signed-off-by: Hans de Goede <hdegoede@redhat.com>
Reviewed-by: Jean Delvare <jdelvare@suse.de>
[b.zolnierkie: ported over fbcon changes]
Signed-off-by: Bartlomiej Zolnierkiewicz <b.zolnierkie@samsung.com>

diff --git a/drivers/video/fbdev/core/Makefile b/drivers/video/fbdev/core/Makefile
index 0214b86..73493bb 100644 (file)
--- a/drivers/video/fbdev/core/Makefile
+++ b/drivers/video/fbdev/core/Makefile
@@ -14,6 +14,9 @@ ifeq ($(CONFIG_FRAMEBUFFER_CONSOLE_ROTATION),y)
 fb-y                             += fbcon_rotate.o fbcon_cw.o fbcon_ud.o \
                                     fbcon_ccw.o
 endif
+ifeq ($(CONFIG_DMI),y)
+fb-y                             += fbcon_dmi_quirks.o
+endif
 endif
 fb-objs                           := $(fb-y)
 

diff --git a/drivers/video/fbdev/core/fbcon.c b/drivers/video/fbdev/core/fbcon.c
index 431a153..fcd5399 100644 (file)
--- a/drivers/video/fbdev/core/fbcon.c
+++ b/drivers/video/fbdev/core/fbcon.c
@@ -136,7 +136,7 @@ static char fontname[40];
 static int info_idx = -1;
 
 /* console rotation */
-static int initial_rotation;
+static int initial_rotation = -1;
 static int fbcon_has_sysfs;
 
 static const struct consw fb_con;
@@ -955,7 +955,10 @@ static const char *fbcon_startup(void)
        ops->cur_rotate = -1;
        ops->cur_blink_jiffies = HZ / 5;
        info->fbcon_par = ops;
-       p->con_rotate = initial_rotation;
+       if (initial_rotation != -1)
+               p->con_rotate = initial_rotation;
+       else
+               p->con_rotate = fbcon_platform_get_rotate(info);
        set_blitting_type(vc, info);
 
        if (info->fix.type != FB_TYPE_TEXT) {
@@ -1092,7 +1095,10 @@ static void fbcon_init(struct vc_data *vc, int init)
 
        ops = info->fbcon_par;
        ops->cur_blink_jiffies = msecs_to_jiffies(vc->vc_cur_blink_ms);
-       p->con_rotate = initial_rotation;
+       if (initial_rotation != -1)
+               p->con_rotate = initial_rotation;
+       else
+               p->con_rotate = fbcon_platform_get_rotate(info);
        set_blitting_type(vc, info);
 
        cols = vc->vc_cols;

diff --git a/drivers/video/fbdev/core/fbcon.h b/drivers/video/fbdev/core/fbcon.h
index 7aaa4ea..60e25e1 100644 (file)
--- a/drivers/video/fbdev/core/fbcon.h
+++ b/drivers/video/fbdev/core/fbcon.h
@@ -261,5 +261,10 @@ extern void fbcon_set_rotate(struct fbcon_ops *ops);
 #define fbcon_set_rotate(x) do {} while(0)
 #endif /* CONFIG_FRAMEBUFFER_CONSOLE_ROTATION */
 
-#endif /* _VIDEO_FBCON_H */
+#ifdef CONFIG_DMI
+int fbcon_platform_get_rotate(struct fb_info *info);
+#else
+#define fbcon_platform_get_rotate(i) FB_ROTATE_UR
+#endif /* CONFIG_DMI */
 
+#endif /* _VIDEO_FBCON_H */

diff --git a/drivers/video/fbdev/core/fbcon_dmi_quirks.c b/drivers/video/fbdev/core/fbcon_dmi_quirks.c
new file mode 100644 (file)
index 0000000..7fbf7df
--- /dev/null
+++ b/drivers/video/fbdev/core/fbcon_dmi_quirks.c
@@ -0,0 +1,131 @@
+/*
+ *  fbcon_dmi_quirks.c -- DMI based quirk detection for fbcon
+ *
+ *     Copyright (C) 2017 Hans de Goede <hdegoede@redhat.com>
+ *
+ *  This file is subject to the terms and conditions of the GNU General Public
+ *  License.  See the file COPYING in the main directory of this archive for
+ *  more details.
+ */
+
+#include <linux/dmi.h>
+#include <linux/fb.h>
+#include <linux/kernel.h>
+#include "fbcon.h"
+
+/*
+ * Some x86 clamshell design devices use portrait tablet screens and a display
+ * engine which cannot rotate in hardware, so we need to rotate the fbcon to
+ * compensate. Unfortunately these (cheap) devices also typically have quite
+ * generic DMI data, so we match on a combination of DMI data, screen resolution
+ * and a list of known BIOS dates to avoid false positives.
+ */
+
+struct fbcon_dmi_rotate_data {
+       int width;
+       int height;
+       const char * const *bios_dates;
+       int rotate;
+};
+
+static const struct fbcon_dmi_rotate_data rotate_data_asus_t100ha = {
+       .width = 800,
+       .height = 1280,
+       .rotate = FB_ROTATE_CCW,
+};
+
+static const struct fbcon_dmi_rotate_data rotate_data_gpd_pocket = {
+       .width = 1200,
+       .height = 1920,
+       .bios_dates = (const char * const []){ "05/26/2017", "06/28/2017",
+               "07/05/2017", NULL },
+       .rotate = FB_ROTATE_CW,
+};
+
+static const struct fbcon_dmi_rotate_data rotate_data_gpd_win = {
+       .width = 720,
+       .height = 1280,
+       .bios_dates = (const char * const []){
+               "10/25/2016", "11/18/2016", "02/21/2017",
+               "03/20/2017", NULL },
+       .rotate = FB_ROTATE_CW,
+};
+
+static const struct fbcon_dmi_rotate_data rotate_data_itworks_tw891 = {
+       .width = 800,
+       .height = 1280,
+       .bios_dates = (const char * const []){ "10/16/2015", NULL },
+       .rotate = FB_ROTATE_CW,
+};
+
+static const struct dmi_system_id rotate_data[] = {
+       {       /* Asus T100HA */
+               .matches = {
+                 DMI_EXACT_MATCH(DMI_SYS_VENDOR, "ASUSTeK COMPUTER INC."),
+                 DMI_EXACT_MATCH(DMI_PRODUCT_NAME, "T100HAN"),
+               },
+               .driver_data = (void *)&rotate_data_asus_t100ha,
+       }, {    /*
+                * GPD Pocket, note that the the DMI data is less generic then
+                * it seems, devices with a board-vendor of "AMI Corporation"
+                * are quite rare, as are devices which have both board- *and*
+                * product-id set to "Default String"
+                */
+               .matches = {
+                 DMI_EXACT_MATCH(DMI_BOARD_VENDOR, "AMI Corporation"),
+                 DMI_EXACT_MATCH(DMI_BOARD_NAME, "Default string"),
+                 DMI_EXACT_MATCH(DMI_BOARD_SERIAL, "Default string"),
+                 DMI_EXACT_MATCH(DMI_PRODUCT_NAME, "Default string"),
+               },
+               .driver_data = (void *)&rotate_data_gpd_pocket,
+       }, {    /* GPD Win (same note on DMI match as GPD Pocket) */
+               .matches = {
+                 DMI_EXACT_MATCH(DMI_BOARD_VENDOR, "AMI Corporation"),
+                 DMI_EXACT_MATCH(DMI_BOARD_NAME, "Default string"),
+                 DMI_EXACT_MATCH(DMI_BOARD_SERIAL, "Default string"),
+                 DMI_EXACT_MATCH(DMI_PRODUCT_NAME, "Default string"),
+               },
+               .driver_data = (void *)&rotate_data_gpd_win,
+       }, {    /* I.T.Works TW891 */
+               .matches = {
+                 DMI_EXACT_MATCH(DMI_SYS_VENDOR, "To be filled by O.E.M."),
+                 DMI_EXACT_MATCH(DMI_PRODUCT_NAME, "TW891"),
+                 DMI_EXACT_MATCH(DMI_BOARD_VENDOR, "To be filled by O.E.M."),
+                 DMI_EXACT_MATCH(DMI_BOARD_NAME, "TW891"),
+               },
+               .driver_data = (void *)&rotate_data_itworks_tw891,
+       },
+       {}
+};
+
+int fbcon_platform_get_rotate(struct fb_info *info)
+{
+       const struct dmi_system_id *match;
+       const struct fbcon_dmi_rotate_data *data;
+       const char *bios_date;
+       int i;
+
+       for (match = dmi_first_match(rotate_data);
+            match;
+            match = dmi_first_match(match + 1)) {
+               data = match->driver_data;
+
+               if (data->width != info->var.xres ||
+                   data->height != info->var.yres)
+                       continue;
+
+               if (!data->bios_dates)
+                       return data->rotate;
+
+               bios_date = dmi_get_system_info(DMI_BIOS_DATE);
+               if (!bios_date)
+                       continue;
+
+               for (i = 0; data->bios_dates[i]; i++) {
+                       if (!strcmp(data->bios_dates[i], bios_date))
+                               return data->rotate;
+               }
+       }
+
+       return FB_ROTATE_UR;
+}