From nobody Fri Dec 19 15:18:34 2025 Received: from mail-ej1-f46.google.com (mail-ej1-f46.google.com [209.85.218.46]) (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 4E5992F1FDD for ; Sun, 12 Oct 2025 19:23:55 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.218.46 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1760297037; cv=none; b=mmisCj8BLtxxzE/nRMw534aBMM1xT3k5T4LjLxhDNy8w/KPPU1zBYsVWSxzzgobDy+403GydPtp4aYjwTHWT4mfxQD8vAva1miADrQTpMUH/3ingUjWCer13BLVxqqKL6OJxCAk2p1tWR/K6BywhXG60PVEEhG7W0pacn/iON0E= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1760297037; c=relaxed/simple; bh=vS1oceHL9gJHejBT3+qUlJVs/cal4N3Fex9YsMuGCJE=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=qF0mwVyKiJ1MQyAmy4HS/TW+Lj6YxjXz+7pRIcgxNvBDAu0UC0IgxDXrw15i0gy7EN/xLzZ7gskBr2zl0N35oBn1/EPd/2igWRqgn42ntagOfvwNl9BH7fBeAXopTNXvrxKdwhH8DLE0FieDh3/5p4mkeJx8lrsTev0A/LJrMN4= 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=k/TuhrCh; arc=none smtp.client-ip=209.85.218.46 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="k/TuhrCh" Received: by mail-ej1-f46.google.com with SMTP id a640c23a62f3a-b3ee18913c0so549768866b.3 for ; Sun, 12 Oct 2025 12:23:55 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1760297034; x=1760901834; 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=ljTiHpH/7wCq4Sb80OipRX+gpuymv7x8m1cTbrMD8nQ=; b=k/TuhrCh+qrZxbUlVNDZSm5mN5BRWBIohIqOUZUlerP8Jx1dm9uFMkWbpfw/XNb3lS fxHiziPFF0SmHqksdhZ9v6jQji0S3W384tcXLxiBNkFIWUrSkOXAzYtwHq/2b6J8ZEGm O3rz5RBtuLPR2jjj2Vgj6xpm2RNy0lzlJWRUTm9LSB9ti0Z69XM6EXZF+xpOD6ql8DHe fPyKMJ7qkqg2L0N7M9xqsveA5kxgDvpoKs66oooj0jebFxpNyMPbJ92GHJKwGQ0UMnr/ wxsHokh652KFFCTHI92I5HAvCWyGOXtInOIMSWKZErOygS/F9DL+8vCs3c6aFoKUw21G 7RPg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1760297034; x=1760901834; 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=ljTiHpH/7wCq4Sb80OipRX+gpuymv7x8m1cTbrMD8nQ=; b=daUzJftQqJr/7S5PizyF2VUs9tk6KaLjPI0YamvrvoqkQxzLE2bhKxplM2sfdD+NtY PM8wKpTleFZ5AJvJW20Ya6kHxFThtf5CTjcPkWNZXvXCda368u8SsNzHVcoj4juCF2CH uWEwFnRpfZ/UerGnjsgAaE7iHDd4E+wBCfWSli9AaPKwb2cChUCbXU5QLTKnvqmIgRin g2tzYbGbZuZmVTvRD4lqaLEqa0EL97lZsTeRGNy5Y9Y7fXbQw9B2WF1gqx3U/KGAZRFJ SC6jZlR6FEc0ohUaLlwBPoriGE2/spnjIDPfcMrhrzf2Vt1pU7O/tbtgVXV2y/OXfQ+M qA0Q== X-Forwarded-Encrypted: i=1; AJvYcCV8IeqmARRHAmUZMslG4iJDTVwj4PMXsOLi1LFHr3ArJgDo1ifYavMvHBjl3H9KIr3Sn2ZmniMX/syGDbA=@vger.kernel.org X-Gm-Message-State: AOJu0Yx/gcf/XMNErfwZKmFguuCWSiproQiRjcnzeJFhn7REEa4TpScg Gr7ztkdglt+kqmRVwuvCew6UbCNlnKOJEso5U9w9MFHpAGw9Gv5lbbxt X-Gm-Gg: ASbGncsDOeK2c+ZwnfGMOCzGSZQIxcKpSXp68oxoMrmYYO70oDU/rxxygUcUEfjlV3N kjbMKn2P5WNtzMMm6k5j++GpaLbKRCCMNM78xaH2jKrMlXr19RUWi30wNIpZiIE9ufORZedF7/A 1AuKPJaKHfnlJmOah5h2/sFvHWxlZCZQef6ZJczwf8hZfrHLBa86pkc89T0dshVEFOUrY5tVtE1 SEgAErTM58zjixoHVwws5iTP1hUidgEPEh8y3BlNGAEJ9iS/VbkqAnkErttAhMKtpqymXzunpqv gnXbR9zjYwwL7w7aYyZQi/FUBS9GGDdOS30iS18c39N43+nE8L8ElQP+6x5oiaFUxtTyz3Ko6bg CmIkS6xgjwdnv22xbtYCSTcZ/3+507FNag2oWfMvrsrg7Bkyr4bEJYntANcc3aRJNqtnciD6Q2t BbyOLhwPEXZORKE0e+uXl6 X-Google-Smtp-Source: AGHT+IH2UBZhZnnANHj8S5Ub3yMR8kafMnVt2A0h1CRlogccMK2B7fLAfojkqBw32F0r0liwzWP3zA== X-Received: by 2002:a17:907:da1:b0:b3a:e4b3:eeb9 with SMTP id a640c23a62f3a-b50abfcd075mr2031796166b.55.1760297033577; Sun, 12 Oct 2025 12:23:53 -0700 (PDT) Received: from jernej-laptop (178-79-73-218.dynamic.telemach.net. [178.79.73.218]) by smtp.gmail.com with ESMTPSA id a640c23a62f3a-b55d67d8283sm760176466b.38.2025.10.12.12.23.52 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 12 Oct 2025 12:23:53 -0700 (PDT) From: Jernej Skrabec To: mripard@kernel.org, wens@csie.org Cc: maarten.lankhorst@linux.intel.com, 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 11/30] drm/sun4i: de2/de3: Simplify CSC config interface Date: Sun, 12 Oct 2025 21:23:11 +0200 Message-ID: <20251012192330.6903-12-jernej.skrabec@gmail.com> X-Mailer: git-send-email 2.51.0 In-Reply-To: <20251012192330.6903-1-jernej.skrabec@gmail.com> References: <20251012192330.6903-1-jernej.skrabec@gmail.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" Merging both function into one lets this one decide on it's own if CSC should be enabled or not. Currently heuristics for that is pretty simple - enable it for YUV formats and disable for RGB. DE3 and newer allows YUV pipeline, which will be easier to implement these way. Signed-off-by: Jernej Skrabec Reviewed-by: Chen-Yu Tsai --- drivers/gpu/drm/sun4i/sun8i_csc.c | 89 ++++++++++---------------- drivers/gpu/drm/sun4i/sun8i_csc.h | 9 ++- drivers/gpu/drm/sun4i/sun8i_vi_layer.c | 11 +--- 3 files changed, 40 insertions(+), 69 deletions(-) diff --git a/drivers/gpu/drm/sun4i/sun8i_csc.c b/drivers/gpu/drm/sun4i/sun8= i_csc.c index c100d29b1a89..cf0c5121661b 100644 --- a/drivers/gpu/drm/sun4i/sun8i_csc.c +++ b/drivers/gpu/drm/sun4i/sun8i_csc.c @@ -107,23 +107,28 @@ static const u32 yuv2rgb_de3[2][3][12] =3D { }, }; =20 -static void sun8i_csc_set_coefficients(struct regmap *map, u32 base, - enum sun8i_csc_mode mode, - enum drm_color_encoding encoding, - enum drm_color_range range) +static void sun8i_csc_setup(struct regmap *map, u32 base, + enum sun8i_csc_mode mode, + enum drm_color_encoding encoding, + enum drm_color_range range) { + u32 base_reg, val; const u32 *table; - u32 base_reg; int i; =20 table =3D yuv2rgb[range][encoding]; =20 switch (mode) { + case SUN8I_CSC_MODE_OFF: + val =3D 0; + break; case SUN8I_CSC_MODE_YUV2RGB: + val =3D SUN8I_CSC_CTRL_EN; base_reg =3D SUN8I_CSC_COEFF(base, 0); regmap_bulk_write(map, base_reg, table, 12); break; case SUN8I_CSC_MODE_YVU2RGB: + val =3D SUN8I_CSC_CTRL_EN; for (i =3D 0; i < 12; i++) { if ((i & 3) =3D=3D 1) base_reg =3D SUN8I_CSC_COEFF(base, i + 1); @@ -135,28 +140,37 @@ static void sun8i_csc_set_coefficients(struct regmap = *map, u32 base, } break; default: + val =3D 0; DRM_WARN("Wrong CSC mode specified.\n"); return; } + + regmap_write(map, SUN8I_CSC_CTRL(base), val); } =20 -static void sun8i_de3_ccsc_set_coefficients(struct regmap *map, int layer, - enum sun8i_csc_mode mode, - enum drm_color_encoding encoding, - enum drm_color_range range) +static void sun8i_de3_ccsc_setup(struct regmap *map, int layer, + enum sun8i_csc_mode mode, + enum drm_color_encoding encoding, + enum drm_color_range range) { + u32 addr, val, mask; const u32 *table; - u32 addr; int i; =20 + mask =3D SUN50I_MIXER_BLEND_CSC_CTL_EN(layer); table =3D yuv2rgb_de3[range][encoding]; =20 switch (mode) { + case SUN8I_CSC_MODE_OFF: + val =3D 0; + break; case SUN8I_CSC_MODE_YUV2RGB: + val =3D mask; addr =3D SUN50I_MIXER_BLEND_CSC_COEFF(DE3_BLD_BASE, layer, 0); regmap_bulk_write(map, addr, table, 12); break; case SUN8I_CSC_MODE_YVU2RGB: + val =3D mask; for (i =3D 0; i < 12; i++) { if ((i & 3) =3D=3D 1) addr =3D SUN50I_MIXER_BLEND_CSC_COEFF(DE3_BLD_BASE, @@ -173,67 +187,30 @@ static void sun8i_de3_ccsc_set_coefficients(struct re= gmap *map, int layer, } break; default: + val =3D 0; DRM_WARN("Wrong CSC mode specified.\n"); return; } -} - -static void sun8i_csc_enable(struct regmap *map, u32 base, bool enable) -{ - u32 val; - - if (enable) - val =3D SUN8I_CSC_CTRL_EN; - else - val =3D 0; - - regmap_update_bits(map, SUN8I_CSC_CTRL(base), SUN8I_CSC_CTRL_EN, val); -} - -static void sun8i_de3_ccsc_enable(struct regmap *map, int layer, bool enab= le) -{ - u32 val, mask; - - mask =3D SUN50I_MIXER_BLEND_CSC_CTL_EN(layer); - - if (enable) - val =3D mask; - else - val =3D 0; =20 regmap_update_bits(map, SUN50I_MIXER_BLEND_CSC_CTL(DE3_BLD_BASE), mask, val); } =20 -void sun8i_csc_set_ccsc_coefficients(struct sun8i_mixer *mixer, int layer, - enum sun8i_csc_mode mode, - enum drm_color_encoding encoding, - enum drm_color_range range) +void sun8i_csc_config(struct sun8i_mixer *mixer, int layer, + enum sun8i_csc_mode mode, + enum drm_color_encoding encoding, + enum drm_color_range range) { u32 base; =20 if (mixer->cfg->de_type =3D=3D SUN8I_MIXER_DE3) { - sun8i_de3_ccsc_set_coefficients(mixer->engine.regs, layer, - mode, encoding, range); + sun8i_de3_ccsc_setup(mixer->engine.regs, layer, + mode, encoding, range); return; } =20 base =3D ccsc_base[mixer->cfg->ccsc][layer]; =20 - sun8i_csc_set_coefficients(mixer->engine.regs, base, - mode, encoding, range); -} - -void sun8i_csc_enable_ccsc(struct sun8i_mixer *mixer, int layer, bool enab= le) -{ - u32 base; - - if (mixer->cfg->de_type =3D=3D SUN8I_MIXER_DE3) { - sun8i_de3_ccsc_enable(mixer->engine.regs, layer, enable); - return; - } - - base =3D ccsc_base[mixer->cfg->ccsc][layer]; - - sun8i_csc_enable(mixer->engine.regs, base, enable); + sun8i_csc_setup(mixer->engine.regs, base, + mode, encoding, range); } diff --git a/drivers/gpu/drm/sun4i/sun8i_csc.h b/drivers/gpu/drm/sun4i/sun8= i_csc.h index 828b86fd0cab..27b6807fc786 100644 --- a/drivers/gpu/drm/sun4i/sun8i_csc.h +++ b/drivers/gpu/drm/sun4i/sun8i_csc.h @@ -28,10 +28,9 @@ enum sun8i_csc_mode { SUN8I_CSC_MODE_YVU2RGB, }; =20 -void sun8i_csc_set_ccsc_coefficients(struct sun8i_mixer *mixer, int layer, - enum sun8i_csc_mode mode, - enum drm_color_encoding encoding, - enum drm_color_range range); -void sun8i_csc_enable_ccsc(struct sun8i_mixer *mixer, int layer, bool enab= le); +void sun8i_csc_config(struct sun8i_mixer *mixer, int layer, + enum sun8i_csc_mode mode, + enum drm_color_encoding encoding, + enum drm_color_range range); =20 #endif diff --git a/drivers/gpu/drm/sun4i/sun8i_vi_layer.c b/drivers/gpu/drm/sun4i= /sun8i_vi_layer.c index 727117658c6c..adcd05acba1b 100644 --- a/drivers/gpu/drm/sun4i/sun8i_vi_layer.c +++ b/drivers/gpu/drm/sun4i/sun8i_vi_layer.c @@ -213,14 +213,9 @@ static void sun8i_vi_layer_update_colors(struct sun8i_= mixer *mixer, int channel, =20 fmt =3D state->fb->format; csc_mode =3D sun8i_vi_layer_get_csc_mode(fmt); - if (csc_mode !=3D SUN8I_CSC_MODE_OFF) { - sun8i_csc_set_ccsc_coefficients(mixer, channel, csc_mode, - state->color_encoding, - state->color_range); - sun8i_csc_enable_ccsc(mixer, channel, true); - } else { - sun8i_csc_enable_ccsc(mixer, channel, false); - } + sun8i_csc_config(mixer, channel, csc_mode, + state->color_encoding, + state->color_range); } =20 static void sun8i_vi_layer_update_buffer(struct sun8i_mixer *mixer, int ch= annel, --=20 2.51.0