From nobody Fri Jul 24 23:30:38 2026 Received: from mail-pg1-f172.google.com (mail-pg1-f172.google.com [209.85.215.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 940042192FA for ; Wed, 22 Jul 2026 05:46:41 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.215.172 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1784699202; cv=none; b=Ih3dzDs2gIrprACve+SX+x2yUlS/vyot7lOmsiV1E4SjyGtGFXA3N5PoWvhnnAFk38ODbVocl/puITAhbfPWz0bh0QrfoHZe/mHPcxgRaUZ9g9MVBvD5Fc7BUe2QRSqAHsqjo8yLfxPpSEORubvJ5XbvXXyPSp9jspS5LT/hGSQ= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1784699202; c=relaxed/simple; bh=XVWfsIAgGX9Xd1n8zXWGc6IgbtmhQvC36aepBIb8Tf8=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=f99QaiO2je7Jh/Y9PFhGESKnXcUO6cQVWpgAv1nAUWpIgs7ZtGJ4IpJWtuiZspCV3ygJfI2SKevFvS6beMKPL/NB71GiqGUJAWybqUUGfxJEeBynF/dv88SfUTncF4DQuQU1Az7B8XXn2GCo79oMIfzE79aCcQBlcopVNnjWO8Q= 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=RfCg2cKT; arc=none smtp.client-ip=209.85.215.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="RfCg2cKT" Received: by mail-pg1-f172.google.com with SMTP id 41be03b00d2f7-c9d1fff21edso7976108a12.1 for ; Tue, 21 Jul 2026 22:46:41 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1784699201; x=1785304001; 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:content-type; bh=gPJSl7du6t+JICWFEnlJMKsprDG3NXTVNkQiPLiNnnI=; b=RfCg2cKT6/4wqTihzEB/jtxzUNqBSvgL1T5F5qi+cJCU7iB0ARbZqQv2tTclMuBT/d 3zEI0HLKwGZ3uZ38Ma+SEMJxugoNwM85UxfW03dgLY5GP03/jmvH0Mu6YSZqAKZDdHcu Q8wIT1gDvS0vg7y6gIT8Ue/OazyBiGzVYPvz0vOIOPfLegBPDlWPE3VlsB1jpGwxQSih lAUK4r0zAtKM64PkI5+o6ubkO63oAFETx3YZ7fneG+q+bOpHr6lJHM+PBRarPp077Kl7 r0abLHkAMTmA0mpant95RXNbM5H04CUFXrDd/6S8fHEAgtklZp+5Tpz6sDM+yrTOwPQX 28uw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1784699201; x=1785304001; 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:content-type; bh=gPJSl7du6t+JICWFEnlJMKsprDG3NXTVNkQiPLiNnnI=; b=Ae5FPXdRtAttc6Wgn7/j+fyZcefgVmigp9zPz6393NFEHY1ruZCTO2i2pPm9JkOA4j M/GLpGdd5JamZyldbfPwkthbmv1XPwE05OOdOeVDloUpSiofkWhLZ2LkUBRb657Nom/z 7quK3JZhiDBq9KQeAVVJ8KhKY8RtqI7TjpL0InX22qox8Oq/vvBQ+tyElLIBrmAKfMC1 XNcYR5YODsu79px0PBv/bM/GCECmOyt06DewGY+T0ubaCWuv/RReQIUbmS1iMTjDor8P QEzS1q0E6difPiX6GRXOcEoKfRIP0qIeVXJVZc6gTpESLldmJt0njrQq1ykMl2sOfzhJ odlw== X-Forwarded-Encrypted: i=1; AHgh+RoKaQldHmZhhwIqxmoTNgCgDIlAmcIHFbwGAaSFPjWKm5tmoVRBFdrzQJYLdn5v9NQW4VeT081exScXNiA=@vger.kernel.org X-Gm-Message-State: AOJu0YzlSqV6DKN46hg7KFhtFc84hPy/98OQam5YWwc6QsfCfJPSFjP2 8zT0tZZoG+nL+0nGHmNjs3x5qmylWcT9ZsRjn8b8YpZ8GtUQKkFGGnVS X-Gm-Gg: AR+sD12+CbhK9R8bZ43AZanmI+RKhOz+OBOStp7sdWx07YI5w42a02prc6XoLOUk0d/ XDZCM7eenSwa0mnR1ndhTMbcp5T4wMK54dfsgr52gbBfulog/+1MC8iQUj5wYQy0L/1ltVIi8Km fJsM+Sp0WtfVUgToikcCcI6AG4wohvtdyvXPo/2pbGiGCRfbFmXqGr0BEk/NXb4udAIcZzSDLHV 3+nfg7bO4FPo+SekIzi6qIaB6dYL4Wvz6c7/crCwSfR69sXY9c93fNbPq3710ns55C8HxMfB5ze nah25eC46698o3O8XeXCOXkJohfzSgxjo8V5nKkUj/pm0UUl/2H5szff1WBxf8o8SRwuBckGHwQ QFKQ8hh8bjNPxpxCvhsgqdsI/2TY3VAdMFHJS1RHUxrufGjbG9rA9f3mEdzx27buMyTUBGCSwMG YIA5t8eo50KfKbCg2j X-Received: by 2002:a05:6300:95:b0:3a2:f7bd:a9a5 with SMTP id adf61e73a8af0-3c3ad95b577mr22524251637.38.1784699200774; Tue, 21 Jul 2026 22:46:40 -0700 (PDT) Received: from UbuntuOS.. ([2409:4080:9090:9e2f:1d63:54d5:537b:d849]) by smtp.gmail.com with ESMTPSA id a92af1059eb24-13d130a8421sm2501696c88.10.2026.07.21.22.46.36 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 21 Jul 2026 22:46:40 -0700 (PDT) From: Prajval Chaudhary To: andriy.shevchenko@intel.com Cc: hverkuil-cisco@xs4all.nl, mchehab@kernel.org, sakari.ailios@linux.intel.com, gregkh@linuxfoundation.org, linux-media@vger.kernel.org, linux-kernel@vger.kernel.org, linux-staging@lists.linux.dev, Prajval Chaudhary Subject: [PATCH v5 1/2] staging: media: atomisp: Remove pad_w and pad_h module parameters Date: Wed, 22 Jul 2026 11:16:14 +0530 Message-Id: <20260722054615.21492-2-prajvalchaudhari733@gmail.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20260722054615.21492-1-prajvalchaudhari733@gmail.com> References: <20260722054615.21492-1-prajvalchaudhari733@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 the 'pad_w' and 'pad_h' module parameters to prevent userspace from overriding internal ISP hardware padding boundaries. Convert them into internal driver constants instead. Signed-off-by: Prajval Chaudhary --- drivers/staging/media/atomisp/pci/atomisp_common.h | 4 ++-- drivers/staging/media/atomisp/pci/atomisp_v4l2.c | 8 ++------ 2 files changed, 4 insertions(+), 8 deletions(-) diff --git a/drivers/staging/media/atomisp/pci/atomisp_common.h b/drivers/s= taging/media/atomisp/pci/atomisp_common.h index a2462fc306fb..7c6c0124ff72 100644 --- a/drivers/staging/media/atomisp/pci/atomisp_common.h +++ b/drivers/staging/media/atomisp/pci/atomisp_common.h @@ -22,8 +22,8 @@ =20 extern int dbg_level; extern int dbg_func; -extern int pad_w; -extern int pad_h; +extern const int pad_w; +extern const int pad_h; =20 /* Minimum padding requirements for ISP2400 (BYT) */ #define ISP2400_MIN_PAD_W 12 diff --git a/drivers/staging/media/atomisp/pci/atomisp_v4l2.c b/drivers/sta= ging/media/atomisp/pci/atomisp_v4l2.c index 812230397409..d117fea2860c 100644 --- a/drivers/staging/media/atomisp/pci/atomisp_v4l2.c +++ b/drivers/staging/media/atomisp/pci/atomisp_v4l2.c @@ -64,13 +64,9 @@ MODULE_PARM_DESC(dbg_func, * output res, and isp output res. however since we do not have this yet, * the chosen solution is the next best thing. */ -int pad_w =3D 16; -module_param(pad_w, int, 0644); -MODULE_PARM_DESC(pad_w, "extra data for ISP processing"); +const int pad_w =3D 16; =20 -int pad_h =3D 16; -module_param(pad_h, int, 0644); -MODULE_PARM_DESC(pad_h, "extra data for ISP processing"); +const int pad_h =3D 16; =20 /* * FIXME: this is a hack to make easier to support ISP2401 variant. --=20 2.34.1 From nobody Fri Jul 24 23:30:38 2026 Received: from mail-pj1-f47.google.com (mail-pj1-f47.google.com [209.85.216.47]) (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 079F52F1FED for ; Wed, 22 Jul 2026 05:46:50 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.216.47 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1784699212; cv=none; b=AEB0RiQo87s24KnXsAnO7WjW9L2P8gLE89P4lYW/cKF+6XvgJBNlf0bCRPJ7XYlgj/qBWhHLIonZ1R6u3yDVLUmKuTr3QXRsSrbA16CuhMGeVfRZX+8Sv+8vdM593IkzSG6mss3O8QFyZKkHOnV5ifXbVXUyCqmOVBW6QoQOQvo= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1784699212; c=relaxed/simple; bh=AD+BNoZWS4UlHFUg/CR2+OjggvmTwg9qgcslY/DZeoU=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=dWRnXp0zkvDiQgCVNjL3D9hVPYWTdxnJYyvMGRcJeUiOMmKl+4/0NekG9PEb0UvGdOJdp4Xh4Ji8wFKPiqm3qZdtPFRoWq0/KjBSdbkzr6+8O+6AzycvPtAShfgxodCnu4tl9wjuFml4+mBqhYFW37S+iyD65hdhvsVNxvgvwBI= 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=NT4y4J1G; arc=none smtp.client-ip=209.85.216.47 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="NT4y4J1G" Received: by mail-pj1-f47.google.com with SMTP id 98e67ed59e1d1-382ef647e20so11627464a91.1 for ; Tue, 21 Jul 2026 22:46:50 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1784699210; x=1785304010; 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:content-type; bh=yYfMwgjAC+NiH4sy7nujM+DhILcgkawlxOFuY4FThsI=; b=NT4y4J1GXvCt0o9nZtvm8A7hopXXgRpM92jgRRNhXdTEj2vDYgpptw6pI1pxQ/0QAB bqdDjhNGPXqlKbjWcKvrs5/I6iM11JjpvGTamjt55LlELEye2maKWkidYGuMxeGRyioe Lq7Fcsb59FYXll8N8hAhG6sBuEvLyDFDdYk5yN7NXXBMR1hST/K3lf4+AXYgL1qJDo1T gLKGtZksJ4EttndRbveH2izSmE71wpCTc34avdBsVEIVn9kzVzmv94/B1YBett6aNBT8 Pupt8W+ZLyPCEZfBX0MM2d8h42hhJitCCmQ1Mc3JGBqw6RYywjsUgI2bYST525M9WebN RMSQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1784699210; x=1785304010; 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:content-type; bh=yYfMwgjAC+NiH4sy7nujM+DhILcgkawlxOFuY4FThsI=; b=WfekRfNo3JA4X7N4nnzPR8QfjQRSWFRd6yFwMluDGoer7O/drw9zi1Kv2pSFCDXz8j 8bGVqJQSSAgoQuKGowdGESvZe5Zz9JSC12ZZ6+cubG0AKYDFd6k8MMO9VY7h8xrWYEgw OVczt/wqg8W5LZQ8o4ZgGaA8MNaFLTeVJHPG94wk8UV34p8vI1ElHaIL1nHYrMGNpIY9 QVzghwqrvQSYNfKNnYmLi3pwS7jo9va22ddYuJMncVaOn2ruKlvckWG295/OR0AFEep+ h2ZKTnq1x6hoKEpLMrczDDcgULz023OVpy6NbsceZlRyx71BevFZe6iDkcOwxTngqCTD 3Srw== X-Forwarded-Encrypted: i=1; AHgh+Ro6ZkY/CfOisky+z80LLjKlxPZxiXA4JyZ9mKJ0LfeDciNI+uDLWklClZMFHvD5nn3VbirAAJOwAvJ8MuI=@vger.kernel.org X-Gm-Message-State: AOJu0YxRwIYqX1OTtBFhtEP8+6LHDfV8xNAuKTtiYadScDqZRgzZb4Kf 1H+T2+sbYARDAV+oOmfCaDOqocC6cZHY9pAErGotYCtMjq9Pqm+w/PKY X-Gm-Gg: AR+sD13YH7sPQv1MYM1RYkjptlE3EKzsAG9+cvvo6aPykTymWBAbBUto/DytptvyXqC ZrgycsrH/ZcttGSd2HT+y+cF2PypM/ZR/qEfG05ypGpTqHfSpyZwfzna1mJiwjzxwy+RilW32M5 OXQGkLW363FP7YqH+jquLMOf24QmfjdbTbsnn/N9meRIYqFyvbdULKpw3H8JAoD7as+Qj341Gfb OLNTzvAyQq3/nZuH0Gmw+OeuuujoP2C1ucWYwxw8l05QL6kSNXLFP/CQzFRBWx1QHuzy3ATmOK/ DexEO7JEgFbQDg1AHe5WhTpEu0GNehEp7jE2G/jFP8nYkIpBd4LFSw4Plp/Dd5eqdgGZd9ERE1k Ro6IDNYUq6vZW823sgYKZWnztZy7CDHus5A1uG/nrn6HVksNcqxw52FdjZ83k7PznCBCL83f3Ek zFf+BsJQ77pYrX586n X-Received: by 2002:a17:90b:5688:b0:38e:ad9d:1161 with SMTP id 98e67ed59e1d1-38ead9d1328mr180991a91.0.1784699210128; Tue, 21 Jul 2026 22:46:50 -0700 (PDT) Received: from UbuntuOS.. ([2409:4080:9090:9e2f:1d63:54d5:537b:d849]) by smtp.gmail.com with ESMTPSA id a92af1059eb24-13d130a8421sm2501696c88.10.2026.07.21.22.46.45 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 21 Jul 2026 22:46:49 -0700 (PDT) From: Prajval Chaudhary To: andriy.shevchenko@intel.com Cc: hverkuil-cisco@xs4all.nl, mchehab@kernel.org, sakari.ailios@linux.intel.com, gregkh@linuxfoundation.org, linux-media@vger.kernel.org, linux-kernel@vger.kernel.org, linux-staging@lists.linux.dev, Prajval Chaudhary Subject: [PATCH v5 2/2] staging: media: atomisp: Remove dbg_level and dbg_func module parameters Date: Wed, 22 Jul 2026 11:16:15 +0530 Message-Id: <20260722054615.21492-3-prajvalchaudhari733@gmail.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20260722054615.21492-1-prajvalchaudhari733@gmail.com> References: <20260722054615.21492-1-prajvalchaudhari733@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 the 'dbg_level' and 'dbg_func' module parameters to align the driver's debug logging with standard Linux kernel printk infrastructure. Previously: - 'dbg_level' controlled trace verbosity level (default 0, up to 9). - 'dbg_func' selected whether CSS trace outputs routed to printk (1) or remained disabled/unrouted (0). Since module-level custom parameters duplicate modern dynamic debug and printk capabilities, remove them and filter trace messages in ia_css_debug_vdtrace() to IA_CSS_DEBUG_WARNING or lower. Signed-off-by: Prajval Chaudhary --- drivers/staging/media/atomisp/pci/atomisp_cmd.c | 8 ++++---- drivers/staging/media/atomisp/pci/atomisp_common.h | 6 ++---- .../staging/media/atomisp/pci/atomisp_compat_css20.c | 12 +++--------- drivers/staging/media/atomisp/pci/atomisp_ioctl.c | 4 ++-- drivers/staging/media/atomisp/pci/atomisp_v4l2.c | 10 ---------- .../pci/runtime/debug/interface/ia_css_debug.h | 10 +++++----- .../atomisp/pci/runtime/debug/src/ia_css_debug.c | 4 ++-- 7 files changed, 18 insertions(+), 36 deletions(-) diff --git a/drivers/staging/media/atomisp/pci/atomisp_cmd.c b/drivers/stag= ing/media/atomisp/pci/atomisp_cmd.c index 6cd500d9fd26..0b40cd69cef0 100644 --- a/drivers/staging/media/atomisp/pci/atomisp_cmd.c +++ b/drivers/staging/media/atomisp/pci/atomisp_cmd.c @@ -3574,8 +3574,8 @@ void atomisp_get_padding(struct atomisp_device *isp, = u32 width, u32 height, struct v4l2_mbus_framefmt *sink; =20 if (!input->crop_support) { - *padding_w =3D pad_w; - *padding_h =3D pad_h; + *padding_w =3D ATOMISP_PAD_W; + *padding_h =3D ATOMISP_PAD_H; return; } =20 @@ -3588,8 +3588,8 @@ void atomisp_get_padding(struct atomisp_device *isp, = u32 width, u32 height, native_rect.height /=3D 2; } =20 - *padding_w =3D min_t(u32, (native_rect.width - width) & ~1, pad_w); - *padding_h =3D min_t(u32, (native_rect.height - height) & ~1, pad_h); + *padding_w =3D min_t(u32, (native_rect.width - width) & ~1, ATOMISP_PAD_W= ); + *padding_h =3D min_t(u32, (native_rect.height - height) & ~1, ATOMISP_PAD= _H); =20 /* The below minimum padding requirements are for BYT / ISP2400 only */ if (IS_ISP2401) diff --git a/drivers/staging/media/atomisp/pci/atomisp_common.h b/drivers/s= taging/media/atomisp/pci/atomisp_common.h index 7c6c0124ff72..fbc72975ec54 100644 --- a/drivers/staging/media/atomisp/pci/atomisp_common.h +++ b/drivers/staging/media/atomisp/pci/atomisp_common.h @@ -20,10 +20,8 @@ =20 #include "ia_css.h" =20 -extern int dbg_level; -extern int dbg_func; -extern const int pad_w; -extern const int pad_h; +#define ATOMISP_PAD_W 16 +#define ATOMISP_PAD_H 16 =20 /* Minimum padding requirements for ISP2400 (BYT) */ #define ISP2400_MIN_PAD_W 12 diff --git a/drivers/staging/media/atomisp/pci/atomisp_compat_css20.c b/dri= vers/staging/media/atomisp/pci/atomisp_compat_css20.c index ea49ebe2da5c..647f6e7e2455 100644 --- a/drivers/staging/media/atomisp/pci/atomisp_compat_css20.c +++ b/drivers/staging/media/atomisp/pci/atomisp_compat_css20.c @@ -784,7 +784,7 @@ int atomisp_css_load_firmware(struct atomisp_device *is= p) isp->css_env.isp_css_env.hw_access_env.load =3D atomisp_css2_hw_load; isp->css_env.isp_css_env.hw_access_env.store =3D atomisp_css2_hw_store; =20 - __set_css_print_env(isp, dbg_func); + __set_css_print_env(isp, 1); =20 isp->css_env.isp_css_env.print_env.error_print =3D atomisp_vprintk; =20 @@ -3372,18 +3372,12 @@ void atomisp_css_set_isp_config_applied_frame(struc= t atomisp_sub_device *asd, =20 int atomisp_get_css_dbgfunc(void) { - return dbg_func; + return 1; } =20 int atomisp_set_css_dbgfunc(struct atomisp_device *isp, int opt) { - int ret; - - ret =3D __set_css_print_env(isp, opt); - if (ret =3D=3D 0) - dbg_func =3D opt; - - return ret; + return __set_css_print_env(isp, opt); } =20 void atomisp_en_dz_capt_pipe(struct atomisp_sub_device *asd, bool enable) diff --git a/drivers/staging/media/atomisp/pci/atomisp_ioctl.c b/drivers/st= aging/media/atomisp/pci/atomisp_ioctl.c index 50366bf10f32..b50d73aaf440 100644 --- a/drivers/staging/media/atomisp/pci/atomisp_ioctl.c +++ b/drivers/staging/media/atomisp/pci/atomisp_ioctl.c @@ -554,8 +554,8 @@ static int atomisp_enum_framesizes(struct file *file, v= oid *priv, return ret; =20 fsize->type =3D V4L2_FRMSIZE_TYPE_DISCRETE; - fsize->discrete.width =3D fse.max_width - pad_w; - fsize->discrete.height =3D fse.max_height - pad_h; + fsize->discrete.width =3D fse.max_width - ATOMISP_PAD_W; + fsize->discrete.height =3D fse.max_height - ATOMISP_PAD_H; =20 return 0; } diff --git a/drivers/staging/media/atomisp/pci/atomisp_v4l2.c b/drivers/sta= ging/media/atomisp/pci/atomisp_v4l2.c index d117fea2860c..fe3b844a47bb 100644 --- a/drivers/staging/media/atomisp/pci/atomisp_v4l2.c +++ b/drivers/staging/media/atomisp/pci/atomisp_v4l2.c @@ -45,15 +45,8 @@ #define CSTATE_EXIT_LATENCY_C1 1 =20 /* cross component debug message flag */ -int dbg_level; -module_param(dbg_level, int, 0644); -MODULE_PARM_DESC(dbg_level, "debug message level (default:0)"); =20 /* log function switch */ -int dbg_func =3D 1; -module_param(dbg_func, int, 0644); -MODULE_PARM_DESC(dbg_func, - "log function switch non/printk (default:printk)"); =20 /* * Set to 16x16 since this is the amount of lines and pixels the sensor @@ -64,9 +57,6 @@ MODULE_PARM_DESC(dbg_func, * output res, and isp output res. however since we do not have this yet, * the chosen solution is the next best thing. */ -const int pad_w =3D 16; - -const int pad_h =3D 16; =20 /* * FIXME: this is a hack to make easier to support ISP2401 variant. diff --git a/drivers/staging/media/atomisp/pci/runtime/debug/interface/ia_c= ss_debug.h b/drivers/staging/media/atomisp/pci/runtime/debug/interface/ia_c= ss_debug.h index 2d0e906530af..87cf8ff7408e 100644 --- a/drivers/staging/media/atomisp/pci/runtime/debug/interface/ia_css_debu= g.h +++ b/drivers/staging/media/atomisp/pci/runtime/debug/interface/ia_css_debu= g.h @@ -9,9 +9,10 @@ =20 /*! \file */ =20 -#include -#include #include +#include +#include +#include #include "ia_css_types.h" #include "ia_css_binary.h" #include "ia_css_frame_public.h" @@ -39,7 +40,6 @@ #define IA_CSS_DEBUG_INFO 9 =20 /* Global variable which controls the verbosity levels of the debug tracin= g */ -extern int dbg_level; =20 /*! @brief Enum defining the different isp parameters to dump. * Values can be combined to dump a combination of sets. @@ -125,8 +125,8 @@ static inline void __printf(2, 0) ia_css_debug_vdtrace(= unsigned int level, const char *fmt, va_list args) { - if (dbg_level >=3D level) - sh_css_vprint(fmt, args); + if (level <=3D IA_CSS_DEBUG_WARNING) + vprintk(fmt, args); } =20 __printf(2, 3) void ia_css_debug_dtrace(unsigned int level, diff --git a/drivers/staging/media/atomisp/pci/runtime/debug/src/ia_css_deb= ug.c b/drivers/staging/media/atomisp/pci/runtime/debug/src/ia_css_debug.c index 5113aa5973f3..86b2cca2f441 100644 --- a/drivers/staging/media/atomisp/pci/runtime/debug/src/ia_css_debug.c +++ b/drivers/staging/media/atomisp/pci/runtime/debug/src/ia_css_debug.c @@ -135,13 +135,13 @@ void ia_css_debug_dtrace(unsigned int level, const ch= ar *fmt, ...) =20 void ia_css_debug_set_dtrace_level(const unsigned int trace_level) { - dbg_level =3D trace_level; + /* Trace level is now controlled dynamically via Linux kernel dynamic deb= ug facility */ return; } =20 unsigned int ia_css_debug_get_dtrace_level(void) { - return dbg_level; + return 0; } =20 static const char *debug_stream_format2str(const enum atomisp_input_format --=20 2.34.1