From nobody Fri Dec 19 17:01:13 2025 Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 92AF01078D for ; Fri, 22 Dec 2023 10:01:59 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=redhat.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=redhat.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b="E7BxdUU6" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1703239318; 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=1KrXB2l1sK5WNrgL14b/nrn7vl1GLfrzGJcKXH5lPKk=; b=E7BxdUU6FXaA8gCD+8+qbNN7RpHHUgY5sSTz+ZAUVBnWT8fYeBr2cLWaOMEs5zbWkC2qUi hfE9U+qR9c6d2OwWAFud0iYmq0U/6q1g8OVdTy7pLct6eJu5hJ3+JWYh6h8OjcrtmxQ0kw 1E+FpoSFC8c89q3wOBJGlrSm1mQbUIo= Received: from mail-wm1-f71.google.com (mail-wm1-f71.google.com [209.85.128.71]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-65-fSizf9qJOvuRan_4KOrdVQ-1; Fri, 22 Dec 2023 05:01:56 -0500 X-MC-Unique: fSizf9qJOvuRan_4KOrdVQ-1 Received: by mail-wm1-f71.google.com with SMTP id 5b1f17b1804b1-40d45be1ce2so1986295e9.1 for ; Fri, 22 Dec 2023 02:01:56 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1703239314; x=1703844114; 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=1KrXB2l1sK5WNrgL14b/nrn7vl1GLfrzGJcKXH5lPKk=; b=YSVh/nin/0FXAwF0RJJRKTarqO2OZZAze/OlfGy++unNuaaMQHndqeU0AJMe4NtkNj I/hlRhkjpttJ3W6oz/OjDikNFfQwEZ41zGlI46J/8OvmpQ5kBdLVX8vhV3v768yiO2Xn fmTbuOB/GUtG1iEFd8BuwakIgNRQq2419LQPDgpG0m/wOn207cLZLJaGiyrVwiTzXWEe G7SiNp+pfxSIptwnfcB81QW8klPmeS5+4LHf0h+tMVegrxt/XOSSpwCmhMNK+On1PIHW DoE/alliIeSmKhidNFgSuEYu1bFkE0LmIv4CGz0s4OkC2lXoHVJBGVyW3ISyhnyjFc8T 6LEQ== X-Gm-Message-State: AOJu0YyGbrTP+3zb2kbe4Omk8UVomq8TM8tYSBcqLtBR3yjwu5kb9Fz0 XVsm7qmZ7NHhfQXC653X8WDIRsNYiNQYjzmP6bsFwBFHL/j3itO3comQAjdFtvhs8P1ZDC6ULMl QYz9MbUHrHm692FGRNP0t8+gQau3xGhiYUcWMM0QPcev9DmTveiNuT3lZRzxwrx921Y5+R6F/Xn zQQR2miHeQkGiNsiY= X-Received: by 2002:a05:600c:3516:b0:40c:69ac:bbe3 with SMTP id h22-20020a05600c351600b0040c69acbbe3mr560848wmq.151.1703239314300; Fri, 22 Dec 2023 02:01:54 -0800 (PST) X-Google-Smtp-Source: AGHT+IG9cdk7GcDcHXW+tJWxQX97Hy6R4J0/6Wgjy0y5eLHmsXkFwLAr+yP0CIsp2UB1gvczU2KRrw== X-Received: by 2002:a05:600c:3516:b0:40c:69ac:bbe3 with SMTP id h22-20020a05600c351600b0040c69acbbe3mr560817wmq.151.1703239313866; Fri, 22 Dec 2023 02:01:53 -0800 (PST) Received: from localhost (205.pool92-176-231.dynamic.orange.es. [92.176.231.205]) by smtp.gmail.com with ESMTPSA id j16-20020a05600c191000b0040c11fbe581sm6426861wmq.27.2023.12.22.02.01.52 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 22 Dec 2023 02:01:52 -0800 (PST) From: Javier Martinez Canillas To: linux-kernel@vger.kernel.org Cc: Maxime Ripard , Jocelyn Falempe , Peter Robinson , Rob Herring , Krzysztof Kozlowski , Geert Uytterhoeven , Conor Dooley , Thomas Zimmermann , Javier Martinez Canillas , Conor Dooley , Daniel Vetter , David Airlie , Krzysztof Kozlowski , Maarten Lankhorst , Rob Herring , devicetree@vger.kernel.org, dri-devel@lists.freedesktop.org Subject: [PATCH v4 1/4] dt-bindings: display: ssd1307fb: Add vendor prefix to width and height Date: Fri, 22 Dec 2023 11:01:38 +0100 Message-ID: <20231222100149.2641687-2-javierm@redhat.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20231222100149.2641687-1-javierm@redhat.com> References: <20231222100149.2641687-1-javierm@redhat.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" The commit 591825fba8a2 ("dt-bindings: display: ssd1307fb: Remove default width and height values") used the wrong properties for width and height, instead of the correct "solomon,width" and "solomon,height" properties. Fix this by adding the vendor prefix to the width and height properties. Fixes: 591825fba8a2 ("dt-bindings: display: ssd1307fb: Remove default width= and height values") Reported-by: Conor Dooley Closes: https://lore.kernel.org/dri-devel/20231218-example-envision-b41ca8e= fa251@spud/ Signed-off-by: Javier Martinez Canillas Acked-by: Rob Herring --- (no changes since v1) .../bindings/display/solomon,ssd1307fb.yaml | 20 +++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/Documentation/devicetree/bindings/display/solomon,ssd1307fb.ya= ml b/Documentation/devicetree/bindings/display/solomon,ssd1307fb.yaml index 3afbb52d1b7f..153ff86fb405 100644 --- a/Documentation/devicetree/bindings/display/solomon,ssd1307fb.yaml +++ b/Documentation/devicetree/bindings/display/solomon,ssd1307fb.yaml @@ -131,9 +131,9 @@ allOf: const: sinowealth,sh1106 then: properties: - width: + solomon,width: default: 132 - height: + solomon,height: default: 64 solomon,dclk-div: default: 1 @@ -149,9 +149,9 @@ allOf: - solomon,ssd1305 then: properties: - width: + solomon,width: default: 132 - height: + solomon,height: default: 64 solomon,dclk-div: default: 1 @@ -167,9 +167,9 @@ allOf: - solomon,ssd1306 then: properties: - width: + solomon,width: default: 128 - height: + solomon,height: default: 64 solomon,dclk-div: default: 1 @@ -185,9 +185,9 @@ allOf: - solomon,ssd1307 then: properties: - width: + solomon,width: default: 128 - height: + solomon,height: default: 39 solomon,dclk-div: default: 2 @@ -205,9 +205,9 @@ allOf: - solomon,ssd1309 then: properties: - width: + solomon,width: default: 128 - height: + solomon,height: default: 64 solomon,dclk-div: default: 1 --=20 2.43.0 From nobody Fri Dec 19 17:01:13 2025 Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 503C41119D for ; Fri, 22 Dec 2023 10:02:00 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=redhat.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=redhat.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b="EqWiktHb" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1703239319; 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=LGLVCef4QzbvTALYo2ea2BIkPY+CGFifWhpyQpWq1Uc=; b=EqWiktHbitdYKzzKQUnoML8fCcvLl07L2++ZQNsdoUiwbTYXB5Y8w97+lxKWPMDeXQwB2j ENMb9k2rgHTDUaD8+v63RvCow0dBZyYXU/wFjLJBlz/NJzvVOlE/PMaqGa5dNEzA4kOULs wrbgdeOR0m1qPktYchcHio7Vw1etJt4= 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-681-62uzTwtdNNyP6ONC7aNbkw-1; Fri, 22 Dec 2023 05:01:58 -0500 X-MC-Unique: 62uzTwtdNNyP6ONC7aNbkw-1 Received: by mail-wm1-f70.google.com with SMTP id 5b1f17b1804b1-40d3b0783beso12108065e9.3 for ; Fri, 22 Dec 2023 02:01:57 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1703239316; x=1703844116; 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=LGLVCef4QzbvTALYo2ea2BIkPY+CGFifWhpyQpWq1Uc=; b=BWmk0hnIWldeCDqEcT2APAXAbGq4poj+2LrNYsp/zm+f2LHjAVVViRrlGQtk0W4WE2 65LnghSdz9UPVrHGB37nF/VIaix0ylLI3pbliaF0dYv5mGm+4rOdy6rARvenubcBnI70 S8Rv0+chKDLVoX2PdtdmaKV4ex0/6fkMzgohZw2M9qE6NSAmkCjnzfjWgAa7PI73SBcR nCMDwc/ma7bc+C8AytAZxCRnCYhPe82dUjZa3rLluwID8Tkuk8WUqFzJy/farEqLOht4 +igdwJRrqtavo4+CEmyh92hiktPKy63PmWU6TP8oq5FMyklpOv6q77bbJ+D3q8CPtabB zFpg== X-Gm-Message-State: AOJu0YzHajy64Jy4HsGQy5j136TQo92UvjOEoHrwFs1VUpPv6cM+cFZY nFus5ZKeWzA/OIfpePvTqwMKG57Ezl0lTJ+GM3OQduZsHOsahFCcYQI5y6JVcpg0g1SFGKDKck/ 4FLxvlJcTmlfBlM4I87JizSUDWblUEtbXhoLCaPPTKP/Lb33hNk0dSg3LhaMO+zVvxPpO3PSllW mU5zsTaaGjsDV/pk0= X-Received: by 2002:a05:600c:4707:b0:40d:30c9:2c0a with SMTP id v7-20020a05600c470700b0040d30c92c0amr579439wmo.115.1703239316376; Fri, 22 Dec 2023 02:01:56 -0800 (PST) X-Google-Smtp-Source: AGHT+IE3RPkPItpbxaMZzXzGJcG1N9FtcaSFzT+abGEsinJLJmdympQDNt+Rajm9hzaq7pPTWoOcOg== X-Received: by 2002:a05:600c:4707:b0:40d:30c9:2c0a with SMTP id v7-20020a05600c470700b0040d30c92c0amr579416wmo.115.1703239316021; Fri, 22 Dec 2023 02:01:56 -0800 (PST) Received: from localhost (205.pool92-176-231.dynamic.orange.es. [92.176.231.205]) by smtp.gmail.com with ESMTPSA id p20-20020a05600c359400b0040d3ae032b3sm6811470wmq.9.2023.12.22.02.01.54 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 22 Dec 2023 02:01:54 -0800 (PST) From: Javier Martinez Canillas To: linux-kernel@vger.kernel.org Cc: Maxime Ripard , Jocelyn Falempe , Peter Robinson , Rob Herring , Krzysztof Kozlowski , Geert Uytterhoeven , Conor Dooley , Thomas Zimmermann , Javier Martinez Canillas , Conor Dooley , Daniel Vetter , David Airlie , Krzysztof Kozlowski , Maarten Lankhorst , Rob Herring , devicetree@vger.kernel.org, dri-devel@lists.freedesktop.org Subject: [PATCH v4 2/4] dt-bindings: display: ssd132x: Add vendor prefix to width and height Date: Fri, 22 Dec 2023 11:01:39 +0100 Message-ID: <20231222100149.2641687-3-javierm@redhat.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20231222100149.2641687-1-javierm@redhat.com> References: <20231222100149.2641687-1-javierm@redhat.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Commit 2d23e7d6bacb ("dt-bindings: display: Add SSD132x OLED controllers") used the wrong properties for width and height, instead of the correct "solomon,width" and "solomon,height" properties. Fix this by adding the vendor prefix to the width and height properties. Fixes: 2d23e7d6bacb ("dt-bindings: display: Add SSD132x OLED controllers") Reported-by: Conor Dooley Closes: https://lore.kernel.org/dri-devel/20231218-example-envision-b41ca8e= fa251@spud/ Signed-off-by: Javier Martinez Canillas Acked-by: Rob Herring --- (no changes since v1) .../devicetree/bindings/display/solomon,ssd132x.yaml | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/Documentation/devicetree/bindings/display/solomon,ssd132x.yaml= b/Documentation/devicetree/bindings/display/solomon,ssd132x.yaml index 37975ee61c5a..dd7939989cf4 100644 --- a/Documentation/devicetree/bindings/display/solomon,ssd132x.yaml +++ b/Documentation/devicetree/bindings/display/solomon,ssd132x.yaml @@ -30,9 +30,9 @@ allOf: const: solomon,ssd1322 then: properties: - width: + solomon,width: default: 480 - height: + solomon,height: default: 128 =20 - if: @@ -42,9 +42,9 @@ allOf: const: solomon,ssd1325 then: properties: - width: + solomon,width: default: 128 - height: + solomon,height: default: 80 =20 - if: @@ -54,9 +54,9 @@ allOf: const: solomon,ssd1327 then: properties: - width: + solomon,width: default: 128 - height: + solomon,height: default: 128 =20 unevaluatedProperties: false --=20 2.43.0 From nobody Fri Dec 19 17:01:13 2025 Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id D3028171D9 for ; Fri, 22 Dec 2023 10:02:03 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=redhat.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=redhat.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b="HOYxbXpd" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1703239322; 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=L4FSS8B/TyNttrAPDKVxxrfugLFfEOoGgW3LT/2ICJc=; b=HOYxbXpdyDSF3zfClSnRrBQ1j3JPXQL+7BQisjQyKSjAdwFj3XqnEl4+Q00jiZwZiqGNel qz/+rH7Oe8nBiBlANfnXXpnYYDxMPE3EKd2eQcZuVE+4zR7at/B5SkfW94ILt+Ld3dINUF blpx594T2hY706Gme4xEMaidiPik/aU= Received: from mail-wr1-f72.google.com (mail-wr1-f72.google.com [209.85.221.72]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-372-Bsa_6LomPOyPJgQ41GUfCw-1; Fri, 22 Dec 2023 05:02:00 -0500 X-MC-Unique: Bsa_6LomPOyPJgQ41GUfCw-1 Received: by mail-wr1-f72.google.com with SMTP id ffacd0b85a97d-3367e2bd8b0so1096623f8f.1 for ; Fri, 22 Dec 2023 02:02:00 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1703239318; x=1703844118; 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=L4FSS8B/TyNttrAPDKVxxrfugLFfEOoGgW3LT/2ICJc=; b=Lc2gH3T7PdtZRSJu3RHCGIeg6sDmlrOpwELS7O5lIeu3+KEVZ1vSS3w80wx6Zv+2hk YEvprGdy1FQPJzbH4lIcWJDZwZXmgv2flbn+Ha3UXaqpUetovQmrTPGiBjmh7mHpS+hB sVLn/TjACtbVrJuosyA0fBfG2jDmfGYVqGr5NRc71WgohTYJby8rh+8c7bd4Py69kdt3 1uI4CPFPfgc1PiDmkQIYDfMWDAlRYyUR7oYWhTPi6LhsdhSYyymSLZGM4oOo8ooBkuv9 pkYjmCJgbUDRE4re6QbsLwZlImjOncX7kJ5wY5Sk6LbwoDJEPq734a8bts4CYyVu0AuL ZSKg== X-Gm-Message-State: AOJu0YzTv0sPSunwYRNNzO3M39AAA022OHug7u0vLZ7YtkvLxkUvJDhH pONNchkzJA6U3yAl4zQV75n6qmf5xMVJfApki6YjloF3J2DfdcCnPJKRFzjgo5TxYkef2jR8f68 GTqIDJO1O56T8SXE112VX+rF4KIRbBl17F8c/PLYAXWJspbuow8RwMOh4CQUi0UiVqKS4/+uRTO E7LmRrRsX1VmkPpJI= X-Received: by 2002:a5d:4351:0:b0:336:7357:a9f9 with SMTP id u17-20020a5d4351000000b003367357a9f9mr609057wrr.83.1703239318723; Fri, 22 Dec 2023 02:01:58 -0800 (PST) X-Google-Smtp-Source: AGHT+IGsZNdU6Ak/y/62OAv0NofaXq3Tb9KBXRWL0RjpFZICnql7RgbmU8gyoAOcGlYZ24PvkGjvFQ== X-Received: by 2002:a5d:4351:0:b0:336:7357:a9f9 with SMTP id u17-20020a5d4351000000b003367357a9f9mr609036wrr.83.1703239318274; Fri, 22 Dec 2023 02:01:58 -0800 (PST) Received: from localhost (205.pool92-176-231.dynamic.orange.es. [92.176.231.205]) by smtp.gmail.com with ESMTPSA id t16-20020adfe450000000b0033666ec47b7sm3883026wrm.99.2023.12.22.02.01.56 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 22 Dec 2023 02:01:57 -0800 (PST) From: Javier Martinez Canillas To: linux-kernel@vger.kernel.org Cc: Maxime Ripard , Jocelyn Falempe , Peter Robinson , Rob Herring , Krzysztof Kozlowski , Geert Uytterhoeven , Conor Dooley , Thomas Zimmermann , Javier Martinez Canillas , Conor Dooley , Daniel Vetter , David Airlie , Krzysztof Kozlowski , Maarten Lankhorst , Rob Herring , devicetree@vger.kernel.org, dri-devel@lists.freedesktop.org Subject: [PATCH v4 3/4] dt-bindings: display: Add SSD133x OLED controllers Date: Fri, 22 Dec 2023 11:01:40 +0100 Message-ID: <20231222100149.2641687-4-javierm@redhat.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20231222100149.2641687-1-javierm@redhat.com> References: <20231222100149.2641687-1-javierm@redhat.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Add a Device Tree binding schema for the OLED panels based on the Solomon SSD133x family of controllers. Signed-off-by: Javier Martinez Canillas Reviewed-by: Rob Herring --- (no changes since v3) Changes in v3: - Move solomon,ssd-common.yaml ref before the properties section and width/height constraints after the other properties (Conor Dooley). Changes in v2: - Unconditionally set the width and height constraints (Conor Dooley). - Fix indentation in the DTS examples (Krzysztof Kozlowski). .../bindings/display/solomon,ssd133x.yaml | 57 +++++++++++++++++++ 1 file changed, 57 insertions(+) create mode 100644 Documentation/devicetree/bindings/display/solomon,ssd13= 3x.yaml diff --git a/Documentation/devicetree/bindings/display/solomon,ssd133x.yaml= b/Documentation/devicetree/bindings/display/solomon,ssd133x.yaml new file mode 100644 index 000000000000..e93879b3da5d --- /dev/null +++ b/Documentation/devicetree/bindings/display/solomon,ssd133x.yaml @@ -0,0 +1,57 @@ +# SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause) +%YAML 1.2 +--- +$id: http://devicetree.org/schemas/display/solomon,ssd133x.yaml# +$schema: http://devicetree.org/meta-schemas/core.yaml# + +title: Solomon SSD133x OLED Display Controllers + +maintainers: + - Javier Martinez Canillas + +allOf: + - $ref: solomon,ssd-common.yaml# + +properties: + compatible: + enum: + - solomon,ssd1331 + + solomon,width: + default: 96 + + solomon,height: + default: 64 + +required: + - compatible + - reg + +unevaluatedProperties: false + +examples: + - | + i2c { + #address-cells =3D <1>; + #size-cells =3D <0>; + + oled@3c { + compatible =3D "solomon,ssd1331"; + reg =3D <0x3c>; + reset-gpios =3D <&gpio2 7>; + }; + + }; + - | + spi { + #address-cells =3D <1>; + #size-cells =3D <0>; + + oled@0 { + compatible =3D "solomon,ssd1331"; + reg =3D <0x0>; + reset-gpios =3D <&gpio2 7>; + dc-gpios =3D <&gpio2 8>; + spi-max-frequency =3D <10000000>; + }; + }; --=20 2.43.0 From nobody Fri Dec 19 17:01:13 2025 Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 238B617992 for ; Fri, 22 Dec 2023 10:02:05 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=redhat.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=redhat.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b="bSbRsXLS" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1703239325; 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=YXfX12BE3LQm3hjKfwCrE87x4MbkwuEOmAkmWXpHcRM=; b=bSbRsXLSTv0HUg8pgijrB5JNcPXb4Wax35ZQXnEOyA7wNOTh9dK4fFeIAgs+L8qYvyLJAf /1O4sgbHbiDSC8C6fa3EhJBrGjanYx2OQWIO5JbOO1v2h7NbC8u1DOWp+sBFaehZs6AYxa XI40K0GqeYn+bdL97MM9PMy8gV8MCec= 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-610-0ww5qdeRMg6qNyXp_dvojw-1; Fri, 22 Dec 2023 05:02:03 -0500 X-MC-Unique: 0ww5qdeRMg6qNyXp_dvojw-1 Received: by mail-wm1-f70.google.com with SMTP id 5b1f17b1804b1-40d3b4606b3so12128385e9.2 for ; Fri, 22 Dec 2023 02:02:02 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1703239321; x=1703844121; 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=YXfX12BE3LQm3hjKfwCrE87x4MbkwuEOmAkmWXpHcRM=; b=mcXAkVVc83c2+gVdSGCmeB+AM+x/nBO3YuAfs9vqhQVGfKwryj6mKZGZY0DpMfZPye 7/56eCe7pD5Fj0soPScZaqSB5RWI3x1Juosm6ZcPuhc3efPrCT+9eoTvHFaPttYhUFup PuZqvz6tPnaahVqd1UT9qyDupZ9caMFmRcC9ppzL9L/0QYjfv7SBslOtwqr6Rwfl6NCL mXv7mQ3HVwTa4n5Ib/9V1aoDqEBnwTM/9wNfxMrcUqVxxLYxVbNgtdlvApaMQaJopPgE rGqOqjBqc1bXkUjBoTeYD9mLutKdqDRjFa6VLbMZdQKkbgNkLFaUCC/TaJqEQf6AP5Xq Z2bg== X-Gm-Message-State: AOJu0YyYyc5zUmTOuPYiYEuOm1i1KLS2nlDRiSCRIXGsu5jTAVE/yW9M IiHToZ5CbG2kXVbOTVQ3tT+y5x1hdsWs0r7XBnlj3RbH0Wj0xT5cXyxQChZD6uQLFvQrBcjbd1V tAEjR6lQbNrVv/vvNrZcli9wR/oog07haswFE/Y0udK145b/g03uRlHiUWhrim1Nf69fcgzXqTM vCw3Myi63dZ4W1YHE= X-Received: by 2002:a05:600c:46cb:b0:40c:6e8:610a with SMTP id q11-20020a05600c46cb00b0040c06e8610amr599041wmo.56.1703239320785; Fri, 22 Dec 2023 02:02:00 -0800 (PST) X-Google-Smtp-Source: AGHT+IFMbzVJT1bjBf2e/+Ma0qCuN59AGZ45LTB53dTlG40IBb/JgrJ7HP28shzEPdsaAARRvafcmg== X-Received: by 2002:a05:600c:46cb:b0:40c:6e8:610a with SMTP id q11-20020a05600c46cb00b0040c06e8610amr599016wmo.56.1703239320287; Fri, 22 Dec 2023 02:02:00 -0800 (PST) Received: from localhost (205.pool92-176-231.dynamic.orange.es. [92.176.231.205]) by smtp.gmail.com with ESMTPSA id bh20-20020a05600c3d1400b0040d15dcb77asm14183757wmb.23.2023.12.22.02.01.59 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 22 Dec 2023 02:01:59 -0800 (PST) From: Javier Martinez Canillas To: linux-kernel@vger.kernel.org Cc: Maxime Ripard , Jocelyn Falempe , Peter Robinson , Rob Herring , Krzysztof Kozlowski , Geert Uytterhoeven , Conor Dooley , Thomas Zimmermann , Javier Martinez Canillas , Daniel Vetter , David Airlie , Maarten Lankhorst , dri-devel@lists.freedesktop.org Subject: [PATCH v4 4/4] drm/ssd130x: Add support for the SSD133x OLED controller family Date: Fri, 22 Dec 2023 11:01:41 +0100 Message-ID: <20231222100149.2641687-5-javierm@redhat.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20231222100149.2641687-1-javierm@redhat.com> References: <20231222100149.2641687-1-javierm@redhat.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" The Solomon SSD133x controllers (such as the SSD1331) are used by RGB dot matrix OLED panels, add a modesetting pipeline to support the chip family. The SSD133x controllers support 256 (8-bit) and 65k (16-bit) color depths but only the 256-color mode (DRM_FORMAT_RGB332) is implemented for now. Signed-off-by: Javier Martinez Canillas Reviewed-by: Jocelyn Falempe --- Changes in v4: - Fix typo in commit message (Jocelyn Falempe). drivers/gpu/drm/solomon/ssd130x-i2c.c | 5 + drivers/gpu/drm/solomon/ssd130x-spi.c | 7 + drivers/gpu/drm/solomon/ssd130x.c | 370 ++++++++++++++++++++++++++ drivers/gpu/drm/solomon/ssd130x.h | 5 +- 4 files changed, 386 insertions(+), 1 deletion(-) diff --git a/drivers/gpu/drm/solomon/ssd130x-i2c.c b/drivers/gpu/drm/solomo= n/ssd130x-i2c.c index f2ccab9c06d9..a047dbec4e48 100644 --- a/drivers/gpu/drm/solomon/ssd130x-i2c.c +++ b/drivers/gpu/drm/solomon/ssd130x-i2c.c @@ -105,6 +105,11 @@ static const struct of_device_id ssd130x_of_match[] = =3D { .compatible =3D "solomon,ssd1327", .data =3D &ssd130x_variants[SSD1327_ID], }, + /* ssd133x family */ + { + .compatible =3D "solomon,ssd1331", + .data =3D &ssd130x_variants[SSD1331_ID], + }, { /* sentinel */ } }; MODULE_DEVICE_TABLE(of, ssd130x_of_match); diff --git a/drivers/gpu/drm/solomon/ssd130x-spi.c b/drivers/gpu/drm/solomo= n/ssd130x-spi.c index 84e035a7ab3f..84bfde31d172 100644 --- a/drivers/gpu/drm/solomon/ssd130x-spi.c +++ b/drivers/gpu/drm/solomon/ssd130x-spi.c @@ -142,6 +142,11 @@ static const struct of_device_id ssd130x_of_match[] = =3D { .compatible =3D "solomon,ssd1327", .data =3D &ssd130x_variants[SSD1327_ID], }, + /* ssd133x family */ + { + .compatible =3D "solomon,ssd1331", + .data =3D &ssd130x_variants[SSD1331_ID], + }, { /* sentinel */ } }; MODULE_DEVICE_TABLE(of, ssd130x_of_match); @@ -166,6 +171,8 @@ static const struct spi_device_id ssd130x_spi_table[] = =3D { { "ssd1322", SSD1322_ID }, { "ssd1325", SSD1325_ID }, { "ssd1327", SSD1327_ID }, + /* ssd133x family */ + { "ssd1331", SSD1331_ID }, { /* sentinel */ } }; MODULE_DEVICE_TABLE(spi, ssd130x_spi_table); diff --git a/drivers/gpu/drm/solomon/ssd130x.c b/drivers/gpu/drm/solomon/ss= d130x.c index bef293922b98..447d0c7c88c6 100644 --- a/drivers/gpu/drm/solomon/ssd130x.c +++ b/drivers/gpu/drm/solomon/ssd130x.c @@ -119,6 +119,26 @@ #define SSD130X_SET_VCOMH_VOLTAGE 0xbe #define SSD132X_SET_FUNCTION_SELECT_B 0xd5 =20 +/* ssd133x commands */ +#define SSD133X_SET_COL_RANGE 0x15 +#define SSD133X_SET_ROW_RANGE 0x75 +#define SSD133X_CONTRAST_A 0x81 +#define SSD133X_CONTRAST_B 0x82 +#define SSD133X_CONTRAST_C 0x83 +#define SSD133X_SET_MASTER_CURRENT 0x87 +#define SSD132X_SET_PRECHARGE_A 0x8a +#define SSD132X_SET_PRECHARGE_B 0x8b +#define SSD132X_SET_PRECHARGE_C 0x8c +#define SSD133X_SET_DISPLAY_START 0xa1 +#define SSD133X_SET_DISPLAY_OFFSET 0xa2 +#define SSD133X_SET_DISPLAY_NORMAL 0xa4 +#define SSD133X_SET_MASTER_CONFIG 0xad +#define SSD133X_POWER_SAVE_MODE 0xb0 +#define SSD133X_PHASES_PERIOD 0xb1 +#define SSD133X_SET_CLOCK_FREQ 0xb3 +#define SSD133X_SET_PRECHARGE_VOLTAGE 0xbb +#define SSD133X_SET_VCOMH_VOLTAGE 0xbe + #define MAX_CONTRAST 255 =20 const struct ssd130x_deviceinfo ssd130x_variants[] =3D { @@ -180,6 +200,12 @@ const struct ssd130x_deviceinfo ssd130x_variants[] =3D= { .default_width =3D 128, .default_height =3D 128, .family_id =3D SSD132X_FAMILY, + }, + /* ssd133x family */ + [SSD1331_ID] =3D { + .default_width =3D 96, + .default_height =3D 64, + .family_id =3D SSD133X_FAMILY, } }; EXPORT_SYMBOL_NS_GPL(ssd130x_variants, DRM_SSD130X); @@ -589,6 +615,117 @@ static int ssd132x_init(struct ssd130x_device *ssd130= x) return 0; } =20 +static int ssd133x_init(struct ssd130x_device *ssd130x) +{ + int ret; + + /* Set color A contrast */ + ret =3D ssd130x_write_cmd(ssd130x, 2, SSD133X_CONTRAST_A, 0x91); + if (ret < 0) + return ret; + + /* Set color B contrast */ + ret =3D ssd130x_write_cmd(ssd130x, 2, SSD133X_CONTRAST_B, 0x50); + if (ret < 0) + return ret; + + /* Set color C contrast */ + ret =3D ssd130x_write_cmd(ssd130x, 2, SSD133X_CONTRAST_C, 0x7d); + if (ret < 0) + return ret; + + /* Set master current */ + ret =3D ssd130x_write_cmd(ssd130x, 2, SSD133X_SET_MASTER_CURRENT, 0x06); + if (ret < 0) + return ret; + + /* Set column start and end */ + ret =3D ssd130x_write_cmd(ssd130x, 3, SSD133X_SET_COL_RANGE, 0x00, ssd130= x->width - 1); + if (ret < 0) + return ret; + + /* Set row start and end */ + ret =3D ssd130x_write_cmd(ssd130x, 3, SSD133X_SET_ROW_RANGE, 0x00, ssd130= x->height - 1); + if (ret < 0) + return ret; + + /* + * Horizontal Address Increment + * Normal order SA,SB,SC (e.g. RGB) + * COM Split Odd Even + * 256 color format + */ + ret =3D ssd130x_write_cmd(ssd130x, 2, SSD13XX_SET_SEG_REMAP, 0x20); + if (ret < 0) + return ret; + + /* Set display start and offset */ + ret =3D ssd130x_write_cmd(ssd130x, 2, SSD133X_SET_DISPLAY_START, 0x00); + if (ret < 0) + return ret; + + ret =3D ssd130x_write_cmd(ssd130x, 2, SSD133X_SET_DISPLAY_OFFSET, 0x00); + if (ret < 0) + return ret; + + /* Set display mode normal */ + ret =3D ssd130x_write_cmd(ssd130x, 1, SSD133X_SET_DISPLAY_NORMAL); + if (ret < 0) + return ret; + + /* Set multiplex ratio value */ + ret =3D ssd130x_write_cmd(ssd130x, 2, SSD13XX_SET_MULTIPLEX_RATIO, ssd130= x->height - 1); + if (ret < 0) + return ret; + + /* Set master configuration */ + ret =3D ssd130x_write_cmd(ssd130x, 2, SSD133X_SET_MASTER_CONFIG, 0x8e); + if (ret < 0) + return ret; + + /* Set power mode */ + ret =3D ssd130x_write_cmd(ssd130x, 2, SSD133X_POWER_SAVE_MODE, 0x0b); + if (ret < 0) + return ret; + + /* Set Phase 1 and 2 period */ + ret =3D ssd130x_write_cmd(ssd130x, 2, SSD133X_PHASES_PERIOD, 0x31); + if (ret < 0) + return ret; + + /* Set clock divider */ + ret =3D ssd130x_write_cmd(ssd130x, 2, SSD133X_SET_CLOCK_FREQ, 0xf0); + if (ret < 0) + return ret; + + /* Set pre-charge A */ + ret =3D ssd130x_write_cmd(ssd130x, 2, SSD132X_SET_PRECHARGE_A, 0x64); + if (ret < 0) + return ret; + + /* Set pre-charge B */ + ret =3D ssd130x_write_cmd(ssd130x, 2, SSD132X_SET_PRECHARGE_B, 0x78); + if (ret < 0) + return ret; + + /* Set pre-charge C */ + ret =3D ssd130x_write_cmd(ssd130x, 2, SSD132X_SET_PRECHARGE_C, 0x64); + if (ret < 0) + return ret; + + /* Set pre-charge level */ + ret =3D ssd130x_write_cmd(ssd130x, 2, SSD133X_SET_PRECHARGE_VOLTAGE, 0x3a= ); + if (ret < 0) + return ret; + + /* Set VCOMH voltage */ + ret =3D ssd130x_write_cmd(ssd130x, 2, SSD133X_SET_VCOMH_VOLTAGE, 0x3e); + if (ret < 0) + return ret; + + return 0; +} + static int ssd130x_update_rect(struct ssd130x_device *ssd130x, struct drm_rect *rect, u8 *buf, u8 *data_array) @@ -753,6 +890,47 @@ static int ssd132x_update_rect(struct ssd130x_device *= ssd130x, return ret; } =20 +static int ssd133x_update_rect(struct ssd130x_device *ssd130x, + struct drm_rect *rect, u8 *data_array, + unsigned int pitch) +{ + unsigned int x =3D rect->x1; + unsigned int y =3D rect->y1; + unsigned int columns =3D drm_rect_width(rect); + unsigned int rows =3D drm_rect_height(rect); + int ret; + + /* + * The screen is divided in Segment and Common outputs, where + * COM0 to COM[N - 1] are the rows and SEG0 to SEG[M - 1] are + * the columns. + * + * Each Segment has a 8-bit pixel and each Common output has a + * row of pixels. When using the (default) horizontal address + * increment mode, each byte of data sent to the controller has + * a Segment (e.g: SEG0). + * + * When using the 256 color depth format, each pixel contains 3 + * sub-pixels for color A, B and C. These have 3 bit, 3 bit and + * 2 bits respectively. + */ + + /* Set column start and end */ + ret =3D ssd130x_write_cmd(ssd130x, 3, SSD133X_SET_COL_RANGE, x, columns -= 1); + if (ret < 0) + return ret; + + /* Set row start and end */ + ret =3D ssd130x_write_cmd(ssd130x, 3, SSD133X_SET_ROW_RANGE, y, rows - 1); + if (ret < 0) + return ret; + + /* Write out update in one go since horizontal addressing mode is used */ + ret =3D ssd130x_write_data(ssd130x, data_array, pitch * rows); + + return ret; +} + static void ssd130x_clear_screen(struct ssd130x_device *ssd130x, u8 *data_= array) { unsigned int pages =3D DIV_ROUND_UP(ssd130x->height, SSD130X_PAGE_HEIGHT); @@ -805,6 +983,22 @@ static void ssd132x_clear_screen(struct ssd130x_device= *ssd130x, u8 *data_array) ssd130x_write_data(ssd130x, data_array, columns * height); } =20 +static void ssd133x_clear_screen(struct ssd130x_device *ssd130x, u8 *data_= array) +{ + const struct drm_format_info *fi =3D drm_format_info(DRM_FORMAT_RGB332); + unsigned int pitch; + + if (!fi) + return; + + pitch =3D drm_format_info_min_pitch(fi, 0, ssd130x->width); + + memset(data_array, 0, pitch * ssd130x->height); + + /* Write out update in one go since horizontal addressing mode is used */ + ssd130x_write_data(ssd130x, data_array, pitch * ssd130x->height); +} + static int ssd130x_fb_blit_rect(struct drm_framebuffer *fb, const struct iosys_map *vmap, struct drm_rect *rect, @@ -866,6 +1060,36 @@ static int ssd132x_fb_blit_rect(struct drm_framebuffe= r *fb, return ret; } =20 +static int ssd133x_fb_blit_rect(struct drm_framebuffer *fb, + const struct iosys_map *vmap, + struct drm_rect *rect, u8 *data_array, + struct drm_format_conv_state *fmtcnv_state) +{ + struct ssd130x_device *ssd130x =3D drm_to_ssd130x(fb->dev); + const struct drm_format_info *fi =3D drm_format_info(DRM_FORMAT_RGB332); + unsigned int dst_pitch; + struct iosys_map dst; + int ret =3D 0; + + if (!fi) + return -EINVAL; + + dst_pitch =3D drm_format_info_min_pitch(fi, 0, drm_rect_width(rect)); + + ret =3D drm_gem_fb_begin_cpu_access(fb, DMA_FROM_DEVICE); + if (ret) + return ret; + + iosys_map_set_vaddr(&dst, data_array); + drm_fb_xrgb8888_to_rgb332(&dst, &dst_pitch, vmap, fb, rect, fmtcnv_state); + + drm_gem_fb_end_cpu_access(fb, DMA_FROM_DEVICE); + + ssd133x_update_rect(ssd130x, rect, data_array, dst_pitch); + + return ret; +} + static int ssd130x_primary_plane_atomic_check(struct drm_plane *plane, struct drm_atomic_state *state) { @@ -964,6 +1188,29 @@ static int ssd132x_primary_plane_atomic_check(struct = drm_plane *plane, return 0; } =20 +static int ssd133x_primary_plane_atomic_check(struct drm_plane *plane, + struct drm_atomic_state *state) +{ + struct drm_plane_state *plane_state =3D drm_atomic_get_new_plane_state(st= ate, plane); + struct drm_crtc *crtc =3D plane_state->crtc; + struct drm_crtc_state *crtc_state =3D NULL; + int ret; + + if (crtc) + crtc_state =3D drm_atomic_get_new_crtc_state(state, crtc); + + ret =3D drm_atomic_helper_check_plane_state(plane_state, crtc_state, + DRM_PLANE_NO_SCALING, + DRM_PLANE_NO_SCALING, + false, false); + if (ret) + return ret; + else if (!plane_state->visible) + return 0; + + return 0; +} + static void ssd130x_primary_plane_atomic_update(struct drm_plane *plane, struct drm_atomic_state *state) { @@ -1034,6 +1281,39 @@ static void ssd132x_primary_plane_atomic_update(stru= ct drm_plane *plane, drm_dev_exit(idx); } =20 +static void ssd133x_primary_plane_atomic_update(struct drm_plane *plane, + struct drm_atomic_state *state) +{ + struct drm_plane_state *plane_state =3D drm_atomic_get_new_plane_state(st= ate, plane); + struct drm_plane_state *old_plane_state =3D drm_atomic_get_old_plane_stat= e(state, plane); + struct drm_shadow_plane_state *shadow_plane_state =3D to_drm_shadow_plane= _state(plane_state); + struct drm_crtc_state *crtc_state =3D drm_atomic_get_new_crtc_state(state= , plane_state->crtc); + struct ssd130x_crtc_state *ssd130x_crtc_state =3D to_ssd130x_crtc_state(= crtc_state); + struct drm_framebuffer *fb =3D plane_state->fb; + struct drm_atomic_helper_damage_iter iter; + struct drm_device *drm =3D plane->dev; + struct drm_rect dst_clip; + struct drm_rect damage; + int idx; + + if (!drm_dev_enter(drm, &idx)) + return; + + drm_atomic_helper_damage_iter_init(&iter, old_plane_state, plane_state); + drm_atomic_for_each_plane_damage(&iter, &damage) { + dst_clip =3D plane_state->dst; + + if (!drm_rect_intersect(&dst_clip, &damage)) + continue; + + ssd133x_fb_blit_rect(fb, &shadow_plane_state->data[0], &dst_clip, + ssd130x_crtc_state->data_array, + &shadow_plane_state->fmtcnv_state); + } + + drm_dev_exit(idx); +} + static void ssd130x_primary_plane_atomic_disable(struct drm_plane *plane, struct drm_atomic_state *state) { @@ -1082,6 +1362,30 @@ static void ssd132x_primary_plane_atomic_disable(str= uct drm_plane *plane, drm_dev_exit(idx); } =20 +static void ssd133x_primary_plane_atomic_disable(struct drm_plane *plane, + struct drm_atomic_state *state) +{ + struct drm_device *drm =3D plane->dev; + struct ssd130x_device *ssd130x =3D drm_to_ssd130x(drm); + struct drm_plane_state *plane_state =3D drm_atomic_get_new_plane_state(st= ate, plane); + struct drm_crtc_state *crtc_state; + struct ssd130x_crtc_state *ssd130x_crtc_state; + int idx; + + if (!plane_state->crtc) + return; + + crtc_state =3D drm_atomic_get_new_crtc_state(state, plane_state->crtc); + ssd130x_crtc_state =3D to_ssd130x_crtc_state(crtc_state); + + if (!drm_dev_enter(drm, &idx)) + return; + + ssd133x_clear_screen(ssd130x, ssd130x_crtc_state->data_array); + + drm_dev_exit(idx); +} + /* Called during init to allocate the plane's atomic state. */ static void ssd130x_primary_plane_reset(struct drm_plane *plane) { @@ -1144,6 +1448,12 @@ static const struct drm_plane_helper_funcs ssd130x_p= rimary_plane_helper_funcs[] .atomic_check =3D ssd132x_primary_plane_atomic_check, .atomic_update =3D ssd132x_primary_plane_atomic_update, .atomic_disable =3D ssd132x_primary_plane_atomic_disable, + }, + [SSD133X_FAMILY] =3D { + DRM_GEM_SHADOW_PLANE_HELPER_FUNCS, + .atomic_check =3D ssd133x_primary_plane_atomic_check, + .atomic_update =3D ssd133x_primary_plane_atomic_update, + .atomic_disable =3D ssd133x_primary_plane_atomic_disable, } }; =20 @@ -1214,6 +1524,33 @@ static int ssd132x_crtc_atomic_check(struct drm_crtc= *crtc, return 0; } =20 +static int ssd133x_crtc_atomic_check(struct drm_crtc *crtc, + struct drm_atomic_state *state) +{ + struct drm_device *drm =3D crtc->dev; + struct ssd130x_device *ssd130x =3D drm_to_ssd130x(drm); + struct drm_crtc_state *crtc_state =3D drm_atomic_get_new_crtc_state(state= , crtc); + struct ssd130x_crtc_state *ssd130x_state =3D to_ssd130x_crtc_state(crtc_s= tate); + const struct drm_format_info *fi =3D drm_format_info(DRM_FORMAT_RGB332); + unsigned int pitch; + int ret; + + if (!fi) + return -EINVAL; + + ret =3D drm_crtc_helper_atomic_check(crtc, state); + if (ret) + return ret; + + pitch =3D drm_format_info_min_pitch(fi, 0, ssd130x->width); + + ssd130x_state->data_array =3D kmalloc(pitch * ssd130x->height, GFP_KERNEL= ); + if (!ssd130x_state->data_array) + return -ENOMEM; + + return 0; +} + /* Called during init to allocate the CRTC's atomic state. */ static void ssd130x_crtc_reset(struct drm_crtc *crtc) { @@ -1275,6 +1612,10 @@ static const struct drm_crtc_helper_funcs ssd130x_cr= tc_helper_funcs[] =3D { .mode_valid =3D ssd130x_crtc_mode_valid, .atomic_check =3D ssd132x_crtc_atomic_check, }, + [SSD133X_FAMILY] =3D { + .mode_valid =3D ssd130x_crtc_mode_valid, + .atomic_check =3D ssd133x_crtc_atomic_check, + }, }; =20 static const struct drm_crtc_funcs ssd130x_crtc_funcs =3D { @@ -1337,6 +1678,31 @@ static void ssd132x_encoder_atomic_enable(struct drm= _encoder *encoder, ssd130x_power_off(ssd130x); } =20 +static void ssd133x_encoder_atomic_enable(struct drm_encoder *encoder, + struct drm_atomic_state *state) +{ + struct drm_device *drm =3D encoder->dev; + struct ssd130x_device *ssd130x =3D drm_to_ssd130x(drm); + int ret; + + ret =3D ssd130x_power_on(ssd130x); + if (ret) + return; + + ret =3D ssd133x_init(ssd130x); + if (ret) + goto power_off; + + ssd130x_write_cmd(ssd130x, 1, SSD13XX_DISPLAY_ON); + + backlight_enable(ssd130x->bl_dev); + + return; + +power_off: + ssd130x_power_off(ssd130x); +} + static void ssd130x_encoder_atomic_disable(struct drm_encoder *encoder, struct drm_atomic_state *state) { @@ -1358,6 +1724,10 @@ static const struct drm_encoder_helper_funcs ssd130x= _encoder_helper_funcs[] =3D { [SSD132X_FAMILY] =3D { .atomic_enable =3D ssd132x_encoder_atomic_enable, .atomic_disable =3D ssd130x_encoder_atomic_disable, + }, + [SSD133X_FAMILY] =3D { + .atomic_enable =3D ssd133x_encoder_atomic_enable, + .atomic_disable =3D ssd130x_encoder_atomic_disable, } }; =20 diff --git a/drivers/gpu/drm/solomon/ssd130x.h b/drivers/gpu/drm/solomon/ss= d130x.h index 075c5c3ee75a..a4554018bb2a 100644 --- a/drivers/gpu/drm/solomon/ssd130x.h +++ b/drivers/gpu/drm/solomon/ssd130x.h @@ -25,7 +25,8 @@ =20 enum ssd130x_family_ids { SSD130X_FAMILY, - SSD132X_FAMILY + SSD132X_FAMILY, + SSD133X_FAMILY }; =20 enum ssd130x_variants { @@ -39,6 +40,8 @@ enum ssd130x_variants { SSD1322_ID, SSD1325_ID, SSD1327_ID, + /* ssd133x family */ + SSD1331_ID, NR_SSD130X_VARIANTS }; =20 --=20 2.43.0