From patchwork Mon Jun 24 20:31:10 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Matthias Kaehlcke X-Patchwork-Id: 11014083 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 2AFAC14BB for ; Mon, 24 Jun 2019 20:31:37 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 1C14D28B0D for ; Mon, 24 Jun 2019 20:31:37 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 0FF8328BBE; Mon, 24 Jun 2019 20:31:37 +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=-8.0 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,MAILING_LIST_MULTI,RCVD_IN_DNSWL_HI 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 A87AE28BB8 for ; Mon, 24 Jun 2019 20:31:36 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1731798AbfFXUbY (ORCPT ); Mon, 24 Jun 2019 16:31:24 -0400 Received: from mail-pf1-f196.google.com ([209.85.210.196]:39047 "EHLO mail-pf1-f196.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1731786AbfFXUbW (ORCPT ); Mon, 24 Jun 2019 16:31:22 -0400 Received: by mail-pf1-f196.google.com with SMTP id j2so8162662pfe.6 for ; Mon, 24 Jun 2019 13:31:22 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=JP95lZdX+e5+GJVUv6OxKodaA7GTVH/s6o/zZ4o6Yqk=; b=GH6GaNaGuD+3/lq/E8qiZgIhrqY4POMDMF6xHbas+S9+1gjPhAdu+raSlGPuBLqD9g BkKsc+XCH1g3Z10BQaTguBLuGNZWvrF/v7D7o9CGRm3XNhjIs+7yeIKYYcTpDmT9I9R8 CIvyVtU+X72CfuHwtLu5CTf7kBuk4/yEwY9wE= 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:mime-version:content-transfer-encoding; bh=JP95lZdX+e5+GJVUv6OxKodaA7GTVH/s6o/zZ4o6Yqk=; b=dyihgq95AwLlVAcJucET6ekc+b0vx5+Bf+77k7Mn5n7ffth0nTqzAD0hfCX8mEEZR4 Qm2/wTkUhcaUzcxQc1jm6HZ+5UUB+n6yvoTQm03c7h1lZmZ4gz69Elbu9S2BRlqBFW7O 0hZn1InNb+OxUrDNkhc75DfLY5AoXY/Rv0/lE1lJtR/zx5mQrVYGLhO+TQjCLXbMDqpa 1QEmDQKUMmUtw3dR2YX/GWNWY2UV+Dy+mH/nioBgN9W1M+lJvIPJROyRDaDADLcciYTl LimvGWDg6OBbRJg2HW2uYAHwGi24F/xGAadLjacn9l6GEUTX8zD7z59ERDLw3MkUNiNS PGgA== X-Gm-Message-State: APjAAAVG3d9Ek90GxC+ibhoESAVbZoLF1vbW1hLc1ZUWQ5Rx7nLuo3zh GJgDT2mSjO9+nVjo/0ywB5cviQ== X-Google-Smtp-Source: APXvYqw9jBap6wGYgRpzAJeJ6bDMEgATfqj/PCB+aRPwnHh0ax4ayLJ9RddKSYOnMpDP5vtjzzt8pg== X-Received: by 2002:a17:90a:cd04:: with SMTP id d4mr27797860pju.128.1561408281769; Mon, 24 Jun 2019 13:31:21 -0700 (PDT) Received: from localhost ([2620:15c:202:1:75a:3f6e:21d:9374]) by smtp.gmail.com with ESMTPSA id r198sm6217026pfc.149.2019.06.24.13.31.20 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 24 Jun 2019 13:31:21 -0700 (PDT) From: Matthias Kaehlcke To: Thierry Reding , Lee Jones , Daniel Thompson , Jingoo Han , Bartlomiej Zolnierkiewicz Cc: linux-pwm@vger.kernel.org, dri-devel@lists.freedesktop.org, linux-fbdev@vger.kernel.org, linux-kernel@vger.kernel.org, Enric Balletbo i Serra , Douglas Anderson , Brian Norris , Pavel Machek , Jacek Anaszewski , Matthias Kaehlcke Subject: [PATCH v2 1/4] MAINTAINERS: Add entry for stable backlight sysfs ABI documentation Date: Mon, 24 Jun 2019 13:31:10 -0700 Message-Id: <20190624203114.93277-2-mka@chromium.org> X-Mailer: git-send-email 2.22.0.410.gd8fdbe21b5-goog In-Reply-To: <20190624203114.93277-1-mka@chromium.org> References: <20190624203114.93277-1-mka@chromium.org> MIME-Version: 1.0 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 Add an entry for the stable backlight sysfs ABI to the MAINTAINERS file. Signed-off-by: Matthias Kaehlcke Acked-by: Daniel Thompson --- Changes in v2: - added Daniel's 'Acked-by' tag --- MAINTAINERS | 1 + 1 file changed, 1 insertion(+) diff --git a/MAINTAINERS b/MAINTAINERS index 57f496cff999..d51e74340870 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -2857,6 +2857,7 @@ F: drivers/video/backlight/ F: include/linux/backlight.h F: include/linux/pwm_backlight.h F: Documentation/devicetree/bindings/leds/backlight +F: Documentation/ABI/stable/sysfs-class-backlight BATMAN ADVANCED M: Marek Lindner From patchwork Mon Jun 24 20:31:11 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Matthias Kaehlcke X-Patchwork-Id: 11014071 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id C050676 for ; Mon, 24 Jun 2019 20:31:26 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id AFECD28BB8 for ; Mon, 24 Jun 2019 20:31:26 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id A3ADD28BC1; Mon, 24 Jun 2019 20:31:26 +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=-8.0 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,MAILING_LIST_MULTI,RCVD_IN_DNSWL_HI 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 00F2228848 for ; Mon, 24 Jun 2019 20:31:26 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1731784AbfFXUbY (ORCPT ); Mon, 24 Jun 2019 16:31:24 -0400 Received: from mail-pf1-f194.google.com ([209.85.210.194]:38470 "EHLO mail-pf1-f194.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1731795AbfFXUbY (ORCPT ); Mon, 24 Jun 2019 16:31:24 -0400 Received: by mail-pf1-f194.google.com with SMTP id y15so3521558pfn.5 for ; Mon, 24 Jun 2019 13:31:23 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=9cvCddzp/rQ9gLoVz2Ohmj6GbBYXrvNQEIWOBydlqbk=; b=RGTicdS+MgEOYEAHS+smvnz8GlVq6o2y1HVT5Balw5Aa4KWF33hdyuiXxr/N1xo7F+ Cjtl6Fev/1MRaF2vXjK9cwelIWWrUlUxQlbN+bA/ht0z5aX334sPz3PdN4Abm+SWsTsG RpsNTk8Sl4N4t1+uRfbQo6YN+2AA71bqGKxso= 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:mime-version:content-transfer-encoding; bh=9cvCddzp/rQ9gLoVz2Ohmj6GbBYXrvNQEIWOBydlqbk=; b=Fya7/yGKY0eWbFkkCO1K+8pJ/F2WceCDJpKJzbDvluGUS5BghsBT1nVRwuqu8BvfvM KK6Qxhh2JaqfNm/9TONOy3ELxDtkIGfFip247SQAl/heAcEZfULf32Yv1yuctsgmpzEt ZQk4R01kALkKPs8ngUqHU0VeP7WON/7BcvBvEtqS9F31GY/pIRCVzjziwm6pIBJWqb8L 860Mhu7VDqjQw1ovMu+J9mrGfXAKSgFCBzwtB9J1WLExlPKMYmDQEfAdB5PjCMiRSxOk UGxE4P26oQxxlxRBfS1Yyd3Ij7j50X6MlFt39A9kjgIIGixy9O/h80ffiyDjRSeCWHCR O72Q== X-Gm-Message-State: APjAAAXuKD+LAkXdiGAzUyBlCdtc4T2rDcIOZvYc+VVJG79Z00bXy4mQ 0bHaxsCIQ1tDJjy8aevDM7147+P7kAI= X-Google-Smtp-Source: APXvYqztkGD2Zm1lhfUGrYuukC/zkqi/1wiD2UFCDCf7MnzGHMPiBOntzubbs4r7XKjVQ5JRS7vvPw== X-Received: by 2002:a17:90a:206a:: with SMTP id n97mr27137163pjc.10.1561408283171; Mon, 24 Jun 2019 13:31:23 -0700 (PDT) Received: from localhost ([2620:15c:202:1:75a:3f6e:21d:9374]) by smtp.gmail.com with ESMTPSA id c98sm315435pje.1.2019.06.24.13.31.22 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 24 Jun 2019 13:31:22 -0700 (PDT) From: Matthias Kaehlcke To: Thierry Reding , Lee Jones , Daniel Thompson , Jingoo Han , Bartlomiej Zolnierkiewicz Cc: linux-pwm@vger.kernel.org, dri-devel@lists.freedesktop.org, linux-fbdev@vger.kernel.org, linux-kernel@vger.kernel.org, Enric Balletbo i Serra , Douglas Anderson , Brian Norris , Pavel Machek , Jacek Anaszewski , Matthias Kaehlcke Subject: [PATCH v2 2/4] backlight: Expose brightness curve type through sysfs Date: Mon, 24 Jun 2019 13:31:11 -0700 Message-Id: <20190624203114.93277-3-mka@chromium.org> X-Mailer: git-send-email 2.22.0.410.gd8fdbe21b5-goog In-Reply-To: <20190624203114.93277-1-mka@chromium.org> References: <20190624203114.93277-1-mka@chromium.org> MIME-Version: 1.0 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 Backlight brightness curves can have different shapes. The two main types are linear and non-linear curves. The human eye doesn't perceive linearly increasing/decreasing brightness as linear (see also 88ba95bedb79 "backlight: pwm_bl: Compute brightness of LED linearly to human eye"), hence many backlights use non-linear (often logarithmic) brightness curves. The type of curve currently is opaque to userspace, so userspace often uses more or less reliable heuristics (like the number of brightness levels) to decide whether to treat a backlight device as linear or non-linear. Export the type of the brightness curve via the new sysfs attribute 'scale'. The value of the attribute may be a simple string like 'linear' or 'non-linear', or a composite string similar to 'compatible' strings of the device tree. A composite string consists of different elements separated by commas, starting with the most-detailed description and ending with the least-detailed one. An example for a composite string is "cie-1931,perceptual,non-linear" This brightness curve was generated with the CIE 1931 algorithm, it is perceptually linear, but not actually linear in terms of the emitted light. If userspace doesn't know about 'cie-1931' or 'perceptual' it should at least be able to interpret the 'non-linear' part. For devices that don't provide information about the scale of their brightness curve the value of the 'scale' attribute is 'unknown'. Signed-off-by: Matthias Kaehlcke --- Changes in v2: - changed order of brightness scale enums, explicitly make 'unknown' zero - minor update of commit message - deleted excess blank line after 'backlight_scale_types' - s/curves/curve/ in sysfs doc --- .../ABI/testing/sysfs-class-backlight | 32 +++++++++++++++++++ MAINTAINERS | 1 + drivers/video/backlight/backlight.c | 21 ++++++++++++ include/linux/backlight.h | 10 ++++++ 4 files changed, 64 insertions(+) create mode 100644 Documentation/ABI/testing/sysfs-class-backlight diff --git a/Documentation/ABI/testing/sysfs-class-backlight b/Documentation/ABI/testing/sysfs-class-backlight new file mode 100644 index 000000000000..da1ce9e5c55a --- /dev/null +++ b/Documentation/ABI/testing/sysfs-class-backlight @@ -0,0 +1,32 @@ +What: /sys/class/backlight//scale +Date: June 2019 +KernelVersion: 5.4 +Contact: Daniel Thompson +Description: + Description of the scale of the brightness curve. The + description consists of one or more elements separated by + commas, from the most detailed to the least detailed + description. + + Possible values are: + + unknown + The scale of the brightness curve is unknown. + + linear + The brightness changes linearly in terms of the emitted + light, changes are perceived as non-linear by the human eye. + + non-linear + The brightness changes non-linearly in terms of the emitted + light, changes might be perceived as linear by the human eye. + + perceptual,non-linear + The brightness changes non-linearly in terms of the emitted + light, changes should be perceived as linear by the human eye. + + cie-1931,perceptual,non-linear + The brightness curve was calculated with the CIE 1931 + algorithm. Brightness changes non-linearly in terms of the + emitted light, changes should be perceived as linear by the + human eye. diff --git a/MAINTAINERS b/MAINTAINERS index d51e74340870..c46812510ba5 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -2858,6 +2858,7 @@ F: include/linux/backlight.h F: include/linux/pwm_backlight.h F: Documentation/devicetree/bindings/leds/backlight F: Documentation/ABI/stable/sysfs-class-backlight +F: Documentation/ABI/testing/sysfs-class-backlight BATMAN ADVANCED M: Marek Lindner diff --git a/drivers/video/backlight/backlight.c b/drivers/video/backlight/backlight.c index 1ef8b6fd62ac..86612ec42ed0 100644 --- a/drivers/video/backlight/backlight.c +++ b/drivers/video/backlight/backlight.c @@ -32,6 +32,14 @@ static const char *const backlight_types[] = { [BACKLIGHT_FIRMWARE] = "firmware", }; +static const char *const backlight_scale_types[] = { + [BACKLIGHT_SCALE_UNKNOWN] = "unknown", + [BACKLIGHT_SCALE_LINEAR] = "linear", + [BACKLIGHT_SCALE_NON_LINEAR] = "non-linear", + [BACKLIGHT_SCALE_PERCEPTUAL] = "perceptual,non-linear", + [BACKLIGHT_SCALE_CIE1931] = "cie-1931,perceptual,non-linear", +}; + #if defined(CONFIG_FB) || (defined(CONFIG_FB_MODULE) && \ defined(CONFIG_BACKLIGHT_CLASS_DEVICE_MODULE)) /* This callback gets called when something important happens inside a @@ -246,6 +254,18 @@ static ssize_t actual_brightness_show(struct device *dev, } static DEVICE_ATTR_RO(actual_brightness); +static ssize_t scale_show(struct device *dev, + struct device_attribute *attr, char *buf) +{ + struct backlight_device *bd = to_backlight_device(dev); + + if (WARN_ON(bd->props.scale > BACKLIGHT_SCALE_NON_LINEAR)) + return sprintf(buf, "unknown\n"); + + return sprintf(buf, "%s\n", backlight_scale_types[bd->props.scale]); +} +static DEVICE_ATTR_RO(scale); + static struct class *backlight_class; #ifdef CONFIG_PM_SLEEP @@ -292,6 +312,7 @@ static struct attribute *bl_device_attrs[] = { &dev_attr_brightness.attr, &dev_attr_actual_brightness.attr, &dev_attr_max_brightness.attr, + &dev_attr_scale.attr, &dev_attr_type.attr, NULL, }; diff --git a/include/linux/backlight.h b/include/linux/backlight.h index 0b5897446dca..94d3559cd968 100644 --- a/include/linux/backlight.h +++ b/include/linux/backlight.h @@ -46,6 +46,14 @@ enum backlight_notification { BACKLIGHT_UNREGISTERED, }; +enum backlight_scale { + BACKLIGHT_SCALE_UNKNOWN = 0, + BACKLIGHT_SCALE_LINEAR, + BACKLIGHT_SCALE_NON_LINEAR, /* needed for backwards compatibility */ + BACKLIGHT_SCALE_PERCEPTUAL, + BACKLIGHT_SCALE_CIE1931, +}; + struct backlight_device; struct fb_info; @@ -80,6 +88,8 @@ struct backlight_properties { enum backlight_type type; /* Flags used to signal drivers of state changes */ unsigned int state; + /* Type of the brightness scale (linear, non-linear, ...) */ + enum backlight_scale scale; #define BL_CORE_SUSPENDED (1 << 0) /* backlight is suspended */ #define BL_CORE_FBBLANK (1 << 1) /* backlight is under an fb blank event */ From patchwork Mon Jun 24 20:31:12 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Matthias Kaehlcke X-Patchwork-Id: 11014077 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id EE2E376 for ; Mon, 24 Jun 2019 20:31:30 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id DF42928B4A for ; Mon, 24 Jun 2019 20:31:30 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id D33D328BBB; Mon, 24 Jun 2019 20:31:30 +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=-8.0 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,MAILING_LIST_MULTI,RCVD_IN_DNSWL_HI 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 5604A28BBE for ; Mon, 24 Jun 2019 20:31:30 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1731834AbfFXUbZ (ORCPT ); Mon, 24 Jun 2019 16:31:25 -0400 Received: from mail-pf1-f194.google.com ([209.85.210.194]:44093 "EHLO mail-pf1-f194.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1731828AbfFXUbZ (ORCPT ); Mon, 24 Jun 2019 16:31:25 -0400 Received: by mail-pf1-f194.google.com with SMTP id t16so8147946pfe.11 for ; Mon, 24 Jun 2019 13:31:24 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=lSYYVqhHYII5ViyDtFOkp4I/i31+agPnClo/p5CN7rU=; b=Mg4fv0I1KvsvYo7P+k+I0/jzY0DpnxpM73UwzZA397nYxCv69Pmx51bd0IZKJQS/T0 e/T2av1TRlRVmfz56FF9Jew1DTrqN5iqbEIH15c5yTcYw4xPo9wLhvaIaKD96sdi5ihi w7DU16/nElyk+XneNHQnooeQwSyLleBKKFhyY= 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:mime-version:content-transfer-encoding; bh=lSYYVqhHYII5ViyDtFOkp4I/i31+agPnClo/p5CN7rU=; b=ClcQmoXciZvfgRUe9O3ayBbIwi9LCDQZectte3jyX/2ySXijoZMcqwPSpyJs5AubeW 0BbiVQFH0fdlXWnFc6moq8EoQUu4UcRsKr9hjPpIU4IPfUpG/zmLjnh37Be8sTYrcT9s JSfArwZrT5Ajhk8m08XkhjnBWN0rMGIv6RoofPkJawUSv0C8Ymf0w6gbidZZNdX3t3qC f6wHCiwihIAXROUkIQedhE744GjXMMFkWpqRoYu42TMouX4uyQqUvPNbIv/bYi4po2iD YXYtXC8D7J7xMEohuO1Z6mX0IEGkDdrCKNSD2YPGCFVcB5pr8TzDoJnuPfwgvxVvGs35 k1iw== X-Gm-Message-State: APjAAAXvox5q7m33d762mYn/ZrMks0J6gRXPphyu7ABdDRIkzKqESJmB bGJE+UL/b7+a41x9gbcZvW2dVRM7hIM= X-Google-Smtp-Source: APXvYqzbWxM5xrdZvQVssIkJ108K28bRsNta+aYXMp4VczMFyBnMpEFk0/3OUZMH3nt4zl2HLpoBMQ== X-Received: by 2002:a65:62ca:: with SMTP id m10mr34696355pgv.57.1561408284531; Mon, 24 Jun 2019 13:31:24 -0700 (PDT) Received: from localhost ([2620:15c:202:1:75a:3f6e:21d:9374]) by smtp.gmail.com with ESMTPSA id e10sm9833411pfi.153.2019.06.24.13.31.23 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 24 Jun 2019 13:31:24 -0700 (PDT) From: Matthias Kaehlcke To: Thierry Reding , Lee Jones , Daniel Thompson , Jingoo Han , Bartlomiej Zolnierkiewicz Cc: linux-pwm@vger.kernel.org, dri-devel@lists.freedesktop.org, linux-fbdev@vger.kernel.org, linux-kernel@vger.kernel.org, Enric Balletbo i Serra , Douglas Anderson , Brian Norris , Pavel Machek , Jacek Anaszewski , Matthias Kaehlcke Subject: [PATCH v2 3/4] backlight: pwm_bl: Set scale type for CIE 1931 curves Date: Mon, 24 Jun 2019 13:31:12 -0700 Message-Id: <20190624203114.93277-4-mka@chromium.org> X-Mailer: git-send-email 2.22.0.410.gd8fdbe21b5-goog In-Reply-To: <20190624203114.93277-1-mka@chromium.org> References: <20190624203114.93277-1-mka@chromium.org> MIME-Version: 1.0 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 For backlight curves calculated with the CIE 1931 algorithm set the brightness scale type property accordingly. This makes the scale type available to userspace via the 'scale' sysfs attribute. Signed-off-by: Matthias Kaehlcke Tested-by: Enric Balletbo i Serra Acked-by: Daniel Thompson --- Changes in v2: - added Enric's 'Tested-by' tag - added Daniel's 'Acked-by' tag --- drivers/video/backlight/pwm_bl.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/drivers/video/backlight/pwm_bl.c b/drivers/video/backlight/pwm_bl.c index fb45f866b923..f067fe7aa35d 100644 --- a/drivers/video/backlight/pwm_bl.c +++ b/drivers/video/backlight/pwm_bl.c @@ -553,6 +553,8 @@ static int pwm_backlight_probe(struct platform_device *pdev) goto err_alloc; } + memset(&props, 0, sizeof(struct backlight_properties)); + if (data->levels) { /* * For the DT case, only when brightness levels is defined @@ -591,6 +593,8 @@ static int pwm_backlight_probe(struct platform_device *pdev) pb->levels = data->levels; } + + props.scale = BACKLIGHT_SCALE_CIE1931; } else { /* * That only happens for the non-DT case, where platform data @@ -601,7 +605,6 @@ static int pwm_backlight_probe(struct platform_device *pdev) pb->lth_brightness = data->lth_brightness * (state.period / pb->scale); - memset(&props, 0, sizeof(struct backlight_properties)); props.type = BACKLIGHT_RAW; props.max_brightness = data->max_brightness; bl = backlight_device_register(dev_name(&pdev->dev), &pdev->dev, pb, From patchwork Mon Jun 24 20:31:13 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Matthias Kaehlcke X-Patchwork-Id: 11014079 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 2964814E5 for ; Mon, 24 Jun 2019 20:31:31 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 1A48520499 for ; Mon, 24 Jun 2019 20:31:31 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 0EB4F28BBE; Mon, 24 Jun 2019 20:31:31 +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=-8.0 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,MAILING_LIST_MULTI,RCVD_IN_DNSWL_HI 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 75BD228B90 for ; Mon, 24 Jun 2019 20:31:30 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1731863AbfFXUba (ORCPT ); Mon, 24 Jun 2019 16:31:30 -0400 Received: from mail-pl1-f193.google.com ([209.85.214.193]:40876 "EHLO mail-pl1-f193.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1731830AbfFXUb0 (ORCPT ); Mon, 24 Jun 2019 16:31:26 -0400 Received: by mail-pl1-f193.google.com with SMTP id a93so7553489pla.7 for ; Mon, 24 Jun 2019 13:31:26 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=uZKHvCx8L/nRTrUb/ohywx0d3IXX3vcHyiOoGdIF2Vg=; b=G/bUhQslRBb9yDeN/Ju1v2H78Jn3pcV6lvi6ZsyGVCuBbzJ+oIhAcvU04QfS10U/4R pdE3J6hWbwxyP4QcHwwtH00UNcd1LgYEz2XOvY5wmOr4tiTSrA/9uD0OATvj9bqrmoPn id+vaY8rgFoQ9n7vUdhFL4XPoNNii/WHKNs9A= 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:mime-version:content-transfer-encoding; bh=uZKHvCx8L/nRTrUb/ohywx0d3IXX3vcHyiOoGdIF2Vg=; b=kui2FxEmyDLf3NYb2C9Lc5q7rYfVn4f5JfCxJ/5RpJQksL2hyP1soamyyM+reql33I zWxOzt0l1waRG0xf8BoFEbmIYo2hxYaDDnxWxz25WCbd46ZBHCSz/MdufvaAQCZ2aFSG amIplvU4FgfX8/v+62h541EXu0mitbhJeb2gbvtjPPz22LlYPYmU8FiGTcgWoZHAM3NS qWcVMzEjaNevNTSBjllGJ8QUzRscwiubQoLg/lxFEA3jamCwdKkXdtxM2GHLfzp5OgMm MRZ6/qAvZU9PDgba0ff/eE+rOLERVVR7MrRbq2HOrvJxcEw0hMxkwGZPc4dMzcvmifjJ e5cg== X-Gm-Message-State: APjAAAV5mkYcFshliTfXDHrrgf0dJ2OLIeG6wZzE1fGVYsCLqwBTs1oH ghZEyY12GLPvtobBtsGC5nrnhw== X-Google-Smtp-Source: APXvYqzY0+srP89wCVDbPca+cx8EHxAJHQuHwUe5lX3IaE2YnttbyJ+9Ii8mxU7OnlFea1FBJZ1y0Q== X-Received: by 2002:a17:902:2006:: with SMTP id n6mr94261265pla.232.1561408286127; Mon, 24 Jun 2019 13:31:26 -0700 (PDT) Received: from localhost ([2620:15c:202:1:75a:3f6e:21d:9374]) by smtp.gmail.com with ESMTPSA id r2sm21887470pfl.67.2019.06.24.13.31.25 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 24 Jun 2019 13:31:25 -0700 (PDT) From: Matthias Kaehlcke To: Thierry Reding , Lee Jones , Daniel Thompson , Jingoo Han , Bartlomiej Zolnierkiewicz Cc: linux-pwm@vger.kernel.org, dri-devel@lists.freedesktop.org, linux-fbdev@vger.kernel.org, linux-kernel@vger.kernel.org, Enric Balletbo i Serra , Douglas Anderson , Brian Norris , Pavel Machek , Jacek Anaszewski , Matthias Kaehlcke Subject: [PATCH v2 4/4] backlight: pwm_bl: Set scale type for brightness curves specified in the DT Date: Mon, 24 Jun 2019 13:31:13 -0700 Message-Id: <20190624203114.93277-5-mka@chromium.org> X-Mailer: git-send-email 2.22.0.410.gd8fdbe21b5-goog In-Reply-To: <20190624203114.93277-1-mka@chromium.org> References: <20190624203114.93277-1-mka@chromium.org> MIME-Version: 1.0 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 Check if a brightness curve specified in the device tree is linear or not and set the corresponding property accordingly. This makes the scale type available to userspace via the 'scale' sysfs attribute. To determine if a curve is linear it is compared to a interpolated linear curve between min and max brightness. The curve is considered linear if no value deviates more than +/-5% of ${brightness_range} from their interpolated value. Signed-off-by: Matthias Kaehlcke Acked-by: Daniel Thompson --- Changes in v2: - use 128 (power of two) instead of 100 as factor for the slope - add comment about max quantization error - added Daniel's 'Acked-by' tag --- drivers/video/backlight/pwm_bl.c | 30 ++++++++++++++++++++++++++++++ 1 file changed, 30 insertions(+) diff --git a/drivers/video/backlight/pwm_bl.c b/drivers/video/backlight/pwm_bl.c index f067fe7aa35d..2297fb4af49d 100644 --- a/drivers/video/backlight/pwm_bl.c +++ b/drivers/video/backlight/pwm_bl.c @@ -404,6 +404,31 @@ int pwm_backlight_brightness_default(struct device *dev, } #endif +static bool pwm_backlight_is_linear(struct platform_pwm_backlight_data *data) +{ + unsigned int nlevels = data->max_brightness + 1; + unsigned int min_val = data->levels[0]; + unsigned int max_val = data->levels[nlevels - 1]; + /* + * Multiplying by 128 means that even in pathological cases such + * as (max_val - min_val) == nlevels the error at max_val is less + * than 1%. + */ + unsigned int slope = (128 * (max_val - min_val)) / nlevels; + unsigned int margin = (max_val - min_val) / 20; /* 5% */ + int i; + + for (i = 1; i < nlevels; i++) { + unsigned int linear_value = min_val + ((i * slope) / 128); + unsigned int delta = abs(linear_value - data->levels[i]); + + if (delta > margin) + return false; + } + + return true; +} + static int pwm_backlight_initial_power_state(const struct pwm_bl_data *pb) { struct device_node *node = pb->dev->of_node; @@ -567,6 +592,11 @@ static int pwm_backlight_probe(struct platform_device *pdev) pb->levels = data->levels; } + + if (pwm_backlight_is_linear(data)) + props.scale = BACKLIGHT_SCALE_LINEAR; + else + props.scale = BACKLIGHT_SCALE_NON_LINEAR; } else if (!data->max_brightness) { /* * If no brightness levels are provided and max_brightness is