From patchwork Fri Jan 30 09:40:10 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Scot Doyle X-Patchwork-Id: 5748231 Return-Path: X-Original-To: patchwork-linux-fbdev@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork1.web.kernel.org (Postfix) with ESMTP id CE8639F302 for ; Fri, 30 Jan 2015 09:42:18 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id D7D3F2025A for ; Fri, 30 Jan 2015 09:42:17 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 9DBF720165 for ; Fri, 30 Jan 2015 09:42:16 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754051AbbA3JmQ (ORCPT ); Fri, 30 Jan 2015 04:42:16 -0500 Received: from mx1.scotdoyle.com ([23.226.141.211]:47988 "EHLO mx1.scotdoyle.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752394AbbA3JmP (ORCPT ); Fri, 30 Jan 2015 04:42:15 -0500 Received: by mx1.scotdoyle.com (Postfix) id 0A66637009D5; Fri, 30 Jan 2015 09:42:02 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by mx1.scotdoyle.com (Postfix) with ESMTP id D021C3700359; Fri, 30 Jan 2015 09:42:01 +0000 (UTC) Date: Fri, 30 Jan 2015 09:40:10 +0000 (UTC) From: Scot Doyle To: Tomi Valkeinen , Jean-Christophe Plagniol-Villard cc: Geert Uytterhoeven , Richard Weinberger , linux-fbdev@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH v6 2/2] fbcon: expose cursor blink interval via sysfs In-Reply-To: Message-ID: References: User-Agent: Alpine 2.11 (DEB 23 2013-08-11) MIME-Version: 1.0 Sender: linux-fbdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-fbdev@vger.kernel.org X-Spam-Status: No, score=-6.9 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_HI, T_RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=ham version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP fbcon toggles cursor display state every 200 milliseconds when blinking. Since users prefer different toggle intervals, expose the interval via /sys/class/graphics/fbcon/cursor_blink_ms so that it may be customized. Values written to the interface set the approximate time interval in milliseconds between cursor toggles, from 1 to 32767. Since the interval is stored internally as a number of jiffies, the millisecond value read from the interface may not exactly match the entered value. An outstanding blink timer is reset after a new value is entered. If the cursor blink is disabled, either via the 'cursor_blink' boolean setting or some other mechanism, the 'cursor_blink_ms' setting may still be modified. The new value will be used if the blink is reactivated. Signed-off-by: Scot Doyle --- drivers/video/console/fbcon.c | 65 +++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 65 insertions(+) diff --git a/drivers/video/console/fbcon.c b/drivers/video/console/fbcon.c index 7a2030b..7baa333 100644 --- a/drivers/video/console/fbcon.c +++ b/drivers/video/console/fbcon.c @@ -3495,11 +3495,76 @@ err: return count; } +static ssize_t show_cursor_blink_ms(struct device *device, + struct device_attribute *attr, char *buf) +{ + struct fbcon_ops *ops; + int idx, ms = -1; + + if (fbcon_has_exited) + return -ENODEV; + + console_lock(); + idx = con2fb_map[fg_console]; + + if (idx != -1 && registered_fb[idx] != NULL) { + ops = ((struct fb_info *)registered_fb[idx])->fbcon_par; + if (ops != NULL) + ms = jiffies_to_msecs(ops->blink_jiffies); + } + + console_unlock(); + return ms < 0 ? -ENODEV : scnprintf(buf, PAGE_SIZE, "%d\n", ms); +} + +static ssize_t store_cursor_blink_ms(struct device *device, + struct device_attribute *attr, + const char *buf, size_t count) +{ + struct fb_info *info; + struct fbcon_ops *ops; + int idx; + short ms; + int r = -ENODEV; + + if (fbcon_has_exited) + return r; + + console_lock(); + idx = con2fb_map[fg_console]; + + if (idx == -1 || registered_fb[idx] == NULL) + goto err; + + info = registered_fb[idx]; + ops = info->fbcon_par; + + if (ops == NULL) + goto err; + + if (!kstrtos16(buf, 0, &ms) && ms > 0) { + ops->blink_jiffies = max_t(int, msecs_to_jiffies(ms), 1); + if (info->queue.func == fb_flashcursor && + ops->flags & FBCON_FLAGS_CURSOR_TIMER) { + fbcon_del_cursor_timer(info); + fbcon_add_cursor_timer(info); + } + r = count; + } else + r = -EINVAL; + +err: + console_unlock(); + return r; +} + static struct device_attribute device_attrs[] = { __ATTR(rotate, S_IRUGO|S_IWUSR, show_rotate, store_rotate), __ATTR(rotate_all, S_IWUSR, NULL, store_rotate_all), __ATTR(cursor_blink, S_IRUGO|S_IWUSR, show_cursor_blink, store_cursor_blink), + __ATTR(cursor_blink_ms, S_IRUGO|S_IWUSR, show_cursor_blink_ms, + store_cursor_blink_ms), }; static int fbcon_init_device(void)