From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mgamail.intel.com (mgamail.intel.com [192.198.163.11]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 529AF309F00 for ; Thu, 9 Apr 2026 20:15:13 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=192.198.163.11 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1775765714; cv=none; b=rgrbJBkQSv7Ag9BgOPIn5fkbpiiHlajEm5nWh3hKKUlUdPmjI3xTuMJMqJjIMcAakTSfuST1xiLFUbssDqdbspGFI0vBknwDAygtuVg8CAQ+e5lPPXf1Ns6qfmICcq3e5r+QV1bwtAWIBmRfJds3Cphseii0EHBm8qXseLBM030= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1775765714; c=relaxed/simple; bh=YBBbblrYKO+b2A9q2jL3a2REFeSdh3PkPcqvnK+nqwU=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=Q/52nufWTlKwkbrUPjOAgV7AlzFbjJx13WdN+y1pjQ3hONg0KNbp+UnzYctLG4ceaABhTiCTrE0wxMtkGkVobo1Rhk/+ZPAdI+1qPHW6HxM6bAVZCZ4DWc3QdBUV/MuJALV5FyFpGGdta1VCUMpSo1L1UVLpzE7dBdVMaFW2X+I= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linux.intel.com; spf=pass smtp.mailfrom=linux.intel.com; dkim=pass (2048-bit key) header.d=intel.com header.i=@intel.com header.b=cMurId4x; arc=none smtp.client-ip=192.198.163.11 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linux.intel.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=linux.intel.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=intel.com header.i=@intel.com header.b="cMurId4x" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1775765713; x=1807301713; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=YBBbblrYKO+b2A9q2jL3a2REFeSdh3PkPcqvnK+nqwU=; b=cMurId4xk1eNv4Pmy0YUvd8eFer9lZkr9MfKtCUxjbEalyKijzJujbXY 7EvmYTnuLVCzGy8mkfdf/WJggPbAlE5MywoGI248pd5ivgR9CiQxTUmRm Y2ob+lKOdth5RKdhf1g06q4qr94dLwib2N8SdKKr+80j2Az2B1vi/JdZv cLagNTES+fvoOGBwl9sH+4jqDp5yknk8k5H8OUTc+LbjiG7lU4FbKfeJQ I0GGU8TMIE2gDISNB2K+KPp0Ww2XG/ZEjsk/VNNN15G9EhKVJzJIg8VJi +DnwZlSfo5MQ8ilOT5GPHl0KRAFUHUd4mmCYOyvj+Z3oaY7PMfoDWCqWZ A==; X-CSE-ConnectionGUID: 4UZQpFNXQiOq8JJbqbDPPQ== X-CSE-MsgGUID: +9i+vgBpTuC3r/6HgnD03A== X-IronPort-AV: E=McAfee;i="6800,10657,11754"; a="87408735" X-IronPort-AV: E=Sophos;i="6.23,170,1770624000"; d="scan'208";a="87408735" Received: from fmviesa003.fm.intel.com ([10.60.135.143]) by fmvoesa105.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 09 Apr 2026 13:15:10 -0700 X-CSE-ConnectionGUID: qyL/HI6rSJOEiHUQp6k9ug== X-CSE-MsgGUID: 936mLF2JT1O2tOiZcY3y/w== X-ExtLoop1: 1 Received: from dalessan-mobl3.ger.corp.intel.com (HELO kekkonen.fi.intel.com) ([10.245.244.29]) by fmviesa003-auth.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 09 Apr 2026 13:15:03 -0700 Received: from punajuuri.localdomain (unknown [192.168.240.130]) by kekkonen.fi.intel.com (Postfix) with ESMTP id 478C5121F82; Thu, 09 Apr 2026 23:15:03 +0300 (EEST) Received: from sailus by punajuuri.localdomain with local (Exim 4.98.2) (envelope-from ) id 1wAvmI-000000045pd-3980; Thu, 09 Apr 2026 23:15:02 +0300 Organization: Intel Finland Oy - BIC 0357606-4 - c/o Alberga Business Park, 6 krs, Bertel Jungin Aukio 5, 02600 Espoo From: Sakari Ailus To: linux-media@vger.kernel.org Cc: hans@jjverkuil.nl, laurent.pinchart@ideasonboard.com, Prabhakar , Kate Hsuan , Dave Stevenson , Tommaso Merciai , Benjamin Mugnier , Sylvain Petinot , Christophe JAILLET , Julien Massot , Naushir Patuck , Stefan Klug , Mirela Rabulea , =?UTF-8?q?Andr=C3=A9=20Apitzsch?= , Heimir Thor Sverrisson , Kieran Bingham , Mehdi Djait , Ricardo Ribalda Delgado , Hans de Goede , Jacopo Mondi , Tomi Valkeinen , David Plowman , "Yu, Ong Hock" , "Ng, Khai Wen" , Jai Luthra , Rishikesh Donadkar Subject: [PATCH v12 72/86] media: ipu6: Get watermark configuration directly from ipdata Date: Thu, 9 Apr 2026 23:14:47 +0300 Message-ID: <20260409201501.975242-73-sakari.ailus@linux.intel.com> X-Mailer: git-send-email 2.47.3 In-Reply-To: <20260409201501.975242-1-sakari.ailus@linux.intel.com> References: <20260409201501.975242-1-sakari.ailus@linux.intel.com> Precedence: bulk X-Mailing-List: linux-media@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Instead of passing watermark configuration data around, get it directly from IPU variant specific static data structure. Signed-off-by: Sakari Ailus --- drivers/media/pci/intel/ipu6/ipu6-isys-video.c | 12 ++++-------- drivers/media/pci/intel/ipu6/ipu6-isys-video.h | 2 -- 2 files changed, 4 insertions(+), 10 deletions(-) diff --git a/drivers/media/pci/intel/ipu6/ipu6-isys-video.c b/drivers/media/pci/intel/ipu6/ipu6-isys-video.c index 0da9070aeb42..1165d5bc693b 100644 --- a/drivers/media/pci/intel/ipu6/ipu6-isys-video.c +++ b/drivers/media/pci/intel/ipu6/ipu6-isys-video.c @@ -759,8 +759,6 @@ void ipu6_isys_configure_stream_watermark(struct ipu6_isys_video *av, av->watermark.width = ipu6_isys_get_frame_width(av); av->watermark.height = ipu6_isys_get_frame_height(av); - av->watermark.sram_gran_shift = isys->pdata->ipdata->sram_gran_shift; - av->watermark.sram_gran_size = isys->pdata->ipdata->sram_gran_size; ret = v4l2_g_ctrl(esd->ctrl_handler, &hb); if (!ret && hb.value >= 0) @@ -799,17 +797,15 @@ static void calculate_stream_datarate(struct ipu6_isys_video *av) ipu6_isys_get_isys_format(ipu6_isys_get_format(av), 0); u32 pages_per_line, pb_bytes_per_line, pixels_per_line, bytes_per_line; u64 line_time_ns, stream_data_rate; - u16 shift, size; - - shift = watermark->sram_gran_shift; - size = watermark->sram_gran_size; pixels_per_line = watermark->width + watermark->hblank; line_time_ns = div_u64(pixels_per_line * NSEC_PER_SEC, watermark->pixel_rate); bytes_per_line = watermark->width * pfmt->bpp / 8; - pages_per_line = DIV_ROUND_UP(bytes_per_line, size); - pb_bytes_per_line = pages_per_line << shift; + pages_per_line = DIV_ROUND_UP(bytes_per_line, + av->isys->pdata->ipdata->sram_gran_size); + pb_bytes_per_line = + pages_per_line << av->isys->pdata->ipdata->sram_gran_shift; stream_data_rate = div64_u64(pb_bytes_per_line * 1000, line_time_ns); watermark->stream_data_rate = stream_data_rate; diff --git a/drivers/media/pci/intel/ipu6/ipu6-isys-video.h b/drivers/media/pci/intel/ipu6/ipu6-isys-video.h index d07c16e79877..80b9d0d001b1 100644 --- a/drivers/media/pci/intel/ipu6/ipu6-isys-video.h +++ b/drivers/media/pci/intel/ipu6/ipu6-isys-video.h @@ -72,8 +72,6 @@ struct video_stream_watermark { u32 frame_rate; u64 pixel_rate; u64 stream_data_rate; - u16 sram_gran_shift; - u16 sram_gran_size; struct list_head stream_node; }; -- 2.47.3