From nobody Sat Feb 7 22:21:14 2026 Received: from mail-pf1-f182.google.com (mail-pf1-f182.google.com [209.85.210.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 80E3034EF04 for ; Wed, 7 Jan 2026 14:43:16 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.210.182 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1767796998; cv=none; b=BiN0ODcA90THYAmDK5aPMxNJAsQJ6IomTWpN4qzgYmNvi0Pa9M5nxGGnbzvxYrFr7nB6A/qEKILhE3D5q1ACUW6mRHhcUHtARSP+GqElUs0DoQXT7/XpmZrcI3kPWvulpatLUITY1ShfyaX0oNXD0u5vHnYutY/34w8YOTO8iVo= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1767796998; c=relaxed/simple; bh=cXUAVc/AvyJ8r0B7qpIrE37AZuq+6fbbTkMbJbdR/pc=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=u17LzgcCkMSnSqjSesHIDGCvMWTwqmBvtU/KIzXi3KguUPBGgApGGq8yq7IXcbk4BxQZhtYfISvYYMmbhn0SShXMC5V+Jka5gOeYrRc2zxO0VahFtuDdyiCRxoQztsq9m1QshfUcMJKcnqrepLveot5AfrJmpSZYiUwiemV329U= 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=LRmaUcHB; arc=none smtp.client-ip=209.85.210.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="LRmaUcHB" Received: by mail-pf1-f182.google.com with SMTP id d2e1a72fcca58-7fc0c1d45a4so1444678b3a.0 for ; Wed, 07 Jan 2026 06:43:16 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1767796996; x=1768401796; 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=kmyuDSwLNtWwhhF1d3uL9GDstNtI6pYYUQfJBzCE6uk=; b=LRmaUcHBIPG9g8mr1VXbqKu2MxX32A2YslKs8sfdWzkU/R5+cqtP3Jqiq3PC0dspCU oxLsO8O4okoIDzLmERVBsTVftSYRvFNNShHOnefM3P5wSea7jJUKNe+MVAHsjPOT+jCK OFmL4JS3dXMJJdMK+WGg45dFjmgH8ltEAZusLFEGtCUatKcTnhQTRQCH1DxYMWeJT6TB XA9iEmEAiD81geRZJ1X5Nrj3EtSznEnU34N5EK4CGfuKhT5wEBBEdeZShQn3xw3/5FCY hRBmYZs+rqh8nrMaOwwEK/r3TGxmjUt8ccK4cLWFPfIsQm2kBQAZpFDvPkTBADdiD8H+ Fuvw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1767796996; x=1768401796; 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=kmyuDSwLNtWwhhF1d3uL9GDstNtI6pYYUQfJBzCE6uk=; b=uzBTpxHVgiehasz47VoiGyu8nHwRwLS2gX4aur0M7pWFYCCBFHHszVS6N7RXtJlUc0 DPbhBfwnxFhD2BvHppwe+03vixCb0YHjdPdeZ25tThly2JrtZRyY4u6A4/pCMTHnvzKU D3k1L00oiQXdPyZk6rITGbFFQ1eHF564QRItzzk11yLZ/D3LyucP/5/XhVxeGTISclB9 4ZvsY4IMUs5lYCRC3prjepSd+/vdt2OtlHez9e1S0fpY8LRdLgiy0YTCBvVzhTmULQV5 5poYMGUiaWWqT1ESvk4zAYqPJ5mbIuOUD64i7k60a928NCF/AnehcE4GRtZ/wNCmDOwu en9w== X-Forwarded-Encrypted: i=1; AJvYcCUK/SBnzoF5Nf+MrHN+sBfebLxydZMBUbl64OAwwISvLjxmUMWto3LhGWoBM55Ma6quo71kGWyfK99W8do=@vger.kernel.org X-Gm-Message-State: AOJu0Ywh1kbM+IYTrs8z3jjfPvKbfhL3dZb3sXd6ONjC245Z412kr/6J c9XKSzkDpVrXIe2L7Gxh0KuiLzsCrzNEu2Rg5yhPVHa3OnHNriOZv+py X-Gm-Gg: AY/fxX4nq5Nq9tyC57EV/OFrnP+QhLgZ2uY6CY4Jf7RXudijomTDFz0dKoHRkrOCZN4 H1264RUJqB1Rh9zDBmjS1GoIv0spABFKY6HcsW05oQWJJwgQWNiRSAAgxTAW6EwAxdVikj0ZKGZ sjNdmkBB8okbt3TkZthTLPH95jER/Tjz/ZqgZ6mBRWKD6Y3jUTdhaKT6uBBqPueKLgZ93aq4yCQ oro1Ms32nsBlLsVipWSzTRAjwkkGBPWvXZRJ4K9SGxflP9ARg0fVB4/dbYmpkyWVSamNpWCG/FT YdzvC/sctlYCn/Vl1EZRYnUMEUzGQPpR0XOk+jObfQ2iXa6JCT3B0aGIHAGv/MToEcvvRF945NN PSzl7Y3CjhRXkN8Zg3wRkNh1XSMNreyfE65B9k25q2fUfmpNhTLcp+eMqoHsgkjwywe+qyJbQg/ dmLxgfvggqrpqprnKCR6d0lw== X-Google-Smtp-Source: AGHT+IFpMcn9Q3hz/Qljz9x+bkzpj0ZDU0R6UbjDE+8Evn5mh7RI/sTVRxFHDAQU55YW/ALIfmtTDQ== X-Received: by 2002:a05:6a00:908b:b0:7e8:450c:61b9 with SMTP id d2e1a72fcca58-81b806c99f9mr2418706b3a.41.1767796995618; Wed, 07 Jan 2026 06:43:15 -0800 (PST) Received: from karthik.. ([43.247.159.43]) by smtp.gmail.com with ESMTPSA id d2e1a72fcca58-819c59da826sm5168936b3a.46.2026.01.07.06.43.12 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 07 Jan 2026 06:43:15 -0800 (PST) From: Karthikey D Kadati To: Hans de Goede , Mauro Carvalho Chehab Cc: Dan Carpenter , Sakari Ailus , linux-media@vger.kernel.org, linux-staging@lists.linux.dev, linux-kernel@vger.kernel.org, Karthikey D Kadati Subject: [PATCH v3 1/3] media: atomisp: replace shadow zoom structs with v4l2_rect Date: Wed, 7 Jan 2026 20:12:50 +0530 Message-ID: <20260107144252.74666-2-karthikey3608@gmail.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20260107144252.74666-1-karthikey3608@gmail.com> References: <20260107144252.74666-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..58201dedf 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 + (long long)dz_config->zoom_region.left * + eff_res.width / asd->sensor_array_res.width; + dz_config->zoom_region.top =3D + (long long)dz_config->zoom_region.top * + eff_res.height / asd->sensor_array_res.height; + dz_config->zoom_region.width =3D + (long long)dz_config->zoom_region.width * + eff_res.width / asd->sensor_array_res.width; + dz_config->zoom_region.height =3D + (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 + (long long)dz_config->zoom_region.left * + eff_res.width / + (asd->sensor_array_res.width - 2 * w_offset); + dz_config->zoom_region.top =3D + (long long)dz_config->zoom_region.top * + eff_res.height / + (asd->sensor_array_res.height - 2 * h_offset); + dz_config->zoom_region.width =3D + (long long)dz_config->zoom_region.width * + eff_res.width / + (asd->sensor_array_res.width - 2 * w_offset); + dz_config->zoom_region.height =3D + (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 + (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 + (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 22:21:14 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 7F7B634EF06 for ; Wed, 7 Jan 2026 14:43:20 +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=1767797002; cv=none; b=omhC5q3FRNGlkV+vpp8s+9wvbM9uSlYTHArE+Hmw1zq2I+Fyn87SaEbWWDWaxPuBs50hGFaABcUhWS0Ifr8ZS64t4T18J6TrVhx4V2aMxqc4PjMgWwUNdq++geGPJw65DDmGpj2VELY/osoHtdpWHsTeZTBSCb1Gm0JRf9ohdYg= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1767797002; c=relaxed/simple; bh=TKdeBU8mKT5yWGknDxcWZj3m54VDH36yEoT5RzaujbU=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=fOcLtUCs7rAeCBlCjXDpoYh8yFSGvwlzAnjO7qHplurMxQwZ8Z61CCenGAzRo92ZOioS5BOmXE1kEWYmN1cIxV9inmCeCDcxfH8iw/YoQeNe5Irnr1L8+9cnAd4k+YvbqS5wP0fBx+jg99NCyd/hjPy+yiXNvdmk1w58+HHWCjg= 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=SQ7FuTOb; 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="SQ7FuTOb" Received: by mail-pf1-f174.google.com with SMTP id d2e1a72fcca58-7b852bb31d9so2015145b3a.0 for ; Wed, 07 Jan 2026 06:43:20 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1767797000; x=1768401800; 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=fkj6vssmN7l7h2hvFyd91TLIHv8AfgSmQLvANyZ3hxM=; b=SQ7FuTObXGP0eMqGtgpgya13rNARC5lEdApr0sal72+gUr8C03S/kcMopQVQq9xnR+ affgWN7V9IVA3Tw02eN7J+rzallgGoarmfLXjcZ85bi26LFGnfkJPSTXU4Qn3CxKKo9j jb/dfy13t5K9YiPAVtu/fpnThM4VZgmQRstT+menAi/YzS7BeRQQnVJ9oqZNEGiBFug4 6aj5D7M9B7Sgdy+33+JWX7c7btayQcm/0NC0WSj6bCwp4F8H4LkJQtOpu5uaKutsJUEZ LYzGcTZiJbeJwkO3JtN/KMhJCU5Sll2cNN07sjFLTfh6coLapZxvx3c7/AAWCPuTE3lA 5oAw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1767797000; x=1768401800; 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=fkj6vssmN7l7h2hvFyd91TLIHv8AfgSmQLvANyZ3hxM=; b=w8xdtaJQYCuud5BYP168eyp+3FBbfRwDmN3cwmSS1o6lH0iW+TnKWs4FcZXLLGTuBs vdoepGn+70no3oAdmDlkFMpYCMHgOjqx+TrADShN6dLXcNhNpOTk52F0caZaaQs0RMul /FaBt5YO1+nqkgzb+XnewxWTCiy5DNAdI0tl76AWDGIU1Wc5z0Hf3wLRRpBS4Oa9Q5fQ Bn29rsxthgktvwyhzJ88mdGdvw9yowr/BA4cYG7YFjnb9O2tuB0KVL/6MnS0eywPzqdC s67RQMjEMJPU8F4iJkoWT7g7YMWY1T6t6MuC3bpxd0pUymKWX0wTRcN2/tAh55Gsr5eE Vmrw== X-Forwarded-Encrypted: i=1; AJvYcCXR/YuFBuW/ETfoi34OljU6ZD+0Dvs1lvgiiVxXg8Ju4/pIFaooJxAssLKe0lr1Qznoe+aWk8Fv7Y27c9A=@vger.kernel.org X-Gm-Message-State: AOJu0YwwAp6mV2tZzEMnNT1A1AuF1mmfq0QX/lDjqKxfiYatgJQZQ9hk 1m9ESvsaiQ1ow7SLC5Igaod9rHULswwlGrak9fKoP3Xwa9mvjBxeYihr X-Gm-Gg: AY/fxX7qOzFnStWSrNdUORgrQJaA8EjAOPwWNLM5gNXgY1LbouXxIzclxsPXRs9aUxW NUx0qZwLk5AfC/+2/U05gJ4VOPMUcPMLlOrwGAbwsmgo8F0tFOedtalFVseQ9761kJJxosTEWQ4 tHHd/UtdIGWFQaoHtF8QG7JfrvzRlK946GOXrl9kNVLB2c7+PrmIO6U3hSuSqMB6+iODjP/0fzm CCNGkdCrLxOWTQIgOnDZkazHu+i+QpnqJQc8MRTijoLmfEQE53l+BsHgIS0vTWe2G8yKavR3UTE QE5qCwgNwak+cnnNe5/QaKmUmNDXm65SWym4ybiOTTkhshAiCBPU5GNhhafgy7VXrqJM2PHezLP HnSMNxczLm9e+z+NGxlVY8lKH9TKVqpeKBw2yqmNDq7Q/sLIaVhbZoHnLJfqBXNy48kNspYjwB/ yR/xq1ig5Yl8s= X-Google-Smtp-Source: AGHT+IFNKIgoAsSsAaMWMKXlRyQndBGHQdjiItfcgOkO3GbHXWCSaLvMXIyZsGQ/A7OHZizbcUKpFg== X-Received: by 2002:a05:6a00:ad06:b0:81a:857b:f944 with SMTP id d2e1a72fcca58-81b7dc5b474mr2840179b3a.26.1767796999769; Wed, 07 Jan 2026 06:43:19 -0800 (PST) Received: from karthik.. ([43.247.159.43]) by smtp.gmail.com with ESMTPSA id d2e1a72fcca58-819c59da826sm5168936b3a.46.2026.01.07.06.43.16 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 07 Jan 2026 06:43:19 -0800 (PST) From: Karthikey D Kadati To: Hans de Goede , Mauro Carvalho Chehab Cc: Dan Carpenter , Sakari Ailus , linux-media@vger.kernel.org, linux-staging@lists.linux.dev, linux-kernel@vger.kernel.org, Karthikey D Kadati Subject: [PATCH v3 2/3] media: atomisp: consolidate statistics buffer allocation Date: Wed, 7 Jan 2026 20:12:51 +0530 Message-ID: <20260107144252.74666-3-karthikey3608@gmail.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20260107144252.74666-1-karthikey3608@gmail.com> References: <20260107144252.74666-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 the actual error code on failure (instead of hardcoded -ENOMEM), 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 | 127 ++++++++++++------ 1 file changed, 85 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..c81773a75 100644 --- a/drivers/staging/media/atomisp/pci/atomisp_ioctl.c +++ b/drivers/staging/media/atomisp/pci/atomisp_ioctl.c @@ -678,13 +678,82 @@ 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; + int ret; + + 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; + + ret =3D atomisp_css_allocate_stat_buffers(asd, + stream_id, + s3a_buf, + NULL, + NULL); + if (ret) { + kfree(s3a_buf); + return ret; + } + 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; + + ret =3D atomisp_css_allocate_stat_buffers(asd, + stream_id, + NULL, + dis_buf, + NULL); + if (ret) { + kfree(dis_buf); + return ret; + } + 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; + + ret =3D atomisp_css_allocate_stat_buffers(asd, + stream_id, + NULL, + NULL, + md_buf); + if (ret) { + kfree(md_buf); + return ret; + } + 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 +764,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 +788,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 22:21:14 2026 Received: from mail-pf1-f170.google.com (mail-pf1-f170.google.com [209.85.210.170]) (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 8652434F24D for ; Wed, 7 Jan 2026 14:43:24 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.210.170 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1767797005; cv=none; b=F14KecYEOUSqKSanAbr/ntLL3lXrDH/5Tv0JNSSZ5aGbfzXruHL8ugW1+HqEtZxUAgi6g9NgWnJOWdYvOOwhdx0Toc5WqchwXloR58wrny+U268abNMg8LOrvVgDMY2yoPwE5QTBgiLsavRXwpF1tCPWw0vqY64Fekxp9gezVio= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1767797005; c=relaxed/simple; bh=F+gAIIyNiSdf9+OMh6aMRK9Uh/Iu6W/YK5YqgWTJwA4=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=VCJokgcWFS8utPfxKCRgzmqGLz+IdH8YZBBqYm6dv7m0Q0yPZ9KfnCrmR+/5FzCOW6xhVmsqgmok3DVbb0jKSn9xToTARSnB5oWOr9Wtpb2csEsIwYbqPJuWLZmkZP4vtu+z13Yz1hxzyzBg4KrKoom1QDSZcWBY/XCciTJUzW4= 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=dnixAfnA; arc=none smtp.client-ip=209.85.210.170 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="dnixAfnA" Received: by mail-pf1-f170.google.com with SMTP id d2e1a72fcca58-7baf61be569so1664503b3a.3 for ; Wed, 07 Jan 2026 06:43:24 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1767797004; x=1768401804; 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=ymGRBUBEtOEh9YhC7XXdt7L3xfVzWmbMSF9czlDoLQk=; b=dnixAfnA1gvKi03TNfAV+/NSgpdTO4CDVMRYau/tOFJmlo58wTCAgDh/bku6r146AW Voc15RTCYiQmNWGaU1yTxrYES54f67OqIjofY2lD5SWRlki37L4/L9Oe9K7vkFBXP4CR Y6XcuaeXjfvRjwJMHGuPdaHX1x552K9/yvsvrUOe+knOMpgK47flOr6jC37r5eEVyStg 14lOGG5rKGlz+BF1vyuEO46ih0eGFpf6LGjW3QiHMCc1KgALnT+vHEAe8+mfT0NRBt0Y FxG6DZwXie0yIqa1jT2HLoqnq9qMohghbgBPqGjqXm5G0BbVG2DsXnEdTlt9ryra4xnT f/hg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1767797004; x=1768401804; 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=ymGRBUBEtOEh9YhC7XXdt7L3xfVzWmbMSF9czlDoLQk=; b=vBVe/LAkrSb1vLaB9Yu1BtC+uPTyHVnoYZPaohe7PJDAhCdyeMSjSMNvrz0Uvcn9k8 WvL9BcbEjjhwhh9NFo0Ba03efZA86m6FM5+QxBEv3Zl3XWbJJNI8nfrKNgEfZa76EV1K mTwiupYtDJlBA2O3DinP0OPF8/KjYzTv7U+0PBrAuWyC+Y2+/YEXxcHjEjmERXXmIKkc vcKv9giCZhxdHC31L/Pqq68m7btKH7QRQENw0LzFFCg4xzEFi3sBJfcd9ldgcOcHgEsV KVPWV+Zj6b1amqlR3VzKPMbNu4b0dfHfo4uPkph5ieJBUlyZuT/jj+pejgMpORj9ajeO kzlQ== X-Forwarded-Encrypted: i=1; AJvYcCXUOvsSbTNgs+J3D7getvgfSAzDpy52ag+Nf0PJQZqtTPHlR6g+6r21uhRhUoSQkiSwUujz5rSzlEb2mVA=@vger.kernel.org X-Gm-Message-State: AOJu0YyVTI0llweuTgECQzW+eUrkK3GLZwCxIjsE70xYGXYbqmpfuHy3 QxNa/TCn/5sjEmLHfGvKhsEyamP3jLir7Mkr4fneJUjv3FmO09eFG0NDpZyORA== X-Gm-Gg: AY/fxX6j0csKbyuXJlkHjSkj0H306ufbMyS1lVi+PhrSU3Aow4z3F32JhlxaHaJwekI ZTOmCd6wQnsHK5FQ5l94wXi+qTlIXBLGwGyYB0iXm+XMnmumHmrzaBMhFY21IWq9o6DujNqSdjK GMXMaIAgEQuy1lrCsgKzoEzIvSDRY2FrFgCvkwpIo56ZceCNCFw8pBnARinw18bvnOMQlTPpBXi f2XHgqqLfiIhHxfnQUhPqky9UT8sml7slw4oK3Fv84TRNHK123APfv7KfsandwhsaeC0uHBCso9 wvs4qhu6QROKaSp4UpvPgH0YWOOsB28iZro5mFy4IkiXwVj57nqpx8NaqpHqvvYdUjJ6Uk3tv63 cGj5IHPUOC18xtrpwo/mIPTYfJ87qePmYFl8U1BP5lkYd/NEVqhVJ7V35uaBin4p196Pjy9wqI2 /QevixV5nQPqY= X-Google-Smtp-Source: AGHT+IFsUPunjV/lY8Qb6jCnT9IV+LNp7BnjiA4+UFwp6AOzMaK/muVQLFCGpc1F7KohWjA1CTiNlg== X-Received: by 2002:aa7:9a84:0:b0:7ef:3f4e:9182 with SMTP id d2e1a72fcca58-81b7fbc8cdemr2184402b3a.47.1767797003890; Wed, 07 Jan 2026 06:43:23 -0800 (PST) Received: from karthik.. ([43.247.159.43]) by smtp.gmail.com with ESMTPSA id d2e1a72fcca58-819c59da826sm5168936b3a.46.2026.01.07.06.43.20 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 07 Jan 2026 06:43:23 -0800 (PST) From: Karthikey D Kadati To: Hans de Goede , Mauro Carvalho Chehab Cc: Dan Carpenter , Sakari Ailus , linux-media@vger.kernel.org, linux-staging@lists.linux.dev, linux-kernel@vger.kernel.org, Karthikey D Kadati Subject: [PATCH v3 3/3] media: atomisp: propagate errors from ISP xnr and IRQ enable Date: Wed, 7 Jan 2026 20:12:52 +0530 Message-ID: <20260107144252.74666-4-karthikey3608@gmail.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20260107144252.74666-1-karthikey3608@gmail.com> References: <20260107144252.74666-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 print an error message if atomisp_css_irq_enable() fails. 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 58201dedf..a3dd8a5b6 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