From patchwork Sat Nov 25 17:33:35 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Hans de Goede X-Patchwork-Id: 10074889 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id C43E8602BC for ; Sat, 25 Nov 2017 17:33:55 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id B05A129011 for ; Sat, 25 Nov 2017 17:33:55 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id A4CD029013; Sat, 25 Nov 2017 17:33:55 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.8 required=2.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED, FREEMAIL_FROM, RCVD_IN_DNSWL_HI, T_DKIM_INVALID autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 2B4A529011 for ; Sat, 25 Nov 2017 17:33:55 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751820AbdKYRdy (ORCPT ); Sat, 25 Nov 2017 12:33:54 -0500 Received: from mail-wr0-f195.google.com ([209.85.128.195]:44599 "EHLO mail-wr0-f195.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751658AbdKYRdy (ORCPT ); Sat, 25 Nov 2017 12:33:54 -0500 Received: by mail-wr0-f195.google.com with SMTP id l22so22731772wrc.11 for ; Sat, 25 Nov 2017 09:33:53 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=oHC2upxFgWxxm09pJiOVOK4kUUJbJAoPpxEvMoZOq4g=; b=BtEyFW5MGSC1YrFWr1p7U4yxefg4z9yoKW5Z8f5J70L8C9hXe75yubkitisXvDlFhr iwa+PzKatY4h9NV6Wuyreo41VJyK+0QPscDTbxxGxWLC3U+oW1Vv3c8HLvzXU0ZkH2eI tAv3yl2X7ab7rXacps/nVBN9I251N1SwJVN3MKCMUr5eBn0D9ZOF+djprg2syxOqyhIv R9jd1MaBtLBYrL9kRGSN+4Dap1NcNeq+kGl9cXbf1pATNpHpYjM+j0W6OZjtU/WEUfVO P9+/Eda2THb0KuKhaSEHliYsFyJBk1otxbV3Q643MYnUzspY6cI6n4A//pprMh5c24II upEQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=oHC2upxFgWxxm09pJiOVOK4kUUJbJAoPpxEvMoZOq4g=; b=jPAObET+e7UmG7PJcySPvVI9hR5/P62F6mUmZqghZ7u33ElyVlqzEljaTPQkdUt8Ue VCFRjyf/8hNAhMchv+ASlIcNsvrSEd7qMkcugI8AF3GHXjzeEPjk4rC+1ijL+chZKyYF Okw+lQKoJX5vD8iSg0CxSrFRc0FSlMJ0PGWE/H+XZH1gTPu6EPnNTFPUWpi90fFleTkY ede7m0bup2h+OzJA6V5berWq+U+O6EHS4Ad0GWdpe10TVsBUF9TWijaTzFpp06SHJVEc OvQPXWeBVlOgS5RRfjnwSl/VXaLymF0iKaEfu5gE9WVdncxHY9v5qC2mZ6RJtWOEIRwo J33A== X-Gm-Message-State: AJaThX5wQmXESVcWjKhbwjOsuegB3eWiYsd7oMS8DnNtavX+wPw9pTHS Cc0yw5xEt3G7nhFCmr6pA3k= X-Google-Smtp-Source: AGs4zMZiKsJroIWuq+W6ysdnMLlWLrOKVwxs67XkepXTLCd6Y1uldnfS8124lmWfxz20VdPHHTagEA== X-Received: by 10.223.160.61 with SMTP id k58mr20198063wrk.252.1511631232815; Sat, 25 Nov 2017 09:33:52 -0800 (PST) Received: from localhost.localdomain.com ([2001:470:7a95:4242:2c1c:b9eb:f8cb:6ccb]) by smtp.gmail.com with ESMTPSA id o135sm8439658wmg.1.2017.11.25.09.33.51 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Sat, 25 Nov 2017 09:33:52 -0800 (PST) From: Hans de Goede X-Google-Original-From: Hans de Goede To: Daniel Vetter , Jani Nikula , Sean Paul , Dave Airlie , Bartlomiej Zolnierkiewicz Cc: Hans de Goede , intel-gfx , dri-devel@lists.freedesktop.org, linux-fbdev@vger.kernel.org Subject: [PATCH v6 1/7] fbcon: Add fbcon_rotate_hint to struct fb_info Date: Sat, 25 Nov 2017 18:33:35 +0100 Message-Id: <20171125173341.14162-2-hdegoede@redhat.com> X-Mailer: git-send-email 2.14.3 In-Reply-To: <20171125173341.14162-1-hdegoede@redhat.com> References: <20171125173341.14162-1-hdegoede@redhat.com> Sender: linux-fbdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-fbdev@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP On some hardware the LCD panel is not mounted upright in the casing, but upside-down or rotated 90 degrees. In this case we want the console to automatically be rotated to compensate. The fbdev-driver may know about the need to rotate. Add a new fbcon_rotate_hint field to struct fb_info, which gets initialized to -1. If the fbdev-driver knows that some sort of rotation is necessary then it can set this field to a FB_ROTATE_* value to tell the fbcon console driver to rotate the console. Signed-off-by: Hans de Goede --- drivers/video/fbdev/core/fbcon.c | 18 ++++++++++++------ drivers/video/fbdev/core/fbsysfs.c | 1 + include/linux/fb.h | 5 +++++ 3 files changed, 18 insertions(+), 6 deletions(-) diff --git a/drivers/video/fbdev/core/fbcon.c b/drivers/video/fbdev/core/fbcon.c index 929ca472c524..30014e5867db 100644 --- a/drivers/video/fbdev/core/fbcon.c +++ b/drivers/video/fbdev/core/fbcon.c @@ -964,10 +964,13 @@ static const char *fbcon_startup(void) ops->cur_blink_jiffies = HZ / 5; ops->info = info; info->fbcon_par = ops; - if (initial_rotation != -1) - p->con_rotate = initial_rotation; - else + + p->con_rotate = initial_rotation; + if (p->con_rotate == -1) + p->con_rotate = info->fbcon_rotate_hint; + if (p->con_rotate == -1) p->con_rotate = fbcon_platform_get_rotate(info); + set_blitting_type(vc, info); if (info->fix.type != FB_TYPE_TEXT) { @@ -1104,10 +1107,13 @@ 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); - if (initial_rotation != -1) - p->con_rotate = initial_rotation; - else + + p->con_rotate = initial_rotation; + if (p->con_rotate == -1) + p->con_rotate = info->fbcon_rotate_hint; + if (p->con_rotate == -1) p->con_rotate = fbcon_platform_get_rotate(info); + set_blitting_type(vc, info); cols = vc->vc_cols; diff --git a/drivers/video/fbdev/core/fbsysfs.c b/drivers/video/fbdev/core/fbsysfs.c index 15755ce1d26c..e31a182b42bf 100644 --- a/drivers/video/fbdev/core/fbsysfs.c +++ b/drivers/video/fbdev/core/fbsysfs.c @@ -58,6 +58,7 @@ struct fb_info *framebuffer_alloc(size_t size, struct device *dev) info->par = p + fb_info_size; info->device = dev; + info->fbcon_rotate_hint = -1; #ifdef CONFIG_FB_BACKLIGHT mutex_init(&info->bl_curve_mutex); diff --git a/include/linux/fb.h b/include/linux/fb.h index bc24e48e396d..d1e5bed39140 100644 --- a/include/linux/fb.h +++ b/include/linux/fb.h @@ -465,6 +465,11 @@ struct fb_info { atomic_t count; int node; int flags; + /* + * -1 by default, set to a FB_ROTATE_* value by the driver, if it knows + * a lcd is not mounted upright and fbcon should rotate to compensate. + */ + int fbcon_rotate_hint; struct mutex lock; /* Lock for open/release/ioctl funcs */ struct mutex mm_lock; /* Lock for fb_mmap and smem_* fields */ struct fb_var_screeninfo var; /* Current var */