From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-pl1-f181.google.com (mail-pl1-f181.google.com [209.85.214.181]) (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 A571A28C871 for ; Mon, 3 Nov 2025 05:57:22 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.214.181 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1762149444; cv=none; b=AIvnEAiVzmcceTS1ffDI8TOEZjge2miRlLjn/B7Paw80pc81ozA3SFCMNA+cW3pRCHsQMi8gYJt5BS9/h6g53wUExrykE5yWY5pkZHNR7rHbcFto9M49DGoiNMi8ZnkngEEwLo8zIoMlF2bYXyNww460r35xyMc/WGg8tL/lE/A= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1762149444; c=relaxed/simple; bh=MQV8jD27ZG+yZve5+9joqOYFG9IDBUKao+l7F/BRtLY=; h=From:To:Cc:Subject:Date:Message-ID:MIME-Version; b=QuOvIaW5xRWxzSdNmvDkK8CZARCN2W1QKx34ZvhX6UwScuuogE224TMpfnnjLIdOjvJryVcEDMkobHuhxvbOup1nVTyDPjStzi4WjFce8hTjN2B+Fwg9UPmxoI2Rr2ckK3yCzKybTNy9YCePmLyiDiWPvIyTGAFmtGMVZcBlxYo= 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=NmUV17Rm; arc=none smtp.client-ip=209.85.214.181 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="NmUV17Rm" Received: by mail-pl1-f181.google.com with SMTP id d9443c01a7336-29470bc80ceso43981225ad.1 for ; Sun, 02 Nov 2025 21:57:22 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1762149442; x=1762754242; 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=cGP4x/41RYIg15mQcXh3AwtklkR1Te1lPQnjCYwhFmM=; b=NmUV17RmAW8NlDQC0Tg18rVoqYMw9cahXBNnb86pYKrEwR0h+H0vPnrA6oksyMjqQs syMs6KPkP4+yRRTp6PWh8Nw8ivtN32Dgl42YczDGXQQGpCoCS1Z2wGfXDddNjvvhdfUg AiEWlYs5Ynym3gHo3v33TTEPyYr1Et+MEGhQ/QBdqDwrq37pWnM8+GYCJlSfUDBdSzEd b2duJ8p1b1+183vnpwHun2eyt2fSARidnNWc8zvWAn3Pp8obMAlXDNveB67sVPC6J76z wqEg35+ySauigJvx69/UbuGRqhL9zrvuHyZs9Q2Qs1bmRmJ0pXY0drgg5XmAHRgbQxo4 LQ9Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1762149442; x=1762754242; 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=cGP4x/41RYIg15mQcXh3AwtklkR1Te1lPQnjCYwhFmM=; b=SMGKsq6iXTJ89Eow2340GhI9Vyamy9e1l+wzsIcpjcx+Ayqp5USJ9xqU2cP9Cfa8qn V1rIjWhN8hx2uIdFMLzp/t+DHs3v0Krzyh/vRuIxQrNeFJeatpU5gIsT0PfSsNrDHwtN z6XS2S5JePTOVor1dCBM/zmkaCYnhxehu9wKqQg0QsvEbT/nVDBl+dvtTLTk0J1l5IZ8 83I2rWHWVoGuNQA3I7NmEZRlVmbpwn94/URfbMt7rFFpYav6zcy3fa6DfWbLcm2B32sB Cvf3pLENMg+YZAx66sYBkzK4OgHATDQdMRUkJfedpy6u5sz8fvyA3NwOsXg2Yz47MMCl FTrQ== X-Gm-Message-State: AOJu0Yx4X6X0+2LNFsPM1RB7wkfPXa/TC+91fTr50a/LFNYHZB6ltFO/ IUzdut86fbRn/5E8PSly6G15qQrKMyAiR7l9dIXSJwWBThH/rOzEg7rQ X-Gm-Gg: ASbGncshB8vBSp5SmKqu9bXoSeDcXNGJ8zAqKBO3fQFAAJTbLMsxKy/nmOOu9SSAaXI xDoLGtv9RwljgskDgA4CNW81PbFSRNf3cE6KjPwymXnOQ3kTjFODxPyPT8O3hX6gGEUjIhINWS1 xAAb59avTqOWXXQIEv2eMYdZPjY72NcCfJLeOFO5Ny3mabIt0bqHQYNf7XViukt28F8916Ci8dJ eI+45fX/w3uBip6IXjIV1J3wR9aUrNIDpC81ECwErxlFuNUry6ocROvgu5kGVd8txKU7LFJukFc HO3ydgYBUbcJb9gO5tCmOnfmuHG0pS8lv1ceQnl63OyEE0y8gVHpsz8819uhS0aZ+nFd5Entys2 MMzvFGsch94Nt6aiyl2+pMCSEgNnmvc8wPKjT+SrnhWyLcTLne9DP4zKR0UcFWTBhBPIlbhfy93 em7Fu4IxFTzxpLkQzEu+3IaZXPBVodWWTl9l9j87na2BkxqsXkLXOcG7YPAw/e4ELElv4ZR6ELm t9zypdW0x5NQ5k= X-Google-Smtp-Source: AGHT+IH1lBFIhyJby/nizHMzTdE7QLj8MvERYVwOXJceUEvmMI5EfyCVP73jaq2qIMw9B4K/+LD0mQ== X-Received: by 2002:a17:902:d4ce:b0:295:6b98:6d65 with SMTP id d9443c01a7336-2956b986f84mr71412435ad.22.1762149441675; Sun, 02 Nov 2025 21:57:21 -0800 (PST) Received: from opensource206.. ([106.222.234.180]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-29577d90896sm51830755ad.34.2025.11.02.21.57.19 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 02 Nov 2025 21:57:21 -0800 (PST) From: Pavan Bobba To: skhan@linuxfoundation.org, kieran.bingham@ideasonboard.com, mchehab@kernel.org Cc: linux-media@vger.kernel.org, linux-kernel@vger.kernel.org, Pavan Bobba Subject: [PATCH] media: vimc: debayer: add support for multiple RGB formats Date: Mon, 3 Nov 2025 11:27:16 +0530 Message-ID: <20251103055716.29537-1-opensource206@gmail.com> X-Mailer: git-send-email 2.43.0 Precedence: bulk X-Mailing-List: linux-media@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Enhance the vimc debayer subdevice to support multiple RGB output formats and improve its format negotiation behavior. This patch introduces the following changes: - Adds ARGB8888_1X32 to the list of supported source pad mbus codes. - Allows userspace to select any valid RGB code on the source pad through set_fmt(). - Propagates width, height, and field settings from sink to source while preserving the selected RGB code. - Sets appropriate default colorimetry for RGB output (sRGB, full-range). - Updates vimc_debayer_process_rgb_frame() to handle RGB24, BGR24, and ARGB32 pixel formats with proper channel ordering and alpha fill. - Adds debug and warning logs for invalid or unsupported formats. These changes make the virtual debayer pipeline more flexible and realistic for testing RGB/ARGB camera capture paths. Signed-off-by: Pavan Bobba --- .../media/test-drivers/vimc/vimc-debayer.c | 113 ++++++++++++++---- 1 file changed, 90 insertions(+), 23 deletions(-) diff --git a/drivers/media/test-drivers/vimc/vimc-debayer.c b/drivers/media/test-drivers/vimc/vimc-debayer.c index bbb7c7a86df0..0fa1cb8d3be1 100644 --- a/drivers/media/test-drivers/vimc/vimc-debayer.c +++ b/drivers/media/test-drivers/vimc/vimc-debayer.c @@ -15,9 +15,6 @@ #include "vimc-common.h" -/* TODO: Add support for more output formats, we only support RGB888 for now. */ -#define VIMC_DEBAYER_SOURCE_MBUS_FMT MEDIA_BUS_FMT_RGB888_1X24 - enum vimc_debayer_rgb_colors { VIMC_DEBAYER_RED = 0, VIMC_DEBAYER_GREEN = 1, @@ -73,6 +70,7 @@ static const u32 vimc_debayer_src_mbus_codes[] = { MEDIA_BUS_FMT_RGB888_1X7X4_SPWG, MEDIA_BUS_FMT_RGB888_1X7X4_JEIDA, MEDIA_BUS_FMT_RGB888_1X32_PADHI, + MEDIA_BUS_FMT_ARGB8888_1X32, }; static const struct vimc_debayer_pix_map vimc_debayer_pix_map_list[] = { @@ -170,7 +168,7 @@ static int vimc_debayer_init_state(struct v4l2_subdev *sd, mf = v4l2_subdev_state_get_format(sd_state, 1); *mf = sink_fmt_default; - mf->code = VIMC_DEBAYER_SOURCE_MBUS_FMT; + mf->code = vimc_debayer_src_mbus_codes[0]; return 0; } @@ -239,6 +237,14 @@ static void vimc_debayer_adjust_sink_fmt(struct v4l2_mbus_framefmt *fmt) vimc_colorimetry_clamp(fmt); } +static void vimc_debayer_set_rgb_mbus_fmt_default(struct v4l2_mbus_framefmt *fmt) +{ + fmt->colorspace = V4L2_COLORSPACE_SRGB; + fmt->quantization = V4L2_QUANTIZATION_FULL_RANGE; + fmt->xfer_func = V4L2_XFER_FUNC_SRGB; + fmt->ycbcr_enc = V4L2_YCBCR_ENC_DEFAULT; +} + static int vimc_debayer_set_fmt(struct v4l2_subdev *sd, struct v4l2_subdev_state *sd_state, struct v4l2_subdev_format *fmt) @@ -250,12 +256,30 @@ static int vimc_debayer_set_fmt(struct v4l2_subdev *sd, if (fmt->which == V4L2_SUBDEV_FORMAT_ACTIVE && vdebayer->src_frame) return -EBUSY; - /* - * Do not change the format of the source pad, it is propagated from - * the sink. - */ - if (VIMC_IS_SRC(fmt->pad)) - return v4l2_subdev_get_fmt(sd, sd_state, fmt); + if (VIMC_IS_SRC(fmt->pad)) { + struct v4l2_mbus_framefmt *source_fmt; + struct v4l2_mbus_framefmt *sink_fmt; + + /* Validate the requested source format */ + if (!vimc_debayer_src_code_is_valid(fmt->format.code)) + return -EINVAL; + + /* Get current formats */ + source_fmt = v4l2_subdev_state_get_format(sd_state, 1); + sink_fmt = v4l2_subdev_state_get_format(sd_state, 0); + + /* Update source format with appropriate properties for RGB output */ + source_fmt->code = fmt->format.code; + source_fmt->width = sink_fmt->width; /* Size should match */ + source_fmt->height = sink_fmt->height; /* Size should match */ + source_fmt->field = sink_fmt->field; /* Field handling should match */ + + /* Set appropriate colorimetry for RGB output */ + vimc_debayer_set_rgb_mbus_fmt_default(source_fmt); + + fmt->format = *source_fmt; + return 0; + } /* Set the new format in the sink pad. */ vimc_debayer_adjust_sink_fmt(&fmt->format); @@ -278,8 +302,25 @@ static int vimc_debayer_set_fmt(struct v4l2_subdev *sd, /* Propagate the format to the source pad. */ format = v4l2_subdev_state_get_format(sd_state, 1); - *format = fmt->format; - format->code = VIMC_DEBAYER_SOURCE_MBUS_FMT; + + /* Propagate size and field from sink, but maintain source code */ + format->width = fmt->format.width; + format->height = fmt->format.height; + format->field = fmt->format.field; + + /* + * Source code should always be valid (set during init or via set_fmt). + * If somehow it's not, this is a bug - log warning and fix it. + */ + if (!vimc_debayer_src_code_is_valid(format->code)) { + dev_warn(vdebayer->ved.dev, + "%s: Invalid source code 0x%x, resetting to default\n", + vdebayer->sd.name, format->code); + format->code = vimc_debayer_src_mbus_codes[0]; + } + + /* Set appropriate colorimetry for RGB output */ + vimc_debayer_set_rgb_mbus_fmt_default(format); return 0; } @@ -297,19 +338,45 @@ static void vimc_debayer_process_rgb_frame(struct vimc_debayer_device *vdebayer, unsigned int rgb[3]) { const struct vimc_pix_map *vpix; - unsigned int i, index; + unsigned int index; vpix = vimc_pix_map_by_code(vdebayer->hw.src_code); - index = VIMC_FRAME_INDEX(lin, col, vdebayer->hw.size.width, 3); - for (i = 0; i < 3; i++) { - switch (vpix->pixelformat) { - case V4L2_PIX_FMT_RGB24: - vdebayer->src_frame[index + i] = rgb[i]; - break; - case V4L2_PIX_FMT_BGR24: - vdebayer->src_frame[index + i] = rgb[2 - i]; - break; - } + if (!vpix) { + dev_dbg(vdebayer->ved.dev, "Invalid source code: 0x%x\n", + vdebayer->hw.src_code); + return; + } + + index = VIMC_FRAME_INDEX(lin, col, vdebayer->hw.size.width, vpix->bpp); + + switch (vpix->pixelformat) { + case V4L2_PIX_FMT_RGB24: + /* RGB24: R-G-B */ + vdebayer->src_frame[index + 0] = rgb[0]; /* Red */ + vdebayer->src_frame[index + 1] = rgb[1]; /* Green */ + vdebayer->src_frame[index + 2] = rgb[2]; /* Blue */ + break; + + case V4L2_PIX_FMT_BGR24: + /* BGR24: B-G-R */ + vdebayer->src_frame[index + 0] = rgb[2]; /* Blue */ + vdebayer->src_frame[index + 1] = rgb[1]; /* Green */ + vdebayer->src_frame[index + 2] = rgb[0]; /* Red */ + break; + + case V4L2_PIX_FMT_ARGB32: + /* ARGB32: A-R-G-B (set alpha to 255) */ + vdebayer->src_frame[index + 0] = 255; /* Alpha */ + vdebayer->src_frame[index + 1] = rgb[0]; /* Red */ + vdebayer->src_frame[index + 2] = rgb[1]; /* Green */ + vdebayer->src_frame[index + 3] = rgb[2]; /* Blue */ + break; + + default: + dev_dbg(vdebayer->ved.dev, + "Unsupported pixel format for debayer: 0x%x\n", + vpix->pixelformat); + break; } } -- 2.43.0