From nobody Mon Feb 9 12:01:41 2026 Received: from mail-qk1-f180.google.com (mail-qk1-f180.google.com [209.85.222.180]) (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 3A3CF1EEA5C for ; Tue, 28 Jan 2025 00:00:19 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.222.180 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1738022421; cv=none; b=X1pmnKi9ARl4YgZJFLVPx6lSQFSI9Qe77jHVMoRszmSnYl1AWEwM7rLzp4GyBF98l1SW2fqOb9n/hNUvrCOwj3iBFQ7hy25RQrMkcaeBF92MtB8ShJWYx1s/VAlsCusuxbib6ISZAApJUVdM42g3CKoxARthccK9sPDbMmB1GUU= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1738022421; c=relaxed/simple; bh=F89MMSV9NhbVTrQYiX2lXAPP0FshxrxUAwalpd9fKSo=; h=From:To:Cc:Subject:Date:Message-ID:MIME-Version; b=l4yM/cmqosDMPMdIt2atORK3vL61LnZ+bSHKKmrWNLouss0ZS4nTfYnM/tqcZn0Dea0JCaUNcJAFhRpN5MyEyZDQpW6UNzNV7OCCEZNGxmtl5PO8PJf4jiGmKb0YN8bYkMHPUX0tvrFlBL01ro29rD45N4wUYfiGk7zlipU4+jA= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=chromium.org; spf=pass smtp.mailfrom=chromium.org; dkim=pass (1024-bit key) header.d=chromium.org header.i=@chromium.org header.b=N9Vo+/gg; arc=none smtp.client-ip=209.85.222.180 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=chromium.org Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=chromium.org Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=chromium.org header.i=@chromium.org header.b="N9Vo+/gg" Received: by mail-qk1-f180.google.com with SMTP id af79cd13be357-7b8618be68bso491405985a.3 for ; Mon, 27 Jan 2025 16:00:19 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; t=1738022419; x=1738627219; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date:message-id:reply-to; bh=EVnEYBOWCQhI/t95EXPgS4UM8DH/cU3R0UVy3CErIS0=; b=N9Vo+/gg/eQl2XXgL/WJfhXK0zOhOhx8LcyhVvbKkEfXGeUrcsOPe2OLA6bWbN3Ric uEt8aKyvuF4PCV1qI4y1UBuROMmV3/wEznDRDOrejW35QHKlUWFH5EJC5S/rftIm1/ER j+9o0nM1Po/cFkbYK7Qu+AGLlo3U4ZetQfgZs= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1738022419; x=1738627219; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=EVnEYBOWCQhI/t95EXPgS4UM8DH/cU3R0UVy3CErIS0=; b=qVzbPFDm1G65DpVCwndGJ/qVVuMdFFItaxL3oidA/zTEmAypPHw7qHmKFmfdw34Ekl qDQ+SRr6FzMvu4E9RJHCP2UKVLhDO7Tsy35cK5c4jvYobj2p/+MXMsJDDJlaz8TTOZ/G LkGWyuoQx44vnl4Gl4OkWEbuRrR6VToeeSwsbyd4g5LSyGwX5ng7jns3FGMPTYA8154P GhivVZ965tRNq75d1NirtFZuDX7rE+ta22KSelcHPFXVIaoyv9tJWtgqqxTyN9I8eBVy oiaSQ3kUCrtWKIyit0Hxz820r7TyqMs4qHJcVc4343pY9QJ8AM9UL8paSGDB0f9Uqa/k tLIA== X-Forwarded-Encrypted: i=1; AJvYcCUpicTlx8zwruK8N5xN2Uz8oeRiQkUF6fZPmyd7Ivx7gicnIslnR/vVVkqvx65Y1Tlk0hOAbhMzGy0Mowc=@vger.kernel.org X-Gm-Message-State: AOJu0YweDQykqJ9Fk7wA4fDtzVkDWnfuDO7HYt66YQmfKesaveP2+dzM 7McyWSqEnwv+qT3SJDHl/HVZqgTot4BBu+fxZtva0TjkffMpk9oVfM301xZ/5Q== X-Gm-Gg: ASbGncspGo2ZZ1Vsk75TyWfQ0AkaVs+a4h8xWnxmO/sdyGGLh46p0L4s6D887RD8tvd BSur8OGHMk+HZ+jNTDKKMlJ6A9FAXTXc20hGr2znVo6jsH1EiBEJ9fOVjm1lhukbtEF/kfIteod nvI9BufL9AZNo41igCk96xQ8PCXfYs8RYVbNm+0K4qbHw5TsLn/fgSYwFfCORbR4FURAwQbrstZ E8j5yGKjeZa98K2ne3iNOaNeoyzif/UsXa8W4wARQAfWi/qhgal/zDpVErZ6lHFsAvilYGA5zbQ F4Fv+EcLSoIFzU8YR9pCvSvsaaCoO9IOSXH0U7hSluoQWSomYhSiUFA= X-Google-Smtp-Source: AGHT+IFssOyZO5ISGfMTVkLxwseF674ZpM43RWbaLGxumv6i9USWwsQeDdnN7h+Eol2L2cPB8KHr8w== X-Received: by 2002:a05:620a:d8a:b0:7b6:e9ba:2853 with SMTP id af79cd13be357-7be63279657mr6930302585a.35.1738022419052; Mon, 27 Jan 2025 16:00:19 -0800 (PST) Received: from pazz.c.googlers.com.com (34.178.186.35.bc.googleusercontent.com. [35.186.178.34]) by smtp.gmail.com with ESMTPSA id d75a77b69052e-46e6687e9desm44929021cf.29.2025.01.27.16.00.18 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 27 Jan 2025 16:00:18 -0800 (PST) From: Paz Zcharya X-Google-Original-From: Paz Zcharya To: Louis Chauvet Cc: Sean Paul , Drew Davenport , dri-devel@lists.freedesktop.org, linux-kernel@vger.kernel.org, Paz Zcharya , David Airlie , Haneen Mohammed , Maarten Lankhorst , Maxime Ripard , Melissa Wen , Simona Vetter , Thomas Zimmermann Subject: [PATCH] drm/vkms: Add support for ABGR8888 pixel format Date: Mon, 27 Jan 2025 23:59:48 +0000 Message-ID: <20250127235956.136032-1-pazz@google.com> X-Mailer: git-send-email 2.48.1.262.g85cc9f2d1e-goog 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" Add support for pixel format ABGR8888, which is the default format on Android devices. This will allow us to use VKMS as the default display driver in Android Emulator (Cuttlefish) and increase VKMS adoption. Changes in v2: - Rebased on top of tip of tree because it has been 3 months. - No functional changes. Signed-off-by: Paz Zcharya Reviewed-by: Louis Chauvet --- drivers/gpu/drm/vkms/vkms_formats.c | 32 +++++++++++++++++++++++++++ drivers/gpu/drm/vkms/vkms_plane.c | 1 + drivers/gpu/drm/vkms/vkms_writeback.c | 1 + 3 files changed, 34 insertions(+) diff --git a/drivers/gpu/drm/vkms/vkms_formats.c b/drivers/gpu/drm/vkms/vkm= s_formats.c index 39b1d7c97d45..30a64ecca87c 100644 --- a/drivers/gpu/drm/vkms/vkms_formats.c +++ b/drivers/gpu/drm/vkms/vkms_formats.c @@ -253,6 +253,26 @@ static void XRGB8888_read_line(const struct vkms_plane= _state *plane, int x_start } } =20 +static void ABGR8888_read_line(const struct vkms_plane_state *plane, int x= _start, int y_start, + enum pixel_read_direction direction, int count, + struct pixel_argb_u16 out_pixel[]) +{ + struct pixel_argb_u16 *end =3D out_pixel + count; + u8 *src_pixels; + + packed_pixels_addr_1x1(plane->frame_info, x_start, y_start, 0, &src_pixel= s); + + int step =3D get_block_step_bytes(plane->frame_info->fb, direction, 0); + + while (out_pixel < end) { + u8 *px =3D (u8 *)src_pixels; + /* Switch blue and red pixels. */ + *out_pixel =3D argb_u16_from_u8888(px[3], px[0], px[1], px[2]); + out_pixel +=3D 1; + src_pixels +=3D step; + } +} + static void ARGB16161616_read_line(const struct vkms_plane_state *plane, i= nt x_start, int y_start, enum pixel_read_direction direction, int count, struct pixel_argb_u16 out_pixel[]) @@ -344,6 +364,14 @@ static void argb_u16_to_XRGB8888(u8 *out_pixel, const = struct pixel_argb_u16 *in_ out_pixel[0] =3D DIV_ROUND_CLOSEST(in_pixel->b, 257); } =20 +static void argb_u16_to_ABGR8888(u8 *out_pixel, const struct pixel_argb_u1= 6 *in_pixel) +{ + out_pixel[3] =3D DIV_ROUND_CLOSEST(in_pixel->a, 257); + out_pixel[2] =3D DIV_ROUND_CLOSEST(in_pixel->b, 257); + out_pixel[1] =3D DIV_ROUND_CLOSEST(in_pixel->g, 257); + out_pixel[0] =3D DIV_ROUND_CLOSEST(in_pixel->r, 257); +} + static void argb_u16_to_ARGB16161616(u8 *out_pixel, const struct pixel_arg= b_u16 *in_pixel) { __le16 *pixel =3D (__le16 *)out_pixel; @@ -420,6 +448,8 @@ pixel_read_line_t get_pixel_read_line_function(u32 form= at) return &ARGB8888_read_line; case DRM_FORMAT_XRGB8888: return &XRGB8888_read_line; + case DRM_FORMAT_ABGR8888: + return &ABGR8888_read_line; case DRM_FORMAT_ARGB16161616: return &ARGB16161616_read_line; case DRM_FORMAT_XRGB16161616: @@ -453,6 +483,8 @@ pixel_write_t get_pixel_write_function(u32 format) return &argb_u16_to_ARGB8888; case DRM_FORMAT_XRGB8888: return &argb_u16_to_XRGB8888; + case DRM_FORMAT_ABGR8888: + return &argb_u16_to_ABGR8888; case DRM_FORMAT_ARGB16161616: return &argb_u16_to_ARGB16161616; case DRM_FORMAT_XRGB16161616: diff --git a/drivers/gpu/drm/vkms/vkms_plane.c b/drivers/gpu/drm/vkms/vkms_= plane.c index e2fce471870f..e34f8c7f83c3 100644 --- a/drivers/gpu/drm/vkms/vkms_plane.c +++ b/drivers/gpu/drm/vkms/vkms_plane.c @@ -15,6 +15,7 @@ static const u32 vkms_formats[] =3D { DRM_FORMAT_ARGB8888, DRM_FORMAT_XRGB8888, + DRM_FORMAT_ABGR8888, DRM_FORMAT_XRGB16161616, DRM_FORMAT_ARGB16161616, DRM_FORMAT_RGB565 diff --git a/drivers/gpu/drm/vkms/vkms_writeback.c b/drivers/gpu/drm/vkms/v= kms_writeback.c index e9b5c74d7c58..fe163271d5b5 100644 --- a/drivers/gpu/drm/vkms/vkms_writeback.c +++ b/drivers/gpu/drm/vkms/vkms_writeback.c @@ -17,6 +17,7 @@ static const u32 vkms_wb_formats[] =3D { DRM_FORMAT_ARGB8888, DRM_FORMAT_XRGB8888, + DRM_FORMAT_ABGR8888, DRM_FORMAT_XRGB16161616, DRM_FORMAT_ARGB16161616, DRM_FORMAT_RGB565 --=20 2.48.1.262.g85cc9f2d1e-goog