From nobody Thu Dec 18 16:38:04 2025 Received: from mail-qv1-f45.google.com (mail-qv1-f45.google.com [209.85.219.45]) (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 5E50B7E9 for ; Wed, 29 Jan 2025 14:23:00 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.219.45 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1738160582; cv=none; b=u8YADDJ3v7TgOKeH3AKDJK374Hm8XdXW6Ew5tdgnyAw0pXk54BbOET1Ce0TWsslJ7+h+opULpzqrt80HpftdMN6wzfwqG872q1qYZ552NPFWsUIhfYz9CXBTFJyT0z4Ob6u3DMcyWNwjS2HjUk8lUXHiVRYTvUH3HjmV81awmSc= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1738160582; c=relaxed/simple; bh=pHdz4X0EwOb/t3HiE4GDehdg3hk7NozspGg//SCsajU=; h=From:To:Cc:Subject:Date:Message-ID:MIME-Version; b=HsddVK2EBnQazY/6iBtoFFUjMvs4HQdK2pWgJ8M3LOCIsq/pFIoxlBBp3m6YBcZFr3LJEaJoYxS5rqGRHvaqOstJBFfjYOq3UQxak0OrnQM5yJp6ODxtu6XTVTjPmgpJyuOALwfI9IPus64UToCyPJSC+sxHlMXmjcxBcFz5siM= 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=ieT3sb6X; arc=none smtp.client-ip=209.85.219.45 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="ieT3sb6X" Received: by mail-qv1-f45.google.com with SMTP id 6a1803df08f44-6dd43b08674so60147356d6.3 for ; Wed, 29 Jan 2025 06:23:00 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; t=1738160579; x=1738765379; 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=m3Vr7rDCdLY3fWFeEGwlf0aZurussB/pry1dFRJSq3g=; b=ieT3sb6X1SEaQ8UfqSPjsCBL9Cg9ChHzg3DSHvrWphUHT18cWA+6qmo0hn26EkZCBx Lla1PVTKMTOt8cnHPMjVUDnEFddxgS2tfsgP9TU8Pc4x85vpKsGYLhoHphUPiXrqX4Lo xFzMCCDYKaArOsmHHa5E8ZHJRKIOyNA3OSKik= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1738160579; x=1738765379; 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=m3Vr7rDCdLY3fWFeEGwlf0aZurussB/pry1dFRJSq3g=; b=RYVnuhHuoWNg/H0iNK7zJvE07Ef+3dRA5oGwBErK1JGm2YwlPFbd00X0VIzCbP2mCr OOq6vEa/PZtGQVJDC6jt7qcH95hn1aV3NUuZSSigqZXZAZC5c6Qp/+b/qcc8gDRZ5dey m6djOfaEordPoXtTBBQW7QGE/bh9MTNlxVRKf8seTozK98FAQGsm1JEvqB49f2ISsPvj ZCwiuWwtxOgk5uHNXBHw9Y/UE9/gBQQaBodTpDe3vfyecf+RDl3IFc1mlKh6nmHqtW56 tvkZ4SuMVIaVoySMRp7hsYDUsdAx+2TYqP1Z8UsSuRKOpWljbRcqY5ALISuSRglMbjmn xcPA== X-Forwarded-Encrypted: i=1; AJvYcCXoc0Jv8mbCksM5fdYnuo14zhWcfaS/zvgqbiLO6FFbnJxu1+UvtRgdM8MP0NrU8YpefWtnIOHI02MK/Ic=@vger.kernel.org X-Gm-Message-State: AOJu0YxKWfr0wdAYAZ+ETZJxvaavYEylOS7UpNI4ze0bETjVveupav4E w8uOSsmk9ARxfppgAg9FvXZQJXZq3NGAk+IOjggBFfijmRXdWfPL6qDCFQvEfg== X-Gm-Gg: ASbGncuqGdvxwBFJ3yuMxUlxtQo6jveqtCcrimCHEg26k3bWzDuexY6UjvmrDhfX0+3 qGNThGvHxo7TXHBpRRymtD0e3pM0UEnj1zEWWqY253sFHzA6VwtP6IGn7U0Nr1UqVpx61ajaOen HzeBWLZlJC5zIY1h76yxXxpv9hYqXQs/WV8J+ODIiRUdHnFeuhf/e1Md5VMyFrRT9c3/MqkTZMA uYKxqVjPvqaOTrQQw6LcVkQ7eGfNpRg/OWAtxcU9Mvfg5DQknbXBdBuLAVKomkMWQgGvHRp0Esr LQ/jcZwqq0Dcc9Cxf/vHwXt0uqroWSQvCfGwsklVmlhJI9sVS0NQYWMTbO1/rY/WtQ== X-Google-Smtp-Source: AGHT+IEzzNGoAQ+MCMyI9cApD6caAlYD6BvCXp3pfu/kjewZwnnoDTvJsGUXFi4yVlnscy0LANg/8g== X-Received: by 2002:ad4:5c4e:0:b0:6d8:a76d:b66c with SMTP id 6a1803df08f44-6e243c949d8mr46528436d6.30.1738160579164; Wed, 29 Jan 2025 06:22:59 -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 6a1803df08f44-6e2057a8fc9sm55590426d6.76.2025.01.29.06.22.58 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 29 Jan 2025 06:22:58 -0800 (PST) From: Paz Zcharya X-Google-Original-From: Paz Zcharya To: Louis Chauvet Cc: David Airlie , Maarten Lankhorst , Thomas Zimmermann , Haneen Mohammed , Sean Paul , Melissa Wen , Simona Vetter , Maxime Ripard , dri-devel@lists.freedesktop.org, Drew Davenport , linux-kernel@vger.kernel.org, Paz Zcharya , Paz Zcharya Subject: [PATCH v2] drm/vkms: Add support for ABGR8888 pixel format Date: Wed, 29 Jan 2025 14:20:58 +0000 Message-ID: <20250129142238.562999-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" From: Paz Zcharya 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. Signed-off-by: Paz Zcharya Reviewed-by: Louis Chauvet --- Changes in v2: - Rebased on top of tip of tree. No functional changes. 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