From nobody Tue Feb 10 04:03:03 2026 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 57EA9C7EE24 for ; Mon, 5 Jun 2023 07:49:13 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229484AbjFEHtJ (ORCPT ); Mon, 5 Jun 2023 03:49:09 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:39482 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229670AbjFEHs5 (ORCPT ); Mon, 5 Jun 2023 03:48:57 -0400 Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 76D33DF for ; Mon, 5 Jun 2023 00:48:12 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1685951291; 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=mJ6LVDenz7leEoWEGqkNGYbuR5Ekaz6eOK5tZIJsJWA=; b=CoJr/Jp/E5kYJzpOmzXW82a1rBb8xhAIcMMicF1LMPc/a3JKrSzrddUTrxZsVx/Z9q/HvB 1vVaKkOHKehpKBGfGDnX5eS5tvMvA1krNkcENwpOcjP7Sin9KMgLApfhtCQ4eW1t8xlknO TrMVWc8lIFccAiC/yz/D5ZCDJeSC43A= Received: from mail-wm1-f70.google.com (mail-wm1-f70.google.com [209.85.128.70]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-515-g85FDL9yOyuR86ZKPwFnFw-1; Mon, 05 Jun 2023 03:48:10 -0400 X-MC-Unique: g85FDL9yOyuR86ZKPwFnFw-1 Received: by mail-wm1-f70.google.com with SMTP id 5b1f17b1804b1-3f7678c74beso5050815e9.3 for ; Mon, 05 Jun 2023 00:48:10 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1685951288; x=1688543288; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=mJ6LVDenz7leEoWEGqkNGYbuR5Ekaz6eOK5tZIJsJWA=; b=LSK4MCmDTGObCQJ/MDkVkWPYFs1csyoFwW9ZvBAbNEt6a0wEUC2d3bCRc5NROh5azj q14W1v2rB2wcKnRmv3h1RNvPw9EMUpeeK+ik8xI2udrRXqv6ZUHe79+P5E+MTmPELBvg 0cRrfv+duee1bnBxs/NDJJu/0h3uZt2b29Y63s5VfxpxpyMTm+FoRdxUT3h+xS/FTlfb +a7pZFIYWC2ctf06aYZjZWXQ+QrhXMupvL9hQ+2r7kxU9JaA4pybD6NVe78emXDupGEF UctzbrTM0WrHyMJCr/yynNJSOKzRJcOaUutTB6G+sHsPp14xDpjC2Nd6zeS7c7PlTQzl Agfw== X-Gm-Message-State: AC+VfDxrCxwWfYRlIeKSJpCXAxqjaSNbhnPFkV3QZSS2gefLpUvCYJFE Z3mCUCQ62VrQ/L469bXC9vXISxR7fQWzz/LX5R3ce0EhQqDv85J+itcJeVB48gmjsz/Z5MUFWSa wbmbHxw+gOHBbvy/2IT5FAIetojC/YqHHqUVPnC5Kktdn9UHkykpVD3ZrAS+VXqxB6+dWU6VyJP 5svsm91KY= X-Received: by 2002:a05:600c:284a:b0:3f6:1377:8b15 with SMTP id r10-20020a05600c284a00b003f613778b15mr7656290wmb.21.1685951288612; Mon, 05 Jun 2023 00:48:08 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ7Y3sEsxNIwZK3n9IEdro6U7y6EP48MP57T3BvOfN5LZhOYLajzhcd2K85ImHRDwpnr2Kb1WQ== X-Received: by 2002:a05:600c:284a:b0:3f6:1377:8b15 with SMTP id r10-20020a05600c284a00b003f613778b15mr7656272wmb.21.1685951288313; Mon, 05 Jun 2023 00:48:08 -0700 (PDT) Received: from minerva.home (205.pool92-176-231.dynamic.orange.es. [92.176.231.205]) by smtp.gmail.com with ESMTPSA id q21-20020a1ce915000000b003f4fb5532a1sm9715192wmc.43.2023.06.05.00.48.07 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 05 Jun 2023 00:48:07 -0700 (PDT) From: Javier Martinez Canillas To: linux-kernel@vger.kernel.org Cc: Thomas Zimmermann , Geert Uytterhoeven , Maxime Ripard , Javier Martinez Canillas , Daniel Vetter , David Airlie , dri-devel@lists.freedesktop.org Subject: [PATCH 1/5] drm/ssd130x: Make default width and height to be controller dependent Date: Mon, 5 Jun 2023 09:47:49 +0200 Message-Id: <20230605074753.562332-2-javierm@redhat.com> X-Mailer: git-send-email 2.40.1 In-Reply-To: <20230605074753.562332-1-javierm@redhat.com> References: <20230605074753.562332-1-javierm@redhat.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" Currently the driver hardcodes the default values to 96x16 pixels but this default resolution depends on the controller. The datasheets for the chips describes the following display controller resolutions: - SH1106: 132 x 64 Dot Matrix OLED/PLED - SSD1306: 128 x 64 Dot Matrix OLED/PLED - SSD1307: 128 x 39 Dot Matrix OLED/PLED - SSD1309: 128 x 64 Dot Matrix OLED/PLED Add this information to the devices' info structures, and use it set as a default if not defined in DT rather than hardcoding to an arbitrary value. Signed-off-by: Javier Martinez Canillas --- drivers/gpu/drm/solomon/ssd130x.c | 14 ++++++++++++-- drivers/gpu/drm/solomon/ssd130x.h | 2 ++ 2 files changed, 14 insertions(+), 2 deletions(-) diff --git a/drivers/gpu/drm/solomon/ssd130x.c b/drivers/gpu/drm/solomon/ss= d130x.c index 8cbf5aa66e19..a0e5e26c0bc9 100644 --- a/drivers/gpu/drm/solomon/ssd130x.c +++ b/drivers/gpu/drm/solomon/ssd130x.c @@ -99,29 +99,39 @@ const struct ssd130x_deviceinfo ssd130x_variants[] =3D { .default_vcomh =3D 0x40, .default_dclk_div =3D 1, .default_dclk_frq =3D 5, + .default_width =3D 132, + .default_height =3D 64, .page_mode_only =3D 1, }, [SSD1305_ID] =3D { .default_vcomh =3D 0x34, .default_dclk_div =3D 1, .default_dclk_frq =3D 7, + .default_width =3D 132, + .default_height =3D 64, }, [SSD1306_ID] =3D { .default_vcomh =3D 0x20, .default_dclk_div =3D 1, .default_dclk_frq =3D 8, .need_chargepump =3D 1, + .default_width =3D 128, + .default_height =3D 64, }, [SSD1307_ID] =3D { .default_vcomh =3D 0x20, .default_dclk_div =3D 2, .default_dclk_frq =3D 12, .need_pwm =3D 1, + .default_width =3D 128, + .default_height =3D 39, }, [SSD1309_ID] =3D { .default_vcomh =3D 0x34, .default_dclk_div =3D 1, .default_dclk_frq =3D 10, + .default_width =3D 128, + .default_height =3D 64, } }; EXPORT_SYMBOL_NS_GPL(ssd130x_variants, DRM_SSD130X); @@ -798,10 +808,10 @@ static void ssd130x_parse_properties(struct ssd130x_d= evice *ssd130x) struct device *dev =3D ssd130x->dev; =20 if (device_property_read_u32(dev, "solomon,width", &ssd130x->width)) - ssd130x->width =3D 96; + ssd130x->width =3D ssd130x->device_info->default_width; =20 if (device_property_read_u32(dev, "solomon,height", &ssd130x->height)) - ssd130x->height =3D 16; + ssd130x->height =3D ssd130x->device_info->default_height; =20 if (device_property_read_u32(dev, "solomon,page-offset", &ssd130x->page_o= ffset)) ssd130x->page_offset =3D 1; diff --git a/drivers/gpu/drm/solomon/ssd130x.h b/drivers/gpu/drm/solomon/ss= d130x.h index db03ee5db392..a2bc8d75078b 100644 --- a/drivers/gpu/drm/solomon/ssd130x.h +++ b/drivers/gpu/drm/solomon/ssd130x.h @@ -37,6 +37,8 @@ struct ssd130x_deviceinfo { u32 default_vcomh; u32 default_dclk_div; u32 default_dclk_frq; + u32 default_width; + u32 default_height; int need_pwm; int need_chargepump; bool page_mode_only; --=20 2.40.1