From nobody Sat Feb 7 13:05:29 2026 Received: from mail-pf1-f178.google.com (mail-pf1-f178.google.com [209.85.210.178]) (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 45C0E331A6D for ; Wed, 7 Jan 2026 13:49:11 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.210.178 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1767793754; cv=none; b=l+Z1aF8VvaxIZX5t4snhHPgoxUuZEtyw0a8L2YH39JUIDasq5ETYRrRLIArQ+/c9WofXk5lWbmQS7eliCDpptw4r/jh1RHxmclIwj5o7UIPA8U2VB5p+HZmE8a1whE8HBApJn6P4b5ZBg0euYIqO3vu8UprEzAk6uNNjHh05v4c= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1767793754; c=relaxed/simple; bh=TKIKwvBOWkccmdrv2iMfjupuseLH7sbcozqajmk2NEk=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=lMSDxofX3CR5gF9qtkuPJganVDPpVDLaIBnQBX8LRPd/cSZu8QdXuLzgSJxE27p50123YGKq/+fb6rRwwbxPrCkmgml4S6DgbIncX9xNclPbpBCva1VzIZ7YI6tplpp6SBrO1uR662qRC/rePyBe7KOa6TFj4OPAOg/zRS8XiMs= 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=TYWoSomd; arc=none smtp.client-ip=209.85.210.178 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="TYWoSomd" Received: by mail-pf1-f178.google.com with SMTP id d2e1a72fcca58-803474aaa8bso501590b3a.0 for ; Wed, 07 Jan 2026 05:49:11 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1767793751; x=1768398551; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=w43P1JW4wQheNkrfXzMs1sXhL7mJiuv4h8HUQUHGvjE=; b=TYWoSomdteo5bClMZf4MKCH2GGvcW6HZFY7GXzs39bg9zE46eodTrlS9qHRsM4sTse wkYuATdN9I2bcgNluh8wr1RrSF6VZ4PLtYbuXT9Lb7p0uksYc2BVcd10+323h9piM0Rw 7HLN4HwO3oA8EFmF95pUJDCMd1A6j1oT/RBdRGIvTaDnHYidL6qqk1jtD50sQeTWDHtM NWRGb6GsxE2CkRsG1DacNzbYM9I1w4t0vBBgGNHIdhxGD7NGxj0zKT9wT+3/e06xEhXY 4mnwEKgVJduGksnwrDiExoC89dXWwhx8ebNseSUQHhU8hfy2ehLUbhim5XW0h/U6lpZi 4qxQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1767793751; x=1768398551; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-gg:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to; bh=w43P1JW4wQheNkrfXzMs1sXhL7mJiuv4h8HUQUHGvjE=; b=NogIVaQA79TmvtkWYpUsJcp3I1v4RiqeVGTv0AQn+uig6RBdMI9UytY4wBbgTNbqHM As0YVJqv532jvcqJiwdVbOm58CvTBweAKPGHNDbR3+Xxad5JSeMY74F0RZQb8odf+11H Eyj1XICxYa3YvArGNakA4+onxnkmFCsezMYZ6uo05/bcaPlfxXTZdQ7ID9RDsGtyqAfC SOYubyuzEOSe/bzo2qcWe/woul0+cownC8cuTa+zHUVg2uKBrUPgfvwLRwMnUQEwQabg vNcEAfw0fw0pY3Tpd4xBaTUPxnUYbxNqOzJ+dtsUCrTmZdqVv9NJgl5ZTbe0B5YYhq2t xJLw== X-Forwarded-Encrypted: i=1; AJvYcCXEHOnezHBM301bFf8lwuZJFsbiYByqz9UGDJahaJVRqKNd6RQWhzZfWLeUdutiWTSWBqoCDpq1g5cQTyw=@vger.kernel.org X-Gm-Message-State: AOJu0Yxnr+yvdyMei47gRDj3m/JikreGSuzd/+tOqz9afEpIBpM7uOSH hhmO8jaVEktrMfwqsSw/+Cy62jQY2EIvIC6f9b39tQVULwr0AEHrgBY7 X-Gm-Gg: AY/fxX7Zghc9RhM8ruKtpTQoylSz41jorRwDeSPOp9jdnx0p/NbjaTpjLHlyNjENV2j FUJpQh2GSyJrzxN+l9tGFsKWVJi9iGObAaTRnS6aA5N0edJS/wVTinBvIPgMohBJuTiagm0jS8O D/J2OGtFCKF7M/8Y62ul3V90FDmpmehDnOevVF3lLXAULnoeu+3y9hCQa5gUIg2WYWF10HG8I6/ 3JCzmp7InbMNyknc83AXZDTQHiJxQ6YtkYvDCjuABN7ChA8jJw2xVDDqc5R/Vf42qs+EdW8lzNg XB35f1PItNaVEf50KQi0xIsNGyVPK/zlYjLxjuE3qVPmvSR+CJJRa52BLrpUILYGtKhyXvz8PMm WiFYB7QH4golX9RprivPl72+oC0agU4WN61D3AXgXhhUjVduj/s1qyvUGdnBbYhk/f2wgJBcTTl zo8rwdF64M7vQWPzt5cEbbuA== X-Google-Smtp-Source: AGHT+IFQ4GDmNAoC50jk0wNrLfNYdKjs2GMJ5j6/dQToki8zi994DWS8NNBarDyaS4anHOX2nPSk2A== X-Received: by 2002:a05:6a00:908e:b0:81b:1a87:9eb8 with SMTP id d2e1a72fcca58-81b789a9c08mr2586363b3a.28.1767793751268; Wed, 07 Jan 2026 05:49:11 -0800 (PST) Received: from karthik.. ([43.247.159.43]) by smtp.gmail.com with ESMTPSA id d2e1a72fcca58-819c5302c61sm5109577b3a.42.2026.01.07.05.49.07 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 07 Jan 2026 05:49:10 -0800 (PST) From: Karthikey D Kadati To: Hans de Goede , Mauro Carvalho Chehab Cc: Sakari Ailus , linux-media@vger.kernel.org, linux-staging@lists.linux.dev, linux-kernel@vger.kernel.org, Karthikey D Kadati Subject: [PATCH v2 RESEND v2 1/3] media: atomisp: replace shadow zoom structs with v4l2_rect Date: Wed, 7 Jan 2026 19:18:42 +0530 Message-ID: <20260107134844.68074-2-karthikey3608@gmail.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20260107134844.68074-1-karthikey3608@gmail.com> References: <81e2d12c-342b-4b88-88a0-3e24115541aa@kernel.org> <20260107134844.68074-1-karthikey3608@gmail.com> 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" Remove custom atomisp_zoom_point and atomisp_zoom_region structs and usage in favor of standard v4l2_rect within atomisp_dz_config. This aligns the driver with V4L2 standards and removes unnecessary custom types. Also standardizes the internal ia_css_region struct members to match V4L2 naming conventions (left, top, width, height) to facilitate the bridge mapping. Updates atomisp_cmd.c and sh_css_params.c to use the new member names and ensures safe math using long long casts to prevent overflow during resolution scaling. Signed-off-by: Karthikey D Kadati --- .../media/atomisp/include/linux/atomisp.h | 19 +-- .../staging/media/atomisp/pci/atomisp_cmd.c | 130 +++++++++--------- .../staging/media/atomisp/pci/ia_css_types.h | 6 +- .../staging/media/atomisp/pci/sh_css_params.c | 16 +-- 4 files changed, 79 insertions(+), 92 deletions(-) diff --git a/drivers/staging/media/atomisp/include/linux/atomisp.h b/driver= s/staging/media/atomisp/include/linux/atomisp.h index fcf116cc4..b5cce12c1 100644 --- a/drivers/staging/media/atomisp/include/linux/atomisp.h +++ b/drivers/staging/media/atomisp/include/linux/atomisp.h @@ -326,27 +326,12 @@ struct atomisp_resolution { u32 height; /** Height */ }; =20 -/* - * This specifies the coordinates (x,y) - */ -struct atomisp_zoom_point { - s32 x; /** x coordinate */ - s32 y; /** y coordinate */ -}; - -/* - * This specifies the region - */ -struct atomisp_zoom_region { - struct atomisp_zoom_point - origin; /* Starting point coordinates for the region */ - struct atomisp_resolution resolution; /* Region resolution */ -}; +#include =20 struct atomisp_dz_config { u32 dx; /** Horizontal zoom factor */ u32 dy; /** Vertical zoom factor */ - struct atomisp_zoom_region zoom_region; /** region for zoom */ + struct v4l2_rect zoom_region; /** region for zoom */ }; =20 struct atomisp_parm { diff --git a/drivers/staging/media/atomisp/pci/atomisp_cmd.c b/drivers/stag= ing/media/atomisp/pci/atomisp_cmd.c index 327836372..4ed6b8aea 100644 --- a/drivers/staging/media/atomisp/pci/atomisp_cmd.c +++ b/drivers/staging/media/atomisp/pci/atomisp_cmd.c @@ -1764,15 +1764,13 @@ int atomisp_calculate_real_zoom_region(struct atomi= sp_sub_device *asd, return -EINVAL; } =20 - if (dz_config->zoom_region.resolution.width - =3D=3D asd->sensor_array_res.width - || dz_config->zoom_region.resolution.height - =3D=3D asd->sensor_array_res.height) { + if (dz_config->zoom_region.width =3D=3D asd->sensor_array_res.width || + dz_config->zoom_region.height =3D=3D asd->sensor_array_res.height) { /*no need crop region*/ - dz_config->zoom_region.origin.x =3D 0; - dz_config->zoom_region.origin.y =3D 0; - dz_config->zoom_region.resolution.width =3D eff_res.width; - dz_config->zoom_region.resolution.height =3D eff_res.height; + dz_config->zoom_region.left =3D 0; + dz_config->zoom_region.top =3D 0; + dz_config->zoom_region.width =3D eff_res.width; + dz_config->zoom_region.height =3D eff_res.height; return 0; } =20 @@ -1783,18 +1781,18 @@ int atomisp_calculate_real_zoom_region(struct atomi= sp_sub_device *asd, */ =20 if (!IS_ISP2401) { - dz_config->zoom_region.origin.x =3D dz_config->zoom_region.origin.x - * eff_res.width - / asd->sensor_array_res.width; - dz_config->zoom_region.origin.y =3D dz_config->zoom_region.origin.y - * eff_res.height - / asd->sensor_array_res.height; - dz_config->zoom_region.resolution.width =3D dz_config->zoom_region.resol= ution.width - * eff_res.width - / asd->sensor_array_res.width; - dz_config->zoom_region.resolution.height =3D dz_config->zoom_region.reso= lution.height - * eff_res.height - / asd->sensor_array_res.height; + dz_config->zoom_region.left =3D + (s32)((long long)dz_config->zoom_region.left * + eff_res.width / asd->sensor_array_res.width); + dz_config->zoom_region.top =3D + (s32)((long long)dz_config->zoom_region.top * + eff_res.height / asd->sensor_array_res.height); + dz_config->zoom_region.width =3D + (u32)((long long)dz_config->zoom_region.width * + eff_res.width / asd->sensor_array_res.width); + dz_config->zoom_region.height =3D + (u32)((long long)dz_config->zoom_region.height * + eff_res.height / asd->sensor_array_res.height); /* * Set same ratio of crop region resolution and current pipe output * resolution @@ -1821,62 +1819,66 @@ int atomisp_calculate_real_zoom_region(struct atomi= sp_sub_device *asd, - asd->sensor_array_res.width * out_res.height / out_res.width; h_offset =3D h_offset / 2; - if (dz_config->zoom_region.origin.y < h_offset) - dz_config->zoom_region.origin.y =3D 0; + if (dz_config->zoom_region.top < h_offset) + dz_config->zoom_region.top =3D 0; else - dz_config->zoom_region.origin.y =3D dz_config->zoom_region.origin.y - = h_offset; + dz_config->zoom_region.top -=3D h_offset; w_offset =3D 0; } else { w_offset =3D asd->sensor_array_res.width - asd->sensor_array_res.height * out_res.width / out_res.height; w_offset =3D w_offset / 2; - if (dz_config->zoom_region.origin.x < w_offset) - dz_config->zoom_region.origin.x =3D 0; + if (dz_config->zoom_region.left < w_offset) + dz_config->zoom_region.left =3D 0; else - dz_config->zoom_region.origin.x =3D dz_config->zoom_region.origin.x - = w_offset; + dz_config->zoom_region.left -=3D w_offset; h_offset =3D 0; } - dz_config->zoom_region.origin.x =3D dz_config->zoom_region.origin.x - * eff_res.width - / (asd->sensor_array_res.width - 2 * w_offset); - dz_config->zoom_region.origin.y =3D dz_config->zoom_region.origin.y - * eff_res.height - / (asd->sensor_array_res.height - 2 * h_offset); - dz_config->zoom_region.resolution.width =3D dz_config->zoom_region.resol= ution.width - * eff_res.width - / (asd->sensor_array_res.width - 2 * w_offset); - dz_config->zoom_region.resolution.height =3D dz_config->zoom_region.reso= lution.height - * eff_res.height - / (asd->sensor_array_res.height - 2 * h_offset); - } - - if (out_res.width * dz_config->zoom_region.resolution.height - > dz_config->zoom_region.resolution.width * out_res.height) { - dz_config->zoom_region.resolution.height =3D - dz_config->zoom_region.resolution.width - * out_res.height / out_res.width; + dz_config->zoom_region.left =3D + (s32)((long long)dz_config->zoom_region.left * + eff_res.width / + (asd->sensor_array_res.width - 2 * w_offset)); + dz_config->zoom_region.top =3D + (s32)((long long)dz_config->zoom_region.top * + eff_res.height / + (asd->sensor_array_res.height - 2 * h_offset)); + dz_config->zoom_region.width =3D + (u32)((long long)dz_config->zoom_region.width * + eff_res.width / + (asd->sensor_array_res.width - 2 * w_offset)); + dz_config->zoom_region.height =3D + (u32)((long long)dz_config->zoom_region.height * + eff_res.height / + (asd->sensor_array_res.height - 2 * h_offset)); + } + + if ((long long)out_res.width * dz_config->zoom_region.height > + (long long)dz_config->zoom_region.width * out_res.height) { + dz_config->zoom_region.height =3D + (u32)((long long)dz_config->zoom_region.width * + out_res.height / out_res.width); } else { - dz_config->zoom_region.resolution.width =3D - dz_config->zoom_region.resolution.height - * out_res.width / out_res.height; + dz_config->zoom_region.width =3D + (u32)((long long)dz_config->zoom_region.height * + out_res.width / out_res.height); } dev_dbg(asd->isp->dev, "%s crop region:(%d,%d),(%d,%d) eff_res(%d, %d) array_size(%d,%d) out_re= s(%d, %d)\n", - __func__, dz_config->zoom_region.origin.x, - dz_config->zoom_region.origin.y, - dz_config->zoom_region.resolution.width, - dz_config->zoom_region.resolution.height, + __func__, dz_config->zoom_region.left, + dz_config->zoom_region.top, + dz_config->zoom_region.width, + dz_config->zoom_region.height, eff_res.width, eff_res.height, asd->sensor_array_res.width, asd->sensor_array_res.height, out_res.width, out_res.height); =20 - if ((dz_config->zoom_region.origin.x + - dz_config->zoom_region.resolution.width + if ((dz_config->zoom_region.left + + dz_config->zoom_region.width > eff_res.width) || - (dz_config->zoom_region.origin.y + - dz_config->zoom_region.resolution.height + (dz_config->zoom_region.top + + dz_config->zoom_region.height > eff_res.height)) return -EINVAL; =20 @@ -1901,10 +1903,10 @@ static bool atomisp_check_zoom_region( =20 config.width =3D asd->sensor_array_res.width; config.height =3D asd->sensor_array_res.height; - w =3D dz_config->zoom_region.origin.x + - dz_config->zoom_region.resolution.width; - h =3D dz_config->zoom_region.origin.y + - dz_config->zoom_region.resolution.height; + w =3D dz_config->zoom_region.left + + dz_config->zoom_region.width; + h =3D dz_config->zoom_region.top + + dz_config->zoom_region.height; =20 if ((w <=3D config.width) && (h <=3D config.height) && w > 0 && h > 0) flag =3D true; @@ -1912,10 +1914,10 @@ static bool atomisp_check_zoom_region( /* setting error zoom region */ dev_err(asd->isp->dev, "%s zoom region ERROR:dz_config:(%d,%d),(%d,%d)array_res(%d, %d)\n", - __func__, dz_config->zoom_region.origin.x, - dz_config->zoom_region.origin.y, - dz_config->zoom_region.resolution.width, - dz_config->zoom_region.resolution.height, + __func__, dz_config->zoom_region.left, + dz_config->zoom_region.top, + dz_config->zoom_region.width, + dz_config->zoom_region.height, config.width, config.height); =20 return flag; diff --git a/drivers/staging/media/atomisp/pci/ia_css_types.h b/drivers/sta= ging/media/atomisp/pci/ia_css_types.h index 676d7e20b..5c21a5415 100644 --- a/drivers/staging/media/atomisp/pci/ia_css_types.h +++ b/drivers/staging/media/atomisp/pci/ia_css_types.h @@ -431,8 +431,10 @@ struct ia_css_point { * This specifies the region */ struct ia_css_region { - struct ia_css_point origin; /** Starting point coordinates for the region= */ - struct ia_css_resolution resolution; /** Region resolution */ + s32 left; /** Starting point coordinates for the region */ + s32 top; + s32 width; /** Region resolution */ + s32 height; }; =20 /** diff --git a/drivers/staging/media/atomisp/pci/sh_css_params.c b/drivers/st= aging/media/atomisp/pci/sh_css_params.c index 11d62313c..0435f20a7 100644 --- a/drivers/staging/media/atomisp/pci/sh_css_params.c +++ b/drivers/staging/media/atomisp/pci/sh_css_params.c @@ -658,9 +658,7 @@ static const struct ia_css_dz_config default_dz_config = =3D { HRT_GDC_N, HRT_GDC_N, { - \ - {0, 0}, \ - {0, 0}, \ + 0, 0, 0, 0 } }; =20 @@ -1210,8 +1208,8 @@ ia_css_process_zoom_and_motion( } =20 assert(stage->stage_num < SH_CSS_MAX_STAGES); - if (params->dz_config.zoom_region.resolution.width =3D=3D 0 && - params->dz_config.zoom_region.resolution.height =3D=3D 0) { + if (params->dz_config.zoom_region.width =3D=3D 0 && + params->dz_config.zoom_region.height =3D=3D 0) { sh_css_update_uds_and_crop_info( &info->sp, &binary->in_frame_info, @@ -4096,10 +4094,10 @@ sh_css_update_uds_and_crop_info_based_on_zoom_regio= n( assert(motion_vector); assert(uds); assert(sp_out_crop_pos); - x0 =3D zoom->zoom_region.origin.x; - y0 =3D zoom->zoom_region.origin.y; - x1 =3D zoom->zoom_region.resolution.width + x0; - y1 =3D zoom->zoom_region.resolution.height + y0; + x0 =3D zoom->zoom_region.left; + y0 =3D zoom->zoom_region.top; + x1 =3D zoom->zoom_region.width + x0; + y1 =3D zoom->zoom_region.height + y0; =20 if ((x0 > x1) || (y0 > y1) || (x1 > pipe_in_res.width) || (y1 > pipe_in_r= es.height)) return -EINVAL; --=20 2.43.0 From nobody Sat Feb 7 13:05:29 2026 Received: from mail-pl1-f182.google.com (mail-pl1-f182.google.com [209.85.214.182]) (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 C29B6331A77 for ; Wed, 7 Jan 2026 13:49:15 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.214.182 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1767793757; cv=none; b=Gp9kSb+A086V3xBZTmGLH//sXMspKOWmmxmHA3skjP7l+Q4G10Dj/w6GZYKJW8gnf7vnXh4Ula5utOe49FaXIlMIZfY/sm7IHqWrU5RMhb67alAl76pWJUf8KCMItkXwyDpJZNrp7qc3XWx/MKQS5ec2Mbcspqowbzi8j+8RrCg= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1767793757; c=relaxed/simple; bh=7aFJtkTCn/RUyXBqDN5A8Rl1FrpL/MQORLd7fWn3cOI=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=YjI5CYFgOdZo3Ewrs1QFpHWE+Q8LGvuG4Bi1EYHmVkMzhQInS0n+AfFzlLxPLsDyhKm4sjw7e1If8+8S/mQbBuB7Srems9Pb+FNGXXd/dE5nL9ywuZtHfOPO1fY2CvXcNilD+f719x6sB2GUHThUcrCGA2HbxE3sXxGg0+WNYw0= 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=i5xWl8vC; arc=none smtp.client-ip=209.85.214.182 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="i5xWl8vC" Received: by mail-pl1-f182.google.com with SMTP id d9443c01a7336-2a0bb2f093aso17395425ad.3 for ; Wed, 07 Jan 2026 05:49:15 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1767793755; x=1768398555; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=0L8w8zzA7n7ZIE7wj1Nj7dJ97iLU993N1NE76Z8Jakg=; b=i5xWl8vCXaigEqSuE1V5RY8bQkqBbNHHINBNQ+Rs2XSi8P08eAbLPQ4gjojz6YDJtR xnp6pMFT0XjdoK7IIgh05/tIqE+/Ie1EwrWz22k8Ef7qnZMM6ao8tkShQNDtE6dUT4Jo AhQ5zsJVwIHAsCCY3uZ3UQGE1Q6y1YwjkdmnLI8Als3+rk29pkwvurQSso7QoFZYQMlb SGonTbEPpHbVObh+d0t8uJvjwFmJjimlPCmEJ0xV195QkgZLallu5lu7VLs5WFqMLmzz R8w8p44uTsAuWybosPLUr7hQMShPJmNmmlahY8NFP8ysdK0HxJqba8iEAZFEM6492Qdd DZfA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1767793755; x=1768398555; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-gg:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to; bh=0L8w8zzA7n7ZIE7wj1Nj7dJ97iLU993N1NE76Z8Jakg=; b=cVql/vkECylTAQj8NCZzrvMGxpuNTDHPl/rrMDY+EXksaFyytVTopHeoybXTRGLjD6 Ep/Psb/Yy8zITVuufROZ2KnOrYVY4WQMHMZV/K3QVGb/ce9CR4Mk25obAfV/UyvVvu9A dF9XNuvxJ6tEzQVr+5rYLMccOTncUz1e0MKRyuJW2RfNFW8Se44VqkfNLQy3pwKx1Mov XFhA4AkslmsF4xDJ8QJdFUOVB0//r3932F8as/Qql9s9aRhgg2wFy5PmAfItEHcyEtlF hrMbA5ac0qTXMNdBIZyMr6Vd7pjph+i40k5+dQ5TosVwYH2QKRwsw7apsQsSW0+KaJQz g6OA== X-Forwarded-Encrypted: i=1; AJvYcCWEQsU/s05O/a2kbO7hphAE81+lthJeqCfGoVc4mNH8+4kw8S9l6lPPyCVIJewB9uX5yQ75G6GWCzoZJbM=@vger.kernel.org X-Gm-Message-State: AOJu0YxFKnE6CZ2VZ6NJhe1YyiykS8x9jAtqrgEl5rwgC+r5yiHBBmeh +GqORQwHG9pv0nMcQ+LfeT/elCyHpnthuVnN1XrC6OSoe0q0npAheoAO X-Gm-Gg: AY/fxX5fsFYdQ5nog6jrLl3GzGFyoUIOosiDlc6A0znADavWHL+HH4g0cdy0WjymQnG aW+nbiq+5feOCf4oXt9tfX5uSTIy8YM448BTk9dE7ADrg+FHk5Y21p6vKWoYnQzW/T2LAVhU2PS Nk1ZTz7BHulRcU3eMb7a3GPsvHU0DSuBBGQYZ/P6TsbqNWVwNyAFk0mzj0aUnWI2nIkNTB0sDy8 T3T47CdGHUUPSYSSTsdDpCu2f+RWUNkqroD5dsmnwBxWc4eyHhHs494J1dh2NX86TJe7xrjy6Pu euRgMj6sJACj9dvwY93AgcKBupf8qWFN2xfiUnNhoUd37SU1sp3x+sKJlIMyMKbTdqT9TT5d394 OZI9YEch7NLhAwJrJKbfMlUBIeONOaBPyk1is8OaAXm9g2AgSI2kZJwypry3dSRAj6BL8H/91BQ 8E1W0yrtj5wHlCjt8l/K3nQw== X-Google-Smtp-Source: AGHT+IE7J+DUw5Iqs5C2fpYR9e3jAQUDZORywRhmTE7GqrIw5ManxpPFTH52JMOGUB9mdhbFJlJkqQ== X-Received: by 2002:a17:90b:2251:b0:33e:30e8:81cb with SMTP id 98e67ed59e1d1-34f68b65ff0mr2290395a91.13.1767793755014; Wed, 07 Jan 2026 05:49:15 -0800 (PST) Received: from karthik.. ([43.247.159.43]) by smtp.gmail.com with ESMTPSA id d2e1a72fcca58-819c5302c61sm5109577b3a.42.2026.01.07.05.49.11 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 07 Jan 2026 05:49:14 -0800 (PST) From: Karthikey D Kadati To: Hans de Goede , Mauro Carvalho Chehab Cc: Sakari Ailus , linux-media@vger.kernel.org, linux-staging@lists.linux.dev, linux-kernel@vger.kernel.org, Karthikey D Kadati Subject: [PATCH v2 RESEND v2 2/3] media: atomisp: consolidate statistics buffer allocation Date: Wed, 7 Jan 2026 19:18:43 +0530 Message-ID: <20260107134844.68074-3-karthikey3608@gmail.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20260107134844.68074-1-karthikey3608@gmail.com> References: <81e2d12c-342b-4b88-88a0-3e24115541aa@kernel.org> <20260107134844.68074-1-karthikey3608@gmail.com> 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" Refactor atomisp_alloc_css_stat_bufs() to use a new helper function atomisp_alloc_stat_bufs_list(). This reduces code duplication for allocating 3A, DIS, and metadata buffers and centralizes the allocation loop logic. The helper returns -ENOMEM on failure, triggering the existing cleanup path in the caller which correctly frees any partially allocated lists. Signed-off-by: Karthikey D Kadati --- .../staging/media/atomisp/pci/atomisp_ioctl.c | 123 ++++++++++++------ 1 file changed, 81 insertions(+), 42 deletions(-) diff --git a/drivers/staging/media/atomisp/pci/atomisp_ioctl.c b/drivers/st= aging/media/atomisp/pci/atomisp_ioctl.c index 5c0a1d92b..9e572b3e6 100644 --- a/drivers/staging/media/atomisp/pci/atomisp_ioctl.c +++ b/drivers/staging/media/atomisp/pci/atomisp_ioctl.c @@ -678,13 +678,78 @@ static int atomisp_g_fmt_cap(struct file *file, void = *fh, return atomisp_try_fmt_cap(file, fh, f); } =20 +static int atomisp_alloc_stat_bufs_list(struct atomisp_sub_device *asd, + u16 stream_id, + struct list_head *buf_list, + int count, + enum ia_css_buffer_type type) +{ + struct atomisp_s3a_buf *s3a_buf; + struct atomisp_dis_buf *dis_buf; + struct atomisp_metadata_buf *md_buf; + + while (count--) { + switch (type) { + case IA_CSS_BUFFER_TYPE_3A_STATISTICS: + s3a_buf =3D kzalloc(sizeof(*s3a_buf), GFP_KERNEL); + if (!s3a_buf) + return -ENOMEM; + + if (atomisp_css_allocate_stat_buffers(asd, + stream_id, + s3a_buf, + NULL, + NULL)) { + kfree(s3a_buf); + return -ENOMEM; + } + list_add_tail(&s3a_buf->list, buf_list); + break; + case IA_CSS_BUFFER_TYPE_DIS_STATISTICS: + dis_buf =3D kzalloc(sizeof(*dis_buf), GFP_KERNEL); + if (!dis_buf) + return -ENOMEM; + + if (atomisp_css_allocate_stat_buffers(asd, + stream_id, + NULL, + dis_buf, + NULL)) { + kfree(dis_buf); + return -ENOMEM; + } + list_add_tail(&dis_buf->list, buf_list); + break; + case IA_CSS_BUFFER_TYPE_METADATA: + md_buf =3D kzalloc(sizeof(*md_buf), GFP_KERNEL); + if (!md_buf) + return -ENOMEM; + + if (atomisp_css_allocate_stat_buffers(asd, + stream_id, + NULL, + NULL, + md_buf)) { + kfree(md_buf); + return -ENOMEM; + } + list_add_tail(&md_buf->list, buf_list); + break; + default: + return -EINVAL; + } + } + + return 0; +} + int atomisp_alloc_css_stat_bufs(struct atomisp_sub_device *asd, - uint16_t stream_id) + u16 stream_id) { struct atomisp_device *isp =3D asd->isp; - struct atomisp_s3a_buf *s3a_buf =3D NULL, *_s3a_buf; - struct atomisp_dis_buf *dis_buf =3D NULL, *_dis_buf; - struct atomisp_metadata_buf *md_buf =3D NULL, *_md_buf; + struct atomisp_dis_buf *dis_buf, *_dis_buf; + struct atomisp_s3a_buf *s3a_buf, *_s3a_buf; + struct atomisp_metadata_buf *md_buf, *_md_buf; int count; struct ia_css_dvs_grid_info *dvs_grid_info =3D atomisp_css_get_dvs_grid_info(&asd->params.curr_grid_info); @@ -695,37 +760,20 @@ int atomisp_alloc_css_stat_bufs(struct atomisp_sub_de= vice *asd, count =3D ATOMISP_CSS_Q_DEPTH + ATOMISP_S3A_BUF_QUEUE_DEPTH_FOR_HAL; dev_dbg(isp->dev, "allocating %d 3a buffers\n", count); - while (count--) { - s3a_buf =3D kzalloc(sizeof(struct atomisp_s3a_buf), GFP_KERNEL); - if (!s3a_buf) - goto error; - - if (atomisp_css_allocate_stat_buffers( - asd, stream_id, s3a_buf, NULL, NULL)) { - kfree(s3a_buf); - goto error; - } - - list_add_tail(&s3a_buf->list, &asd->s3a_stats); - } + if (atomisp_alloc_stat_bufs_list(asd, stream_id, + &asd->s3a_stats, count, + IA_CSS_BUFFER_TYPE_3A_STATISTICS)) + goto error; } =20 if (list_empty(&asd->dis_stats) && dvs_grid_info && dvs_grid_info->enable) { count =3D ATOMISP_CSS_Q_DEPTH + 1; dev_dbg(isp->dev, "allocating %d dis buffers\n", count); - while (count--) { - dis_buf =3D kzalloc(sizeof(struct atomisp_dis_buf), GFP_KERNEL); - if (!dis_buf) - goto error; - if (atomisp_css_allocate_stat_buffers( - asd, stream_id, NULL, dis_buf, NULL)) { - kfree(dis_buf); - goto error; - } - - list_add_tail(&dis_buf->list, &asd->dis_stats); - } + if (atomisp_alloc_stat_bufs_list(asd, stream_id, + &asd->dis_stats, count, + IA_CSS_BUFFER_TYPE_DIS_STATISTICS)) + goto error; } =20 for (i =3D 0; i < ATOMISP_METADATA_TYPE_NUM; i++) { @@ -736,19 +784,10 @@ int atomisp_alloc_css_stat_bufs(struct atomisp_sub_de= vice *asd, ATOMISP_METADATA_QUEUE_DEPTH_FOR_HAL; dev_dbg(isp->dev, "allocating %d metadata buffers for type %d\n", count, i); - while (count--) { - md_buf =3D kzalloc(sizeof(struct atomisp_metadata_buf), - GFP_KERNEL); - if (!md_buf) - goto error; - - if (atomisp_css_allocate_stat_buffers( - asd, stream_id, NULL, NULL, md_buf)) { - kfree(md_buf); - goto error; - } - list_add_tail(&md_buf->list, &asd->metadata[i]); - } + if (atomisp_alloc_stat_bufs_list(asd, stream_id, + &asd->metadata[i], count, + IA_CSS_BUFFER_TYPE_METADATA)) + goto error; } } return 0; --=20 2.43.0 From nobody Sat Feb 7 13:05:29 2026 Received: from mail-pf1-f174.google.com (mail-pf1-f174.google.com [209.85.210.174]) (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 666E7332EA4 for ; Wed, 7 Jan 2026 13:49:19 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.210.174 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1767793760; cv=none; b=l5Se280JqB5HGrV4tHsVx4ievoUViknFnruLEh5q278ykQCHAHgaGeqS8WNjZ/aU+KOBU//XNjrJLu2EW8OVvibb46TMh+QafytRAGUBdJWWSXB/hH9Sqk0Av2ulKA8xSbYxQY5P7ZF5lKbeEXsTCjqY1/KV5lBWcJiQiUBAs5I= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1767793760; c=relaxed/simple; bh=VcJC7sCWJodERaoTS9t7XlGBxL7hprZHiIDPn09Ne7s=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=cjWWfQwl+Nl56JPuzQlVQm09pfXzTT0XD4vfQn6CGrw0rYD0AnRwiL6+Qh7QU4pPrMlKvRYCNpJQoLccHTmKdWgLImN44eX0cKDCD5gekI6vG27zC5MOYHqO7v4cU0ocTRgjFT6jJSy86ayjoBbxU6aFvGZ8nWw+ussOcMmwJHM= 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=gxJYz8bt; arc=none smtp.client-ip=209.85.210.174 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="gxJYz8bt" Received: by mail-pf1-f174.google.com with SMTP id d2e1a72fcca58-7b9387df58cso2491137b3a.3 for ; Wed, 07 Jan 2026 05:49:19 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1767793758; x=1768398558; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=Bw6fgNtZmBe2W56ugS12P5lnC0TRTn4SZrhJOxug+wQ=; b=gxJYz8bt/oZWkgpgaOd6u2u1vp5NupVrTV28o7GAMqG/gNb/5MIwE/mQ+eLk16y44C /SwwjQa/mMB9W9jIEPqQgxLYMi6DKCjrI0bEh8TjBDduUp3OHS18IQkfsE+xoEO8uw97 zi0ZsPBBF9cVtWgNKEc2Hu32F9kQRoFkTagClrG7GI4cT5NIFpn+8Y8aFvyVPZrLjmJy Twa8y3hACCRLTm7ePSOm9oWLQwogNhZdCyuu/D7V0LeYq/sKTRI4hqpvkYoaJ5bXsFLp INm2Gw5FEti9G0w2BTUI3+yz8KoNTTNHvHtkZFGyrIXSVhRI7yihqEtF2GEDgOvJ+h7t DBgA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1767793758; x=1768398558; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-gg:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to; bh=Bw6fgNtZmBe2W56ugS12P5lnC0TRTn4SZrhJOxug+wQ=; b=ipo1v/0eHzRS1EN71XmCxsFA3QVk0gJry4B9RItzEA8Ld8+8X1wdDNYlY8KMqOb5l/ 7DdijBjfqP5xHb9NWrPUs63OP61aSqlMD9xF1Pc47AS0+p1ijvhnvm8HeZ8qmxeWx7Iq qGuPJT0cUG20F6HDtIdI0cp7DaBBLqp94S/DeU01EMnn15m3p5mg7z9hOtqdB8f1wJxd cNVqyXv0jx/JyhFdE6SODTGqgY62s3BheAFPLLIO5UUvAKqXAB86rV8u0ABmF8fBJrSK rCiSlTndLglaGpJrkqIrQEDlY5QiLUlMzl5Cq2Fqjblc2QG1zWx9BXh0lzFUR1XT9lnD UcGg== X-Forwarded-Encrypted: i=1; AJvYcCUOz4ROv5hibr+wAeVrkgvBg5ICr/PGDDifntFWgjOIyVOoLjnxxGRb6SANj5i6dS5Gf4TH+LP3VQHqERc=@vger.kernel.org X-Gm-Message-State: AOJu0YzyQWaz0GzRQwZWUOZGbHYufdYXqvY8w03AHWpjLU+mEPNLIvNM 6t8RD2AjnH2vY+gPhVTxG/+kxc90x6s/5si5+3BC1KI6prsuHmaxKgJF X-Gm-Gg: AY/fxX64z30C+RDJvSAPUbkhO6uAkfV0x7t8Oinuvin4qV0X9g+aLtLF4PC4BXVl3dQ G5EZVHqyDWrWmse7xbDTWaweUp8eGTgNi9b0cDir3/ywpNsWxL2OeEKsYwkEamMe4Zx3FC+p3Lc hzl1Pt1NDwV7TjNXUYF7g9AcdJlCYeWrs3jPVvfID4HtydJYJq/+7XCmDs9vL+Njt1g8ciXP6Zc sJ74FXgnfX8EPxdxrhByIwobESpbtu8ie2NEMjHcYMTsz5t5qJimnmu4z7vM4Hmolv/pNqY6uUP HKtUEvnDhrkQ0aVu+N4D7TtMOmrDBGu16X8VqLcPu/cWXTxshH0GtvdBlSi7HOZoLZ+bCfv6pIC talF2PpQubMfNzRzXhBzL5YAe2UFqmNlb6k2CSJTTMhWGfD0d+VElkiCrW7bkEdxoxlmm1FZAs/ jU96eDtE4qOCc= X-Google-Smtp-Source: AGHT+IFj4SFEIp18Y5M2C38LwZUCcGWQNMHaApWC/2wyk9IyQIwapqJnVP0bVg04ZV9jnPoyGDdrDA== X-Received: by 2002:a05:6a20:6a26:b0:35d:cad7:cd63 with SMTP id adf61e73a8af0-3898f91d20fmr2344473637.30.1767793758490; Wed, 07 Jan 2026 05:49:18 -0800 (PST) Received: from karthik.. ([43.247.159.43]) by smtp.gmail.com with ESMTPSA id d2e1a72fcca58-819c5302c61sm5109577b3a.42.2026.01.07.05.49.15 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 07 Jan 2026 05:49:18 -0800 (PST) From: Karthikey D Kadati To: Hans de Goede , Mauro Carvalho Chehab Cc: Sakari Ailus , linux-media@vger.kernel.org, linux-staging@lists.linux.dev, linux-kernel@vger.kernel.org, Karthikey D Kadati Subject: [PATCH v2 RESEND v2 3/3] media: atomisp: propagate errors from ISP xnr and IRQ enable Date: Wed, 7 Jan 2026 19:18:44 +0530 Message-ID: <20260107134844.68074-4-karthikey3608@gmail.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20260107134844.68074-1-karthikey3608@gmail.com> References: <81e2d12c-342b-4b88-88a0-3e24115541aa@kernel.org> <20260107134844.68074-1-karthikey3608@gmail.com> 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" Propagate the return value of atomisp_css_capture_enable_xnr() in atomisp_xnr(). Also check the return value of atomisp_css_irq_enable() and log an error once using dev_err_once() to avoid flooding dmesg. Signed-off-by: Karthikey D Kadati --- drivers/staging/media/atomisp/pci/atomisp_cmd.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/drivers/staging/media/atomisp/pci/atomisp_cmd.c b/drivers/stag= ing/media/atomisp/pci/atomisp_cmd.c index 4ed6b8aea..da2481af2 100644 --- a/drivers/staging/media/atomisp/pci/atomisp_cmd.c +++ b/drivers/staging/media/atomisp/pci/atomisp_cmd.c @@ -874,7 +874,8 @@ void atomisp_assert_recovery_work(struct work_struct *w= ork) if (!isp->asd.streaming) goto out_unlock; =20 - atomisp_css_irq_enable(isp, IA_CSS_IRQ_INFO_CSS_RECEIVER_SOF, false); + if (atomisp_css_irq_enable(isp, IA_CSS_IRQ_INFO_CSS_RECEIVER_SOF, false)) + dev_err_once(isp->dev, "atomisp_css_irq_enable failed\n"); =20 spin_lock_irqsave(&isp->lock, flags); isp->asd.streaming =3D false; @@ -925,8 +926,9 @@ void atomisp_assert_recovery_work(struct work_struct *w= ork) =20 atomisp_csi2_configure(&isp->asd); =20 - atomisp_css_irq_enable(isp, IA_CSS_IRQ_INFO_CSS_RECEIVER_SOF, - atomisp_css_valid_sof(isp)); + if (atomisp_css_irq_enable(isp, IA_CSS_IRQ_INFO_CSS_RECEIVER_SOF, + atomisp_css_valid_sof(isp))) + dev_err_once(isp->dev, "atomisp_css_irq_enable failed\n"); =20 if (atomisp_freq_scaling(isp, ATOMISP_DFS_MODE_AUTO, true) < 0) dev_dbg(isp->dev, "DFS auto failed while recovering!\n"); @@ -1196,9 +1198,7 @@ int atomisp_xnr(struct atomisp_sub_device *asd, int f= lag, return 0; } =20 - atomisp_css_capture_enable_xnr(asd, !!*xnr_enable); - - return 0; + return atomisp_css_capture_enable_xnr(asd, !!*xnr_enable); } =20 /* --=20 2.43.0