From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from perceval.ideasonboard.com (perceval.ideasonboard.com [213.167.242.64]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 255E1246326 for ; Fri, 25 Apr 2025 11:02:07 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=213.167.242.64 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1745578928; cv=none; b=bUyARECHyGjrbiE59jx8YNurGUrfoXlSP2XpNuA3sd/HL2F1TwKQPTggkJ+wDu0z9JVLHUEiL69/OI6GIUGdlPI85wlb+1LYhcv7+hEMPyF9tAbksDWA26NX3N8KoOvwPYyYDdfFkfRGjnLDQNxtnWIEpXG68hOoedYFO7Pidzg= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1745578928; c=relaxed/simple; bh=1CuJY4hGwE84SAOCBlZRb945jT4TJiAFMYrzRssZsd4=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=c6oa7JyIVHZ0kBxTaqZ8aYgbpOQfWd2Pmh6gpwQAxqwsBIw8FmaVeyAT1doQVwejpKZ0KirU5xMgWDRIO1dForUUMHjDIPVD6CeiGhzzJHjhFpsmJPcI1qiDu6EOoK7fiwZ9mLDNc+CiS/y/YdzgoW7MveQMys1/asEBwBSvJ6E= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=ideasonboard.com; spf=pass smtp.mailfrom=ideasonboard.com; dkim=pass (1024-bit key) header.d=ideasonboard.com header.i=@ideasonboard.com header.b=MNe55MzA; arc=none smtp.client-ip=213.167.242.64 Authentication-Results: smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=ideasonboard.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=ideasonboard.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=ideasonboard.com header.i=@ideasonboard.com header.b="MNe55MzA" Received: from [127.0.1.1] (91-158-153-178.elisa-laajakaista.fi [91.158.153.178]) by perceval.ideasonboard.com (Postfix) with ESMTPSA id 1AA8182E; Fri, 25 Apr 2025 13:01:56 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com; s=mail; t=1745578916; bh=1CuJY4hGwE84SAOCBlZRb945jT4TJiAFMYrzRssZsd4=; h=From:Date:Subject:References:In-Reply-To:To:Cc:From; b=MNe55MzAq8wmJCMrnxwaOZ/UJmlq1K8SwgitFJ0MqoDpZ7ABMoJSSzlc1Agtfyrmw PFR9JycTNDEZKeBxS6kkcP/Lvpt6eJvKcpoygMooTCleWEc9uWTjYot3NDn7zSxpn7 HVzPuapRnpdZ4W5+dIsAo45cj8CoYDWFPOToIHoo= From: Tomi Valkeinen Date: Fri, 25 Apr 2025 14:01:29 +0300 Subject: [PATCH v5 09/11] drm: xlnx: zynqmp: Add support for Y8 and Y10_P32 Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 7bit Message-Id: <20250425-xilinx-formats-v5-9-c74263231630@ideasonboard.com> References: <20250425-xilinx-formats-v5-0-c74263231630@ideasonboard.com> In-Reply-To: <20250425-xilinx-formats-v5-0-c74263231630@ideasonboard.com> To: Vishal Sagar , Anatoliy Klymenko , Maarten Lankhorst , Maxime Ripard , Thomas Zimmermann , David Airlie , Simona Vetter , Laurent Pinchart , Michal Simek Cc: dri-devel@lists.freedesktop.org, linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org, Geert Uytterhoeven , Dmitry Baryshkov , Pekka Paalanen , Tomi Valkeinen X-Mailer: b4 0.15-dev-c25d1 X-Developer-Signature: v=1; a=openpgp-sha256; l=1957; i=tomi.valkeinen@ideasonboard.com; h=from:subject:message-id; bh=1CuJY4hGwE84SAOCBlZRb945jT4TJiAFMYrzRssZsd4=; b=owEBbQKS/ZANAwAIAfo9qoy8lh71AcsmYgBoC2ucI9Pj7KChTyK2e0k4imtAkJxhm7GReG99Q N3FjcKt6+SJAjMEAAEIAB0WIQTEOAw+ll79gQef86f6PaqMvJYe9QUCaAtrnAAKCRD6PaqMvJYe 9aFpD/9aFvmVQ3r+m0MJuG5X7yhrlhqqSLAAoBhY87qr4uiiEHLm0mVo2bznVeu/lzQcT54wuC6 cbKenTXdMkNDGNx90a0QdLCW6if4gvirHWKiZi6bSrtFBDjdsu05y59S0NeJlxGihVS5jY0wioA 2LlOiTWHGSBlL1X4+4NPxqsM5Koemv3HhXjY/I3eeyMq2N0ToR6thqFihOyG814B22ADmqwjvUc 88KFZp9NPsL4mmNkkKmZTUaH/hK+tuk7NB48Sy4F9OPjPsuBkujnoY5Vg4B4IRk6ZIiVUK3pxOY VgIdan10n5LQSmWKcbvHQ9lfvPJvuqC7wIpDw1NphbUaZ+XRxuX5JL4+I4IGIldcLj1aXI7oRBh X+iWEG4ol/SyqpRjj0EYv/DmDoWqhTGoSpuoyLQGEX/5bD33Z7vfUhwzzgg6ygcn3ZVg/Tu10kr K5LttNkbJ3JBNcPitq6NqDj/lvUXnSTjWsAHP4VG9krFqaazIK18GPL0MoRyNq0JEG2wP4zVWcc t/8QbjjfBIUZyfX8dPo6DPOJWXjOR1oSmm7NV0wxxOI6GwIB65G7VYvRRT9GITHuiyKTWnEM9mG 51QtoHRHTy2ZnTchDf6fZyEywC0oGPlcZBYkSfckXqo9mIFh3zKpoYMVcWY628MflE33sa1flin IlyNn6iRej7SaBg== X-Developer-Key: i=tomi.valkeinen@ideasonboard.com; a=openpgp; fpr=C4380C3E965EFD81079FF3A7FA3DAA8CBC961EF5 Add support for Y8 and Y10_P32 formats. We also need to add new csc matrices for the y-only formats. Signed-off-by: Tomi Valkeinen --- drivers/gpu/drm/xlnx/zynqmp_disp.c | 26 +++++++++++++++++++++++++- 1 file changed, 25 insertions(+), 1 deletion(-) diff --git a/drivers/gpu/drm/xlnx/zynqmp_disp.c b/drivers/gpu/drm/xlnx/zynqmp_disp.c index 1dc77f2e4262..fe111fa8cc13 100644 --- a/drivers/gpu/drm/xlnx/zynqmp_disp.c +++ b/drivers/gpu/drm/xlnx/zynqmp_disp.c @@ -307,6 +307,16 @@ static const struct zynqmp_disp_format avbuf_vid_fmts[] = { .buf_fmt = ZYNQMP_DISP_AV_BUF_FMT_NL_VID_YV16CI_10, .swap = false, .sf = scaling_factors_101010, + }, { + .drm_fmt = DRM_FORMAT_Y8, + .buf_fmt = ZYNQMP_DISP_AV_BUF_FMT_NL_VID_MONO, + .swap = false, + .sf = scaling_factors_888, + }, { + .drm_fmt = DRM_FORMAT_Y10_P32, + .buf_fmt = ZYNQMP_DISP_AV_BUF_FMT_NL_VID_YONLY_10, + .swap = false, + .sf = scaling_factors_101010, }, }; @@ -697,6 +707,16 @@ static const u32 csc_sdtv_to_rgb_offsets[] = { 0x0, 0x1800, 0x1800 }; +static const u16 csc_sdtv_to_rgb_yonly_matrix[] = { + 0x0, 0x0, 0x1000, + 0x0, 0x0, 0x1000, + 0x0, 0x0, 0x1000, +}; + +static const u32 csc_sdtv_to_rgb_yonly_offsets[] = { + 0x0, 0x0, 0x0 +}; + /** * zynqmp_disp_blend_set_output_format - Set the output format of the blender * @disp: Display controller @@ -846,7 +866,11 @@ static void zynqmp_disp_blend_layer_enable(struct zynqmp_disp *disp, ZYNQMP_DISP_V_BLEND_LAYER_CONTROL(layer->id), val); - if (layer->drm_fmt->is_yuv) { + if (layer->drm_fmt->format == DRM_FORMAT_Y8 || + layer->drm_fmt->format == DRM_FORMAT_Y10_P32) { + coeffs = csc_sdtv_to_rgb_yonly_matrix; + offsets = csc_sdtv_to_rgb_yonly_offsets; + } else if (layer->drm_fmt->is_yuv) { coeffs = csc_sdtv_to_rgb_matrix; offsets = csc_sdtv_to_rgb_offsets; } else { -- 2.43.0