From nobody Thu Nov 28 00:51:09 2024 Received: from relay2-d.mail.gandi.net (relay2-d.mail.gandi.net [217.70.183.194]) (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 4200C1DBB3A for ; Mon, 7 Oct 2024 16:46:27 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=217.70.183.194 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1728319590; cv=none; b=nyj4VBDDmRcAvubd+c4YQCycSySpQUtsdbTIHJQublbD7YcgKu24kuE5rtzovDBhcE8Rgt4Qi91MArpqalpU827107XY/1GDWmViDKZow1JAXRVkg63y5ZKEOWLHKhhDWeBRkKDHGkFtmwCOn4Kot2HplRQFYPJ0+pkZ7P68pLk= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1728319590; c=relaxed/simple; bh=tjCECeaRUNgLtjoCubWJYzz5yqt33aSKr7lRkrSGE3Q=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=SXQn5GUSnVfQ3Vcb0SYqM1tYJL+XH+3x1uLNwtmSExt97wJQnvzqi13nolpfQV3tNw2azayhM/btQc1lfYl7A+GTOItS+RpILnxKqU/iZ+F7tg/ubQSUFPKpy9XA4PVaJUrCsTOcGEwRSm2PYQM676CcT/HW4HviephaRs3aJuk= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=bootlin.com; spf=pass smtp.mailfrom=bootlin.com; dkim=pass (2048-bit key) header.d=bootlin.com header.i=@bootlin.com header.b=inzug6K7; arc=none smtp.client-ip=217.70.183.194 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=bootlin.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=bootlin.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=bootlin.com header.i=@bootlin.com header.b="inzug6K7" Received: by mail.gandi.net (Postfix) with ESMTPSA id 9E91540008; Mon, 7 Oct 2024 16:46:25 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bootlin.com; s=gm1; t=1728319586; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=TshjFsEcmwoQXvk8So0jN9vV1qz5TvwoCPRDKomZ+Ac=; b=inzug6K7nln/+wo6fmTC/tG6iHM6RjDLpIZfqQNfmE26fJZRbEUXveZtkR4w49P9G87BzA 6EoTHQMy42LFZpgbCSpxNzG7jMICDvGyVEbcMBBQaQkxdN6AqfvICpC+4Dr45DxImqO2pq aUQQ6mqeiBLtVp7cJLZ3ZgOk9bpN/LqNtElQELmMldZVycCi2e8DLv3yWvwtO/FO7138nr SXHUHaS5OH6CSWX7ysAEe022LMZpZvgP0BllZEllqlx2BqwrDqPm8PtsPK2GPO5HFk/9ag BQ/+JonMYMrFtOykl3ef8CfB/wqvBM1V7hdzP3bZaEfSij8uS0r6bLpaB5zfsw== From: Louis Chauvet Date: Mon, 07 Oct 2024 18:46:09 +0200 Subject: [PATCH RESEND v2 4/8] drm/vkms: Add support for RGB565 formats 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: quoted-printable Message-Id: <20241007-b4-new-color-formats-v2-4-d47da50d4674@bootlin.com> References: <20241007-b4-new-color-formats-v2-0-d47da50d4674@bootlin.com> In-Reply-To: <20241007-b4-new-color-formats-v2-0-d47da50d4674@bootlin.com> To: Rodrigo Siqueira , Melissa Wen , =?utf-8?q?Ma=C3=ADra_Canal?= , Haneen Mohammed , Maarten Lankhorst , Maxime Ripard , Thomas Zimmermann , David Airlie , Simona Vetter , Simona Vetter Cc: dri-devel@lists.freedesktop.org, arthurgrillo@riseup.net, linux-kernel@vger.kernel.org, jeremie.dautheribes@bootlin.com, miquel.raynal@bootlin.com, thomas.petazzoni@bootlin.com, seanpaul@google.com, marcheu@google.com, nicolejadeyee@google.com, Louis Chauvet , 20241007-yuv-v12-0-01c1ada6fec8@bootlin.com X-Mailer: b4 0.14.1 X-Developer-Signature: v=1; a=openpgp-sha256; l=2973; i=louis.chauvet@bootlin.com; h=from:subject:message-id; bh=tjCECeaRUNgLtjoCubWJYzz5yqt33aSKr7lRkrSGE3Q=; b=owEBbQKS/ZANAwAIASCtLsZbECziAcsmYgBnBBBbJr4y73v18yqNBvJ5HKR+bm1UF3UwLE4Xg 6zAJDQYza+JAjMEAAEIAB0WIQRPj7g/vng8MQxQWQQgrS7GWxAs4gUCZwQQWwAKCRAgrS7GWxAs 4iBgD/9U6mvHY83R1kx5F5efuprOX+EwzYe3Y9i+m2OVxlpZFUON4AN4eiAAMoGe0zkI6bVE+Od tV/gbvXAIe/9zsyqYhwnmicpTKdlt+dlnC13jpSzl6yzYIFWpze7+4umQEduUhIGraKF6QvlCww J6GT4sOGGxYBzX8VOa48HfT4XxNBwg95oKszp9vkR2Pbr0GjDdlrvaUUmsNQ8LZ5klh93pPBuGb +LK7DxboP0C/BJgO3WI9d+j+a+eXLoK/MBvMRtRUZP4tao4P+bdjKJR32BGLkgR4o8+eXdJsyZs kFDkfkftTmIw5l6wsRC8WRwJ78nGVnadQfyqGRaKCPDYSYrrGPYs3s34no8VJlDWZ3fY5O95tAl lbL/CRh6m4K/4d1t/vWOpq7t7ArlaHdy/6iVRFSIfUebeJlZuf/PKSgxB57p+jAvz9SfpJlehRs 6BYW3/faQ4/6+KEUMvFzwUpJcMhhMByzeqVNkcWwUNguPsRVQnF05BveCA0XjmDvRc5+37/bzRg NkzYzpKaKL0X7C6KUEWHkgd0gEkb5CT+K3SvJ33AKAyrFetklPfXxUbD6ivwGAYGmUxgWBXnLOL kKrv5ubcQ5kF9XCw2u+k0Z4SmfvKh3k+HBVOqa2BYw57bBRD2rQTO7CaSwNEKQuhPL7zpMiwnGD e6JZOhQv4t7Kj4g== X-Developer-Key: i=louis.chauvet@bootlin.com; a=openpgp; fpr=8B7104AE9A272D6693F527F2EC1883F55E0B40A5 X-GND-Sasl: louis.chauvet@bootlin.com The format RGB565 was already supported. Add the support for: - BGR565 Signed-off-by: Louis Chauvet --- drivers/gpu/drm/vkms/vkms_formats.c | 25 ++++++++++++++++++++++++- drivers/gpu/drm/vkms/vkms_plane.c | 1 + 2 files changed, 25 insertions(+), 1 deletion(-) diff --git a/drivers/gpu/drm/vkms/vkms_formats.c b/drivers/gpu/drm/vkms/vkm= s_formats.c index c03a481f5005..e34bea5da752 100644 --- a/drivers/gpu/drm/vkms/vkms_formats.c +++ b/drivers/gpu/drm/vkms/vkms_formats.c @@ -249,7 +249,7 @@ static struct pixel_argb_u16 argb_u16_from_RGB565(const= __le16 *pixel) return out_pixel; } =20 -static struct pixel_argb_u16 argb_u16_from_gray8(u16 gray) +static struct pixel_argb_u16 argb_u16_from_gray8(u8 gray) { return argb_u16_from_u8888(255, gray, gray, gray); } @@ -259,6 +259,26 @@ static struct pixel_argb_u16 argb_u16_from_grayu16(u16= gray) return argb_u16_from_u16161616(0xFFFF, gray, gray, gray); } =20 +static struct pixel_argb_u16 argb_u16_from_BGR565(const __le16 *pixel) +{ + struct pixel_argb_u16 out_pixel; + + s64 fp_rb_ratio =3D drm_fixp_div(drm_int2fixp(65535), drm_int2fixp(31)); + s64 fp_g_ratio =3D drm_fixp_div(drm_int2fixp(65535), drm_int2fixp(63)); + + u16 rgb_565 =3D le16_to_cpu(*pixel); + s64 fp_b =3D drm_int2fixp((rgb_565 >> 11) & 0x1f); + s64 fp_g =3D drm_int2fixp((rgb_565 >> 5) & 0x3f); + s64 fp_r =3D drm_int2fixp(rgb_565 & 0x1f); + + out_pixel.a =3D (u16)0xffff; + out_pixel.b =3D drm_fixp2int_round(drm_fixp_mul(fp_b, fp_rb_ratio)); + out_pixel.g =3D drm_fixp2int_round(drm_fixp_mul(fp_g, fp_g_ratio)); + out_pixel.r =3D drm_fixp2int_round(drm_fixp_mul(fp_r, fp_rb_ratio)); + + return out_pixel; +} + VISIBLE_IF_KUNIT struct pixel_argb_u16 argb_u16_from_yuv888(u8 y, u8 chann= el_1, u8 channel_2, const struct conversion_matrix *matrix) { @@ -447,6 +467,7 @@ READ_LINE_16161616(XRGB16161616_read_line, px, 0xFFFF, = px[2], px[1], px[0]) READ_LINE_16161616(XBGR16161616_read_line, px, 0xFFFF, px[0], px[1], px[2]) =20 READ_LINE(RGB565_read_line, px, __le16, argb_u16_from_RGB565, px) +READ_LINE(BGR565_read_line, px, __le16, argb_u16_from_BGR565, px) =20 READ_LINE(R8_read_line, px, u8, argb_u16_from_gray8, *px) =20 @@ -668,6 +689,8 @@ pixel_read_line_t get_pixel_read_line_function(u32 form= at) return &XBGR16161616_read_line; case DRM_FORMAT_RGB565: return &RGB565_read_line; + case DRM_FORMAT_BGR565: + return &BGR565_read_line; case DRM_FORMAT_NV12: case DRM_FORMAT_NV16: case DRM_FORMAT_NV24: diff --git a/drivers/gpu/drm/vkms/vkms_plane.c b/drivers/gpu/drm/vkms/vkms_= plane.c index 1e971c7760d9..a243a706459f 100644 --- a/drivers/gpu/drm/vkms/vkms_plane.c +++ b/drivers/gpu/drm/vkms/vkms_plane.c @@ -26,6 +26,7 @@ static const u32 vkms_formats[] =3D { DRM_FORMAT_ARGB16161616, DRM_FORMAT_ABGR16161616, DRM_FORMAT_RGB565, + DRM_FORMAT_BGR565, DRM_FORMAT_NV12, DRM_FORMAT_NV16, DRM_FORMAT_NV24, --=20 2.46.2