From mboxrd@z Thu Jan 1 00:00:00 1970 Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.remote-ip=209.85.218.50 ARC-Seal: i=1; d=subspace.kernel.org; s=arc20261015; a=rsa-sha256; cv=none; t=1793287797; b=bJPvVMA0rFjiuo8c2gXMAsvYEysp5kSXah5yVFQWAT64M23DUxMDWaoGX/jsn9iGtYXQ JTlDNoaGLWImnA3KPQ8OJ9K7lrXQ15S6r5bmsFFOb66gDsKE0Q5n4DpmCEVuhWHm07clH YhQYDW1urnP3dgLknlMwqJp8wMfYmckLxCn81aVvFodzVj6xJDqadzCBbwPUNwkQJjaTY nIEKZXG+DXMcRl8NEENIdIjFqXlC5HXv5gtpYTTOfeZn2K8eMsMGGZJydXsUj06pUknrx Rsjj+Xo7pRAYxFTNoO1TYjFlvCV3pH+nPQy1QHdFOuYdesZV3+O90qv2povC04BKkfg== ARC-Message-Signature: i=1; d=subspace.kernel.org; s=arc20261015; a=rsa-sha256; c=relaxed/relaxed; t=1793287797; 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=9M4G56dPBxxYm4UBeJKw22tO2je0w07E2UABc7EU4Ug=; b=ELZOW8/Nt5kWa9lqPtGCYl/wV5N3XpI+MgN9Zdx0OHxaK4f5ott2W/uSdFIjALKjvwnP d5pa6DAYQjL5j7JzJwwD226D8tQ/2Wvc5zmScfl8lcrkDQbEDdKztV9UJKFzkDJLzRF9G veQFaRNH3JID+CtlArr0F908nYjAGp9CClbBGSFkX2XXEmWbFhbav8J71G/tPQBSDMSfF bS6H8JkvpB3hZnilopXFStLIPyvpw8ck4MQqJCA6mlCaFw7z118N5GjN3E7KKCEWKPk0d m7b8TywLQTrrvgGKqHOnbKLAEPMTbAJ1Ob9F0uQa0U+JG+p+pSKqMyYNmHMS73IiODw== ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass header.from=gmail.com; spf=pass smtp.mailfrom=gmail.com; arc=none smtp.remote-ip=209.85.218.50 Received: from mail-ej1-f50.google.com (mail-ej1-f50.google.com [209.85.218.50]) (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 9A19760A2605 for ; Thu, 29 Oct 2026 15:29:46 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.4.2 smtp.subspace.kernel.org 9A19760A2605 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 Received: by mail-ej1-f50.google.com with SMTP id a640c23a62f3a-c40e30c26a4so178761266b.0 for ; Thu, 29 Oct 2026 08:29:46 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20260707; t=1793287785; x=1793892585; 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=9M4G56dPBxxYm4UBeJKw22tO2je0w07E2UABc7EU4Ug=; b=TIFfsiqOBrKM7jfT1jZW7jF9oOu2LVQdiJQQEf1zIAw83mrHfgK3Fi3rAqcL5gtQJz nHfWIWa1yq6rl53dgqZ/jq8/gqri0SeYjn1iKJ2KY3p4c6ZDxX6VXwxmFTiBUV7rEoWU F2qqypeRD2W41n2R9cxWkKAwWyc32WOIwDzD/yhSrq0eid0XueNJcFzByyzB6+hN39Fk lWZcLBa3blTCZHnXhaMtAYC0Lw9w99rMDjmbRTQL6wVdG9pB59GKpnKQRRwqKQBTK6ts RxnkP/+/Xq/VqRdIhZH891x3BQmPTfqZDTq9xCxISHDyecsOJEoBF+MmfKbkVAQthNaj aD6g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20260707; t=1793287785; x=1793892585; 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=9M4G56dPBxxYm4UBeJKw22tO2je0w07E2UABc7EU4Ug=; b=UZoz89TQadyL9IXczDDae6u5qBN4YEVNKHbGiJLT52viFQIQnj9bvSakiGpG4bgKdf If7wdXGcJb69w7lRj9iXNn2PzSkNwZdcTlIxRK10F+nRhXFP6UmKMeF/LVV2TwUhEisv lO9kILVz2ti90/AHQDPbi8ChbcZH3u4fWkynotcTJ8+cx9/Ljtrh1hgK08TCoI9Azl8G L+b8wEdGRyxUQi0vJSj/fDmrstqIlucPuwtJ1ZcYpgNksA3tC4PaMweI30t7grrNm/FC jdTIDbX7mvFYN7MZrV2SNRi71Bd6i886ZVl4dMcWcclaDNZVx/fYlbZPLUANSQhfrt1s PHmA== X-Forwarded-Encrypted: i=1; AKwUvBxJUCLh29+FOu38sVg08J0GuowCESu/UJfJdLfIiWMwZO4Z3AxIup//q4qy+h1wKlTOuBpg+qJQ4Em+@vger.kernel.org X-Gm-Message-State: AFq9FYKYiveY8bAhZQoe5oqDF23DsCoUoxqdpL6PeZe0oRAFB1MVhXWV ZBdeYi/j+VO8pdFMFzDOPJX38fASSjaq2v2+9Ia/wukgyRmkK9lIUrbj X-Gm-Gg: AYBFou0uqAF5otxsWBRaTniEhjCskgcpufgfnk68yXfiNJpfZpATF+UwXmRAA0Kl+a7 oxx9OL5M0IhdKetWqdQcGViG4SznbPk0ZmFna6CivA45nacLM86ko+gI8lRlfJnbHX1Gfg11eVP rFHteVoSoGpn2CxAdWqzv8kqiHiOB/gVwm/rNVSfVKfVLrRAdM3E1sJyyNsgGKdpC2/Oxm5+zpZ NEt89uKybttrcsx444E39WY+g48mEHi8HbgvnrPHWWShj4UCmBPOJ/2QyZjC8I9ipnuMlDUtYSQ tN2cxPGKIlO678YPPczC9Xtz+PCpFe0BRSaohx8yoc4t++4ggqCMiNNzpQygmiaabsoWR2NsdRr vPrhW6aKTC6NESGnhqCD6C87zdVMjY818r4/Mjq9ETLaox6qHl1OJZBMtGoDy6oPr3cEmGLHxR5 xykBwO2WsbjK42OdBJOaqG3ahrLo6liRMlwkOpGx/w3H3Zf7uBB6Q/p89X3YjGOXjjzAljiTSdg OhUT69u6qlhwAIIuMdi/3m5HwFJN7bbGXRRHo5kqpp38wOI7ITCk1vZnzWieU4bW291zahNH7VF xlA20RhaaJUN+3VvB0UCDwN846Vjzfgo1DKwZ//TvjmoM6ffbFz5LfyE8F+WPHsHJEYKHvCZ X-Received: by 2002:a17:906:f59c:b0:c3e:2224:1b86 with SMTP id a640c23a62f3a-c49d10eee61mr278811366b.2.1793287784835; Thu, 29 Oct 2026 08:29:44 -0700 (PDT) Received: from xeon ([188.163.112.62]) by smtp.gmail.com with ESMTPSA id a640c23a62f3a-c4ca27984f8sm1252166b.80.2026.10.29.08.29.43 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 29 Oct 2026 08:29:44 -0700 (PDT) From: Svyatoslav Ryhel To: Neil Armstrong , Jessica Zhang , David Airlie , Simona Vetter , Maarten Lankhorst , Maxime Ripard , Thomas Zimmermann , Rob Herring , Krzysztof Kozlowski , Conor Dooley , Thierry Reding , Jonathan Hunter , Mikko Perttunen , Svyatoslav Ryhel Cc: dri-devel@lists.freedesktop.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, linux-tegra@vger.kernel.org Subject: [PATCH v5 08/11] drm/tegra: Convert to use atomic versions of drm_encoder_helper_funcs Date: Thu, 29 Oct 2026 17:29:06 +0200 Message-ID: <20261029152909.234584-9-clamor95@gmail.com> X-Mailer: git-send-email 2.53.0 In-Reply-To: <20261029152909.234584-1-clamor95@gmail.com> References: <20261029152909.234584-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. 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 a4c0c63bbe567..202aed6a6fc12 100644 --- a/drivers/gpu/drm/tegra/dsi.c +++ b/drivers/gpu/drm/tegra/dsi.c @@ -856,7 +856,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); @@ -920,16 +921,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); @@ -1060,8 +1070,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 c0845bb45bb15..0a2420095d061 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 01475995d9cc8..7dea0cac61233 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 ab81e412e05f1..85cd5c8cbef4e 100644 --- a/drivers/gpu/drm/tegra/sor.c +++ b/drivers/gpu/drm/tegra/sor.c @@ -2206,7 +2206,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); @@ -2247,13 +2248,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; @@ -2262,7 +2267,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); @@ -2660,8 +2668,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