From nobody Sun Oct 5 18:16:44 2025 Received: from mail-pg1-f172.google.com (mail-pg1-f172.google.com [209.85.215.172]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 6191A2397B0 for ; Thu, 31 Jul 2025 03:23:51 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.215.172 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1753932232; cv=none; b=jW8CvkgBcbYZbgrZ8yBkTp4PvIoaj3xN+EgQ/GZmqrs3HIXN0QLjvOyIGzy3molOC6uvpkGdY58IgaYRRIs9IEI/pFuSvO1zBZXeAd9FqMZqpaAnDpCPNpZoAo9yc8Uo2hJO7IufmaSUw9+btEvMe6Ma9oxR6LKGr2lhSEeWAfA= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1753932232; c=relaxed/simple; bh=XxMNf+s+au9pzXX5Y2tRQ2TxicTyQrqJ3gGr+HCCcZY=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=bWfh1Ykt/pxoXvOuK9GHl6mZN2jswvnVImO86HtTcuxxcIEThwakq43OK14juVOrRpmN16N53+fhzEeQi+Zm7ff3+zapxSO2DnSelSf6H167bFeb/x0g3i2AdXGjE78nXOp6w12clJOSYl7e60C8+oZ9k/mX1Vcx8IgwdFMlyv8= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=brighamcampbell.com; spf=pass smtp.mailfrom=brighamcampbell.com; dkim=pass (2048-bit key) header.d=brighamcampbell.com header.i=@brighamcampbell.com header.b=PeG5+NLr; arc=none smtp.client-ip=209.85.215.172 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=brighamcampbell.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=brighamcampbell.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=brighamcampbell.com header.i=@brighamcampbell.com header.b="PeG5+NLr" Received: by mail-pg1-f172.google.com with SMTP id 41be03b00d2f7-b390136ed88so358599a12.2 for ; Wed, 30 Jul 2025 20:23:51 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=brighamcampbell.com; s=google; t=1753932231; x=1754537031; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=98acdjAVPrJS4Gqdzmu/lk9sXTEBspyDUAMw8EWioqY=; b=PeG5+NLrnizXuc8avN2RiqcC5fdBEvaPXzEW2gAxelQIsvUe1TW4Yqw24DYQ5rhgZY Hn+Tkb/j9ZToEDf7LGr5SXyk2KQFb+gqVrVITMf9svoLborKXglcGBzKDjjYoWMWK401 DSfCTTWDhdrzsUuflNKXEXx3dEdpSAX5RPgtM+0CIk+aEgFolQK868gLDo+zrQNGYNjV N4HlKkj8kQCDNM9pcGuifS/FRBBVhBDH19BOxerD9SrQ2VAIYJqb3BjrVOA1TRJTzvyr YgwSC7p1hPnl68GXVQee0d6QvUokp8miPA4SDR1d/jTpNEF0UzVIGdwHaJHHJVLAOlhX UXoA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1753932231; x=1754537031; 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=98acdjAVPrJS4Gqdzmu/lk9sXTEBspyDUAMw8EWioqY=; b=HTRVy2Nzu2j16akQIkA8BwJ+4MNPJ7XJilrzLiANUKcjnHfJaWPqhBClDSP0CXETrI sYPuR9R05ulx2hLXtfmaCwq0pZASR8YxilWggBScyjhDJOiIGxL/p69VSSQrqaiUbBEN +J/K+ClShHDbFViS/UeHXpKkzHW/1aMLo/bYh/69oehg1BgoB17xFX5R3hGzTLahp3yF IwG5u3bXRWKVloQMNhdHNrZXAPmP+jozu7DTWoDWvZ9TaxVw/N+yVTbcOXf0w3eGvrpm FLEu1gM6zHwa1QEXEb6BUyl4M67rokcum/idT4ssZLi/vQHL91CxihBFdVAc1oHrpeva IddQ== X-Forwarded-Encrypted: i=1; AJvYcCU+FnMA8ErSnfRy2kYvOthFOk6MvuFhPVYXWm3Yvc0iOQEpy3EYqwZSv8YNEqzzaNRiiVkPiXH7TuFpq2Q=@vger.kernel.org X-Gm-Message-State: AOJu0YyFYu88LvjEwrcdNTOS9lDRf6rZzwmUOzhgfYc8OnAd+esxJ59n 3wu4YamEa6yn5Qffqf2yk8DZJnbUnCPljy6h1F/qajsOk/tNmDeLbwbifAuYEGqQEig= X-Gm-Gg: ASbGncvnxoh+5Nc3PCSCmkwFyH0pVm+PXzjWdDFIwi0KXIojdSr8c8O0BOBV/uqM2g0 WHP6g/i9WqReKvR83Jj3i3pYaOUd23a23LdV1e0T39oqKNQn1BA17cB1NnZWaPlt2U622o54p+z VET0Z7L7Gp1f0dUYzWTExfRAuwuM5jMAn9NqKQaBDdO+7+oO/5GjrkHr7DXs+8sYs88AhNHRSoI TT6gMIGIfY65m46SvQSbFSakbPtKnBSHxdcQEsS2a5TZOhL/ndBfXjf2gh2gNXgmQV22Jb3wBYI EDOkHVvctTZ2b6hFvu4k/VegH1u1oIbm+IVyAzIilyMbBn0PHOsFrnMzSlzsqzu9J+CtCf+4jWA o70+UkLNkkMqHsTs1Gf76YQb5RALIKDQG3dm+3ZfaT7HCe8T0lg== X-Google-Smtp-Source: AGHT+IG7cxswJdJ/7tpMHzX/PLpF1znLcf9i4exYcEFax9LRUgDC4Zu20SehYungolPEBKBedQbYCA== X-Received: by 2002:a17:903:1aee:b0:23f:d861:bd4b with SMTP id d9443c01a7336-24096a63f17mr93878045ad.5.1753932230738; Wed, 30 Jul 2025 20:23:50 -0700 (PDT) Received: from mystery-machine.tail542cf.ts.net ([64.71.154.6]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-241d1f15092sm4854795ad.66.2025.07.30.20.23.49 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 30 Jul 2025 20:23:50 -0700 (PDT) From: Brigham Campbell To: maarten.lankhorst@linux.intel.com, mripard@kernel.org, tzimmermann@suse.de, airlied@gmail.com, simona@ffwll.ch, linus.walleij@linaro.org, neil.armstrong@linaro.org, jessica.zhang@oss.qualcomm.com, sam@ravnborg.org Cc: dianders@chromium.org, skhan@linuxfoundation.org, linux-kernel-mentees@lists.linux.dev, dri-devel@lists.freedesktop.org, linux-kernel@vger.kernel.org, Brigham Campbell Subject: [PATCH v4 1/3] drm/panel: novatek-nt35560: Fix invalid return value Date: Wed, 30 Jul 2025 21:23:41 -0600 Message-ID: <20250731032343.1258366-2-me@brighamcampbell.com> X-Mailer: git-send-email 2.50.1 In-Reply-To: <20250731032343.1258366-1-me@brighamcampbell.com> References: <20250731032343.1258366-1-me@brighamcampbell.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" Fix bug in nt35560_set_brightness() which causes the function to erroneously report an error. mipi_dsi_dcs_write() returns either a negative value when an error occurred or a positive number of bytes written when no error occurred. The buggy code reports an error under either condition. Fixes: 8152c2bfd780 ("drm/panel: Add driver for Sony ACX424AKP panel") Reviewed-by: Douglas Anderson Reviewed-by: Neil Armstrong Signed-off-by: Brigham Campbell --- drivers/gpu/drm/panel/panel-novatek-nt35560.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/gpu/drm/panel/panel-novatek-nt35560.c b/drivers/gpu/dr= m/panel/panel-novatek-nt35560.c index 98f0782c8411..17898a29efe8 100644 --- a/drivers/gpu/drm/panel/panel-novatek-nt35560.c +++ b/drivers/gpu/drm/panel/panel-novatek-nt35560.c @@ -161,7 +161,7 @@ static int nt35560_set_brightness(struct backlight_devi= ce *bl) par =3D 0x00; ret =3D mipi_dsi_dcs_write(dsi, MIPI_DCS_WRITE_CONTROL_DISPLAY, &par, 1); - if (ret) { + if (ret < 0) { dev_err(nt->dev, "failed to disable display backlight (%d)\n", ret); return ret; } --=20 2.50.1 From nobody Sun Oct 5 18:16:44 2025 Received: from mail-pl1-f176.google.com (mail-pl1-f176.google.com [209.85.214.176]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 6C68E23F27B for ; Thu, 31 Jul 2025 03:23:53 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.214.176 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1753932235; cv=none; b=uPuMMwgZiYXuu3KtSEr/InZ4hmNn1qxcdrID7IIJdXuUfYgKrZSHNpzxdgIf32M/r7xITGrqyM7jaF+dDfhA29MEvXR+C254YA6i4NgGtSP+5IFe13ZtElN5O3UucschhZ3M/hioLQaxQf8vkv1Ak6ONnhC2PTuuat6TdIJuojM= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1753932235; c=relaxed/simple; bh=LLFmmNUX/DfeDumtfAPB0PNqG1IDii9NIMiRI2MPg3o=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=XEf7RVcJ6SjrqRzk/9YO9EfbnK7x3ZKvA78OeWMUyH6QjF6UIshzRd1PnBthcA+OY4UmmaBrukG8Trk5m2Fc5z1JWE07IwNtPY+emnrjsM2m91O0zPja6jnB9xpru3pklvDnF22bWebWCOnSW7Kp+mlZtzbRe2Hyr18Feumvud0= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=brighamcampbell.com; spf=pass smtp.mailfrom=brighamcampbell.com; dkim=pass (2048-bit key) header.d=brighamcampbell.com header.i=@brighamcampbell.com header.b=GsfC5GMp; arc=none smtp.client-ip=209.85.214.176 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=brighamcampbell.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=brighamcampbell.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=brighamcampbell.com header.i=@brighamcampbell.com header.b="GsfC5GMp" Received: by mail-pl1-f176.google.com with SMTP id d9443c01a7336-24003ed822cso3529635ad.1 for ; Wed, 30 Jul 2025 20:23:53 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=brighamcampbell.com; s=google; t=1753932233; x=1754537033; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=YO3wVwEDuSYhrQ+FF5y/l5gPvVgHJtS+tEfRcRSUajo=; b=GsfC5GMpMtYRzPX9tM/lW9f9Bxyq3YL+TRYragSk9tjtpotzCskkdTRKE7xPWzTYv/ s4soT8W2gRVn6A49Z9dxdMHMaDtdAjnKBoQ/d1G0gX4rBcwCL1jTATBqG8bOXaipUXqY PjMc94uVQOs25FMWVTy11ZkJis8PwJsTyT1exw1HqEE/KbYRKYyL9VGs38Xm/3yU1Ab6 nOtmIB+AEhk7Cm3/YxIdRk4J3pek7NRKw7GsJCDxgIt3mCl9jC/rKpL8xDvpx/RN2Yqp gM8mq9LYI7OX1m9HwUQYUDKbHrni28zakFSO5NCpVOO8uic0ZgFRAmDXhnpFemidipA7 lgAw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1753932233; x=1754537033; 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=YO3wVwEDuSYhrQ+FF5y/l5gPvVgHJtS+tEfRcRSUajo=; b=N1J/3wVJWWISS5VRaheNerkivfFVrzesSoqjgtXIpYb4jd98htcz6RxCNkrH9a6HNI tMaUxtcrfjNQdzaVXQxh+w+MnW1a9e0fIJv7pCqpE2nNxxBxYCcdxO6jJXbqHAuBH8uF FN8b3LimVZpCYBPcxJCL+QsoBxdDhNeDq7w/mXmpy47dqfxKqDgx3JWfftL7DrTOidt/ YFtqoQZNTHqkywA0J+KYYWTqoal5eCulRSdvwYUdD3PKuX85flPWO8dYb++6TgWaNahx /lshaSt0CXA+wgIFFnxG4fry/M9qqxIj2x82c93tlU6NA7F9TyCE+zJmPfB4qOoV3T1J CiIw== X-Forwarded-Encrypted: i=1; AJvYcCXaImrZOT8PIO7ph62fiFXtm4BN4LuzubxqE57vdyUe5LyVkBToZCtrhRX8PsUXYvAPtmbPIG6e3j3lPF4=@vger.kernel.org X-Gm-Message-State: AOJu0YweywjFc9C0THEUA1y4H+ZykZBvPslLoPUZPwleE1ND6m+fywnE zoSTShKA/gShTcBi2XtQXebhVR5lB942lFPJ2emK5LXpjkrep9tq5RdaUAwMcUp/ubs= X-Gm-Gg: ASbGncsob7Fa5IEI5lRGbVh8zx+lr7M0MJuG/dKULp0DBtXmluWATkFcoknNXnyvpQt G1BrZrUzMtZqVPrhXEA2q2w4+DDxk6kzN1GZymh99udH1ANxmfUuIrYBnub5EWSqj9rfwjia9tn cGYmVB4k0eMsZyAUNWi7jYBZ6CVHwhhizLX3D7nS1P3LylWKN1Kg9bsyIOrJ1Xz/UNZ2yHAV9s4 aFBDB9MQwZC59nb3sVDUGYiU1tHBbbM0D8Sqxg7IHfasMv09m/h7UhNV0QfcBBQjIqk5b5/zX2H d0qBK574TSnn119/hlQk/OjOJSmr8NVrTJOUFHTvu6ob/ZS7lGt0umf1JD0fbFYshwkHTbtFaCT VYWCZL4fmwm2iGW8/v0JcrXavNcAKmJEwMn1Otfdpw5zVqPTwKrNGT5vz2NJY X-Google-Smtp-Source: AGHT+IE18gcw1L9AiSBmhHHznkEqWPINFS1vbZ9/Dmhaw4XfpgJGvjyRPijQawkyMW2EZS4l0LoVIg== X-Received: by 2002:a17:903:3bcb:b0:23d:fa9a:80ac with SMTP id d9443c01a7336-24096a9ddcdmr85611615ad.16.1753932232544; Wed, 30 Jul 2025 20:23:52 -0700 (PDT) Received: from mystery-machine.tail542cf.ts.net ([64.71.154.6]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-241d1f15092sm4854795ad.66.2025.07.30.20.23.50 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 30 Jul 2025 20:23:52 -0700 (PDT) From: Brigham Campbell To: maarten.lankhorst@linux.intel.com, mripard@kernel.org, tzimmermann@suse.de, airlied@gmail.com, simona@ffwll.ch, linus.walleij@linaro.org, neil.armstrong@linaro.org, jessica.zhang@oss.qualcomm.com, sam@ravnborg.org Cc: dianders@chromium.org, skhan@linuxfoundation.org, linux-kernel-mentees@lists.linux.dev, dri-devel@lists.freedesktop.org, linux-kernel@vger.kernel.org, Brigham Campbell Subject: [PATCH v4 2/3] drm: Add MIPI read_multi func and two write macros Date: Wed, 30 Jul 2025 21:23:42 -0600 Message-ID: <20250731032343.1258366-3-me@brighamcampbell.com> X-Mailer: git-send-email 2.50.1 In-Reply-To: <20250731032343.1258366-1-me@brighamcampbell.com> References: <20250731032343.1258366-1-me@brighamcampbell.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" Create mipi_dsi_dcs_read_multi(), which accepts a mipi_dsi_multi_context struct for improved error handling and cleaner panel driver code. Create mipi_dsi_dcs_write_var_seq_multi() and mipi_dsi_generic_write_var_seq_multi() macros which allow MIPI panel drivers to write non-constant data to display controllers. Reviewed-by: Douglas Anderson Signed-off-by: Brigham Campbell --- drivers/gpu/drm/drm_mipi_dsi.c | 37 ++++++++++++++++++++++++++++++++++ include/drm/drm_mipi_dsi.h | 35 ++++++++++++++++++++++++++++++++ 2 files changed, 72 insertions(+) diff --git a/drivers/gpu/drm/drm_mipi_dsi.c b/drivers/gpu/drm/drm_mipi_dsi.c index a00d76443128..0f2c3be98212 100644 --- a/drivers/gpu/drm/drm_mipi_dsi.c +++ b/drivers/gpu/drm/drm_mipi_dsi.c @@ -1075,6 +1075,43 @@ ssize_t mipi_dsi_dcs_read(struct mipi_dsi_device *ds= i, u8 cmd, void *data, } EXPORT_SYMBOL(mipi_dsi_dcs_read); =20 +/** + * mipi_dsi_dcs_read_multi() - mipi_dsi_dcs_read() w/ accum_err + * @ctx: Context for multiple DSI transactions + * @cmd: DCS command + * @data: buffer in which to receive data + * @len: size of receive buffer + * + * Like mipi_dsi_dcs_read() but deals with errors in a way that makes it + * convenient to make several calls in a row. + */ +void mipi_dsi_dcs_read_multi(struct mipi_dsi_multi_context *ctx, u8 cmd, + void *data, size_t len) +{ + struct mipi_dsi_device *dsi =3D ctx->dsi; + struct device *dev =3D &dsi->dev; + struct mipi_dsi_msg msg =3D { + .channel =3D dsi->channel, + .type =3D MIPI_DSI_DCS_READ, + .tx_buf =3D &cmd, + .tx_len =3D 1, + .rx_buf =3D data, + .rx_len =3D len + }; + ssize_t ret; + + if (ctx->accum_err) + return; + + ret =3D mipi_dsi_device_transfer(dsi, &msg); + if (ret < 0) { + ctx->accum_err =3D ret; + dev_err(dev, "dcs read with command %#x failed: %d\n", cmd, + ctx->accum_err); + } +} +EXPORT_SYMBOL(mipi_dsi_dcs_read_multi); + /** * mipi_dsi_dcs_nop() - send DCS nop packet * @dsi: DSI peripheral device diff --git a/include/drm/drm_mipi_dsi.h b/include/drm/drm_mipi_dsi.h index 369b0d8830c3..f06c753603ba 100644 --- a/include/drm/drm_mipi_dsi.h +++ b/include/drm/drm_mipi_dsi.h @@ -333,6 +333,8 @@ ssize_t mipi_dsi_dcs_write(struct mipi_dsi_device *dsi,= u8 cmd, const void *data, size_t len); ssize_t mipi_dsi_dcs_read(struct mipi_dsi_device *dsi, u8 cmd, void *data, size_t len); +void mipi_dsi_dcs_read_multi(struct mipi_dsi_multi_context *ctx, u8 cmd, + void *data, size_t len); int mipi_dsi_dcs_nop(struct mipi_dsi_device *dsi); int mipi_dsi_dcs_soft_reset(struct mipi_dsi_device *dsi); int mipi_dsi_dcs_get_power_mode(struct mipi_dsi_device *dsi, u8 *mode); @@ -415,6 +417,22 @@ void mipi_dsi_dcs_set_tear_off_multi(struct mipi_dsi_m= ulti_context *ctx); mipi_dsi_generic_write_multi(ctx, d, ARRAY_SIZE(d)); \ } while (0) =20 +/** + * mipi_dsi_generic_write_var_seq_multi - transmit non-constant data using= a + * generic write packet + * + * This macro will print errors for you and error handling is optimized for + * callers that call this multiple times in a row. + * + * @ctx: Context for multiple DSI transactions + * @seq: buffer containing the payload + */ +#define mipi_dsi_generic_write_var_seq_multi(ctx, seq...) \ + do { \ + const u8 d[] =3D { seq }; \ + mipi_dsi_generic_write_multi(ctx, d, ARRAY_SIZE(d)); \ + } while (0) + /** * mipi_dsi_dcs_write_seq_multi - transmit a DCS command with payload * @@ -431,6 +449,23 @@ void mipi_dsi_dcs_set_tear_off_multi(struct mipi_dsi_m= ulti_context *ctx); mipi_dsi_dcs_write_buffer_multi(ctx, d, ARRAY_SIZE(d)); \ } while (0) =20 +/** + * mipi_dsi_dcs_write_var_seq_multi - transmit a DCS command with non-cons= tant + * payload + * + * This macro will print errors for you and error handling is optimized for + * callers that call this multiple times in a row. + * + * @ctx: Context for multiple DSI transactions + * @cmd: Command + * @seq: buffer containing data to be transmitted + */ +#define mipi_dsi_dcs_write_var_seq_multi(ctx, cmd, seq...) \ + do { \ + const u8 d[] =3D { cmd, seq }; \ + mipi_dsi_dcs_write_buffer_multi(ctx, d, ARRAY_SIZE(d)); \ + } while (0) + /** * struct mipi_dsi_driver - DSI driver * @driver: device driver model driver --=20 2.50.1 From nobody Sun Oct 5 18:16:44 2025 Received: from mail-pg1-f169.google.com (mail-pg1-f169.google.com [209.85.215.169]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 242C323FC49 for ; Thu, 31 Jul 2025 03:23:55 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.215.169 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1753932237; cv=none; b=Xt4FCdbcgJ98DhAkk/98phrx0A+novUCxL2+25ZwmtGQJhj2Y/m3gtOC1CeIeJmCH9Tr3Jtj/WiPcNvppHwlyvNfNPTb5LyZH6nlI6cHJD1J50qL7+vIx0tBJhYJlYE+9ghJ5zYeb/lWI0HPO93Ms4FFJxmzuhHh3xW1NKdkG74= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1753932237; c=relaxed/simple; bh=min3RkzhSY2+BuE9oVHC3RQH8qtFhVDcXi4weEpISO4=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=I+p3Y9NA6htVc8UaIV4UGnUpiWdaQr2yNduW8jOrK0vsDo/n0bb5yJi+bA6mbKvaoBMD+4lqfab6ZMYVNlQKJVoNQhWt7sve9s1r+D633yv1TXiCCO1GmepZfxIPKxAPl3N4NFYia7hQPszUfEftC9awZEWrzR516vLD+3GaMxw= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=brighamcampbell.com; spf=pass smtp.mailfrom=brighamcampbell.com; dkim=pass (2048-bit key) header.d=brighamcampbell.com header.i=@brighamcampbell.com header.b=iXmHijFo; arc=none smtp.client-ip=209.85.215.169 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=brighamcampbell.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=brighamcampbell.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=brighamcampbell.com header.i=@brighamcampbell.com header.b="iXmHijFo" Received: by mail-pg1-f169.google.com with SMTP id 41be03b00d2f7-b3be5c0eb99so377123a12.1 for ; Wed, 30 Jul 2025 20:23:55 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=brighamcampbell.com; s=google; t=1753932234; x=1754537034; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=PR4erbh6ZgobZPCbAljGsIGhNSgdyY2tm2UVINDkl1A=; b=iXmHijFohCEVNDX2D8J82uNh+0uucaT/07zrcU8mIMyI+saKp7E+qe9q12UdvutUgE B70OnRJmyKrwxIw5pB2PH1UoAovUZw/Z9eJ6SnqXj5OtISzdn/NbdbW03oFYkZVRn9NT tYZTRwjl28RfGLQyi6YLaPnH4O7RY+krg15rwlzir6AqtpiidTMgLZEWYhYlP89smAWF hCJLT3Keu88LQTwLUucZ7xJb1jTmPeG9W5MOTu4IK4M05yrxg8wiBokpeKDly1MiaqCm ii6crqb9r2nxEL8Fo7xDJXaPKSagopjOS8upt8dkFZ1UjEXRjYSblrqGjYs/QYQD51os x5aA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1753932234; x=1754537034; 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=PR4erbh6ZgobZPCbAljGsIGhNSgdyY2tm2UVINDkl1A=; b=J2LXLvGtEpqXORuPMVKVRjesTprqucIo3PQCEVSK4LHcfB33jDXEnN3WONLSrn8UKT 9trulAvaQDjkdCMMauowzMt262NJZEgLlqVSV03od1+mPZ6b4I1TGsfgk2+ugpMJTdEc qfy35xns9q8GJJrDlfvsINJEtnMl4DqFH+bqZna/u6xV+H/WiXiSXnhz1nZ8Q8/MC1qG osFsd2ccNROFzBWvC1U7iM13/eHU1PVIRrKPjmyPL9Vlt74pwOpoL+CESUqQxoUZyeXj OyDO3OEwZMvxJERDkLe70v/tV3KAmJuOK8hPD5pducJXg49ycAMu45wu3qY3MV20FDN0 sDzQ== X-Forwarded-Encrypted: i=1; AJvYcCUcCCanPrFGN1Eksm8Lh1suid1x2OjrDSfXj8jhHNEtY1ADBcMPyZD4UimVj+gGNRp0GJt6Q0aMu3OghMo=@vger.kernel.org X-Gm-Message-State: AOJu0YzyHik/U5/CdjL/MlgO1OiRJRJrN2T8fGMQmg5/f1e35Zbzp3jg EPsTR2YB8WFJGhq88Hys/dSJovCO435ZsgN/9ofZAcHfrFQ55/u94V3wXFt3/vnk4AA= X-Gm-Gg: ASbGncvgSjaVbGrG8eX6FDc6CZj3BJhqOiOyjPjl2hOFyyZgNrlKOgZhpmfkNf5wZdT U6UgaAKviT39YjPd0jMhzyq+wdXiwMQXci5W1INLg1qUydq6QnmppnVsZA7Y7Fp9yDX264RrUsq nY3kHXihubhAuill0WDp5FmH+BvyDWuWLDvR7vpQzPd5U0zzGckyhvMLU8FOcu8Iu1zSQw9SYj5 nF1RdvPl4Vri1L7vHdEPbiDqekWNXTqnzpG8FpPGUY2YNzJz2EQmKIcU9nZI4K+8FRHIpJQrXgV 3IXaPF4k+rinvUeD5FsudY9pbQWeCugITv42dRH7tU96rv095T+1SDbe7sD6Pm+76Zqh+z2sOqb Fs2nzSeKBhl0V58tXWDVCE2d2ybnG3KMa8dqb5FbH0wI+/q0Oxw== X-Google-Smtp-Source: AGHT+IFEi5IQayUd6dSQJz6zmL6NNLcdXlf5A1LgyRteGbmaHcxPXIggzpAY2gpHDGNv33zqHOfhwA== X-Received: by 2002:a17:902:e848:b0:224:1eab:97b2 with SMTP id d9443c01a7336-24096b85139mr73686225ad.53.1753932234478; Wed, 30 Jul 2025 20:23:54 -0700 (PDT) Received: from mystery-machine.tail542cf.ts.net ([64.71.154.6]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-241d1f15092sm4854795ad.66.2025.07.30.20.23.52 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 30 Jul 2025 20:23:53 -0700 (PDT) From: Brigham Campbell To: maarten.lankhorst@linux.intel.com, mripard@kernel.org, tzimmermann@suse.de, airlied@gmail.com, simona@ffwll.ch, linus.walleij@linaro.org, neil.armstrong@linaro.org, jessica.zhang@oss.qualcomm.com, sam@ravnborg.org Cc: dianders@chromium.org, skhan@linuxfoundation.org, linux-kernel-mentees@lists.linux.dev, dri-devel@lists.freedesktop.org, linux-kernel@vger.kernel.org, Brigham Campbell Subject: [PATCH v4 3/3] drm/panel: novatek-nt35560: Clean up driver Date: Wed, 30 Jul 2025 21:23:43 -0600 Message-ID: <20250731032343.1258366-4-me@brighamcampbell.com> X-Mailer: git-send-email 2.50.1 In-Reply-To: <20250731032343.1258366-1-me@brighamcampbell.com> References: <20250731032343.1258366-1-me@brighamcampbell.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" Update driver to use the "multi" variants of MIPI functions which facilitate improved error handling and cleaner driver code. Remove information from a comment which was made obsolete by commit 994ea402c767 ("drm/panel: Rename Sony ACX424 to Novatek NT35560"), which determined that this driver supports the Novatek NT35560 panel controller. Reviewed-by: Douglas Anderson Signed-off-by: Brigham Campbell --- drivers/gpu/drm/panel/panel-novatek-nt35560.c | 198 ++++++------------ 1 file changed, 60 insertions(+), 138 deletions(-) diff --git a/drivers/gpu/drm/panel/panel-novatek-nt35560.c b/drivers/gpu/dr= m/panel/panel-novatek-nt35560.c index 17898a29efe8..561e6643dcbb 100644 --- a/drivers/gpu/drm/panel/panel-novatek-nt35560.c +++ b/drivers/gpu/drm/panel/panel-novatek-nt35560.c @@ -148,24 +148,20 @@ static inline struct nt35560 *panel_to_nt35560(struct= drm_panel *panel) static int nt35560_set_brightness(struct backlight_device *bl) { struct nt35560 *nt =3D bl_get_data(bl); - struct mipi_dsi_device *dsi =3D to_mipi_dsi_device(nt->dev); - int period_ns =3D 1023; + struct mipi_dsi_multi_context dsi_ctx =3D { + .dsi =3D to_mipi_dsi_device(nt->dev) + }; int duty_ns =3D bl->props.brightness; + int period_ns =3D 1023; u8 pwm_ratio; u8 pwm_div; - u8 par; - int ret; =20 if (backlight_is_blank(bl)) { /* Disable backlight */ - par =3D 0x00; - ret =3D mipi_dsi_dcs_write(dsi, MIPI_DCS_WRITE_CONTROL_DISPLAY, - &par, 1); - if (ret < 0) { - dev_err(nt->dev, "failed to disable display backlight (%d)\n", ret); - return ret; - } - return 0; + mipi_dsi_dcs_write_seq_multi(&dsi_ctx, + MIPI_DCS_WRITE_CONTROL_DISPLAY, + 0x00); + return dsi_ctx.accum_err; } =20 /* Calculate the PWM duty cycle in n/256's */ @@ -176,12 +172,6 @@ static int nt35560_set_brightness(struct backlight_dev= ice *bl) =20 /* Set up PWM dutycycle ONE byte (differs from the standard) */ dev_dbg(nt->dev, "calculated duty cycle %02x\n", pwm_ratio); - ret =3D mipi_dsi_dcs_write(dsi, MIPI_DCS_SET_DISPLAY_BRIGHTNESS, - &pwm_ratio, 1); - if (ret < 0) { - dev_err(nt->dev, "failed to set display PWM ratio (%d)\n", ret); - return ret; - } =20 /* * Sequence to write PWMDIV: @@ -192,46 +182,23 @@ static int nt35560_set_brightness(struct backlight_de= vice *bl) * 0x22 PWMDIV * 0x7F 0xAA CMD2 page 1 lock */ - par =3D 0xaa; - ret =3D mipi_dsi_dcs_write(dsi, 0xf3, &par, 1); - if (ret < 0) { - dev_err(nt->dev, "failed to unlock CMD 2 (%d)\n", ret); - return ret; - } - par =3D 0x01; - ret =3D mipi_dsi_dcs_write(dsi, 0x00, &par, 1); - if (ret < 0) { - dev_err(nt->dev, "failed to enter page 1 (%d)\n", ret); - return ret; - } - par =3D 0x01; - ret =3D mipi_dsi_dcs_write(dsi, 0x7d, &par, 1); - if (ret < 0) { - dev_err(nt->dev, "failed to disable MTP reload (%d)\n", ret); - return ret; - } - ret =3D mipi_dsi_dcs_write(dsi, 0x22, &pwm_div, 1); - if (ret < 0) { - dev_err(nt->dev, "failed to set PWM divisor (%d)\n", ret); - return ret; - } - par =3D 0xaa; - ret =3D mipi_dsi_dcs_write(dsi, 0x7f, &par, 1); - if (ret < 0) { - dev_err(nt->dev, "failed to lock CMD 2 (%d)\n", ret); - return ret; - } + mipi_dsi_dcs_write_var_seq_multi(&dsi_ctx, + MIPI_DCS_SET_DISPLAY_BRIGHTNESS, + pwm_ratio); + + mipi_dsi_dcs_write_seq_multi(&dsi_ctx, 0xf3, 0xaa); + mipi_dsi_dcs_write_seq_multi(&dsi_ctx, 0x00, 0x01); + mipi_dsi_dcs_write_seq_multi(&dsi_ctx, 0x7d, 0x01); + + mipi_dsi_dcs_write_var_seq_multi(&dsi_ctx, 0x22, pwm_div); + + mipi_dsi_dcs_write_seq_multi(&dsi_ctx, 0x7f, 0xaa); =20 /* Enable backlight */ - par =3D 0x24; - ret =3D mipi_dsi_dcs_write(dsi, MIPI_DCS_WRITE_CONTROL_DISPLAY, - &par, 1); - if (ret < 0) { - dev_err(nt->dev, "failed to enable display backlight (%d)\n", ret); - return ret; - } + mipi_dsi_dcs_write_seq_multi(&dsi_ctx, MIPI_DCS_WRITE_CONTROL_DISPLAY, + 0x24); =20 - return 0; + return dsi_ctx.accum_err; } =20 static const struct backlight_ops nt35560_bl_ops =3D { @@ -244,32 +211,23 @@ static const struct backlight_properties nt35560_bl_p= rops =3D { .max_brightness =3D 1023, }; =20 -static int nt35560_read_id(struct nt35560 *nt) +static void nt35560_read_id(struct mipi_dsi_multi_context *dsi_ctx) { - struct mipi_dsi_device *dsi =3D to_mipi_dsi_device(nt->dev); + struct device dev =3D dsi_ctx->dsi->dev; u8 vendor, version, panel; u16 val; - int ret; =20 - ret =3D mipi_dsi_dcs_read(dsi, NT35560_DCS_READ_ID1, &vendor, 1); - if (ret < 0) { - dev_err(nt->dev, "could not vendor ID byte\n"); - return ret; - } - ret =3D mipi_dsi_dcs_read(dsi, NT35560_DCS_READ_ID2, &version, 1); - if (ret < 0) { - dev_err(nt->dev, "could not read device version byte\n"); - return ret; - } - ret =3D mipi_dsi_dcs_read(dsi, NT35560_DCS_READ_ID3, &panel, 1); - if (ret < 0) { - dev_err(nt->dev, "could not read panel ID byte\n"); - return ret; - } + mipi_dsi_dcs_read_multi(dsi_ctx, NT35560_DCS_READ_ID1, &vendor, 1); + mipi_dsi_dcs_read_multi(dsi_ctx, NT35560_DCS_READ_ID2, &version, 1); + mipi_dsi_dcs_read_multi(dsi_ctx, NT35560_DCS_READ_ID3, &panel, 1); + + if (dsi_ctx->accum_err < 0) + return; =20 if (vendor =3D=3D 0x00) { - dev_err(nt->dev, "device vendor ID is zero\n"); - return -ENODEV; + dev_err(&dev, "device vendor ID is zero\n"); + dsi_ctx->accum_err =3D -ENODEV; + return; } =20 val =3D (vendor << 8) | panel; @@ -278,16 +236,16 @@ static int nt35560_read_id(struct nt35560 *nt) case DISPLAY_SONY_ACX424AKP_ID2: case DISPLAY_SONY_ACX424AKP_ID3: case DISPLAY_SONY_ACX424AKP_ID4: - dev_info(nt->dev, "MTP vendor: %02x, version: %02x, panel: %02x\n", + dev_info(&dev, + "MTP vendor: %02x, version: %02x, panel: %02x\n", vendor, version, panel); break; default: - dev_info(nt->dev, "unknown vendor: %02x, version: %02x, panel: %02x\n", + dev_info(&dev, + "unknown vendor: %02x, version: %02x, panel: %02x\n", vendor, version, panel); break; } - - return 0; } =20 static int nt35560_power_on(struct nt35560 *nt) @@ -322,92 +280,56 @@ static void nt35560_power_off(struct nt35560 *nt) static int nt35560_prepare(struct drm_panel *panel) { struct nt35560 *nt =3D panel_to_nt35560(panel); - struct mipi_dsi_device *dsi =3D to_mipi_dsi_device(nt->dev); - const u8 mddi =3D 3; + struct mipi_dsi_multi_context dsi_ctx =3D { + .dsi =3D to_mipi_dsi_device(nt->dev) + }; int ret; =20 ret =3D nt35560_power_on(nt); if (ret) return ret; =20 - ret =3D nt35560_read_id(nt); - if (ret) { - dev_err(nt->dev, "failed to read panel ID (%d)\n", ret); - goto err_power_off; - } + nt35560_read_id(&dsi_ctx); =20 - /* Enabe tearing mode: send TE (tearing effect) at VBLANK */ - ret =3D mipi_dsi_dcs_set_tear_on(dsi, + /* Enable tearing mode: send TE (tearing effect) at VBLANK */ + mipi_dsi_dcs_set_tear_on_multi(&dsi_ctx, MIPI_DSI_DCS_TEAR_MODE_VBLANK); - if (ret) { - dev_err(nt->dev, "failed to enable vblank TE (%d)\n", ret); - goto err_power_off; - } =20 /* * Set MDDI * * This presumably deactivates the Qualcomm MDDI interface and * selects DSI, similar code is found in other drivers such as the - * Sharp LS043T1LE01 which makes us suspect that this panel may be - * using a Novatek NT35565 or similar display driver chip that shares - * this command. Due to the lack of documentation we cannot know for - * sure. + * Sharp LS043T1LE01. */ - ret =3D mipi_dsi_dcs_write(dsi, NT35560_DCS_SET_MDDI, - &mddi, sizeof(mddi)); - if (ret < 0) { - dev_err(nt->dev, "failed to set MDDI (%d)\n", ret); - goto err_power_off; - } + mipi_dsi_dcs_write_seq_multi(&dsi_ctx, NT35560_DCS_SET_MDDI, 3); =20 - /* Exit sleep mode */ - ret =3D mipi_dsi_dcs_exit_sleep_mode(dsi); - if (ret) { - dev_err(nt->dev, "failed to exit sleep mode (%d)\n", ret); - goto err_power_off; - } - msleep(140); + mipi_dsi_dcs_exit_sleep_mode_multi(&dsi_ctx); + mipi_dsi_msleep(&dsi_ctx, 140); =20 - ret =3D mipi_dsi_dcs_set_display_on(dsi); - if (ret) { - dev_err(nt->dev, "failed to turn display on (%d)\n", ret); - goto err_power_off; - } + mipi_dsi_dcs_set_display_on_multi(&dsi_ctx); if (nt->video_mode) { - /* In video mode turn peripheral on */ - ret =3D mipi_dsi_turn_on_peripheral(dsi); - if (ret) { - dev_err(nt->dev, "failed to turn on peripheral\n"); - goto err_power_off; - } + mipi_dsi_turn_on_peripheral_multi(&dsi_ctx); } =20 - return 0; - -err_power_off: - nt35560_power_off(nt); - return ret; + if (dsi_ctx.accum_err < 0) + nt35560_power_off(nt); + return dsi_ctx.accum_err; } =20 static int nt35560_unprepare(struct drm_panel *panel) { struct nt35560 *nt =3D panel_to_nt35560(panel); - struct mipi_dsi_device *dsi =3D to_mipi_dsi_device(nt->dev); - int ret; + struct mipi_dsi_multi_context dsi_ctx =3D { + .dsi =3D to_mipi_dsi_device(nt->dev) + }; =20 - ret =3D mipi_dsi_dcs_set_display_off(dsi); - if (ret) { - dev_err(nt->dev, "failed to turn display off (%d)\n", ret); - return ret; - } + mipi_dsi_dcs_set_display_off_multi(&dsi_ctx); + mipi_dsi_dcs_enter_sleep_mode_multi(&dsi_ctx); + + if (dsi_ctx.accum_err < 0) + return dsi_ctx.accum_err; =20 - /* Enter sleep mode */ - ret =3D mipi_dsi_dcs_enter_sleep_mode(dsi); - if (ret) { - dev_err(nt->dev, "failed to enter sleep mode (%d)\n", ret); - return ret; - } msleep(85); =20 nt35560_power_off(nt); --=20 2.50.1