From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-wm1-f42.google.com (mail-wm1-f42.google.com [209.85.128.42]) (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 C404A366541 for ; Mon, 3 Aug 2026 16:11:23 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.128.42 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1785773486; cv=none; b=Pss232QMlOy7AVuiYTjoGKCvE96ncUbSUo7PdWn5bJ18LgYWkYpQZ0MZdzbk9lA4S49r9JllDn3c/Rhw/Nr5vwj7l75b+jiQ15PyGlk1Gz7GWTjSVJm7QacTrOVkbVFkRh5/RO/rUI4CQN4Ud1/6nfuFvapkbNujzYj6dutxxcY= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1785773486; c=relaxed/simple; bh=fTzsF9nNJWce3JZtECoiuvBAAOYdzetgdaAQeWxNuE8=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=TWM3kDJdmHdpRR/3ElB2sJ7xVYoblN+4GldtlmvNal2AHVMOJyFSMOYHBFmGvthn782nDeO6yN8xf8cOVTzJCTXwy4Lefkvd+kIjUr50UYlz+TM2Z7Pdt4osNsxK96FZE6LEsiQzkeiQE1jT7axPHtD2/IwSfW1qZJZtVbCJRZE= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com; spf=pass smtp.mailfrom=gmail.com; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b=k3WPZC8l; arc=none smtp.client-ip=209.85.128.42 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.b="k3WPZC8l" Received: by mail-wm1-f42.google.com with SMTP id 5b1f17b1804b1-49553515a8bso36277485e9.1 for ; Mon, 03 Aug 2026 09:11:22 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1785773481; x=1786378281; 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=65tLrBmDcrjX0P/kWTBoZe536eu486JrEmAUPZ6dfSY=; b=k3WPZC8lNOWGKjif3WgAgqJTbbDNUxcd0jR6qI76QxUXoMc+Ou3kFL6HZD2qBeaJGy Oaez6k0OT8e2X0OtRH0gpmc0b0n3QapJBoMUJxIwNiIZE2Pz1WtoB8DIfjBzNQIyirNn Y0IjtxeIEEEaVIALbEPpglno0VKODRhRQmcaME2wpmXC9ozOU2y5jORa7/DsP4KrBLlR 0hb317kYKIY7iC5rmHHcmbx7lQD91m2F7YMd+6DKZdKw11v6Rmq0tATawUsAw1n10KGU zbrwOh2n5aEj24fr0h0bvmOeQBCUOxDP0gJ437aFfMEVwo7lmeibxNSMPDP8n/ZddU9R PcOg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1785773481; x=1786378281; 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=65tLrBmDcrjX0P/kWTBoZe536eu486JrEmAUPZ6dfSY=; b=CPU3ABP6E2PPESHfVG96LO5e+k4hwxD7WX5iwra2uFreYJ5yeCNo6nlgI2hHICDu13 ZFhHm6EusCb5R6huBOJC6EUSz19aUXruOwc5YDyIquC2jNy23KDOEn/xKuB5eSDQ1q/g EfV8jw6jjrEndn2Dr3jekE2vk1vSB6IARLEpzjXe+7YB+vrpotgy2uf/3PIUph+wMI0U JAfqG8v2aJINw4PK0FRz2IlNbqWWnhgtaqzBVvIzz0mqDhDX4yyJgDlcqdeSb+xISCSf 9MkKgk2ycx2GaAZ6buJNXgjO+brJtW2XAVrEPnR66kDL7h0Awy3lYItPWyuCBLgXWIR8 8pdw== X-Forwarded-Encrypted: i=1; AHgh+RoRPjfkaDZhadoFn1Az7+11tJ6+7tNwVuza7Vg53kFto+NWnv8irKtlkSk4oG0UhWVyMUEG5vNziMfY6l0=@vger.kernel.org X-Gm-Message-State: AOJu0YzrBeI1Wi2yuq82q7FSCx1GrqK/+4RJc4apdXhJ34dpkdkTfm81 5corpxKWuNJbdA5HJ0kGYfxI6NA+c3xBfb95QIqbb303ySoxtFyrDlo8 X-Gm-Gg: AR+sD11teERCiBzKp6rZ74tjGrW199DftKexgu/fLA6f8ZJWywC8Q6rLdWBJEZ28K9G Frkar2dXAGD8WdA0aemlIRWHLxQ5xult7VHXKDNOc3EsglKup0/1kvzaVmyFqIBuHAwUhiFWsSL oSc9LgOkVf4gvvwXfKj1YzN+Z2wQMk+jwphhG0tKK4LcB2nNuCzniyfjYEoGsdubDQD1KJhHakN dLGDa3lgcRi2E+PfBEIwW+pxFkFcK1P8q3qXOgxJ+W4lkXyaro9FaEV3dKhb2ys2o6vgD6FAcFo FVoCCmRzTBd0qpCpRqxbBRN6Rsj5SeiW38Ca9afLbApQA4pidEW+5g9keU0t13V/N4nZR0oyx2h jurs73NjY0UpQRcno4U1q7I8Y0C/1GN55t8NKlUwxEp5g5bVDEfdwdFOEPRH8tXjS0hd9WEflxZ BpYukcdCaTEH51k3IZEMPtX94nJtMzaA6m2MUJDZ2fDgqLOQ57oCtnQG9MYnIDodPx8T20t3+qD VJaEMZZKJ/RPJKqUPZWNL3yNDsP+wg+BFld97Rk7CNR4aDgY1xotnbb0LKorfgYDU1O8TMS383q uqclJVoH2MYvxVW7vVSP8R9a3oMT1JTO/h2RYfruYa6CHrJ//ZdW2SNWBotXd/dZDyjBX7HUFgo 82wHyBt1dvkGEnz9r+N+DFq9EEbfiNDQmnwyoFb5oR3eQqX4a48diA6PMXhKzvj3MFt64xeLIlU PykA== X-Received: by 2002:a05:600c:19cf:b0:495:7a04:b006 with SMTP id 5b1f17b1804b1-4980c66b572mr227085475e9.8.1785773480944; Mon, 03 Aug 2026 09:11:20 -0700 (PDT) Received: from jernej-laptop (APN-122-100-117-gprs.simobil.net. [46.122.100.117]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-49949fc2da2sm3363735e9.3.2026.08.03.09.11.18 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 03 Aug 2026 09:11:20 -0700 (PDT) From: Jernej Skrabec To: wens@kernel.org Cc: maarten.lankhorst@linux.intel.com, mripard@kernel.org, tzimmermann@suse.de, airlied@gmail.com, simona@ffwll.ch, samuel@sholland.org, dri-devel@lists.freedesktop.org, linux-arm-kernel@lists.infradead.org, linux-sunxi@lists.linux.dev, linux-kernel@vger.kernel.org, Jernej Skrabec Subject: [PATCH 04/13] drm/sun4i: tcon-top: Keep mixer routes distinct Date: Mon, 3 Aug 2026 18:10:42 +0200 Message-ID: <52eb247169b268054302afa71e598add0b04748d.1785772659.git.jernej.skrabec@gmail.com> X-Mailer: git-send-email 2.55.0 In-Reply-To: References: Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Both mixer selectors reset to TCON 0. Selecting the same TCON for both mixers causes black or corrupted output. When a route would collide, park the other mixer on another described TCON, or an unused selector if none exists. Since the TCON index is now used as a shift, also reject negative values. Tested on Orange Pi 3 with TCON_LCD0 and TCON_TV0. Link: https://lore.kernel.org/linux-sunxi/Zn8GVkpwXwhaUFno@titan/ Link: https://lore.kernel.org/linux-sunxi/20241108-tcon_fix-v1-1-616218cc0d5f@jookia.org/ Fixes: 05db311a792d ("drm/sun4i: tcon-top: Add helpers for mux switching") Signed-off-by: Jernej Skrabec --- drivers/gpu/drm/sun4i/sun8i_tcon_top.c | 71 +++++++++++++++++++++----- drivers/gpu/drm/sun4i/sun8i_tcon_top.h | 6 +++ 2 files changed, 65 insertions(+), 12 deletions(-) diff --git a/drivers/gpu/drm/sun4i/sun8i_tcon_top.c b/drivers/gpu/drm/sun4i/sun8i_tcon_top.c index 8adda578c51b..9cbd655518b2 100644 --- a/drivers/gpu/drm/sun4i/sun8i_tcon_top.c +++ b/drivers/gpu/drm/sun4i/sun8i_tcon_top.c @@ -25,6 +25,49 @@ static bool sun8i_tcon_top_node_is_tcon_top(struct device_node *node) return !!of_match_node(sun8i_tcon_top_of_table, node); } +static unsigned int sun8i_tcon_top_get_tcon_map(struct device_node *node) +{ + static const u32 out_ports[] = { + TCON_TOP_MIXER0_OUT_PORT, + TCON_TOP_MIXER1_OUT_PORT, + }; + unsigned int i, map = 0; + + for (i = 0; i < ARRAY_SIZE(out_ports); i++) { + struct device_node *port; + + port = of_graph_get_port_by_id(node, out_ports[i]); + if (!port) + continue; + + for_each_of_graph_port_endpoint(port, ep) { + struct of_endpoint endpoint; + + if (of_graph_parse_endpoint(ep, &endpoint)) + continue; + + if (endpoint.id < TCON_TOP_PORT_TCON_NUM) + map |= BIT(endpoint.id); + } + + of_node_put(port); + } + + return map; +} + +static unsigned int sun8i_tcon_top_park_index(struct sun8i_tcon_top *tcon_top, + int tcon) +{ + unsigned int candidates; + + candidates = tcon_top->tcon_map & ~BIT(tcon); + if (!candidates) + candidates = GENMASK(TCON_TOP_PORT_TCON_NUM - 1, 0) & ~BIT(tcon); + + return ffs(candidates) - 1; +} + int sun8i_tcon_top_set_hdmi_src(struct device *dev, int tcon) { struct sun8i_tcon_top *tcon_top = dev_get_drvdata(dev); @@ -57,6 +100,7 @@ EXPORT_SYMBOL(sun8i_tcon_top_set_hdmi_src); int sun8i_tcon_top_de_config(struct device *dev, int mixer, int tcon) { struct sun8i_tcon_top *tcon_top = dev_get_drvdata(dev); + u32 mixer_msk, other_msk; unsigned long flags; u32 reg; @@ -70,21 +114,27 @@ int sun8i_tcon_top_de_config(struct device *dev, int mixer, int tcon) return -EINVAL; } - if (tcon > 3) { - dev_err(dev, "TCON index is too high!\n"); + if (tcon < 0 || tcon >= TCON_TOP_PORT_TCON_NUM) { + dev_err(dev, "TCON index is invalid!\n"); return -EINVAL; } + mixer_msk = mixer ? TCON_TOP_PORT_DE1_MSK : TCON_TOP_PORT_DE0_MSK; + other_msk = mixer ? TCON_TOP_PORT_DE0_MSK : TCON_TOP_PORT_DE1_MSK; + spin_lock_irqsave(&tcon_top->reg_lock, flags); reg = readl(tcon_top->regs + TCON_TOP_PORT_SEL_REG); - if (mixer == 0) { - reg &= ~TCON_TOP_PORT_DE0_MSK; - reg |= FIELD_PREP(TCON_TOP_PORT_DE0_MSK, tcon); - } else { - reg &= ~TCON_TOP_PORT_DE1_MSK; - reg |= FIELD_PREP(TCON_TOP_PORT_DE1_MSK, tcon); + + reg &= ~mixer_msk; + reg |= field_prep(mixer_msk, tcon); + + if (field_get(other_msk, reg) == tcon) { + reg &= ~other_msk; + reg |= field_prep(other_msk, + sun8i_tcon_top_park_index(tcon_top, tcon)); } + writel(reg, tcon_top->regs + TCON_TOP_PORT_SEL_REG); spin_unlock_irqrestore(&tcon_top->reg_lock, flags); @@ -143,6 +193,7 @@ static int sun8i_tcon_top_bind(struct device *dev, struct device *master, return -ENOMEM; clk_data->num = CLK_NUM; tcon_top->clk_data = clk_data; + tcon_top->tcon_map = sun8i_tcon_top_get_tcon_map(dev->of_node); spin_lock_init(&tcon_top->reg_lock); @@ -175,10 +226,6 @@ static int sun8i_tcon_top_bind(struct device *dev, struct device *master, goto err_assert_reset; } - /* - * At least on H6, some registers have some bits set by default - * which may cause issues. Clear them here. - */ writel(0, regs + TCON_TOP_PORT_SEL_REG); writel(0, regs + TCON_TOP_GATE_SRC_REG); diff --git a/drivers/gpu/drm/sun4i/sun8i_tcon_top.h b/drivers/gpu/drm/sun4i/sun8i_tcon_top.h index 0390584a330e..2b887470a49f 100644 --- a/drivers/gpu/drm/sun4i/sun8i_tcon_top.h +++ b/drivers/gpu/drm/sun4i/sun8i_tcon_top.h @@ -14,6 +14,10 @@ #define TCON_TOP_PORT_SEL_REG 0x1C #define TCON_TOP_PORT_DE0_MSK GENMASK(1, 0) #define TCON_TOP_PORT_DE1_MSK GENMASK(5, 4) +#define TCON_TOP_PORT_TCON_NUM 4 + +#define TCON_TOP_MIXER0_OUT_PORT 1 +#define TCON_TOP_MIXER1_OUT_PORT 3 #define TCON_TOP_GATE_SRC_REG 0x20 #define TCON_TOP_HDMI_SRC_MSK GENMASK(29, 28) @@ -29,6 +33,8 @@ struct sun8i_tcon_top { void __iomem *regs; struct reset_control *rst; + unsigned int tcon_map; + /* * spinlock is used to synchronize access to same * register where multiple clock gates can be set. -- 2.43.0