From patchwork Tue Jan 24 22:41:41 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Rayyan Ansari X-Patchwork-Id: 47943 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:adf:eb09:0:0:0:0:0 with SMTP id s9csp2407854wrn; Tue, 24 Jan 2023 14:43:01 -0800 (PST) X-Google-Smtp-Source: AMrXdXu5bqyUCQ4/ofSbHzw0kKcBcZSD8jMem36ZFWraT+Ul6hOUXrb5hxjkS5k2Ba3FeO6rLEf5 X-Received: by 2002:a17:907:3a90:b0:7c0:e5c6:2a74 with SMTP id fh16-20020a1709073a9000b007c0e5c62a74mr22425508ejc.34.1674600181531; Tue, 24 Jan 2023 14:43:01 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1674600181; cv=none; d=google.com; s=arc-20160816; b=VevvHwjcEWXAXWKU2XLrdJiCgVm/q/EiOV3mo27pONVeM71LJ0JVlp+DApUgxZsnup +l83yfi7QmNk0US6A0SI8/ePWsZCKCf+trR4mUeckVcqEaABT140G9YFe5gSR5+z9e/P +U6UywhI+TcK6oT8mXNHSLKxQQuwS2hOGTT4Ci7uPUZ/FRNJjKwERsrH7e7/FavUx71/ zqQweRXV0jJDRdOd7oWrmES8gz8yoe5TO7Ncc03LRuX+KrGVZGZiMTB4X/lcBHKFyRmJ Le/IIsMvriYedXfX2adAwF9dEUtRPKV3B+1r9O+5qLRJheZcQUjZSCarqIDI0KlyQ60Q wC+A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=KvJHwd3ZtTUQMGaubg6Qm+PNWUp6rIHTegEYq4CZ9Fo=; b=yAWkwO2D3ITngrxP4rMs9fvtbjm3snAXCy/9c4dqcdh6CkROmt215QUPtRHEd/L+pv m3xKLpnM+Xr8CCbSYkO5Xu/ZsrMRcgEfogUhqWolPf0kE2h0tNXqotJfQKXNSlJMwMLO NOZqA+oihNeuec+7NzCJ6aOafrwBk9AlhSIgYUSw0ofdEU/VPQpoh7Dwy1IoE8ncGT98 LdQKUSHFrKP7n7km+lBwCXLh9Btzbcdc7VuqdHlC0EOVP5WFTDy6vO178/WJT/UH8chk AZaYNZr5l2IQBE2isr9+nZKJGgV6rWMXMGw/8DgZ5gk7XlhC/BvHUrGhY8VzEgQW8rrn xYiw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@ansari.sh header.s=key1 header.b=L6NmD0bb; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=QUARANTINE sp=QUARANTINE dis=NONE) header.from=ansari.sh Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id f7-20020a1709063f4700b00874b8b86295si3868978ejj.484.2023.01.24.14.42.37; Tue, 24 Jan 2023 14:43:01 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@ansari.sh header.s=key1 header.b=L6NmD0bb; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=QUARANTINE sp=QUARANTINE dis=NONE) header.from=ansari.sh Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S235236AbjAXWmL (ORCPT + 99 others); Tue, 24 Jan 2023 17:42:11 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:43564 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S235207AbjAXWmI (ORCPT ); Tue, 24 Jan 2023 17:42:08 -0500 Received: from out-243.mta0.migadu.com (out-243.mta0.migadu.com [IPv6:2001:41d0:1004:224b::f3]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 92C113585 for ; Tue, 24 Jan 2023 14:42:06 -0800 (PST) X-Report-Abuse: Please report any abuse attempt to abuse@migadu.com and include these headers. DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ansari.sh; s=key1; t=1674600124; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=KvJHwd3ZtTUQMGaubg6Qm+PNWUp6rIHTegEYq4CZ9Fo=; b=L6NmD0bbN/VtkjhGm01kiMkr5YLrKWJcjNKZXRKkn6BCj+HmG3cGPnzOeAqzgFLcIfIO0N 4ZaOQrrN7NHEtjmV3N14/GcpGS08eELuvgXcFm2T+EUfYKhGIwGWd2cNdKJrXl3ke9UxEN 7sYQz4/aOTCGOkW3c+eMMhwIz+3FB2s= From: Rayyan Ansari To: dri-devel@lists.freedesktop.org Cc: ~postmarketos/upstreaming@lists.sr.ht, asahi@lists.linux.dev, janne@jannau.net, Rayyan Ansari , Daniel Vetter , David Airlie , devicetree@vger.kernel.org, Hans de Goede , Javier Martinez Canillas , Krzysztof Kozlowski , linux-fbdev@vger.kernel.org, linux-kernel@vger.kernel.org, Rob Herring , Thomas Zimmermann Subject: [PATCH v3 1/2] drm/simpledrm: Allow physical width and height configuration via DT Date: Tue, 24 Jan 2023 22:41:41 +0000 Message-Id: <20230124224142.7133-2-rayyan@ansari.sh> In-Reply-To: <20230124224142.7133-1-rayyan@ansari.sh> References: <20230124224142.7133-1-rayyan@ansari.sh> MIME-Version: 1.0 X-Migadu-Flow: FLOW_OUT X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,SPF_HELO_NONE,SPF_PASS autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1755945560158399598?= X-GMAIL-MSGID: =?utf-8?q?1755945560158399598?= Add optional width-mm and height-mm devicetree properties and use this to set the DRM Display Mode instead of calculating it based on an average DPI. Signed-off-by: Rayyan Ansari --- drivers/gpu/drm/tiny/simpledrm.c | 60 +++++++++++++++++++++++++++----- 1 file changed, 51 insertions(+), 9 deletions(-) diff --git a/drivers/gpu/drm/tiny/simpledrm.c b/drivers/gpu/drm/tiny/simpledrm.c index 162eb44dcba8..7aab7fa572f0 100644 --- a/drivers/gpu/drm/tiny/simpledrm.c +++ b/drivers/gpu/drm/tiny/simpledrm.c @@ -128,6 +128,23 @@ simplefb_read_u32_of(struct drm_device *dev, struct device_node *of_node, return ret; } +static int +simplefb_read_u32_of_opt(struct drm_device *dev, struct device_node *of_node, + const char *name, u32 *value) +{ + int ret = of_property_read_u32(of_node, name, value); + + if (ret == -EINVAL) { + *value = 0; + ret = 0; + } else if (ret) { + drm_err(dev, "simplefb: cannot parse framebuffer %s: error %d\n", + name, ret); + } + + return ret; +} + static int simplefb_read_string_of(struct drm_device *dev, struct device_node *of_node, const char *name, const char **value) @@ -184,6 +201,19 @@ simplefb_get_format_of(struct drm_device *dev, struct device_node *of_node) return simplefb_get_validated_format(dev, format); } +static int +simplefb_get_mm_of(struct drm_device *dev, struct device_node *of_node, + const char *name) +{ + int mm; + int ret = simplefb_read_u32_of_opt(dev, of_node, name, &mm); + + if (ret) + return ret; + return simplefb_get_validated_int(dev, name, mm); +} + + /* * Simple Framebuffer device */ @@ -599,16 +629,12 @@ static const struct drm_mode_config_funcs simpledrm_mode_config_funcs = { */ static struct drm_display_mode simpledrm_mode(unsigned int width, - unsigned int height) + unsigned int height, + unsigned int width_mm, + unsigned int height_mm) { - /* - * Assume a monitor resolution of 96 dpi to - * get a somewhat reasonable screen size. - */ const struct drm_display_mode mode = { - DRM_MODE_INIT(60, width, height, - DRM_MODE_RES_MM(width, 96ul), - DRM_MODE_RES_MM(height, 96ul)) + DRM_MODE_INIT(60, width, height, width_mm, height_mm) }; return mode; @@ -622,6 +648,7 @@ static struct simpledrm_device *simpledrm_device_create(struct drm_driver *drv, struct simpledrm_device *sdev; struct drm_device *dev; int width, height, stride; + int width_mm = 0, height_mm = 0; const struct drm_format_info *format; struct resource *res, *mem; void __iomem *screen_base; @@ -676,6 +703,12 @@ static struct simpledrm_device *simpledrm_device_create(struct drm_driver *drv, format = simplefb_get_format_of(dev, of_node); if (IS_ERR(format)) return ERR_CAST(format); + width_mm = simplefb_get_mm_of(dev, of_node, "width-mm"); + if (width_mm < 0) + return ERR_PTR(width_mm); + height_mm = simplefb_get_mm_of(dev, of_node, "height-mm"); + if (height_mm < 0) + return ERR_PTR(height_mm); } else { drm_err(dev, "no simplefb configuration found\n"); return ERR_PTR(-ENODEV); @@ -686,7 +719,16 @@ static struct simpledrm_device *simpledrm_device_create(struct drm_driver *drv, return ERR_PTR(-EINVAL); } - sdev->mode = simpledrm_mode(width, height); + /* + * Assume a monitor resolution of 96 dpi if physical dimensions + * are not specified to get a somewhat reasonable screen size. + */ + if (!width_mm) + width_mm = DRM_MODE_RES_MM(width, 96ul); + if (!height_mm) + height_mm = DRM_MODE_RES_MM(height, 96ul); + + sdev->mode = simpledrm_mode(width, height, width_mm, height_mm); sdev->format = format; sdev->pitch = stride; From patchwork Tue Jan 24 22:41:42 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Rayyan Ansari X-Patchwork-Id: 47944 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:adf:eb09:0:0:0:0:0 with SMTP id s9csp2412391wrn; Tue, 24 Jan 2023 14:57:39 -0800 (PST) X-Google-Smtp-Source: AMrXdXtW9u7Ca4n5nfWv2654N+FowO+gW9+JDdsJHF59Q/TmAWUfsvAwwxyNSE2MTgmCcD2/+cr+ X-Received: by 2002:a17:902:9a86:b0:194:4196:7dae with SMTP id w6-20020a1709029a8600b0019441967daemr26865799plp.3.1674601059171; Tue, 24 Jan 2023 14:57:39 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1674601059; cv=none; d=google.com; s=arc-20160816; b=Q8bxKC67QuYsCh8KprE+HEweSuKu1mK+ENHXWBEMJYlCM3mXqKq8bOlHurmno8lS5Q algf3WzWqAiS1+8K03H9Mapwk8sCHp9c6ohHjAXDZS2V79w5/7+fCIyzk6UbYg9Sjr5E l52VVPDblwoL7IAunEnDwwkn/dXhkE62/fGjo88CCM8DVK3Gyr+ZDTOIw4HWwigXt4bz l9MBYejuq9VYKGRoa09HJX3Kskq+CciKve9kECNQHZsNGgHSKF6Ql9hqsq9T10eL5l+Q QHFJowJ9ZV83QHpI0rWUv6eljqNj3OuRcG2XraPA+uz5p+56olwJ18anD1+c29SvJzqt zeLA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=36Vs8J0xhZS4TyMPNV0MC8jbKBVP8w8N3cOPO33G5Wk=; b=VPK+bWlxCVjmTwI9Xdt0YQdXOribfhAbiSoGgnRjDtMwS1Xpc6d1vlAB9kYjxMkHTC YF0moKwK7zxj1lcR7i2O9I5yy87hVw11R1GEZDmdi2wT5VyOhJ0ISeG+/cSN1U5qxo8U okssH0Ws4ltpLKfLdIay/b2ttj/IZEqtvW9xJzhqM1gG6JTrJdpFKoy/z2x55ri3iKwn WEsutiFMC39Z/UdwoI32hqIL9JIeKXUPuWZRZccpjPW1jk9/ts4N6T42WW9ETGHLoDq7 Ez0TMXqU/hWpUuTBl+rYNMG90/goQ7OR1+hOZDwnVN1jQ9uygRsxIzAix1vHIOb9vBtW qt5A== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@ansari.sh header.s=key1 header.b=NDz7l4pP; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=QUARANTINE sp=QUARANTINE dis=NONE) header.from=ansari.sh Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id o4-20020a170902bcc400b0018725be1285si3394872pls.558.2023.01.24.14.57.20; Tue, 24 Jan 2023 14:57:39 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@ansari.sh header.s=key1 header.b=NDz7l4pP; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=QUARANTINE sp=QUARANTINE dis=NONE) header.from=ansari.sh Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S235216AbjAXWmO (ORCPT + 99 others); Tue, 24 Jan 2023 17:42:14 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:43608 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S235218AbjAXWmJ (ORCPT ); Tue, 24 Jan 2023 17:42:09 -0500 Received: from out-235.mta0.migadu.com (out-235.mta0.migadu.com [91.218.175.235]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 7C2C64A1D6 for ; Tue, 24 Jan 2023 14:42:07 -0800 (PST) X-Report-Abuse: Please report any abuse attempt to abuse@migadu.com and include these headers. DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ansari.sh; s=key1; t=1674600125; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=36Vs8J0xhZS4TyMPNV0MC8jbKBVP8w8N3cOPO33G5Wk=; b=NDz7l4pPA+sUvoQ0mDQNcUtYzr72ERejOPwyYOT4DtmFUwQqUNTU257VyRO0+JF/FswAXH o+DK4x7vQ2KpVpyASwIA8gwOmP/oGcIzYvE/zqTEcqeFrGuPgG7NvzXYM8TEz1lj5rJldo K7Dqn36RngXMNaaFLCEqxRHj8zJe9GU= From: Rayyan Ansari To: dri-devel@lists.freedesktop.org Cc: ~postmarketos/upstreaming@lists.sr.ht, asahi@lists.linux.dev, janne@jannau.net, Rayyan Ansari , Daniel Vetter , David Airlie , devicetree@vger.kernel.org, Hans de Goede , Javier Martinez Canillas , Krzysztof Kozlowski , linux-fbdev@vger.kernel.org, linux-kernel@vger.kernel.org, Rob Herring , Thomas Zimmermann Subject: [PATCH v3 2/2] dt-bindings: display: simple-framebuffer: Document physical width and height properties Date: Tue, 24 Jan 2023 22:41:42 +0000 Message-Id: <20230124224142.7133-3-rayyan@ansari.sh> In-Reply-To: <20230124224142.7133-1-rayyan@ansari.sh> References: <20230124224142.7133-1-rayyan@ansari.sh> MIME-Version: 1.0 X-Migadu-Flow: FLOW_OUT X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,SPF_HELO_NONE,SPF_PASS autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1755946480078626590?= X-GMAIL-MSGID: =?utf-8?q?1755946480078626590?= Document the optional width-mm and height-mm simple-framebuffer properties. Signed-off-by: Rayyan Ansari --- .../devicetree/bindings/display/simple-framebuffer.yaml | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/Documentation/devicetree/bindings/display/simple-framebuffer.yaml b/Documentation/devicetree/bindings/display/simple-framebuffer.yaml index dd64f70b5014..4ae33a4d2da9 100644 --- a/Documentation/devicetree/bindings/display/simple-framebuffer.yaml +++ b/Documentation/devicetree/bindings/display/simple-framebuffer.yaml @@ -106,6 +106,12 @@ properties: - x2r10g10b10 - x8r8g8b8 + width-mm: + description: Physical width of the display in millimetres + + height-mm: + description: Physical height of the display in millimetres + display: $ref: /schemas/types.yaml#/definitions/phandle description: Primary display hardware node