From mboxrd@z Thu Jan 1 00:00:00 1970 Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.remote-ip=209.85.208.52 ARC-Seal: i=1; d=subspace.kernel.org; s=arc20261015; a=rsa-sha256; cv=none; t=1795335549; b=aidyPmD4trc7UOaLn2oPPJuWGSodjdvPEwfUE+lLmKo40tS19ePHJ88iZlPp4+Mnbco2 b0cLvRCaSILdSugD1LjB38w84ii2pCJaLuIyrmoOFBJbuqHWu1p4nW9MeWVW/o32JNUXb gvFvjv3WbEh7wDfK3i/1WBf9grkwAhmcOD5wBPlkhJWRXBXvrpiGB6991kHQnc+2cdpNh p4SfnWeiwCbv4h5MyJUYU8eh3+vmn3nTSxSsOn8OjGzJXtGgOqCKuDeIsrs7aXuX/jsCm szde43GPNB7ew9H7j2mJFxkxXFfrgx1gec4dHGWI0f0JuFxPN3JXFDoxekDfqSQ44MA== ARC-Message-Signature: i=1; d=subspace.kernel.org; s=arc20261015; a=rsa-sha256; c=relaxed/relaxed; t=1795335549; h=DMARC-Filter:Received:DKIM-Signature:X-Google-DKIM-Signature: X-Forwarded-Encrypted:X-Gm-Message-State:X-Gm-Gg:X-Received:Received: From:To:Cc:Subject:Date:Message-ID:X-Mailer:In-Reply-To:References: MIME-Version:Content-Transfer-Encoding; bh=VfcnZ/HFw1s58SKFpRHNdXm93jOgGRhJ6GdPFfCfrqo=; b=Gu6OC1t6V5ljIGJUuGMwFxvenUDsXXe48UUse9XHbq2MogwVJqNzSo6Po4dluVeJkgvS z4xhqxM2C9Qf2Ri0SOpCHaaQxkXMa5y7mKfeRgDFRa3o+7/C/vI8p7xeTlRvWVzPs2Sob iY5C/tvm1Z8CakWqXcAaRDu4V2Bop8qodt+9Wb6kxQsHc+g1/qKAkqqvpt+kru09upT0w TkiAi8CLPMwnwWIqfLOuAbttGpfSrljeSMP01vgXbPya8oiSdlJ/cOiMvcmdoCgXIFATh +HSDnIRk/UJNIBYDm4IYU+H4gn7JwVHIQgROklyRlReERmpxTePzgYb/H4GMZoMea1g== ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass header.from=gmail.com; spf=pass smtp.mailfrom=gmail.com; dkim=pass header.d=gmail.com header.i=@gmail.com header.a=rsa-sha256 header.s=20260707 header.b=SvD3hzCS; arc=none smtp.remote-ip=209.85.208.52 Received: from mail-ed1-f52.google.com (mail-ed1-f52.google.com [209.85.208.52]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits) key-exchange X25519 server-signature ECDSA (prime256v1) server-digest SHA256) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 2661A606A320 for ; Sun, 22 Nov 2026 08:19:09 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.4.2 smtp.subspace.kernel.org 2661A606A320 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.a=rsa-sha256 header.s=20260707 header.b=SvD3hzCS Received: by mail-ed1-f52.google.com with SMTP id 4fb4d7f45d1cf-6b408f2d936so3323737a12.1 for ; Sun, 22 Nov 2026 00:19:08 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20260707; t=1795335547; x=1795940347; 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:content-type; bh=VfcnZ/HFw1s58SKFpRHNdXm93jOgGRhJ6GdPFfCfrqo=; b=SvD3hzCSvPZQwkoX4FcghI5fseAbTbHClhOYz8rkLk8Sc5AKQTVPF6eK6H8cdasJuW cYMn+8SuHPmQ4NGQ6KCOcRVSw33EGaNtUTmJ5dj6PeF+YrzO910ydCMV9/HvDFjghLvf OiLVv28L5QvOgqnEM6VaNGS8M6syzYJ1jrN+z5g95PUwjBOws2g07Ezic10VOYK3ixu+ kQ9H/FUCzxEApnNlnGpyP+YEZlfgK6lJQFItXitFZ2YHfH8B4+DVOA2l2S/jugaZZPXU OmA2NawbC8vVth5Nmvh9lPI0KGEZ97ySgMwN0Nmtc722aVBkc+Uys/7C8OibdigUb7X4 9j0w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20260707; t=1795335547; x=1795940347; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-gg:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to:content-type; bh=VfcnZ/HFw1s58SKFpRHNdXm93jOgGRhJ6GdPFfCfrqo=; b=ArSMJ0kkEkyqjidUsEVvdaQ9E/47/Ul5Hz65pgV6RlvpIfNoUUuqeFxzb2ohl6UEYj ZZSNby5E2aG+/sDVjWWNpv6d1H4Caz6wE1Mm1Ewi9s+nSUyyP75GyxsfErsxFDnEmzbp R34j6IQ4v+2dPWnKaoyQptv792ZID/kPSz9cmMwAmmUK/8zu7RR6WJY6lMdXfT4ufWTE ogNN8zBz5o1ue0A6EfmLzZqZmdtW8JJwuCViwZm1xEpPyJ9JpXKOYL2VIQgkTHo1jKJ3 lWzsk1sZT19xUw9txXrRdJuNZvKCspZ+xCDLXHRwITCqUArkqB2hVI5y5O92McDFykiF EVuQ== X-Forwarded-Encrypted: i=1; AL+hErER50Ut1dkrhOuDsgOp7p1rcDu1Gzo+mTwuXUtUDIPVlnb0pcvUvIhVO0zMOSZSa9+z5Ia4AxpU0GmD@vger.kernel.org X-Gm-Message-State: APuU4Z/ERn2bAF1Ytb0UBvDKTuJNa+hDqUOLhwhOl8+LazBq+/7JEj4n gAI/ZIrLQF8CFwhaSOy1cE94HxXn99xdvpBIy9JzfhaX0EJ7Wz9i0zJR X-Gm-Gg: AZFdTZeQXKsA6ENR6zrWxhC/8IxrhGnI0YO7sgHplOZpeJXL8tE2NHFK3mNvhUixuJf ai8i2oOHmNn9TOOMqWk7UwgGJcRAhqnlT37C1QpvCrOLktT38mN/rwh71ntiDxy6IJFKyzbY3bj wBRZLz/ZxfOojA2oKFFbq86QjPnxj2VZu3OYncEqL1Rz+ezk5v7Tj5JBsJTbs/314alHoNkxGF+ 6n7pQNgoHfljHtfC0/1sNlyNQ0paE4H4O+eofcYtiOYUfAJH4PI2GnsyZFQ74qPLTygiNKf2adn cLU9gXBY7KcI46oOQ15rK9S9tmNSI45HZJn/VYQPS5Ar2kwWdmYsoFjkeUi0qKVTk8WHO0u3y/w rwy6twwnE8x5nVU9v/50/PAhtxl22X2rTkn9KG09wsy6FrRNBqea7OfZGaKeWuEaUl7+9/fddDU unfeS06ogSguiyTyMbv5tpVV0c8VKFKncBa29gJL6yyGTEJjs+LyL5+ZGBwXtk60jmEcTHmdkF5 1ugYL2nRncM6sE9zEG2kpmLFlE/ds4P2bpw2wtj/zv0Pj/LC1U7+EGxxJJQq2afWWlG5B7zelJO WPokjwnRxeAwBN7cNEoEi9bE7GYXR7/ntwv6VtuTAzA3u97YT5or2hgTsOuJnZwoM7FRZLlF/Fa cJz+OcWmOjfXH86SxUY1ZPTOAo/Foi7g= X-Received: by 2002:a05:6402:e87:b0:6ba:85c8:9fd3 with SMTP id 4fb4d7f45d1cf-6ba85c8a3ccmr1465163a12.31.1795335547456; Sun, 22 Nov 2026 00:19:07 -0800 (PST) Received: from xeon ([188.163.112.62]) by smtp.gmail.com with ESMTPSA id 4fb4d7f45d1cf-6ba370e8ad0sm3617167a12.18.2026.11.22.00.19.03 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 22 Nov 2026 00:19:05 -0800 (PST) From: Svyatoslav Ryhel To: Maarten Lankhorst , Maxime Ripard , Thomas Zimmermann , David Airlie , Simona Vetter , Rob Herring , Krzysztof Kozlowski , Conor Dooley , Thierry Reding , Jonathan Hunter , Neil Armstrong , Jessica Zhang , Mikko Perttunen , Svyatoslav Ryhel Cc: dri-devel@lists.freedesktop.org, devicetree@vger.kernel.org, linux-tegra@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH v8 09/12] drm/tegra: Convert to use atomic versions of drm_encoder_helper_funcs Date: Sun, 22 Nov 2026 10:18:17 +0200 Message-ID: <20261122081820.53199-10-clamor95@gmail.com> X-Mailer: git-send-email 2.53.0 In-Reply-To: <20261122081820.53199-1-clamor95@gmail.com> References: <20261122081820.53199-1-clamor95@gmail.com> X-Mailing-List: devicetree@vger.kernel.org List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Switch to using the atomic versions of the enable() and disable() operations. This is required for acquiring the next bridge state without causing crashes, in order to properly set up the encoder. Signed-off-by: Svyatoslav Ryhel --- drivers/gpu/drm/tegra/dsi.c | 20 +++++++++++++++----- drivers/gpu/drm/tegra/hdmi.c | 20 +++++++++++++++----- drivers/gpu/drm/tegra/rgb.c | 23 +++++++++++++++++------ drivers/gpu/drm/tegra/sor.c | 18 +++++++++++++----- 4 files changed, 60 insertions(+), 21 deletions(-) diff --git a/drivers/gpu/drm/tegra/dsi.c b/drivers/gpu/drm/tegra/dsi.c index 6d6adc485e51e..cd61070072beb 100644 --- a/drivers/gpu/drm/tegra/dsi.c +++ b/drivers/gpu/drm/tegra/dsi.c @@ -855,7 +855,8 @@ static void tegra_dsi_unprepare(struct tegra_dsi *dsi) dev_err(dsi->dev, "failed to suspend: %d\n", err); } -static void tegra_dsi_encoder_disable(struct drm_encoder *encoder) +static void tegra_dsi_encoder_disable(struct drm_encoder *encoder, + struct drm_atomic_commit *comm_state) { struct tegra_output *output = encoder_to_output(encoder); struct tegra_dc *dc = to_tegra_dc(encoder->crtc); @@ -919,16 +920,25 @@ static int tegra_dsi_prepare(struct tegra_dsi *dsi) return 0; } -static void tegra_dsi_encoder_enable(struct drm_encoder *encoder) +static void tegra_dsi_encoder_enable(struct drm_encoder *encoder, + struct drm_atomic_commit *comm_state) { - struct drm_display_mode *mode = &encoder->crtc->state->adjusted_mode; struct tegra_output *output = encoder_to_output(encoder); struct tegra_dc *dc = to_tegra_dc(encoder->crtc); + struct drm_connector_state *conn_state; struct tegra_dsi *dsi = to_dsi(output); + struct drm_crtc_state *crtc_state; + struct drm_connector *connector; struct tegra_dsi_state *state; + struct drm_display_mode *mode; u32 value; int err; + connector = drm_atomic_get_new_connector_for_encoder(comm_state, encoder); + conn_state = drm_atomic_get_new_connector_state(comm_state, connector); + crtc_state = drm_atomic_get_new_crtc_state(comm_state, conn_state->crtc); + mode = &crtc_state->adjusted_mode; + err = tegra_dsi_prepare(dsi); if (err < 0) { dev_err(dsi->dev, "failed to prepare: %d\n", err); @@ -1059,8 +1069,8 @@ static const struct drm_encoder_funcs tegra_dsi_encoder_funcs = { }; static const struct drm_encoder_helper_funcs tegra_dsi_encoder_helper_funcs = { - .disable = tegra_dsi_encoder_disable, - .enable = tegra_dsi_encoder_enable, + .atomic_disable = tegra_dsi_encoder_disable, + .atomic_enable = tegra_dsi_encoder_enable, .atomic_check = tegra_dsi_encoder_atomic_check, }; diff --git a/drivers/gpu/drm/tegra/hdmi.c b/drivers/gpu/drm/tegra/hdmi.c index e8c4347f09e69..a78279810dd82 100644 --- a/drivers/gpu/drm/tegra/hdmi.c +++ b/drivers/gpu/drm/tegra/hdmi.c @@ -1166,7 +1166,8 @@ tegra_hdmi_connector_helper_funcs = { .mode_valid = tegra_hdmi_connector_mode_valid, }; -static void tegra_hdmi_encoder_disable(struct drm_encoder *encoder) +static void tegra_hdmi_encoder_disable(struct drm_encoder *encoder, + struct drm_atomic_commit *comm_state) { struct tegra_output *output = encoder_to_output(encoder); struct tegra_dc *dc = to_tegra_dc(encoder->crtc); @@ -1209,18 +1210,27 @@ static void tegra_hdmi_encoder_disable(struct drm_encoder *encoder) dev_err(hdmi->dev, "failed to suspend: %d\n", err); } -static void tegra_hdmi_encoder_enable(struct drm_encoder *encoder) +static void tegra_hdmi_encoder_enable(struct drm_encoder *encoder, + struct drm_atomic_commit *comm_state) { - struct drm_display_mode *mode = &encoder->crtc->state->adjusted_mode; unsigned int h_sync_width, h_front_porch, h_back_porch, i, rekey; struct tegra_output *output = encoder_to_output(encoder); struct tegra_dc *dc = to_tegra_dc(encoder->crtc); struct tegra_hdmi *hdmi = to_hdmi(output); + struct drm_connector_state *conn_state; + struct drm_crtc_state *crtc_state; unsigned int pulse_start, div82; + struct drm_connector *connector; + struct drm_display_mode *mode; int retries = 1000; u32 value; int err; + connector = drm_atomic_get_new_connector_for_encoder(comm_state, encoder); + conn_state = drm_atomic_get_new_connector_state(comm_state, connector); + crtc_state = drm_atomic_get_new_crtc_state(comm_state, conn_state->crtc); + mode = &crtc_state->adjusted_mode; + err = host1x_client_resume(&hdmi->client); if (err < 0) { dev_err(hdmi->dev, "failed to resume: %d\n", err); @@ -1460,8 +1470,8 @@ tegra_hdmi_encoder_atomic_check(struct drm_encoder *encoder, } static const struct drm_encoder_helper_funcs tegra_hdmi_encoder_helper_funcs = { - .disable = tegra_hdmi_encoder_disable, - .enable = tegra_hdmi_encoder_enable, + .atomic_disable = tegra_hdmi_encoder_disable, + .atomic_enable = tegra_hdmi_encoder_enable, .atomic_check = tegra_hdmi_encoder_atomic_check, }; diff --git a/drivers/gpu/drm/tegra/rgb.c b/drivers/gpu/drm/tegra/rgb.c index 227a178f761bd..d48d498068ac8 100644 --- a/drivers/gpu/drm/tegra/rgb.c +++ b/drivers/gpu/drm/tegra/rgb.c @@ -90,7 +90,8 @@ static void tegra_dc_write_regs(struct tegra_dc *dc, tegra_dc_writel(dc, table[i].value, table[i].offset); } -static void tegra_rgb_encoder_disable(struct drm_encoder *encoder) +static void tegra_rgb_encoder_disable(struct drm_encoder *encoder, + struct drm_atomic_commit *state) { struct tegra_output *output = encoder_to_output(encoder); struct tegra_rgb *rgb = to_rgb(output); @@ -99,12 +100,22 @@ static void tegra_rgb_encoder_disable(struct drm_encoder *encoder) tegra_dc_commit(rgb->dc); } -static void tegra_rgb_encoder_enable(struct drm_encoder *encoder) +static void tegra_rgb_encoder_enable(struct drm_encoder *encoder, + struct drm_atomic_commit *state) { - struct drm_display_mode *mode = &encoder->crtc->state->adjusted_mode; struct tegra_output *output = encoder_to_output(encoder); struct tegra_rgb *rgb = to_rgb(output); - u32 value; + struct drm_connector_state *conn_state; + struct drm_crtc_state *crtc_state; + struct drm_connector *connector; + struct drm_display_mode *mode; + u32 bus_flags, value; + + /* Get mode flags */ + connector = drm_atomic_get_new_connector_for_encoder(state, encoder); + conn_state = drm_atomic_get_new_connector_state(state, connector); + crtc_state = drm_atomic_get_new_crtc_state(state, conn_state->crtc); + mode = &crtc_state->adjusted_mode; tegra_dc_write_regs(rgb->dc, rgb_enable, ARRAY_SIZE(rgb_enable)); @@ -201,8 +212,8 @@ static const struct drm_encoder_funcs tegra_rgb_encoder_funcs = { }; static const struct drm_encoder_helper_funcs tegra_rgb_encoder_helper_funcs = { - .disable = tegra_rgb_encoder_disable, - .enable = tegra_rgb_encoder_enable, + .atomic_disable = tegra_rgb_encoder_disable, + .atomic_enable = tegra_rgb_encoder_enable, .atomic_check = tegra_rgb_encoder_atomic_check, }; diff --git a/drivers/gpu/drm/tegra/sor.c b/drivers/gpu/drm/tegra/sor.c index ebac9068b670f..45a9ea94c4355 100644 --- a/drivers/gpu/drm/tegra/sor.c +++ b/drivers/gpu/drm/tegra/sor.c @@ -2203,7 +2203,8 @@ static void tegra_sor_hdmi_scdc_start(struct tegra_sor *sor) } } -static void tegra_sor_hdmi_disable(struct drm_encoder *encoder) +static void tegra_sor_hdmi_disable(struct drm_encoder *encoder, + struct drm_atomic_commit *comm_state) { struct tegra_output *output = encoder_to_output(encoder); struct tegra_dc *dc = to_tegra_dc(encoder->crtc); @@ -2244,13 +2245,17 @@ static void tegra_sor_hdmi_disable(struct drm_encoder *encoder) host1x_client_suspend(&sor->client); } -static void tegra_sor_hdmi_enable(struct drm_encoder *encoder) +static void tegra_sor_hdmi_enable(struct drm_encoder *encoder, + struct drm_atomic_commit *comm_state) { struct tegra_output *output = encoder_to_output(encoder); unsigned int h_ref_to_sync = 1, pulse_start, max_ac; struct tegra_dc *dc = to_tegra_dc(encoder->crtc); struct tegra_sor_hdmi_settings *settings; + struct drm_connector_state *conn_state; struct tegra_sor *sor = to_sor(output); + struct drm_crtc_state *crtc_state; + struct drm_connector *connector; struct tegra_sor_state *state; struct drm_display_mode *mode; unsigned long rate, pclk; @@ -2259,7 +2264,10 @@ static void tegra_sor_hdmi_enable(struct drm_encoder *encoder) int err; state = to_sor_state(output->connector.state); - mode = &encoder->crtc->state->adjusted_mode; + connector = drm_atomic_get_new_connector_for_encoder(comm_state, encoder); + conn_state = drm_atomic_get_new_connector_state(comm_state, connector); + crtc_state = drm_atomic_get_new_crtc_state(comm_state, conn_state->crtc); + mode = &crtc_state->adjusted_mode; pclk = mode->clock * 1000; err = host1x_client_resume(&sor->client); @@ -2657,8 +2665,8 @@ static void tegra_sor_hdmi_enable(struct drm_encoder *encoder) } static const struct drm_encoder_helper_funcs tegra_sor_hdmi_helpers = { - .disable = tegra_sor_hdmi_disable, - .enable = tegra_sor_hdmi_enable, + .atomic_disable = tegra_sor_hdmi_disable, + .atomic_enable = tegra_sor_hdmi_enable, .atomic_check = tegra_sor_encoder_atomic_check, }; -- 2.53.0