From nobody Sat Feb 7 19:45:47 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 3484735E53D for ; Wed, 7 Jan 2026 15:09: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=1767798565; cv=none; b=UNKbMgUT92F56no0XtohVoH8ZhIOKlXI2f/oZVhIjsZJof+EqBia7PkMx1AAsZm60niGdUN1lOx9WRucC8GgvaG62/XKiJShY9Gyehnh/fdy7iPiRiiGBMRNf/bRKMpWWN2pIzklqyAChjDi/qwWiG+2WsaKkjAJCyR9FQ1UXWA= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1767798565; c=relaxed/simple; bh=xKFsJabEMwnI1MXju9I0t3B+DJrI9n8oUM1d99mUiCg=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=rdOqiS6Hve4Vg9JI9W4G4OhgoyvrYfvsEpZ/AgeHp1W4c5aP4MbB5oyeHaeI0s2n3NqQsd1ci80Sk/qwtS++pQ9sClVzdsaBwywhHGHydc67MrOvrB56LxMH/0wydZwh949ykKFHrCYVuZS3dF4cYgHWjeqgfHdjpW5Y2F8JYE4= 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=EcUvId2i; 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="EcUvId2i" Received: by mail-pf1-f170.google.com with SMTP id d2e1a72fcca58-7b7828bf7bcso1835400b3a.2 for ; Wed, 07 Jan 2026 07:09:24 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1767798563; x=1768403363; 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=QvqM+SWBFA3rR7ce2iMSgH9tTLda8L0N8W2RxvU0YTU=; b=EcUvId2iXg4x9a7Q2Cw90koM+tvedzeYdkmvvrHk3ZrhB37sIR1U3Fl2Azusp5Q/06 +a+AKOXo5YCqPL5d5IuSngBbHZTBjGyNfmF7/DD6XkUDC6VwyOza5Xo6+mzPe9jQ5p9G j+xOurxRp+W4LOmaRMVEJ5yodTHkCWY4mRnTmNrDSIGHfvfLRO/3u+XxH+WtbzJpBPdF 2dIBtuteQQ/M7Jw0D6+1CWZ3juMZ0EiFEAjI6OP8V0VpP4x7QIJq8CG6/sQgsHi/abFq 1PIV50eGNHT+OX3nV7uC+T+KRxLDiq5Bb/JZROcD9+0nUOdyoZD9EVXJVPTlI10MgaIk BaGA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1767798563; x=1768403363; 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=QvqM+SWBFA3rR7ce2iMSgH9tTLda8L0N8W2RxvU0YTU=; b=ZK0UL1/qP54b9AbNqHCjtG9ILlcokjux1xDSu3aUOpYBiwwBNHK5Ym2vXjWa/0MGzJ pSN5cc4Hh+M/F45xEkS+rt4hVlM/lDug+/NQhkb31b1hMWJxYO+x0fJElq0yMMEL45v+ qBagqET2IZ+IDigoa/1TjybR/ZgKH8JpsKv2WOjfjeKOHkKHKGV0h0ZK8gMHbTk9YFd0 9VG1XcJCWPxSoj70FSvKkEZl8L7j/SzsI9/NB0WAfOlN1fH4Jaa6dXaih+JSpN5WLhb7 4olTMpBmyskcXFAog7FDHqDNt960LbS4nzLyeBb1omdRBsX5+nq9EPAPBboltitS+O3r OCtA== X-Forwarded-Encrypted: i=1; AJvYcCUOF0LugNPv/vsvjUXlivPqeVCg1TlEBACiYWJaGvrwPHgXh2bxtam68prVkXeVRxnVb4DUiekodQopTuQ=@vger.kernel.org X-Gm-Message-State: AOJu0Ywl6ic56eRAZlPKT4G79iKUIPjNrn2QXhw/whnG0jXIana6wfcr h5gRk9c838mK9KIZ5nlqEcha/T4zCyOdEw13hPlDeWvuPq3Tl1IMs/JQ X-Gm-Gg: AY/fxX4jIzoD6MWZru6ShZLOhxN5eiSx9UY+ZgvGYPLhj+gURcEzUbpp8AtUGdoIk2w KF6i744tQ8Z9agFCIjloLDRObTYOYk226yZxsbDhJ+4cqJY/1B/bxpko1POHuMrATTMID9CE/JO 2D43B7bQkOraauVtFpWWcoOMhQDxiu+DnuY/FSpRsCjF2ZSZpjodNCZzsrBBdFPU9HpQO+Sz0hX SupOT16MPTbkDsHivv++AdZDJ6iL/NORyOpuG++tjrf3kvFNX06XUBQWIwNno3RfszPRJQ0ezp8 ag29CkA3Sijkx5/EdozM8HkITp1tVjAuh0e90ig/2X+r57Z6q9csNWn1ILeRdY33NW5Q8UpFZmc liEcQMX5p/JG2CDZEDPbvMdHa8IH8lL9l5bV8X4Q73/HZqaj9gEv6HkFkZEZZoRmHXyfuvCSp7i I8EgJYnM9eCHY= X-Google-Smtp-Source: AGHT+IEMZL7cDWMK2efRhgrCEhtbkTevVTHEG1U32DuXu98OETg5HHFEdrcXTWamiC55tEBJtwVoxw== X-Received: by 2002:a05:6a00:3487:b0:819:5db9:6c4c with SMTP id d2e1a72fcca58-81b7d95ee54mr2540288b3a.8.1767798563245; Wed, 07 Jan 2026 07:09:23 -0800 (PST) Received: from karthik.. ([43.247.159.43]) by smtp.gmail.com with ESMTPSA id d2e1a72fcca58-819c59df961sm5246114b3a.47.2026.01.07.07.09.18 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 07 Jan 2026 07:09:22 -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 v4 1/3] media: atomisp: replace shadow zoom structs with v4l2_rect Date: Wed, 7 Jan 2026 20:38:56 +0530 Message-ID: <20260107150858.79818-2-karthikey3608@gmail.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20260107150858.79818-1-karthikey3608@gmail.com> References: <20260107150858.79818-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 standardize 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. 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..677c460fe 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 + dz_config->zoom_region.left * + eff_res.width / asd->sensor_array_res.width; + dz_config->zoom_region.top =3D + dz_config->zoom_region.top * + eff_res.height / asd->sensor_array_res.height; + dz_config->zoom_region.width =3D + dz_config->zoom_region.width * + eff_res.width / asd->sensor_array_res.width; + dz_config->zoom_region.height =3D + 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 + dz_config->zoom_region.left * + eff_res.width / + (asd->sensor_array_res.width - 2 * w_offset); + dz_config->zoom_region.top =3D + dz_config->zoom_region.top * + eff_res.height / + (asd->sensor_array_res.height - 2 * h_offset); + dz_config->zoom_region.width =3D + dz_config->zoom_region.width * + eff_res.width / + (asd->sensor_array_res.width - 2 * w_offset); + dz_config->zoom_region.height =3D + dz_config->zoom_region.height * + eff_res.height / + (asd->sensor_array_res.height - 2 * h_offset); + } + + if (out_res.width * dz_config->zoom_region.height > + dz_config->zoom_region.width * out_res.height) { + dz_config->zoom_region.height =3D + 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 + 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 19:45:47 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 28AD235F8D4 for ; Wed, 7 Jan 2026 15:09:35 +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=1767798576; cv=none; b=ccnAidog/bIw6dt0v/9GBX50hfiiZ/51hBnIc2E6HjXkrnGTaVi+p0ugCPz4WFJFxidhu17ITWG7jVY+AOGmTpmBEjAdGqpSquen8K7bMQk6WmRQD27KKV9yqVAkQiwaqdOAS7XnrJgfhhuX90QYf3RbxU8b+HX8NlQBegsWMiM= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1767798576; c=relaxed/simple; bh=iGThI7AMvpXUH2QvGeoBUTMOmlzpo8uINvbPcxu0oHc=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=vFvggd7G1FaajPG8Fi4FLRlbe34wl2hHQn6ofBmA+vB2iEPMGnMw0+bQAIaN6ocIaV+qdK3fNbcpEN7Qx0ThaoXd8s/lbdcYDvCxqcBL9T/rm2rxQdDT/ggbZbNGNkxXHFT/0Rg21bo5sS1/al4tKL3C2hOGG2tKQqO6+3VNxAE= 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=dTv8eUix; 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="dTv8eUix" Received: by mail-pf1-f174.google.com with SMTP id d2e1a72fcca58-7b8eff36e3bso2511259b3a.2 for ; Wed, 07 Jan 2026 07:09:35 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1767798574; x=1768403374; 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=839scXuIahBjk14ZPBwF1ot2Ofseckln89nJ0huuhEU=; b=dTv8eUixXPWQIz8vXukRw2gjb24E5bhcWjl2tJ60kGhZvvVoNlmzlNMLTboqrpuFAq LuxMOhENQWNEkW7YcN9JixMluMfwate5O7oPfoynynWNB0OHCH8qWKVmGr8I0aLcoISa oJYOSKVdVp7WPgKLC7/vVNZTPHkost/iEPUIj02g0xHM7hZjsBih/qTir2C5cIba9lpV 9WwWxtECctydUinw8eDMGJ4yBwicZpbE528qEe7Qm005Zl5YfbtoD6iXJk124jgamHUN SUToLVPF40xQaTkn7Q4Lget6N1rHYUEIsdvq5sJIKyiz2RsChshKp+BZMCm/Zpy4cpDD v9IQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1767798574; x=1768403374; 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=839scXuIahBjk14ZPBwF1ot2Ofseckln89nJ0huuhEU=; b=wshEmgpBNNSluIAmgSIezyivK9Flygb2KfptletlQpE6JLt5mNupL1SoI6pFeS0MvK tHDwiNp+am3yrrdjqk1sv6H4xOAiPfJtXvl3P/e4frWeoX/6n5ZNdrIOeAxGRgMoAkS2 2nDQPDiO1AkDjAGbkMTHlJR96GXmYBjqrHUrRw3kNtoItI1kwP0lIeBfLsFxLINnrg1s FE4kYKMX6CmiZxcCJ2HHO2VWzYfiAnJilU4ry+1xhOGsLprJICtRH8L2KEou5QHUxE2n IG6t3ZWwh4faZjc0wOqk6HSJU2eudwBQBiO71KMFCcP/xd1fhA+T1vyZY7dvxDwGVjBB IsyA== X-Forwarded-Encrypted: i=1; AJvYcCVN5Y/I2577twBSAOL4tQ6xUdLpeuGvbO5mrwZw51aCANR7TWvKW0bGMUZgzCHNAYC8sMcPta+MAJaKJZA=@vger.kernel.org X-Gm-Message-State: AOJu0YyK0DtDVtZcCOX27WLlR7L9kiHRIpHIDQhPQfZbPhSblCJIFr+B V+dWXnKSZSLTbiyQ43bxj6dMLKs+etkFQcra2lWSjIDMMQjNeS9E2AvF X-Gm-Gg: AY/fxX5W1JMOnyCuJkKuQIlHYPg1aGK5ssYmR4Wx55FnHkrVHIRw/068MOkNqYWEBuW UekN9OwloflEE+zOOKBMOXflY8SHMGooe20VqiS6u6HFlYVcw4PfaGFmYrb2JdudT3aTF1X8jTF i5WAC42LAZZE6ZcogU200fo2Un3TLlbOsmJ5iyfZPiihaic9ox4Dpqjdg69r+3tMBNNc9XoLZkc 87ZXl81CmaYVxGdWTRrxuj8tpiN4xYTNUI7UcL4IaU9JionJ9QgH6+uoU/+WsTx6kf+GTpiuScD Bl6tH77i64rTx2oaVxMvRPAVK9z5lslsrw/ZekDiFj+QRMVKvjB6lZEzJ+PzLZUhRtIl6RgQbAv +PcX+mAOpaF6yE+27DUumojj9asjcK5av/0IquJB5f+fwW+RvHXJwkt5ETzRGFc+NWjEEi0Np7m lyViLdgalJauU= X-Google-Smtp-Source: AGHT+IHBpXqkh/7RGbwjPDPLci2dCtXCz7QKcOwf/IAx50TXMsFMeoxMZ4/+sP8T0Bj6SQUlodTgPg== X-Received: by 2002:a05:6a00:f04:b0:7a9:c21a:559a with SMTP id d2e1a72fcca58-81b7d86249cmr2486687b3a.8.1767798574470; Wed, 07 Jan 2026 07:09:34 -0800 (PST) Received: from karthik.. ([43.247.159.43]) by smtp.gmail.com with ESMTPSA id d2e1a72fcca58-819c59df961sm5246114b3a.47.2026.01.07.07.09.24 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 07 Jan 2026 07:09:34 -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 v4 2/3] media: atomisp: consolidate statistics buffer allocation Date: Wed, 7 Jan 2026 20:38:57 +0530 Message-ID: <20260107150858.79818-3-karthikey3608@gmail.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20260107150858.79818-1-karthikey3608@gmail.com> References: <20260107150858.79818-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 19:45:47 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 AE98235FF6F for ; Wed, 7 Jan 2026 15:09:38 +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=1767798580; cv=none; b=VKnncSvpkdE4ftO5O/eRKX5uW6Eq3VARUQ9FEvJI3o4XGsn1G3hTnBlDF/I5PfgKV8B9D8/fKg5YTFKconDd32PexCnuPIddyryrZuYJMoBkMelyt+7Yk4fZmmGQ429JiH9XyRv1rd2e2unx4RmnTUjrvYgEHtpgPJyIq8EyO8c= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1767798580; c=relaxed/simple; bh=mnmqm+sV4J6xoZuyVc6SiEB8yZ+1Lv05//8FJGOKXHc=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=u5WkYjzoTvesnh+/v69DTP8MEJaH14r4laixUyG5RcT+AkmoEOJZGWf6CorhYW6bxS144CfBczZqiu6Q/hGpl3hVSW+L3JSPzkbRfhkdiYyjwzYPuJi4rQHVUKYQfktgSz1235FLxe3vs9ptoNMULw/NOboNmRslKRSAiL8uYVw= 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=NdYpryTR; 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="NdYpryTR" Received: by mail-pf1-f182.google.com with SMTP id d2e1a72fcca58-7acd9a03ba9so1576001b3a.1 for ; Wed, 07 Jan 2026 07:09:38 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1767798578; x=1768403378; 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=KeBDx+YUjGbbLJYP7ioCQ7iYFylmc1DSRE5Jg3YEh+4=; b=NdYpryTRT8DeqDFTuENaXQt+tw4jVqWla45qCIb0JafqUARiubDnXtQbrZTTlZCVXt EEeeLqKmA+TilH34yoA329POF7y8O3+juOCdXuhpvF9/3v4dUzQW4+egEj0DimDOSAC+ XKhPkhpZk31s2znobARvlqFSpkWDp4WPcWrbel/z54HrOc16U4qBh2Af896IlBD1yNhU 73FcbA1r43x1oUsrC4/BLv6Gf3MWCijLmTqFrb1KTk3j4NFLx5bCuK5csJ7uBTSuPkPJ 9u0wsKoacmDt03WuVJ02zF/DZZgDUllFVYYYospAjdpEVwHUN9MvZ1K4V/65SVVW67nF 4BYA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1767798578; x=1768403378; 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=KeBDx+YUjGbbLJYP7ioCQ7iYFylmc1DSRE5Jg3YEh+4=; b=YV3VW1EHtve6GyOp9ZAhA1xkGZXQQATSLhBBX9TehHNbwbS3PcAdbMVA3cttz7IIwd YDQwk+39XHL/OnJQsHrRs5IJupJidatm0JBdUu8KSFlcq4QtlHoE4nOaOxgLIh5EU4Ab 4juDN1nJafySPLw5BJCRd/XQTUoFDYIwOxAXd4lnTzRs3F5YjC3ObDIeXJPNn4F5JMp4 2cfEwe3AkdBrVt7wEsWCkktVfcOKGJg7PKMIim6zCggZyb/dtfgq+itbvwVQ0lTtKbCO Pj7sWeYcYMLOxIBDA/mDXqY/KS+9B92N28Lam5DUu7vk4p3egg0CB1t8AJuWDKZiUrxZ Hfaw== X-Forwarded-Encrypted: i=1; AJvYcCUYmuSUaT7hJhxx1PuKSIFy5z2wjkeUlN/g3Hq/KlIgQZOWEuw+8tuX8AfqGoWuCMH4Ifl2ubWEq03WYeE=@vger.kernel.org X-Gm-Message-State: AOJu0Yz77C0tJ0syxlRRFziathiY+pgBntPsdKnAm4e/5i50jag8d4qV zjRx1EYXrq/LAMGQv8+hLm1/OM1Zn2YjY9WMU5JVDxkPn2r/MawuPOeG X-Gm-Gg: AY/fxX4QDteu2oun2VQmtzgGmsQnTCDSA7Dtyd+Vg2v1ZDtxCd670JyiO8Mv1oWW/pk VwvkwykrV6nnOUBtRgVhlpojL9j4WNMRZSa8sIatdiUvU9j0Kor2SviSfacpnd/iBoepUkcVUA5 ZE93EJQM1wqeA+FSiSJiqVJThKp29NAb3jhdnsJQ7j00gdA5NsaT6zX48B+zKKwy3mAeoJ2/M7I gDaHpktl8OtbzxuHMU2sJ3HVPHzbfl0w3yxgYI3k7Z97QSIED9QEgmPG4HcbBcEBp2VMGkXiAZM BFPogCd5IpVCipbKh7AOb5mGoMgOYyBHw2Y4y5FvdQ386yPpTUEqNeMJZOB12mqUUopbMQeyGuE DjkfnSox76N+83PFh79bJvCvz7owS7H3lfbe+Hs6ae/NljXrvZrqNfLlUfrAeL/gafbAkLuU3wM vcWEqINy924es= X-Google-Smtp-Source: AGHT+IGMs2B36viuuAnfjeiIBdzTg9KYUmjvbamIyDu2pKeCZP0v+ieVtRSjbeiTwNmI0J2gSr8EKg== X-Received: by 2002:a05:6a00:4103:b0:7f7:850:dbed with SMTP id d2e1a72fcca58-81b7f7e2ae4mr2318127b3a.44.1767798577923; Wed, 07 Jan 2026 07:09:37 -0800 (PST) Received: from karthik.. ([43.247.159.43]) by smtp.gmail.com with ESMTPSA id d2e1a72fcca58-819c59df961sm5246114b3a.47.2026.01.07.07.09.34 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 07 Jan 2026 07:09:37 -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 v4 3/3] media: atomisp: propagate errors from ISP xnr and IRQ enable Date: Wed, 7 Jan 2026 20:38:58 +0530 Message-ID: <20260107150858.79818-4-karthikey3608@gmail.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20260107150858.79818-1-karthikey3608@gmail.com> References: <20260107150858.79818-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 677c460fe..0f5b2e90d 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