From nobody Sun Feb 8 03:27:12 2026 Received: from mail-pl1-f172.google.com (mail-pl1-f172.google.com [209.85.214.172]) (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 576C9305066 for ; Mon, 5 Jan 2026 14:58:23 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.214.172 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1767625105; cv=none; b=on1bJboxK44Qwz47EMp3vN20/hzR19zhRpNPbfqCOdvjnE/gN09QpOR76qw4Ecy2FcQFVG91izjtZjWB0kKKaUQ3ihS98ZVYzwvGMh1qQF+EZbzS61KoK1IGir2E+VyTvF7s0SlPQz9OZkddb6ZBc3Oat01gNEXouVi6dEBthGk= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1767625105; c=relaxed/simple; bh=TKIKwvBOWkccmdrv2iMfjupuseLH7sbcozqajmk2NEk=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=P4/nPxt0c0knaWVByWLRhsVIUjh4YjS/O90krUTc8PYe+UeKqo+eWZM+QKiIscBVDalCt3MmYJvFXt2z3K5klSmPWHk1J7AzV6xcsJ1RnxUsr2nava+wXTvgn22HhO4Q1dik9DyJpq2eHKeQP/wQRy496Wjkqa5w7V5flNrRTzQ= 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=LaLljtvv; arc=none smtp.client-ip=209.85.214.172 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="LaLljtvv" Received: by mail-pl1-f172.google.com with SMTP id d9443c01a7336-2a0f3f74587so200552965ad.2 for ; Mon, 05 Jan 2026 06:58:23 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1767625103; x=1768229903; 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=LaLljtvvsaUGUivKPiWkCMSPmhlFAZh5dJFWIaTCxbfYtcfUieW7cftypSaoF5tANS LvUCFBFyG13yyCQZQSFxnWANC2rxa5TI19hF536Qmf035C9ysMPoQSzMgWppVHQbgtrp IebvWGFOZkRiC6aZcjmi2X7AfUxlBUAZrSZHLQIamYZRVOlbSrgz4EWKvwzcECI1rIJM kMptK7Ik4nBg5v7uFPJnJcIimE2OxFL2kHAWfZmwNZX7Zz6U8JbW1KvWbiCXf+bkUPEK wfj7nSVH18xzRct8qO60csYf+0X/Gz660fpoITE8+kz1YMt9Q+evzEzCUtbSAkylaQmY 4ZVw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1767625103; x=1768229903; 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=eT7whKZ9a8UhHksjMREdCCBB3wHLi+Xohgaz1kVy84UmAqeMcMsHz5Efvc7PxfOLVb G+HShFPsnBdWPm4quMiqOivPHMeHtlqcSdqj/o+3p6frF/agrhl55hunivQ3IS/xoJRY jivnVI6Xw7jqDXonJvlhswTcNdGuXXfiLtfg0vuFnEGQ/xbp2ww1XmbZ1BzGI1LSrgBx OLit8/FD874RPvPsAY0/nxZHBO/LGII48WjVgnZDM4Ciib82cc5ICUzjfIgEy2iE5NoN 77L6xjn8vmg2uKrueWYYIZ14wrUCiRA+cLCnyrc83+PMuPDfxYNFmbPFNFmxD1aDDLRn ywfA== X-Forwarded-Encrypted: i=1; AJvYcCXjjZ7hmi1LVs4ExKahWmPC3wB/5AoIjZO6azeh2JBVF86DtKJDmGRvfus1zEQgilupa6Z27GuS42M40q8=@vger.kernel.org X-Gm-Message-State: AOJu0Yx5UmxvV/9a28hUm9U9UQaBb9SJVdjL+S9OVWoIKfwC/K61Je+g ++qJIwKIk3ynF2aHh4gZwrkvdW6IR6aDf7+a4xD/KcYLN1M7dtnBlzUr X-Gm-Gg: AY/fxX7cobhO+pOqe/TT0FHsB8MmQP79V2bLnAi66bkCbKtGWlEX3a6z/vt/gjo4sNX oHmcm294yuoz8zHMsYbkNktK5YfSvQYebtVfHYnX5Lbcn8aWWpNTlqKdde23kXLl0DnXB9GGsST Hmdac6X8oCplK00d2VoEU8Xh4V5PeKrwxYcSzsoXEt56dJnBNXqQcBzfjxr5Bo31q9UnPDc3Lxe kcAKRru/R/hWkfb0LKikJc1nV9GU1MPxwfGdQ01XwrOj3zR5y+FTQjlf5O0NET7Ui31zLyqCk1m CEwxVuMuNH7f48MtCthznj7d1RFcC3yeRCXY51FzyXh4GBY2kjapp6XEXJkZN54hGyK+/cIf5nB PD/2kYoJ3SYAzB4StOv4R1MnbZzJzZkgz9oGVoMBbGndPzs0U9yZtB3wLroVDhSuJySgExNqTTY ux7ad7yfeXEtw= X-Google-Smtp-Source: AGHT+IHy152Z6oGjqTyOM0Pyz6O4DiVhOTLYoZf+nEhTMBJXwimGMA8sfdnXh1bBOmerORC/+OHzzw== X-Received: by 2002:a17:902:e74c:b0:298:1422:510d with SMTP id d9443c01a7336-2a3e2d2f925mr250065ad.48.1767625102536; Mon, 05 Jan 2026 06:58:22 -0800 (PST) Received: from karthik.. ([43.247.159.43]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-2a3e2b81484sm715955ad.78.2026.01.05.06.58.19 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 05 Jan 2026 06:58:22 -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 1/3] media: atomisp: replace shadow zoom structs with v4l2_rect Date: Mon, 5 Jan 2026 20:27:22 +0530 Message-ID: <20260105145724.37305-2-karthikey3608@gmail.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20260105145724.37305-1-karthikey3608@gmail.com> References: <81e2d12c-342b-4b88-88a0-3e24115541aa@kernel.org> <20260105145724.37305-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 Sun Feb 8 03:27:12 2026 Received: from mail-pl1-f174.google.com (mail-pl1-f174.google.com [209.85.214.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 B065D30BB88 for ; Mon, 5 Jan 2026 14:58:26 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.214.174 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1767625108; cv=none; b=kjHx8PNltgDwzp4VVfuhrcJMEGpoAJfJrq+MHNRUYE+2DkxD2ki5bJyzsE3xDHoxMpz3seCsGe5oJgsL3Fy3sNcvVpydMaV3+sw429eF8d8sfsJBEESmLE9QcyWMmPaSRgoEHq1drBzw085wg1ATtPPG3yKKVV3Ywkwg2gn5Yeg= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1767625108; c=relaxed/simple; bh=7aFJtkTCn/RUyXBqDN5A8Rl1FrpL/MQORLd7fWn3cOI=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=fAxNeAi/M94DYjQVUUTKUdT29trplTRLK915zIQ1oXhAS8PbiOZsT1gulkZPFose5qrBotRHpIt6JxSaK5A3GiuFeRntdYNfbEW1K5oV3EXqUAQg+LFy4g3uu5gRJhTW2igcqodg3NrfHY5ExcQJyURItquvJiV7Hav1Tm5WiBI= 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=MBq9/XyF; arc=none smtp.client-ip=209.85.214.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="MBq9/XyF" Received: by mail-pl1-f174.google.com with SMTP id d9443c01a7336-29f30233d8aso162855075ad.0 for ; Mon, 05 Jan 2026 06:58:26 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1767625106; x=1768229906; 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=MBq9/XyFYPKbzlnRavv9/Uv2M1u1CqjhyxbtDbJkoMBpaRUdpAB175P6Rs3omI3fbG jcNTJyDnuiWbGiMxJV+Vb2zI51PESZeYHVsbEaORHrEWVP1HA1S29Ti8O0hHOIbqckTF NxlEKIR2hXAQDaGDJN9L/fJ1kz8wBMcGBKQmx3fy872aT6x+OUDQjfKdM2VRKEVKYBvj 5nv+yStuq/rI+NSadysv10oACPTPC2M55IJU3EWjhgc7CAd5cVwRA3Z/UPD0lYr50ANm nAHrgY97j5/vqVcr9fmBD9+vs//bbszrB24aGnnnGrW2Prxx/GA39q0EVDa0oW55AZov bzBg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1767625106; x=1768229906; 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=P3a4Br70eKcl2XpbcdSDBUhPyilZeL9FgRIhkhsXoXAptei4GUS67xwrzbp4jPychY X+LOtRM4oZDZx1JaqUYt4LwV7RmyEVV+0TYCvzSJMI5vHwjFfcQpLHeDyxdGojyCMkZW glqNKJIhJ2XpqaP8WktKiPtxbWe2S5JsTMO4Jaf/sl+wqqVf1sDXaOY6jF93YDQiGPvE LZ23Xb5yomi0syqvuhk8lt15V9RKomqCnpJ7Tqqv3m+JhizGcsZODS85IKazaVD1/X4y Wg1I9hFOUMUu0t0kFlbmIdncnCAoRPs7o0/z3Pta1LPdm7OiHECfUPi3xC8/1jqJdEKZ tsaw== X-Forwarded-Encrypted: i=1; AJvYcCUytNYdj7A2hWBen82FSZdEZmbDlVbEGR88IbPFJvWRBHwFEXf4l9HdiLY9KS9nVF7OlkygTDGUJ69l1Nw=@vger.kernel.org X-Gm-Message-State: AOJu0YyUX2VaUNRhlXLj5JSYH/heQLnTur+zuEXkLJsQQU6VZt57RS/P FNfJ6y/TkeXx4qyw+ZGVt4dMtBxxU7r5ZthRLy3LchvKWlrPUro/2lo4 X-Gm-Gg: AY/fxX6W+g1g9Ngea4QjIgMl5232/SH96Q/dqS+899/jZwZLNjN4+Ktbq7ogFCWMbKy eDIw3cDzxEjFdBSoMo0LrnThAGETp3070t01pG3Gw8JumoTQtlpy9VR5+Istoy+RSeZcLpakaQa yYGcomqksjsihxe6iHxKfVa158YijqV58R9JoI3FbLtMdw8Y2jBcAxhXeh1by6ajNNddWmN0NAZ czJSA6WVTPN9PkrmPf/VJx0q0vP3XDc613EnWGsFE+NN9tQmrevRV7ylQs6S7HQ7LmomxEi4dgp /Xhw4JxOwffJsOdvv7Rl3ITsiGC/jKrzw29gHcmaePxNyDazeQ+c/Am/Sbt+mjCijXKjRZMo1FZ F6+DusOEARH4/2j30/nmh8QD37PQ6xwVu1IB1kSuE69bccTXDpi1oEBK5IFO/aoKRf3O9JK1ND8 UsDYlXhUz1VgY= X-Google-Smtp-Source: AGHT+IEThfma4vyAoTFD9Z1px96n831nFofd6uJzy0WpP50OzQzghORJxsBujiDHnCn4NZgVK1DF1w== X-Received: by 2002:a17:902:cf0e:b0:297:f09a:51cd with SMTP id d9443c01a7336-2a3e2cbb55fmr472125ad.14.1767625106054; Mon, 05 Jan 2026 06:58:26 -0800 (PST) Received: from karthik.. ([43.247.159.43]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-2a3e2b81484sm715955ad.78.2026.01.05.06.58.22 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 05 Jan 2026 06:58:25 -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 2/3] media: atomisp: consolidate statistics buffer allocation Date: Mon, 5 Jan 2026 20:27:23 +0530 Message-ID: <20260105145724.37305-3-karthikey3608@gmail.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20260105145724.37305-1-karthikey3608@gmail.com> References: <81e2d12c-342b-4b88-88a0-3e24115541aa@kernel.org> <20260105145724.37305-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 Sun Feb 8 03:27:12 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 71DC831326A for ; Mon, 5 Jan 2026 14:58:30 +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=1767625111; cv=none; b=i5LEJKkt+wzUqdQGDcDOYOdiIioqA+Zx1KpS5SHst9VuPntyU8VGcCf2SDApjh0r0GsX3Siyvco3KEMXcwxS/SyHDaUcwhK9fibHNn06MG94+jVrESKrIgp/yWLek3k+7v3/NPknVtkg71EYY43xgTh5v+Fi/86siJT77p8oawo= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1767625111; c=relaxed/simple; bh=VcJC7sCWJodERaoTS9t7XlGBxL7hprZHiIDPn09Ne7s=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=jgoM1Ni5FD2bmXJOl2NBV4dQXKjQEodhMcZ+meF9QbgaQHvDKqKAYRBpgccvqVr2heNTsL9kYLE8QwzB5c8BJjDToYFaFB+WdsTMO9vAePhag6d9LcNzIHRFZ+9RgJWzs3gbqZuffELcebjnmw2t3QAkohkO7fkn5cz6KzhLzmA= 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=aLZ7nyLI; 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="aLZ7nyLI" Received: by mail-pf1-f182.google.com with SMTP id d2e1a72fcca58-81345800791so34114b3a.0 for ; Mon, 05 Jan 2026 06:58:30 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1767625110; x=1768229910; 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=aLZ7nyLI5ISY1e8Lnq3V3hGK4/90QvWT0qYWnZb1+PYdO7fy7UZ7vi43XwCYtOclpc QLBJUZZNwX/paQs+dk8MPLJWjCNtsVBDQpGIZnhXX+ZnWd4zNkmx1O/YvZ8nOotQpjtn 94PZ9IO52oTJEtSuattxoZnHbPMFnoGhb+TUCM6T527NkvE+hGVzi+UAhB8cMOKXnVpb rvtl6RMdBSQKtLznImarXMPZgFCUxkPrSiZONvHLuptKsIz3bCFg+I/SglobSpxhTR39 EllzMR2Y0giGpBzyf82CSo/Myx9uP7weM+c6YbtcwNGsVK21nxwUd/n9fZJ2ebiD1781 Qpsw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1767625110; x=1768229910; 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=jRAmimzG2nLptyPxn8nsoOoX1CFi9i7iA5AJqDlebNVsUYu0dCVLCjxoYxwOiqDkBI o+XNI2Rfr6rou9EwmyePJf1CRoD0gGJU4prfsW36FTUDBADkkSb+orMcFcgPr/CLFe+t +rCX7B9HU+twFeCb7rVrtF1UCkbsNs9SpyaNPXGvAQEKDZEKv+eeSycUgep37V/WL13H Hi04w0uAjG3nsBnDo+d/tSP9K18CEXr35QRG4+JOMuZkdNcyhrLmfqJ6LLqmQQ0nkmEY XHO2Tf1ycPTvZh+Uv1W/dyGCInKY5LkBe3HllzMOc1k4AZh8HUT/4BbIwhBShhyb4chH DGZA== X-Forwarded-Encrypted: i=1; AJvYcCVrRvAV2fv77xVmLU/GIKPH+GqHDHQWGf9bOwTjX/jWott0akpV5VJX/eStwBurBHU+mJCNkFW00oy+lQg=@vger.kernel.org X-Gm-Message-State: AOJu0YwF1R0mIzKPMxR5kVdx46aoYIi2X3f8foybCZUIW5IMW8hQ4yCq mk4AQtJKnfkQiw6clN32t0jvNOoODZaQafX5HNvsBOwA8hLfDbL8upnl X-Gm-Gg: AY/fxX6KHhnNTJhOgyDv8949HHGJ+IcuEzmfRUXZY42qpgfhFmlAovuYlvvOnrX7mHb FuV+O1o35gJtg7CiY0yGUcroVs7blMnPPp8/uLuOzkkmYmJkXIGZ/j1yG/VdVJH2jW4wvHTha7Y xOntbFg+JlwDGL6/tjeXDnj8FCW7na2+tdtPHirsVcMVJBehJ9EuCRiXFYZrJFZ4aTOGWVpokT4 HgAJ1+VklNm9WHKAhY4FbJyI5WewJ73qeItwho1xstDvV5wRTdnBe9/v0v6LujqQUP8jQeIpfzx QFe93ianhKVKzwZWcl6WnFod+Jq925CWZI6N8R6QXPZ64ie+fiq1nmvIdUO0W0wQhT63/BMXTOP 5FtFBgeewwFlwD2dklq12GDeuOSC0AM9rjnBZ0kobGAUtyyifJusmxhwWoIAeio7oBj+RTLIuV7 ERP7fsw3NWcz8= X-Google-Smtp-Source: AGHT+IHd0J7CYDZvoLfOcn3yuW4Bcd7pC34RjnYz8x8yPWpwNDXN3La7THKi3GPsSVNRoAdXAZJ7RQ== X-Received: by 2002:a05:6a20:6a08:b0:342:1f0:9af3 with SMTP id adf61e73a8af0-376a81dcc3dmr42857702637.29.1767625109526; Mon, 05 Jan 2026 06:58:29 -0800 (PST) Received: from karthik.. ([43.247.159.43]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-2a3e2b81484sm715955ad.78.2026.01.05.06.58.26 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 05 Jan 2026 06:58:29 -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 3/3] media: atomisp: propagate errors from ISP xnr and IRQ enable Date: Mon, 5 Jan 2026 20:27:24 +0530 Message-ID: <20260105145724.37305-4-karthikey3608@gmail.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20260105145724.37305-1-karthikey3608@gmail.com> References: <81e2d12c-342b-4b88-88a0-3e24115541aa@kernel.org> <20260105145724.37305-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