From nobody Mon Feb 9 19:42:36 2026 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id F2250EC873E for ; Thu, 7 Sep 2023 16:55:15 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S244755AbjIGQzR (ORCPT ); Thu, 7 Sep 2023 12:55:17 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:35836 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S244636AbjIGQzP (ORCPT ); Thu, 7 Sep 2023 12:55:15 -0400 Received: from mail-lj1-x22e.google.com (mail-lj1-x22e.google.com [IPv6:2a00:1450:4864:20::22e]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 8873E1FEF for ; Thu, 7 Sep 2023 09:54:51 -0700 (PDT) Received: by mail-lj1-x22e.google.com with SMTP id 38308e7fff4ca-2b9d07a8d84so19670981fa.3 for ; Thu, 07 Sep 2023 09:54:51 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1694105612; x=1694710412; 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=zSVSANzjwjWJL58JqdMOyxf39JxdZOjplNSWyv8wvaY=; b=XywIpqIGwX4ZoiB2xEaEnF1citpCFFIkNsrhnCg+p63B7a/hBbW/jSkLqoN8LXGN/P /wNG2n3wnClVMrkucZJY52cbCxFZdnCY7IYX1ERmXt9XLziEqM2Z1+ArZH1GzP/fDtNb Sunvd+wC+HtIzO9H3i4UhleizAPdfjLMZOGQzalzKISIp5cpGaXuTm4J09QHlqDnSnWo 1UzYYchbmOl+MkQJ2lMeEjej0iNNwQw4yN6CNqvCoDFZ+A/hTNp3l142wLRxGq2wNTqn xBvvJhMvNK8YqZR2/WId+zHCZRyydJm9skbCSy/PIghJCrqjdaeR2YtrFw4Hovu3dHLf Vp+Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1694105612; x=1694710412; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=zSVSANzjwjWJL58JqdMOyxf39JxdZOjplNSWyv8wvaY=; b=Gys245+rUrvPfv9pyZ5HWiIE2YIoPcQ1pvo/XpSyWmVCnHBQI4alOKPmzJmG5MgGEj Va5Vctsw86Dh1OGQJs2o6FJMBoe7sBAzXEh5PwIm1uyrR0SnKhBxJsmdTECdDIU3nrsB /Sz7r4z7iIU70jEIrCnb+u/bwD0M1AIxZrBKzFjC1nsAwBC7nNZeuYkhxVdm0iZvvHkp lgRyoC5Iw5aWY9eryZNU7NyzExOZ6eJIxPgtZsUAJQqlfbFocUsP7U/Fo67uENB89E9u lzuUkorLG1mS3sIeOWe5jwAuqlr9qKaaQZv2cjaAnMBmw2yDR326P8QuMpdpKI2S2cdr 3V2Q== X-Gm-Message-State: AOJu0YzMt97W4EnOY4GbyJQOoYoF1ixEnoqWtJPaq2K5rGn9vllcJKKq 5fJbQk0f5QhBKUzS5zCB/BVYM0aA16Ch0gs+quA= X-Google-Smtp-Source: AGHT+IHKo1JmOMb4+djt+NKGu6fxIHBbTNo3gqmI+h53oZDKltsofVpbHkVMvWTKSuUVVecRTOFMHQ== X-Received: by 2002:a5d:5643:0:b0:319:7471:2965 with SMTP id j3-20020a5d5643000000b0031974712965mr5838wrw.21.1694105066449; Thu, 07 Sep 2023 09:44:26 -0700 (PDT) Received: from sagittarius-a.chello.ie (188-141-3-169.dynamic.upc.ie. [188.141.3.169]) by smtp.gmail.com with ESMTPSA id d15-20020adffd8f000000b00317ab75748bsm23822145wrr.49.2023.09.07.09.44.25 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 07 Sep 2023 09:44:26 -0700 (PDT) From: Bryan O'Donoghue To: rfoss@kernel.org, todor.too@gmail.com, bryan.odonoghue@linaro.org, agross@kernel.org, andersson@kernel.org, konrad.dybcio@linaro.org, mchehab@kernel.org, hverkuil-cisco@xs4all.nl, laurent.pinchart@ideasonboard.com, sakari.ailus@linux.intel.com, andrey.konovalov@linaro.org Cc: linux-media@vger.kernel.org, linux-arm-msm@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH v4 09/17] media: qcom: camss: Remove special case for VFE get/put Date: Thu, 7 Sep 2023 17:44:02 +0100 Message-ID: <20230907164410.36651-10-bryan.odonoghue@linaro.org> X-Mailer: git-send-email 2.42.0 In-Reply-To: <20230907164410.36651-1-bryan.odonoghue@linaro.org> References: <20230907164410.36651-1-bryan.odonoghue@linaro.org> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" From sdm845 onwards we need to ensure the VFE is powered on prior to switching on the CSID. Currently the code tests for sdm845, sm8250 and then does get/set. This is not extensible and it turns out is not necessary either since vfe_get and vfe_set reference count. Remove the over-conservative SoC version check. Signed-off-by: Bryan O'Donoghue Suggested-by: Laurent Pinchart Tested-by: Bryan O'Donoghue # rb3 # db410c --- drivers/media/platform/qcom/camss/camss-csid.c | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) diff --git a/drivers/media/platform/qcom/camss/camss-csid.c b/drivers/media= /platform/qcom/camss/camss-csid.c index 99f651e2021cb..02ae3f5cb0c0e 100644 --- a/drivers/media/platform/qcom/camss/camss-csid.c +++ b/drivers/media/platform/qcom/camss/camss-csid.c @@ -159,15 +159,12 @@ static int csid_set_power(struct v4l2_subdev *sd, int= on) struct camss *camss =3D csid->camss; struct device *dev =3D camss->dev; struct vfe_device *vfe =3D &camss->vfe[csid->id]; - u32 version =3D camss->res->version; int ret =3D 0; =20 if (on) { - if (version =3D=3D CAMSS_8250 || version =3D=3D CAMSS_845) { - ret =3D vfe_get(vfe); - if (ret < 0) - return ret; - } + ret =3D vfe_get(vfe); + if (ret < 0) + return ret; =20 ret =3D pm_runtime_resume_and_get(dev); if (ret < 0) @@ -217,8 +214,7 @@ static int csid_set_power(struct v4l2_subdev *sd, int o= n) regulator_bulk_disable(csid->num_supplies, csid->supplies); pm_runtime_put_sync(dev); - if (version =3D=3D CAMSS_8250 || version =3D=3D CAMSS_845) - vfe_put(vfe); + vfe_put(vfe); } =20 return ret; --=20 2.41.0