From patchwork Tue Mar 4 13:07:07 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bryan O'Donoghue X-Patchwork-Id: 14000697 Received: from mail-wr1-f52.google.com (mail-wr1-f52.google.com [209.85.221.52]) (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 E81B92036FE for ; Tue, 4 Mar 2025 13:07:12 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.221.52 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1741093634; cv=none; b=E4Gsn4oFGlfRIttpQtpYrNAtdfKZrLl2zuI1K+gRIZCA9WU/UEVSGRg9hNCtXwXx/ZyC94sFA38dm0dfETec1vVfdMN8ad0Xbdbs4Am9EJA7jJm7l4TAzBqfMfIxEPbbouyhXUUB0Thuo1VZs8SXbe5D14RqesijXmO6FIJWNOU= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1741093634; c=relaxed/simple; bh=zp7dfq9ZHu42Fop+Hzp7Ynopwb9wccKSyGLv3/T6KYc=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=FGDFAiD3cDSf11KU7CyFQ6MuhAoTljyUuAE/1t8B0TfLNSQ6U4ie4jtS1x6LnAy5ynPEXhziELfdiwUELuaI4ktbMlg1njpGQ/o0pWjFjeusK8JKUm6PQoAhefVEKzt2Xx4MzSn9hmpXATJGZ8b6GGWY6s5C6btvR/MjYQlD00Q= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linaro.org; spf=pass smtp.mailfrom=linaro.org; dkim=pass (2048-bit key) header.d=linaro.org header.i=@linaro.org header.b=kcz72HOA; arc=none smtp.client-ip=209.85.221.52 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linaro.org Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=linaro.org Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=linaro.org header.i=@linaro.org header.b="kcz72HOA" Received: by mail-wr1-f52.google.com with SMTP id ffacd0b85a97d-38a25d4b9d4so3387839f8f.0 for ; Tue, 04 Mar 2025 05:07:12 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1741093631; x=1741698431; darn=vger.kernel.org; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:from:to:cc:subject:date:message-id :reply-to; bh=T0qKgshl2F0rJcY3RgeB9zYkoCzuHBzqb6ry7L6OfzQ=; b=kcz72HOAtWYz3QzNm8dbICF5Wm4deg46csGs3Af1Duj6G2puOgyHodGALb4sYtWgov SwDC9XfZ63zRnPfzeaGa39NTULiIhFfQZ2MPCWaaEsWZ8mtjZcmfBLEaDGURLSLZ5DqD h0CKxvJ/mlYqCYNMh9mkEwjnmOrfYILOFvnuV7W99Rk7Xy5jnrliwZwEN5hhJogSnVNi U37Uzpw0BddOFydNov/0kRkOB0rOmnDEdXRnWcAg6ZPNAC+/4QhQADMCDIQMRoVmnw3U /tP0O+6M+dCURtFMYtYs5reBBgGHKwoomWa8rK9AU2XDiKTNWjo9Y/0Vfb2P87WS7Ipo MXHg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1741093631; x=1741698431; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=T0qKgshl2F0rJcY3RgeB9zYkoCzuHBzqb6ry7L6OfzQ=; b=FH4lOJ9P/HdB7bV1H3fAbKvrRPu22BjKkrCFhBGZwtLzJNaF0X0FClaKNLjxCXsO80 wPYZQD75hDwWlPcigllWUGINiyN++z/p/r8yV5/emuOBriFbEQOCQ3a9mlL2CJcioYxu 4MGy/k9POdFXnaqIGSU4LQ5+jJsvwVP1NSW8fvOIbQAE7+1ZyLr3PV4TJwP2vn/Thrh6 OFVklt14C2Q+0BZ5ER5PqDp6HebmMIyH7l4Wr76TADOJgYTOO6LIrY+HF8EBCWCb91q+ sqsG9Qs/3OyUeRGzfroydlZUKJxG9tgTCMKG8KftjKlRRp3meTE0XnaGwhqzVgE818Tm onvQ== X-Forwarded-Encrypted: i=1; AJvYcCWDIniQDJI71FyULb0MVsA8GSr3sbSW/LU30ygEN7YaTmgkdZ7XtjMeGxsANDdJX5BsSNWRVDCiEj+JXdOy@vger.kernel.org X-Gm-Message-State: AOJu0YwUvXGDuT9pPdgzGbipM768H1bzg10J8JVUFpBXRnK/a2hwc8J4 nWJOZsG5s9Vf0iyiHQUzOuiAbkY7B/HyijyVTeCZmIoJS0cX7XlFzIfSkqPI2mE= X-Gm-Gg: ASbGncsLa5OEb4cuRCXM0P8zV1nqThRh34AskZoq+9ouMVBKR1iiXUYXseNXANKOmUD npoDgVYibNSKovpQs9PJHpYj7YCwGiwIDxgE1//woCoknNDPHXkrWKG72JOcpfOeE4womwWTf3B gx9z4O+d4Fmmiwh6IcSud+ahqxch9x3TYcBo61x4kl4KcsPZOHMS8QO9JhW4uqiohlKH9TY896n q/uPcjjZb3BJ/3au+fjDQnuxdJ9p/deDLEz41IjTC6+35VFkh9cvUURbOt9vb3OAaW/k9kZNplZ Qg6uTmJt592IotQa8HM6y6oZ1MumqqpSGm9TeWvOpMsy7ZbpErnRr1PD9wkDgpm4h+NSER3pUC8 J4gjViQ== X-Google-Smtp-Source: AGHT+IGt41Z+aO1r0FZqK5TAia+vDzJ+cmrhxgfP8isz0xSsSE8fCGSnzIfP3HUl2KwIfn42/exnSw== X-Received: by 2002:a5d:59ae:0:b0:391:1652:f0c5 with SMTP id ffacd0b85a97d-3911652f24fmr2043369f8f.37.1741093631080; Tue, 04 Mar 2025 05:07:11 -0800 (PST) Received: from [127.0.1.1] (188-141-3-146.dynamic.upc.ie. [188.141.3.146]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-390e47b6cd8sm17401715f8f.44.2025.03.04.05.07.09 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 04 Mar 2025 05:07:10 -0800 (PST) From: Bryan O'Donoghue Date: Tue, 04 Mar 2025 13:07:07 +0000 Subject: [PATCH 1/8] media: dt-bindings: Document SC8280XP/SM8350 Venus Precedence: bulk X-Mailing-List: linux-arm-msm@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Message-Id: <20250304-b4-linux-media-comitters-sc8280xp-venus-v1-1-279c7ea55493@linaro.org> References: <20250304-b4-linux-media-comitters-sc8280xp-venus-v1-0-279c7ea55493@linaro.org> In-Reply-To: <20250304-b4-linux-media-comitters-sc8280xp-venus-v1-0-279c7ea55493@linaro.org> To: Stanimir Varbanov , Vikash Garodia , Mauro Carvalho Chehab , Rob Herring , Krzysztof Kozlowski , Conor Dooley , Konrad Dybcio , Bjorn Andersson Cc: linux-media@vger.kernel.org, linux-arm-msm@vger.kernel.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, Bryan O'Donoghue , Johan Hovold X-Mailer: b4 0.15-dev-33ea6 From: Konrad Dybcio Both of these SoCs implement an IRIS2 block, with SC8280XP being able to clock it a bit higher. Document it. Signed-off-by: Konrad Dybcio Link: https://lore.kernel.org/r/20230731-topic-8280_venus-v1-1-8c8bbe1983a5@linaro.org Signed-off-by: Johan Hovold [ bod: dropped dts video-encoder/video-decoder ] Signed-off-by: Bryan O'Donoghue --- .../bindings/media/qcom,sm8350-venus.yaml | 119 +++++++++++++++++++++ 1 file changed, 119 insertions(+) diff --git a/Documentation/devicetree/bindings/media/qcom,sm8350-venus.yaml b/Documentation/devicetree/bindings/media/qcom,sm8350-venus.yaml new file mode 100644 index 0000000000000..352ad85ae50cd --- /dev/null +++ b/Documentation/devicetree/bindings/media/qcom,sm8350-venus.yaml @@ -0,0 +1,119 @@ +# SPDX-License-Identifier: (GPL-2.0 OR BSD-2-Clause) +%YAML 1.2 +--- +$id: http://devicetree.org/schemas/media/qcom,sm8350-venus.yaml# +$schema: http://devicetree.org/meta-schemas/core.yaml# + +title: Qualcomm SM8350 Venus video encode and decode accelerators + +maintainers: + - Konrad Dybcio + +description: | + The Venus Iris2 IP is a video encode and decode accelerator present + on Qualcomm platforms + +allOf: + - $ref: qcom,venus-common.yaml# + +properties: + compatible: + enum: + - qcom,sc8280xp-venus + - qcom,sm8350-venus + + clocks: + maxItems: 3 + + clock-names: + items: + - const: iface + - const: core + - const: vcodec0_core + + resets: + maxItems: 1 + + reset-names: + items: + - const: core + + power-domains: + maxItems: 3 + + power-domain-names: + items: + - const: venus + - const: vcodec0 + - const: mx + + interconnects: + maxItems: 3 + + interconnect-names: + items: + - const: cpu-cfg + - const: video-mem + - const: video-llcc + + operating-points-v2: true + opp-table: + type: object + + iommus: + maxItems: 1 + +required: + - compatible + - power-domain-names + - iommus + +unevaluatedProperties: false + +examples: + - | + #include + #include + #include + #include + #include + #include + + venus: video-codec@aa00000 { + compatible = "qcom,sm8350-venus"; + reg = <0x0aa00000 0x100000>; + interrupts = ; + + clocks = <&gcc GCC_VIDEO_AXI0_CLK>, + <&videocc VIDEO_CC_MVS0C_CLK>, + <&videocc VIDEO_CC_MVS0_CLK>; + clock-names = "iface", + "core", + "vcodec0_core"; + + resets = <&gcc GCC_VIDEO_AXI0_CLK_ARES>; + reset-names = "core"; + + power-domains = <&videocc MVS0C_GDSC>, + <&videocc MVS0_GDSC>, + <&rpmhpd SM8350_MX>; + power-domain-names = "venus", + "vcodec0", + "mx"; + + interconnects = <&gem_noc MASTER_APPSS_PROC QCOM_ICC_TAG_ACTIVE_ONLY + &config_noc SLAVE_VENUS_CFG QCOM_ICC_TAG_ACTIVE_ONLY>, + <&mmss_noc MASTER_VIDEO_P0 QCOM_ICC_TAG_ALWAYS + &mc_virt SLAVE_EBI1 QCOM_ICC_TAG_ALWAYS>, + <&mmss_noc MASTER_VIDEO_P0 QCOM_ICC_TAG_ALWAYS + &gem_noc SLAVE_LLCC QCOM_ICC_TAG_ALWAYS>; + interconnect-names = "cpu-cfg", + "video-mem", + "video-llcc"; + + operating-points-v2 = <&venus_opp_table>; + iommus = <&apps_smmu 0x2100 0x400>; + memory-region = <&pil_video_mem>; + + status = "disabled"; + }; From patchwork Tue Mar 4 13:07:08 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bryan O'Donoghue X-Patchwork-Id: 14000698 Received: from mail-wr1-f53.google.com (mail-wr1-f53.google.com [209.85.221.53]) (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 2848B204593 for ; Tue, 4 Mar 2025 13:07:13 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.221.53 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1741093636; cv=none; b=g668t4VNHGankNFa/j0c2kQVyKtMDNdXIiQnk09D6tmdtqQFmVQwNIiXUF6tu4bnDapqCO0pEdjxtwVZF9exoWomKqsbEMBgHIZgzY/7LWz7cXWsKLXzx+hALbY9/s9Ve2LjdAtUuZhPzIMR3H5jxOrHeK86EeQke17iSDURFnw= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1741093636; c=relaxed/simple; bh=p6tzcyV2ztMb72HG02Epla8JNG+sbRzfglIoOgRfNwY=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=Upw96q38tYURJRu3+2ObKpJNUu7rZuoe1LQ04PipNb5tHtiUY5/9yhOEdZSURM5xIg1wgiD/aLwpDK2J22nMtc+aF7Jhp4HLfqaZpaQL08YXZdqXiihdcS4B6eajUH5V7tSC4f7UWgkSLVTyGvL5sApEb9GpBo0SZ6EdjdbbwKE= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linaro.org; spf=pass smtp.mailfrom=linaro.org; dkim=pass (2048-bit key) header.d=linaro.org header.i=@linaro.org header.b=nkMwFDLG; arc=none smtp.client-ip=209.85.221.53 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linaro.org Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=linaro.org Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=linaro.org header.i=@linaro.org header.b="nkMwFDLG" Received: by mail-wr1-f53.google.com with SMTP id ffacd0b85a97d-390d98ae34dso4538757f8f.3 for ; Tue, 04 Mar 2025 05:07:13 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1741093632; x=1741698432; darn=vger.kernel.org; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:from:to:cc:subject:date:message-id :reply-to; bh=fc2UFOQyH0/Jqy9uNhciWp/BhWlHs4mucXqaZLSwSf8=; b=nkMwFDLGaPHCB5at7uJPeHsUP8pwpzLi97cqZV5krLgWbqXvC93L5eaW5BJ5kKxZkk jti261WR+Vro2Ln1EUutzd3hM/OZ9uiM3Zi6rN/qffqXjEu6gr7DCYCEjg9Kjkm1yyR8 M6enXZzW8fA6o+f+xmgXMu1g+s/0TpylibQhAagZGLwGIQEEwCqNPGt9yT6hlUdBd9sc bWDPECWykPopWieVh90cRRn2pLEdReOIEilbtj03fkSCu3IB2CJvXSGQI+ZeA4L324yb xFQCadgqPVNZrSkPAluvVsv/IddiQeZxftf//VfBf1kY9XYnYmXrksQ388OVza8LFQWv ZbVA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1741093632; x=1741698432; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=fc2UFOQyH0/Jqy9uNhciWp/BhWlHs4mucXqaZLSwSf8=; b=AFYx/jKUB/Cnh6HB5bsScXla9lBhHL3FUX+7UeP0jiuD8RFAwh4gOR4hOFLp95cwAV R/yZU6jIJEf20pqOdxumBTyeLyfmLE/u1QgR4Ovuz+i8M1Sb3KCAFDPv1lnPPWlhV/uc BESh+OJabRhg0xPAmmPmOdDx1fDgE06c7yrzK6rapALrLCY3oQW0tWoP6L2YsUk/NW1G ZIlt0ZROfc/s120J4QcvY+YNv4d+Ib3ndTewZKRKFeZSdI+RFRcOv7PypwRmByz7APZC /Ly8M++tnQ6lAkZdUvkBARPZN4KO3PVvfl+FBYf83nBKNynLYFs/q+M77lnilr0OUf5J wewQ== X-Forwarded-Encrypted: i=1; AJvYcCW9nrMxNKXwcAbCfqf8Y5Y6bBast8UQAXbzSvyFnWNNprZrrXkGcFmrz7RWSoFx3V9r44tUoUOzuvcWkR58@vger.kernel.org X-Gm-Message-State: AOJu0Yy/kyM8c4pAvuK84K5j8NgCLj/OoN8/kRJLNSSyY4G2NTqhro9Y J8pJbsh8h3yUol7s+OLxrP6eQQyVoymygiNTbtNstvBhjzvLDrL7Gu8HPB8T2b8= X-Gm-Gg: ASbGncuDUezkyZoekX+//0OjFplXq+Usyu+KYy5otQS1Vp4TkptH8w6STdl1p4FMY3P 3M6G5Wb5Ns8ldqsxpcMAR9mGhbXFSKQzZDdHS4YjH5hKGxC2D7NHPwHjqxH6GgPeA65Jh7Rg7Wf C57n/XGadQSAMlX65MCwvfFj+gAoodTGzMK/vIF2c+CcfO7lOcYpGGH60wGhXY6MPw6JokOxqQV CfXlvWAoOkm8sHJHjBCW9BBSuxCcUWGKVbg3hSDCNoF1zHUHZtNEZdXnaL1sffQOYDhRf/NmQ0L 6d6QNn8Xahf/I5Z3FE+aqAOowrCqCBEULahiMeVLY/mtUJ9hTVmjjxOuvfxh8VDAUO8b5AhsfYD coLM5tA== X-Google-Smtp-Source: AGHT+IFlVQpbJbhy5jiyL8Usdv0nuA/4jjTLzZGkc9256Np8g3V59AFfddEVwJtu35RRPr2UhvWQvA== X-Received: by 2002:a5d:64a6:0:b0:390:e535:8758 with SMTP id ffacd0b85a97d-390ec7ca0e7mr13859515f8f.9.1741093632440; Tue, 04 Mar 2025 05:07:12 -0800 (PST) Received: from [127.0.1.1] (188-141-3-146.dynamic.upc.ie. [188.141.3.146]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-390e47b6cd8sm17401715f8f.44.2025.03.04.05.07.11 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 04 Mar 2025 05:07:12 -0800 (PST) From: Bryan O'Donoghue Date: Tue, 04 Mar 2025 13:07:08 +0000 Subject: [PATCH 2/8] media: venus: core: Remove trailing commas from of match entries Precedence: bulk X-Mailing-List: linux-arm-msm@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Message-Id: <20250304-b4-linux-media-comitters-sc8280xp-venus-v1-2-279c7ea55493@linaro.org> References: <20250304-b4-linux-media-comitters-sc8280xp-venus-v1-0-279c7ea55493@linaro.org> In-Reply-To: <20250304-b4-linux-media-comitters-sc8280xp-venus-v1-0-279c7ea55493@linaro.org> To: Stanimir Varbanov , Vikash Garodia , Mauro Carvalho Chehab , Rob Herring , Krzysztof Kozlowski , Conor Dooley , Konrad Dybcio , Bjorn Andersson Cc: linux-media@vger.kernel.org, linux-arm-msm@vger.kernel.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, Bryan O'Donoghue , Johan Hovold , Konrad Dybcio X-Mailer: b4 0.15-dev-33ea6 From: Konrad Dybcio Even though it has zero effect on functionality, remove them for coherency with other drivers. Signed-off-by: Konrad Dybcio Reviewed-by: Bryan O'Donoghue Link: https://lore.kernel.org/r/20230731-topic-8280_venus-v1-2-8c8bbe1983a5@linaro.org Signed-off-by: Johan Hovold Signed-off-by: Bryan O'Donoghue --- drivers/media/platform/qcom/venus/core.c | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/drivers/media/platform/qcom/venus/core.c b/drivers/media/platform/qcom/venus/core.c index 77d48578ecd28..61fb59788a810 100644 --- a/drivers/media/platform/qcom/venus/core.c +++ b/drivers/media/platform/qcom/venus/core.c @@ -1058,15 +1058,15 @@ static const struct venus_resources sc7280_res = { }; static const struct of_device_id venus_dt_match[] = { - { .compatible = "qcom,msm8916-venus", .data = &msm8916_res, }, - { .compatible = "qcom,msm8996-venus", .data = &msm8996_res, }, - { .compatible = "qcom,msm8998-venus", .data = &msm8998_res, }, - { .compatible = "qcom,sdm660-venus", .data = &sdm660_res, }, - { .compatible = "qcom,sdm845-venus", .data = &sdm845_res, }, - { .compatible = "qcom,sdm845-venus-v2", .data = &sdm845_res_v2, }, - { .compatible = "qcom,sc7180-venus", .data = &sc7180_res, }, - { .compatible = "qcom,sc7280-venus", .data = &sc7280_res, }, - { .compatible = "qcom,sm8250-venus", .data = &sm8250_res, }, + { .compatible = "qcom,msm8916-venus", .data = &msm8916_res }, + { .compatible = "qcom,msm8996-venus", .data = &msm8996_res }, + { .compatible = "qcom,msm8998-venus", .data = &msm8998_res }, + { .compatible = "qcom,sdm660-venus", .data = &sdm660_res }, + { .compatible = "qcom,sdm845-venus", .data = &sdm845_res }, + { .compatible = "qcom,sdm845-venus-v2", .data = &sdm845_res_v2 }, + { .compatible = "qcom,sc7180-venus", .data = &sc7180_res }, + { .compatible = "qcom,sc7280-venus", .data = &sc7280_res }, + { .compatible = "qcom,sm8250-venus", .data = &sm8250_res }, { } }; MODULE_DEVICE_TABLE(of, venus_dt_match); From patchwork Tue Mar 4 13:07:09 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bryan O'Donoghue X-Patchwork-Id: 14000700 Received: from mail-wr1-f50.google.com (mail-wr1-f50.google.com [209.85.221.50]) (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 6F8DD204680 for ; Tue, 4 Mar 2025 13:07:15 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.221.50 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1741093639; cv=none; b=XjKg33SVU+QPFxJ24acubOyvJvv/O4AceyjYue5E3SvZcZABCdlA1X5VGnyRABJ9KwU5QnbY0QIu0o0e7ekN43/9jP09NTfzLmvY2lF8cqpyeI84px4xwZVdx5LEFOeU19agxGXAmgeQDQAm+xCL5dZw+hG2LseTGkVA8X8lD4Q= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1741093639; c=relaxed/simple; bh=FaXxWBTtA0V9vWn2OFkttUFzPuAdqQgSnU2vFsSbkqI=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=Iga267PsJbExA3TKQVBHteFviMhTMUF1fdRHPyTsLH2gePCCAIgAi16CGF07IJqPFa753hndf5L8Ovkwkhqpsw2laoTODivvUrm02K4O/XPOq4Hub2r7bDtZI3c9DPLXlswCVkb0chjI78LNfeiaVCgOMuVYHUSRbuNKpaI8Erc= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linaro.org; spf=pass smtp.mailfrom=linaro.org; dkim=pass (2048-bit key) header.d=linaro.org header.i=@linaro.org header.b=P2U96kjI; arc=none smtp.client-ip=209.85.221.50 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linaro.org Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=linaro.org Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=linaro.org header.i=@linaro.org header.b="P2U96kjI" Received: by mail-wr1-f50.google.com with SMTP id ffacd0b85a97d-390ec7c2d40so3884630f8f.1 for ; Tue, 04 Mar 2025 05:07:15 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1741093634; x=1741698434; darn=vger.kernel.org; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:from:to:cc:subject:date:message-id :reply-to; bh=U6HSOnQBr0FDVpREIMoFhmB69JXqeBMODdqv9u5g3C4=; b=P2U96kjImqkUyovt+nf7z/PdDXHS4hm/QKlqa2kM691zNt/05WLjSvlTI/h3uZIfHi UQErMq7C3EhO7fEJwHfNV1h42wTwUL9/nsSH6OKVTTdJu/lZIBtSXgmpnXQJaUtNSWF4 47FBRKvGCqdrqL8kD3iAYlfsggwYvw26tcwdogR/RDCMkK2wMvlDw/B8ADyuLvm3QfGc zq6aTEG13xKwfcF1Pcq1gPGlvn8FPLNyWHNnVEkvGp47Z30dcoVLLzitj4D+DKUE/ceJ 2PumeYTkppHEZWcF+xwieOXkKAuGgoX1gobfjQ9APrphRlSv9iV7Znwj0omtxKYa+ZZr kH1A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1741093634; x=1741698434; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=U6HSOnQBr0FDVpREIMoFhmB69JXqeBMODdqv9u5g3C4=; b=sROSk4cERZS/kkyTXWeoEFzv4dsxoVYfnlEDKeEsULjXDbh53YnWtK43fzA8z0UdX5 CmXCvw5gLmXwpMd87r3p/4veOjevd8hNSRtigQ+QZtTtYgiX20ypXGF5ywd6YyBM49nE 2jOmbHem/G/lFyjNml2pLoJUBc9isqR7K4qjZCEZ1dMYZMej2zOJ2uoyg1pIdJnL8EIq Ltx6YC/v1fggc66ft9w1PCwrSy4LPGS+AJGvdVyTgb4MZFpaEx4tst2TLRxYL4yVey2E XqS7bLrUe3j4LmmexwdW2rYZw/hG2Xd/m2eCO5xI0N+AFL2QUbTZPIxpgyXTUODSe2un KZjw== X-Forwarded-Encrypted: i=1; AJvYcCUfpCXTlqOcTav8ENtnmTPs+IwEq1Ls/d6DyyhabnrrNAYakVTLPKhwGCG2rxuCCQA+sSEfLhyiN05J3OS0@vger.kernel.org X-Gm-Message-State: AOJu0YwR1aNSfYB3Wcx2x+4dBSjHyZzrGMEa1AH3nn/AbU5UbwB2FIhA wv9lEUEZTS+Y4ffV85SqUST/EbB/JEH3YCnHkDA1DkQvsixxlMkVItXCFmHJVCdCI7eYLs1VEQv 2 X-Gm-Gg: ASbGnctuk+Fujj0dTz7Nr1wLKP1P6SvDYduvwMkXhSXp4A5DjjkTPDIs/B+XN5eWXFR U23OjCvk3Q+fL4gWi93Vc6I4KD2RW0LxB06LFGQrKXEgFDUmCS0oYq95EEnDHTrPy4CaTRqIRFO NPKX0CGq77QAnPkj8afJHPlmnkkKKJuVzNzpBNqU+cOefiUvXn28CKzLuo5I4cckghXGBJI2nMZ W/X6jM4z3c7CUvcdF8oDvtaKffzjx6th9kRYCCafGq6EKf7idQQZ4hTRKuUpMAEoAm5xvWB0qyw XWab+tziHJ9orpmYngKtV9dS+MOQuThY/QDcLaKhSXdxXJbe//ghlHsVNTwIzL55ZlqD5newEqk 7Q79rog== X-Google-Smtp-Source: AGHT+IFd1jiwpx5EeofZBxtQSONJsTOBslCT9aMW9/Tof0U0ChG1L8NGbIX2J18ydo0KXKMo/1Upcg== X-Received: by 2002:a05:6000:2a02:b0:390:f412:dd41 with SMTP id ffacd0b85a97d-390f412e13bmr9259864f8f.53.1741093633694; Tue, 04 Mar 2025 05:07:13 -0800 (PST) Received: from [127.0.1.1] (188-141-3-146.dynamic.upc.ie. [188.141.3.146]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-390e47b6cd8sm17401715f8f.44.2025.03.04.05.07.12 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 04 Mar 2025 05:07:13 -0800 (PST) From: Bryan O'Donoghue Date: Tue, 04 Mar 2025 13:07:09 +0000 Subject: [PATCH 3/8] media: venus: hfi_venus: Support only updating certain bits with presets Precedence: bulk X-Mailing-List: linux-arm-msm@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Message-Id: <20250304-b4-linux-media-comitters-sc8280xp-venus-v1-3-279c7ea55493@linaro.org> References: <20250304-b4-linux-media-comitters-sc8280xp-venus-v1-0-279c7ea55493@linaro.org> In-Reply-To: <20250304-b4-linux-media-comitters-sc8280xp-venus-v1-0-279c7ea55493@linaro.org> To: Stanimir Varbanov , Vikash Garodia , Mauro Carvalho Chehab , Rob Herring , Krzysztof Kozlowski , Conor Dooley , Konrad Dybcio , Bjorn Andersson Cc: linux-media@vger.kernel.org, linux-arm-msm@vger.kernel.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, Bryan O'Donoghue , Johan Hovold , Konrad Dybcio X-Mailer: b4 0.15-dev-33ea6 From: Konrad Dybcio On some platforms (like SM8350) we're expected to only touch certain bits (such as 0 and 4 corresponding to mask 0x11). Add support for doing so. Signed-off-by: Konrad Dybcio Reviewed-by: Bryan O'Donoghue Link: https://lore.kernel.org/r/20230731-topic-8280_venus-v1-3-8c8bbe1983a5@linaro.org Signed-off-by: Johan Hovold Signed-off-by: Bryan O'Donoghue --- drivers/media/platform/qcom/venus/core.h | 1 + drivers/media/platform/qcom/venus/hfi_venus.c | 15 ++++++++++++--- 2 files changed, 13 insertions(+), 3 deletions(-) diff --git a/drivers/media/platform/qcom/venus/core.h b/drivers/media/platform/qcom/venus/core.h index abeeafa866971..b595f72b3afc4 100644 --- a/drivers/media/platform/qcom/venus/core.h +++ b/drivers/media/platform/qcom/venus/core.h @@ -38,6 +38,7 @@ struct freq_tbl { struct reg_val { u32 reg; u32 value; + u32 mask; }; struct bw_tbl { diff --git a/drivers/media/platform/qcom/venus/hfi_venus.c b/drivers/media/platform/qcom/venus/hfi_venus.c index a9167867063c4..ef2ea4727758f 100644 --- a/drivers/media/platform/qcom/venus/hfi_venus.c +++ b/drivers/media/platform/qcom/venus/hfi_venus.c @@ -359,10 +359,19 @@ static void venus_set_registers(struct venus_hfi_device *hdev) const struct venus_resources *res = hdev->core->res; const struct reg_val *tbl = res->reg_tbl; unsigned int count = res->reg_tbl_size; - unsigned int i; + unsigned int i, val; + + for (i = 0; i < count; i++) { + val = tbl[i].value; - for (i = 0; i < count; i++) - writel(tbl[i].value, hdev->core->base + tbl[i].reg); + /* In some cases, we only want to update certain bits */ + if (tbl[i].mask) { + val = readl(hdev->core->base + tbl[i].reg); + val = (val & ~tbl[i].mask) | (tbl[i].value & tbl[i].mask); + } + + writel(val, hdev->core->base + tbl[i].reg); + } } static void venus_soft_int(struct venus_hfi_device *hdev) From patchwork Tue Mar 4 13:07:10 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bryan O'Donoghue X-Patchwork-Id: 14000699 Received: from mail-wr1-f53.google.com (mail-wr1-f53.google.com [209.85.221.53]) (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 C3C38204689 for ; Tue, 4 Mar 2025 13:07:16 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.221.53 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1741093638; cv=none; b=rAoPMQLKJ4dMcZdHDSiI+qIxnZPASOb90Gc5DPOKBxL77zhmgunl1G3AsNrrgNogADCPHot/axbdBIKAsblYdFMpqteoklgN6ML5Ztc7RgdPcx7ztf6rhTJM+k3qhWnQ8OdgeHcbKA9etMzYggOHLGyCkq4RM0UKAMenmLFpeAI= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1741093638; c=relaxed/simple; bh=/NrrKu4n1tF2HpwX/3ZU9A1mDCbhjYaDgP2YCETu4tE=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=KH0lNeF1LAf1TLYs64reAOPSv03o46RSh11dN0TljMSKgV714rvBLnnrh7Q071w3nU6PIvSmTIyk7Ec92zga7SZxaPB93KTfBGWy+3gctlg1oyB2zZT9V3eIhVkkbMkJyuu5ozPL3Anib9X6IR6zoSmqmKXhGYKUFNYGALtG6Xw= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linaro.org; spf=pass smtp.mailfrom=linaro.org; dkim=pass (2048-bit key) header.d=linaro.org header.i=@linaro.org header.b=n0EkaPTY; arc=none smtp.client-ip=209.85.221.53 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linaro.org Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=linaro.org Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=linaro.org header.i=@linaro.org header.b="n0EkaPTY" Received: by mail-wr1-f53.google.com with SMTP id ffacd0b85a97d-390d98ae34dso4538783f8f.3 for ; Tue, 04 Mar 2025 05:07:16 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1741093635; x=1741698435; darn=vger.kernel.org; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:from:to:cc:subject:date:message-id :reply-to; bh=nReu5+cl9WzV6+48QR0ZYCEfLXug0GahkekE8tX+Eds=; b=n0EkaPTY/NmMTg4W9rJqtaQjn7nNvzM8XLDUsc1A9s0jv0cJw17FBiprcv7e+NWmVe RSQbrsjt/K857XHe/c1Rqabbp5pSo/OzRvR1X75plUxl6tvJXG+2C9JDoGtGxXChrsTQ SYy0zvpbls5WBkycMwkA8pMFcvWEXSpxsf1Hx8cT5fNSfB3BfPcuih19qTTQP/jdHXda u02aKlTE9sBMQ3wzf9un12P2/D/zQrzePpEXl5Uslzw10cbfm6mJMm9qRhhhE8CO6ANo MLnup02BarWRUJb4+VNpnZKdrLdlIwF1149HPgGSpwe3JFjoG7VeB4wARot7JhYNil3J tbjw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1741093635; x=1741698435; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=nReu5+cl9WzV6+48QR0ZYCEfLXug0GahkekE8tX+Eds=; b=SgLS/bq9184f0BbwuP4ooMR8Pj1+bwuz29CvVwxCvcHzqAmTms1N2ub8AZURQPnliQ eTYNMvbyPjtmY/zOiWe0gr7+uPwPVSYDzvuAKTuS6OwVvu2dg+ck4AAEv3Wpgc3ZIn4r MA86k8gUxWpt39sVyaQLzjvEIQhyOu7Gs2BwB3GC+PiBZD1tN/60S6Qa9bt1upgW7wYz 9YHdDsCmBovlRmqDQDhB1zwGKfEV9QFEEGyRajAMTtUHqif39NmH3YKR1R4hYV/CCSjM 4eZimxzgVoCIfxM0Hx6fg9e4cfFu+yX1Qx32AHuvWEoPVSm+pMXyLuozPy5qx7cDSGil okFg== X-Forwarded-Encrypted: i=1; AJvYcCXzh/0xYi+BmDV7Woui6aPL+k1XEH4tLEVWQiOgqj1onTL4PgbhZELmOeM6VuEB00mzp9qqtqxN4J5jdJQq@vger.kernel.org X-Gm-Message-State: AOJu0YyHcX4n/APrXUYEyzLUf9ZTrux8WceUxJJYnKNWb7DFfxU+KRKs /Ae8gV+2gsXlo4ECeiFcMjjYtdZBZlbkQiD01ItlkIo/WFlPpiX1KVKTI6gDeaI= X-Gm-Gg: ASbGnctGJOxulNsuBV3g9HVc3Ur5oLJPKnOmwrO18H5c4qrL6xT3SskJ06Dizr8Q3V+ J/NAZ2T6QlDMXbW51CmMJYWyTKMzaRWU+Su8ShaGQCae4dWuof9X0ViGk/unWQODjUKAIpZqG6v PQpRtioHn4eIcI8qrZKXShITn9FftY4rFm7yNRSnkiJLDQxzAyOHfC1c42lTE94NwllDwzZrOj3 SQfXXmPrwOqoiL0qLbxmIDmAgb3XZU2P5hUpNQKV3ztsangddy7LwnrG1OT6fH8cDpj893hmUA0 whZL9sYn6VSfOoxRQZYdEaR8CB0x5WMkT3h8mMX0JewLTOZgLso9EvnSce4CDkK5RuhOz39RMce 7zt+syw== X-Google-Smtp-Source: AGHT+IFFQwNalVDcJ6wvBNHtHEZZ1GuZCNcAdrK9S2+uRO3n9xEvwwqdDOGiOLjqar6ic5Tu3r7jAA== X-Received: by 2002:a5d:64e2:0:b0:38d:d371:e04d with SMTP id ffacd0b85a97d-390eca5b1abmr13994541f8f.34.1741093634919; Tue, 04 Mar 2025 05:07:14 -0800 (PST) Received: from [127.0.1.1] (188-141-3-146.dynamic.upc.ie. [188.141.3.146]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-390e47b6cd8sm17401715f8f.44.2025.03.04.05.07.13 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 04 Mar 2025 05:07:14 -0800 (PST) From: Bryan O'Donoghue Date: Tue, 04 Mar 2025 13:07:10 +0000 Subject: [PATCH 4/8] media: platform: venus: Add optional LLCC path Precedence: bulk X-Mailing-List: linux-arm-msm@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Message-Id: <20250304-b4-linux-media-comitters-sc8280xp-venus-v1-4-279c7ea55493@linaro.org> References: <20250304-b4-linux-media-comitters-sc8280xp-venus-v1-0-279c7ea55493@linaro.org> In-Reply-To: <20250304-b4-linux-media-comitters-sc8280xp-venus-v1-0-279c7ea55493@linaro.org> To: Stanimir Varbanov , Vikash Garodia , Mauro Carvalho Chehab , Rob Herring , Krzysztof Kozlowski , Conor Dooley , Konrad Dybcio , Bjorn Andersson Cc: linux-media@vger.kernel.org, linux-arm-msm@vger.kernel.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, Bryan O'Donoghue , Johan Hovold , Konrad Dybcio X-Mailer: b4 0.15-dev-33ea6 From: Konrad Dybcio Some newer SoCs (such as SM8350) have a third interconnect path. Add it and make it optional. Signed-off-by: Konrad Dybcio Link: https://lore.kernel.org/r/20230731-topic-8280_venus-v1-4-8c8bbe1983a5@linaro.org Signed-off-by: Johan Hovold Signed-off-by: Bryan O'Donoghue --- drivers/media/platform/qcom/venus/core.c | 19 +++++++++++++++++++ drivers/media/platform/qcom/venus/core.h | 3 +++ drivers/media/platform/qcom/venus/pm_helpers.c | 3 +++ 3 files changed, 25 insertions(+) diff --git a/drivers/media/platform/qcom/venus/core.c b/drivers/media/platform/qcom/venus/core.c index 61fb59788a810..93e5b9e1f70cc 100644 --- a/drivers/media/platform/qcom/venus/core.c +++ b/drivers/media/platform/qcom/venus/core.c @@ -393,6 +393,15 @@ static int venus_probe(struct platform_device *pdev) if (IS_ERR(core->cpucfg_path)) return PTR_ERR(core->cpucfg_path); + core->llcc_path = devm_of_icc_get(dev, "video-llcc"); + if (IS_ERR(core->llcc_path)) { + /* LLCC path is optional */ + if (PTR_ERR(core->llcc_path) == -ENODATA) + core->llcc_path = NULL; + else + return PTR_ERR(core->llcc_path); + } + core->irq = platform_get_irq(pdev, 0); if (core->irq < 0) return core->irq; @@ -581,12 +590,18 @@ static __maybe_unused int venus_runtime_suspend(struct device *dev) if (ret) goto err_cpucfg_path; + ret = icc_set_bw(core->llcc_path, 0, 0); + if (ret) + goto err_llcc_path; + ret = icc_set_bw(core->video_path, 0, 0); if (ret) goto err_video_path; return ret; +err_llcc_path: + icc_set_bw(core->video_path, kbps_to_icc(20000), 0); err_video_path: icc_set_bw(core->cpucfg_path, kbps_to_icc(1000), 0); err_cpucfg_path: @@ -626,6 +641,10 @@ static __maybe_unused int venus_runtime_resume(struct device *dev) if (ret) return ret; + ret = icc_set_bw(core->llcc_path, kbps_to_icc(20000), 0); + if (ret) + return ret; + ret = icc_set_bw(core->cpucfg_path, kbps_to_icc(1000), 0); if (ret) return ret; diff --git a/drivers/media/platform/qcom/venus/core.h b/drivers/media/platform/qcom/venus/core.h index b595f72b3afc4..0cb17b7db0963 100644 --- a/drivers/media/platform/qcom/venus/core.h +++ b/drivers/media/platform/qcom/venus/core.h @@ -65,6 +65,7 @@ struct venus_resources { unsigned int bw_tbl_enc_size; const struct bw_tbl *bw_tbl_dec; unsigned int bw_tbl_dec_size; + bool has_llcc_path; const struct reg_val *reg_tbl; unsigned int reg_tbl_size; const struct hfi_ubwc_config *ubwc_conf; @@ -136,6 +137,7 @@ struct venus_format { * @vcodec1_clks: an array of vcodec1 struct clk pointers * @video_path: an interconnect handle to video to/from memory path * @cpucfg_path: an interconnect handle to cpu configuration path + * @llcc_path: an interconnect handle to video to/from llcc path * @pmdomains: a pointer to a list of pmdomains * @opp_pmdomain: an OPP power-domain * @resets: an array of reset signals @@ -189,6 +191,7 @@ struct venus_core { struct clk *vcodec1_clks[VIDC_VCODEC_CLKS_NUM_MAX]; struct icc_path *video_path; struct icc_path *cpucfg_path; + struct icc_path *llcc_path; struct dev_pm_domain_list *pmdomains; struct dev_pm_domain_list *opp_pmdomain; struct reset_control *resets[VIDC_RESETS_NUM_MAX]; diff --git a/drivers/media/platform/qcom/venus/pm_helpers.c b/drivers/media/platform/qcom/venus/pm_helpers.c index 33a5a659c0ada..3afda28cdfed2 100644 --- a/drivers/media/platform/qcom/venus/pm_helpers.c +++ b/drivers/media/platform/qcom/venus/pm_helpers.c @@ -237,6 +237,9 @@ static int load_scale_bw(struct venus_core *core) dev_dbg(core->dev, VDBGL "total: avg_bw: %u, peak_bw: %u\n", total_avg, total_peak); + if (core->res->has_llcc_path) + icc_set_bw(core->llcc_path, total_avg, total_peak); + return icc_set_bw(core->video_path, total_avg, total_peak); } From patchwork Tue Mar 4 13:07:11 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bryan O'Donoghue X-Patchwork-Id: 14000701 Received: from mail-wr1-f54.google.com (mail-wr1-f54.google.com [209.85.221.54]) (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 C52B22046B9 for ; Tue, 4 Mar 2025 13:07:17 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.221.54 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1741093640; cv=none; b=Gj6WJ7TkAfYqf4d89hE/pJo5PCsEfpHE8/NF8IuSSP67YtYNUxCuplTfmgUN7p5ITB/av5PQ5fADYiu1B2iyRW8rZrRJeRfpU5pa6zipjGbfbSbtSB3FncPPnmh4zsvAfSA8n40KIKFgvNNYoaKKliIUX/MD8r7/roFxu9/FROU= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1741093640; c=relaxed/simple; bh=eVAsey3JxdTzcp2dytGoCKkDVWArrUAtGBxSzsk01Zc=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=Hab1h1nxsjzlpmksRx6jgjsPOAQyYX2zdHuwkmPdLadWCAWDBeOP7TUi8T6bmftbFzcUdf49SWfNnY0njVLFt+MU/rGI1y+unIodVnaKaBbNGy9pbw4nw4J9boRGeOpgCQwrDovXkSBkNPKARlV+puARSNQTSBNoWGpRoPG3Wt8= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linaro.org; spf=pass smtp.mailfrom=linaro.org; dkim=pass (2048-bit key) header.d=linaro.org header.i=@linaro.org header.b=NLIMuJvg; arc=none smtp.client-ip=209.85.221.54 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linaro.org Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=linaro.org Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=linaro.org header.i=@linaro.org header.b="NLIMuJvg" Received: by mail-wr1-f54.google.com with SMTP id ffacd0b85a97d-390eebcc331so2347878f8f.1 for ; Tue, 04 Mar 2025 05:07:17 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1741093636; x=1741698436; darn=vger.kernel.org; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:from:to:cc:subject:date:message-id :reply-to; bh=cuQPD4WHO0oVNRv+mxZovyBbMl3mHwOGIxiQAqnpkUE=; b=NLIMuJvgH+cc55I8VqOQYO6oHtM8h5SDDLFlxoZOFgmYOBBKC79kivJqLebm5TH2jY tPju7WC3wlIuNFhE0cAp75EtmRNBiqXNXBhrgg/XdhdzxAPuSZHcgv6EgBbAzR2KiALp OCqX64qZ2wSOwFtdqYXzwIGPZUBIKYvyDnKUv9l1r+xA4ZdTc9X4SYyRmjMezSNBNB4b bmOTk3UO4bX0+Z5f4ukZaCuA2cF/iFr24+p2+9neZimHvWjV7+sY/US+bh0JnhL650jD lQmYfWJajC2CJ+NpWaYi82EAmasWeKM5eZAsEQgrdyI5Hkyopnm9uzS+gY8LJoNxi6MO O5qA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1741093636; x=1741698436; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=cuQPD4WHO0oVNRv+mxZovyBbMl3mHwOGIxiQAqnpkUE=; b=SaRxyI6O6WAqHvMxfkY9pVkY3VsjANhIvmUSbCG4DOLIqVAvnLNWGtPDj72awJucSQ iMU5iAJgbo6K+JeLY4Bn73UcpmbuLndDAXt6ynuJ31VRQAd+ui4pD+zQGRmpg3Io+0lN 2PJvFfd62bkkxcorj89tPkfFnIvTtqqqedOTUEMyKlqEMRRohiOG74mnH2TFbIrpM+Cg Ts+3KHqNqDGaM4Hp2VZKrnPSXdWEuE/4UG4hJ75nvbkYvsy81PdJtJA1QmmlDGxGPFVe fY4IjEClNOrAjFpEHXW72Tk1n0z9+AWMjzPrVanDcrKLHDbcbFGfky5kan7ayIdgq4dW 6Eow== X-Forwarded-Encrypted: i=1; AJvYcCVnzx6RzbvhcvzHoOEyHH3X5/ddHzO5NonmpIUo6amK3Xs+8gp4Cwj5HUtl+bbFtD1MGyhHXHJ9psx3Au22@vger.kernel.org X-Gm-Message-State: AOJu0YydSq6M5M3YSsN+mPglcUuSQbd9OKjqX0LzK3gHKEmF8Prp9ROy iHbGe64BB3+WClwIfJ4sRFYgrK9bI+5k+j1HpuXhvua2USAzTOXT7Y0fbxLbt00= X-Gm-Gg: ASbGnctuBHKhPF88jQxaB3uW5GMzSDpVvSHxKZCIBZ+wVc6KU8rcLzWuoFjRJ0oFyl5 C0S4HG38jbIR4E+c0T/G19L4pk8S5m4tAFNZaVyb3SthJFO6mbpPyP6u+TD5T8iI9pr4wARVsz4 Jb7FvsQ6wOrNUb0HAYuDKNoKe7tv11t/AuUXFMLwKKyGcBFFqRWld1VzxP8r3uI+9aSJynhtw0v /DkLTFODkdFjzTbwqXdMSGsYtkF2p0FGyi86FLLiLpbW+CIf6mAiGaRQNqJVBrLn8e8rSLVaqdN 3q5Qt8rjm8TzIu+DPURRcBYqCjUB12D4jmvuRLvtcVFJc0CWQmfvYB4yY8M20YAVqmdYq0W6azi k21zCAA== X-Google-Smtp-Source: AGHT+IFHR8q/L6pe4BnBXKTY1Ga7eFmSDtcmLdUHWlgfJfHC/2yz9FYNMzKiIzY6WUs6i/rWq/DfjA== X-Received: by 2002:a05:6000:2a81:b0:38f:2c10:da1e with SMTP id ffacd0b85a97d-3911561959fmr1840760f8f.27.1741093636048; Tue, 04 Mar 2025 05:07:16 -0800 (PST) Received: from [127.0.1.1] (188-141-3-146.dynamic.upc.ie. [188.141.3.146]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-390e47b6cd8sm17401715f8f.44.2025.03.04.05.07.15 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 04 Mar 2025 05:07:15 -0800 (PST) From: Bryan O'Donoghue Date: Tue, 04 Mar 2025 13:07:11 +0000 Subject: [PATCH 5/8] media: venus: core: Add SM8350 resource struct Precedence: bulk X-Mailing-List: linux-arm-msm@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Message-Id: <20250304-b4-linux-media-comitters-sc8280xp-venus-v1-5-279c7ea55493@linaro.org> References: <20250304-b4-linux-media-comitters-sc8280xp-venus-v1-0-279c7ea55493@linaro.org> In-Reply-To: <20250304-b4-linux-media-comitters-sc8280xp-venus-v1-0-279c7ea55493@linaro.org> To: Stanimir Varbanov , Vikash Garodia , Mauro Carvalho Chehab , Rob Herring , Krzysztof Kozlowski , Conor Dooley , Konrad Dybcio , Bjorn Andersson Cc: linux-media@vger.kernel.org, linux-arm-msm@vger.kernel.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, Bryan O'Donoghue , Johan Hovold , Konrad Dybcio X-Mailer: b4 0.15-dev-33ea6 From: Konrad Dybcio Add SM8350 configuration data and related compatible. Signed-off-by: Konrad Dybcio Link: https://lore.kernel.org/r/20230731-topic-8280_venus-v1-5-8c8bbe1983a5@linaro.org [ johan: rebase on 6.9-rc1; convert vcodec_pmdomains ] Signed-off-by: Johan Hovold [ bod: added static video encoder/decoder desciptors ] Signed-off-by: Bryan O'Donoghue --- drivers/media/platform/qcom/venus/core.c | 41 ++++++++++++++++++++++++++++++++ 1 file changed, 41 insertions(+) diff --git a/drivers/media/platform/qcom/venus/core.c b/drivers/media/platform/qcom/venus/core.c index 93e5b9e1f70cc..dbce635f9fa45 100644 --- a/drivers/media/platform/qcom/venus/core.c +++ b/drivers/media/platform/qcom/venus/core.c @@ -1012,6 +1012,46 @@ static const struct venus_resources sm8250_res = { .enc_nodename = "video-encoder", }; +static const struct reg_val sm8350_reg_preset[] = { + { 0xb0088, 0, 0x11 }, +}; + +static const struct venus_resources sm8350_res = { + .freq_tbl = sm8250_freq_table, + .freq_tbl_size = ARRAY_SIZE(sm8250_freq_table), + .reg_tbl = sm8350_reg_preset, + .reg_tbl_size = ARRAY_SIZE(sm8350_reg_preset), + .bw_tbl_enc = sm8250_bw_table_enc, + .bw_tbl_enc_size = ARRAY_SIZE(sm8250_bw_table_enc), + .bw_tbl_dec = sm8250_bw_table_dec, + .bw_tbl_dec_size = ARRAY_SIZE(sm8250_bw_table_dec), + .clks = { "core", "iface" }, + .clks_num = 2, + .resets = { "core" }, + .resets_num = 1, + .vcodec0_clks = { "vcodec0_core" }, + .vcodec_clks_num = 1, + .vcodec_pmdomains = (const char *[]) { "venus", "vcodec0" }, + .vcodec_pmdomains_num = 2, + .opp_pmdomain = (const char *[]) { "mx", NULL }, + .vcodec_num = 1, + .max_load = 7833600, /* 7680x4320@60fps */ + .hfi_version = HFI_VERSION_6XX, + .vpu_version = VPU_VERSION_IRIS2, + .num_vpp_pipes = 4, + .vmem_id = VIDC_RESOURCE_NONE, + .vmem_size = 0, + .vmem_addr = 0, + .dma_mask = GENMASK(31, 29) - 1, + .cp_start = 0, + .cp_size = 0x25800000, + .cp_nonpixel_start = 0x1000000, + .cp_nonpixel_size = 0x24800000, + .fwname = "qcom/vpu-2.0/venus.mbn", + .dec_nodename = "video-decoder", + .enc_nodename = "video-encoder", +}; + static const struct freq_tbl sc7280_freq_table[] = { { 0, 460000000 }, { 0, 424000000 }, @@ -1086,6 +1126,7 @@ static const struct of_device_id venus_dt_match[] = { { .compatible = "qcom,sc7180-venus", .data = &sc7180_res }, { .compatible = "qcom,sc7280-venus", .data = &sc7280_res }, { .compatible = "qcom,sm8250-venus", .data = &sm8250_res }, + { .compatible = "qcom,sm8350-venus", .data = &sm8350_res }, { } }; MODULE_DEVICE_TABLE(of, venus_dt_match); From patchwork Tue Mar 4 13:07:12 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bryan O'Donoghue X-Patchwork-Id: 14000702 Received: from mail-wm1-f54.google.com (mail-wm1-f54.google.com [209.85.128.54]) (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 F2E37204C16 for ; Tue, 4 Mar 2025 13:07:18 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.128.54 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1741093641; cv=none; b=Yd7TqBKjo7IM8Oh+2wEFAXOf0ZlhIJtpZsPpuU6L9+5xWlzScJVBdKUNwwdOt9vxE8PJ1lUhwmCxnPzS8c4Ee+64RQ0X12DrzjT8//W4TWS6JK7g3b1By8faXCVkbryxAyU+WcIQc2v0yX3E4QVxtITeNfeX8E31urN8PUk2iz0= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1741093641; c=relaxed/simple; bh=IoiH9OQAEf3mXrHzsj+NdNwY3Jf5RojQPu8snsaCHFQ=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=Trk9ZKaEcbJKxUrsB7Hnc22ATu4LDFdLSFwZfqp7Sg7uERCO4BrTlo6kVGank1M7fHq+zmTSbVdFw1e6vBQggqzWz/guSXjcrj6OZPw9frW46vVEZfIkTTTA8TlHb1wp6m1CW+fbEBPT5d1HIB8/+KZUg2Zb+TsQKdcW/D1Tx1Y= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linaro.org; spf=pass smtp.mailfrom=linaro.org; dkim=pass (2048-bit key) header.d=linaro.org header.i=@linaro.org header.b=jyiqlwbK; arc=none smtp.client-ip=209.85.128.54 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linaro.org Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=linaro.org Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=linaro.org header.i=@linaro.org header.b="jyiqlwbK" Received: by mail-wm1-f54.google.com with SMTP id 5b1f17b1804b1-43bd03ed604so215665e9.2 for ; Tue, 04 Mar 2025 05:07:18 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1741093637; x=1741698437; darn=vger.kernel.org; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:from:to:cc:subject:date:message-id :reply-to; bh=HN7nnD+hMqlXpSytJ9E50dtqwKHUCkr4EcUs1bwqocs=; b=jyiqlwbK8CPoT5ncAKwY9Dhh7NiDkdry1wVeJdvLYfzJlkw0BUEKuraPckLfQLZsH7 L+XAiWFBhp2gI1Yw7WdckT+Qc4w6MrgmSaH36f3urPgTtAQXsQT+i8AL0OvbEtW/Nj34 G2Dx49YrNWALV8dbKlXgjcW8UpyARMXEs0JgLMB4gw6rwzIYZULvwNrOOEnQvlnwPwaT T1kVdc6SHlMC11HF25Et021TVBHf3kpICaxaGj5AZ08jqNJhYnwfjQQyHwY49DfHrvdl 0LNxWkU+C42AOiO+QeTMsSu9k668m9JTztzvg6HEBBuqtP4NbJxAyFjmTa3+g59x0h63 08xg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1741093637; x=1741698437; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=HN7nnD+hMqlXpSytJ9E50dtqwKHUCkr4EcUs1bwqocs=; b=UCX8YXpDFZH2k3Nrb0bT6viG7pJxdzmnu4rMqdrQ2Sl73li8a/WYP3qUmyqxnkD93a Xtn7tNgXvVZWYQPZJfjo9E9Jf/Pv0LAfCHixD0gQEVZwAL1g0by/ZJJIM2rgv8wsqL0Q nSEGUoQYL/in42HmA7MMUYcfeflQdUQN6n+Kt4IyYAXvW3e/W61mMXNosL1FUVFREua9 w9dwkK4jGadHncK6YrIFeQmp7lG61MxIV35JvKPAOcY6+HVJOLYCthWl4qhwVKbjckbc /P9+yofsHXyKABnEfTM2oZUKEB5GHVxVTjXV1+8wsTOYKR7t1I9lWPsPusiXL8ajnFVD UjOQ== X-Forwarded-Encrypted: i=1; AJvYcCVRH/mFUGO6IBREvOcICRFoux4YJKKOj9lwN8SOu05cnVVHgpQZdxiimb1Q7J2ktxmeEWHqLeU30ib50K+g@vger.kernel.org X-Gm-Message-State: AOJu0YyeUig/wbzvsGlO32mvXNXNMH4bxrQT6MdLRSDsjgSpW2CQHuLf KbyePGbifmr8j4uJpjb9b/65wWCHe2VOnAxAXHUWaRkAKd5vQbiHzNQkZKxtSsM= X-Gm-Gg: ASbGncux3URNT/s9bqn5+4zwubLPyJy6X2ZA9DvDXtcAzUFFc61PEIqn+kldIaGOqi8 Tp8a0w/gOjVz3KupCUAin0l0SWVQbbLp1JJrxOUwUKIUg+LsLRqhI34p+iYP92QJ/M/VLxGKeCz AD0kixDvOC2TrxPupltrrduAC6tJ32DWEJyspG6gkZmls68Frqt+PDwaq1s9GZTVdx+17M3CUBM cef0iTomo4N3Zx5VkLM3hPaZtf85Xi22C5FF0B6jMa0ZvrifQGBSPwsE2Fn9cHzih6bNGIeUcX0 Jd4wMfOVKaW4/RB3Ftw2cV3BZX0S/BetX0u+QZHLA3o4Ozn4zeejYxKYYnWlB1IkulMLPMf+SB8 +Ovl3TQ== X-Google-Smtp-Source: AGHT+IE3DuQ06O0EnwZraoN4Izgb+nThp2nxKKlJ9gEJ3NSSMpW+apKTyi1H7hUDREkQwtXTLJ8z3A== X-Received: by 2002:a5d:47c9:0:b0:391:1473:336a with SMTP id ffacd0b85a97d-391147333f7mr3080494f8f.36.1741093637175; Tue, 04 Mar 2025 05:07:17 -0800 (PST) Received: from [127.0.1.1] (188-141-3-146.dynamic.upc.ie. [188.141.3.146]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-390e47b6cd8sm17401715f8f.44.2025.03.04.05.07.16 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 04 Mar 2025 05:07:16 -0800 (PST) From: Bryan O'Donoghue Date: Tue, 04 Mar 2025 13:07:12 +0000 Subject: [PATCH 6/8] media: venus: core: Add SC8280XP resource struct Precedence: bulk X-Mailing-List: linux-arm-msm@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Message-Id: <20250304-b4-linux-media-comitters-sc8280xp-venus-v1-6-279c7ea55493@linaro.org> References: <20250304-b4-linux-media-comitters-sc8280xp-venus-v1-0-279c7ea55493@linaro.org> In-Reply-To: <20250304-b4-linux-media-comitters-sc8280xp-venus-v1-0-279c7ea55493@linaro.org> To: Stanimir Varbanov , Vikash Garodia , Mauro Carvalho Chehab , Rob Herring , Krzysztof Kozlowski , Conor Dooley , Konrad Dybcio , Bjorn Andersson Cc: linux-media@vger.kernel.org, linux-arm-msm@vger.kernel.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, Bryan O'Donoghue , Johan Hovold , Konrad Dybcio X-Mailer: b4 0.15-dev-33ea6 From: Konrad Dybcio Add SC8280XP configuration data and related compatible. Signed-off-by: Konrad Dybcio Reviewed-by: Bryan O'Donoghue Link: https://lore.kernel.org/r/20230731-topic-8280_venus-v1-6-8c8bbe1983a5@linaro.org [ johan: rebase on 6.9-rc1; convert vcodec_pmdomains ] Signed-off-by: Johan Hovold [ bod: added static video encoder/decoder desciptors ] Signed-off-by: Bryan O'Donoghue --- drivers/media/platform/qcom/venus/core.c | 47 ++++++++++++++++++++++++++++++++ 1 file changed, 47 insertions(+) diff --git a/drivers/media/platform/qcom/venus/core.c b/drivers/media/platform/qcom/venus/core.c index dbce635f9fa45..3d23a5919462d 100644 --- a/drivers/media/platform/qcom/venus/core.c +++ b/drivers/media/platform/qcom/venus/core.c @@ -1116,6 +1116,52 @@ static const struct venus_resources sc7280_res = { .enc_nodename = "video-encoder", }; +static const struct freq_tbl sc8280xp_freq_table[] = { + { 0, 239999999 }, + { 0, 338000000 }, + { 0, 366000000 }, + { 0, 444000000 }, + { 0, 533000000 }, + { 0, 560000000 }, +}; + +static const struct venus_resources sc8280xp_res = { + .freq_tbl = sc8280xp_freq_table, + .freq_tbl_size = ARRAY_SIZE(sc8280xp_freq_table), + .reg_tbl = sm8350_reg_preset, + .reg_tbl_size = ARRAY_SIZE(sm8350_reg_preset), + .bw_tbl_enc = sm8250_bw_table_enc, + .bw_tbl_enc_size = ARRAY_SIZE(sm8250_bw_table_enc), + .bw_tbl_dec = sm8250_bw_table_dec, + .bw_tbl_dec_size = ARRAY_SIZE(sm8250_bw_table_dec), + .clks = { "core", "iface" }, + .clks_num = 2, + .resets = { "core" }, + .resets_num = 1, + .vcodec0_clks = { "vcodec0_core" }, + .vcodec_clks_num = 1, + .vcodec_pmdomains = (const char *[]) { "venus", "vcodec0" }, + .vcodec_pmdomains_num = 2, + .opp_pmdomain = (const char *[]) { "mx", NULL }, + .vcodec_num = 1, + .max_load = 7833600, /* 7680x4320@60fps */ + .hfi_version = HFI_VERSION_6XX, + .vpu_version = VPU_VERSION_IRIS2, + .num_vpp_pipes = 4, + .vmem_id = VIDC_RESOURCE_NONE, + .vmem_size = 0, + .vmem_addr = 0, + .dma_mask = GENMASK(31, 29) - 1, + .cp_start = 0, + .cp_size = 0x25800000, + .cp_nonpixel_start = 0x1000000, + .cp_nonpixel_size = 0x24800000, + .fwname = "qcom/vpu-2.0/venus.mbn", + .dec_nodename = "video-decoder", + .enc_nodename = "video-encoder", +}; + + static const struct of_device_id venus_dt_match[] = { { .compatible = "qcom,msm8916-venus", .data = &msm8916_res }, { .compatible = "qcom,msm8996-venus", .data = &msm8996_res }, @@ -1125,6 +1171,7 @@ static const struct of_device_id venus_dt_match[] = { { .compatible = "qcom,sdm845-venus-v2", .data = &sdm845_res_v2 }, { .compatible = "qcom,sc7180-venus", .data = &sc7180_res }, { .compatible = "qcom,sc7280-venus", .data = &sc7280_res }, + { .compatible = "qcom,sc8280xp-venus", .data = &sc8280xp_res }, { .compatible = "qcom,sm8250-venus", .data = &sm8250_res }, { .compatible = "qcom,sm8350-venus", .data = &sm8350_res }, { } From patchwork Tue Mar 4 13:07:13 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bryan O'Donoghue X-Patchwork-Id: 14000703 Received: from mail-wr1-f54.google.com (mail-wr1-f54.google.com [209.85.221.54]) (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 6D3B1204F86 for ; Tue, 4 Mar 2025 13:07:20 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.221.54 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1741093642; cv=none; b=WGhcKooPktj6KDyrNeMuqVtz7A2CZtEXy0orpal22ornQzaOrkKH3B5l0mmqCkYGpIwysu+Dld2r4TzspdAufvkTq8tZk2POtI6OsCWrrB9IYP60fLEG5NZyObe6gDj29nNPlQjVFJHycstM3qwOsAbUa+oXKJbmxC5KQlK3Cb0= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1741093642; c=relaxed/simple; bh=TO/kj9+lLvHOlw6v676cGN2X1xrQoQT6nqKUEG+rBfQ=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=l54M6qJbrOBuT/8PpNe9UPNE4MeiG7bmSuuCaCiWAdo97opf76XBkpbOYrLja8SDO3JdhN/qubhXXOzv9oGTC/0bkeKhk8xOAwsJuXIO7L66e6R9tUpSO00HI/GHupOvyCODIzWDEGMI3EZ3mnd06ZhLqmrsiKb6d6yrq2awXfM= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linaro.org; spf=pass smtp.mailfrom=linaro.org; dkim=pass (2048-bit key) header.d=linaro.org header.i=@linaro.org header.b=d6+NaMNL; arc=none smtp.client-ip=209.85.221.54 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linaro.org Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=linaro.org Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=linaro.org header.i=@linaro.org header.b="d6+NaMNL" Received: by mail-wr1-f54.google.com with SMTP id ffacd0b85a97d-390eb7c1024so3223746f8f.0 for ; Tue, 04 Mar 2025 05:07:20 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1741093639; x=1741698439; darn=vger.kernel.org; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:from:to:cc:subject:date:message-id :reply-to; bh=Nln3oiv+wCOohYzCVrwCh2whMM1hc+Xd6ZxmtYAIQvg=; b=d6+NaMNL5ZdSTpfsrszfNjt3oZB9Sz7TxOp9XFxjI1WxUvQKqrHWZ1fU8AFsmSJSVN GR34CLe2T5F/1+T3IdwRjSPcw8iq9KmWAU/Hj+XdjpcUeQxDl73PocjucWh1BLfJchsz ZdMhOPbwlePm/Pj7M3Co6AuTxWndKOIidu8nmB5GjuegiCqnrCqxNslUJ6APn87zSUZi oZKhiU3kPzuuwUMNYYnBRd61yjjYhed9WpVTXNvRZu7Dbw+nhtMDqSEiqx6CD/foTPtZ D1J7Y0L8wUK97lBVzbpEYEXiSZ7ikGgk6E1WeBJePUt0fn+AeXWx6FJ16tbw6RFDGAHr C+9Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1741093639; x=1741698439; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=Nln3oiv+wCOohYzCVrwCh2whMM1hc+Xd6ZxmtYAIQvg=; b=eaQfTIP31Q6KrgusbftMWknLSOJUUobmX+GvrlFbq2BZ8v37oTpd9U7YCmN5plRYf7 ShRGwe2pV6edSxGOWUT/OoDbnY2guJzOQd3U5VQYl5Gg/5h+E15JdL1smVZMPoKGAGBT aK93XwoUfHy70GbhbR1aLmWdx7IdMVOE2/N+t+qcjNQR7YfMPg+cZK/tIjfYUxkG1HSR d85amk96c9yAiU/PiUkXW5KNdplQqOyYt8WvocloFyDnU9Mmb1qW0Mj31pNKfiQBE9vs DGJd0fZW1ZDap4usRKHNBzkXyFUqf9nTcbWaakjkvWHZWJ0vX8+ByBlBetCEO0nwJzu1 ZdHQ== X-Forwarded-Encrypted: i=1; AJvYcCWK5wj5/AoVoWriH2suMNDCs4KiAyhjR/EpsRXF1nzFNTTjpPfz/UpaaTkEkppzsqMip/4yDerXiWtfY9wp@vger.kernel.org X-Gm-Message-State: AOJu0Yw737TsD/SgMA9V9gGusLeFCtrRRGQL6Pnm7jGGYNmKuwSkxMt4 EX2EBRamUdBDEil7mcmWjLZ/tcIO09iD2j2MLxTin57GbYG4FfjrFd+vzpNBfvA= X-Gm-Gg: ASbGncs2rjhnWCWiAI0SjJ79b2UAvyBZQ7PV0yaA3U4IK2pNbpxvYn7cWF7s9tCS0J9 CdbkihNZeBN4GR3Zf/aGUhf8u1Ynys8+EOzPkPPaEggFg0gMa1yokG5UvzzStdrL0cb4DuBFvql WK0VsDijHBp3epob+Qmj+hvQcNlv0PdherkGaD8kCIPJBmtGPcSkCkAsNp/h0O8zq4oD+Qmaak4 D+FBu/dinTlgJNNjZ6zY+f6EJMklvgwl9wukceZMW0N8wluIvkQrAiILSkNCF2V6ZRAXZ2GUqQ/ xaLyT2JutHHycqPo4aZpoMjqomkGW6ttAZWQpltIJJdIwSR5m6LFFVv5Wu3HfV3XwPtGupuJFr7 szUxu0w== X-Google-Smtp-Source: AGHT+IGpTFcm31h9EpuPbAm3YUIJaoJyD95IH89so3fYUNBg2B1J+FhEDae5gGh7l1PFPh0SPC0Ycg== X-Received: by 2002:a5d:6da3:0:b0:390:e85b:a8ee with SMTP id ffacd0b85a97d-390ec7c6a2fmr13832592f8f.1.1741093638590; Tue, 04 Mar 2025 05:07:18 -0800 (PST) Received: from [127.0.1.1] (188-141-3-146.dynamic.upc.ie. [188.141.3.146]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-390e47b6cd8sm17401715f8f.44.2025.03.04.05.07.17 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 04 Mar 2025 05:07:18 -0800 (PST) From: Bryan O'Donoghue Date: Tue, 04 Mar 2025 13:07:13 +0000 Subject: [PATCH 7/8] arm64: dts: qcom: sc8280xp: Add Venus Precedence: bulk X-Mailing-List: linux-arm-msm@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Message-Id: <20250304-b4-linux-media-comitters-sc8280xp-venus-v1-7-279c7ea55493@linaro.org> References: <20250304-b4-linux-media-comitters-sc8280xp-venus-v1-0-279c7ea55493@linaro.org> In-Reply-To: <20250304-b4-linux-media-comitters-sc8280xp-venus-v1-0-279c7ea55493@linaro.org> To: Stanimir Varbanov , Vikash Garodia , Mauro Carvalho Chehab , Rob Herring , Krzysztof Kozlowski , Conor Dooley , Konrad Dybcio , Bjorn Andersson Cc: linux-media@vger.kernel.org, linux-arm-msm@vger.kernel.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, Bryan O'Donoghue , Johan Hovold , Konrad Dybcio X-Mailer: b4 0.15-dev-33ea6 From: Konrad Dybcio Add the required nodes to enable Venus on sc8280xp. Signed-off-by: Konrad Dybcio [ johan: use sm8350 videocc defines ] Signed-off-by: Johan Hovold [ bod: dropped video encoder/decoder declarations ] [ bod: added interconnect tags ] Signed-off-by: Bryan O'Donoghue --- arch/arm64/boot/dts/qcom/sc8280xp.dtsi | 82 ++++++++++++++++++++++++++++++++++ 1 file changed, 82 insertions(+) diff --git a/arch/arm64/boot/dts/qcom/sc8280xp.dtsi b/arch/arm64/boot/dts/qcom/sc8280xp.dtsi index 01501acb1790a..fe8aa24d5d51e 100644 --- a/arch/arm64/boot/dts/qcom/sc8280xp.dtsi +++ b/arch/arm64/boot/dts/qcom/sc8280xp.dtsi @@ -10,6 +10,8 @@ #include #include #include +#include +#include #include #include #include @@ -690,6 +692,11 @@ reserved-region@85b00000 { no-map; }; + pil_video_mem: pil_video_region@86700000 { + reg = <0 0x86700000 0 0x500000>; + no-map; + }; + pil_adsp_mem: adsp-region@86c00000 { reg = <0 0x86c00000 0 0x2000000>; no-map; @@ -3699,6 +3706,81 @@ usb_1_dwc3_ss: endpoint { }; }; + venus: video-codec@aa00000 { + compatible = "qcom,sm8350-venus"; + reg = <0 0x0aa00000 0 0x100000>; + interrupts = ; + + clocks = <&gcc GCC_VIDEO_AXI0_CLK>, + <&videocc VIDEO_CC_MVS0C_CLK>, + <&videocc VIDEO_CC_MVS0_CLK>; + clock-names = "iface", + "core", + "vcodec0_core"; + power-domains = <&videocc MVS0C_GDSC>, + <&videocc MVS0_GDSC>, + <&rpmhpd SC8280XP_MX>; + power-domain-names = "venus", + "vcodec0", + "mx"; + + resets = <&gcc GCC_VIDEO_AXI0_CLK_ARES>; + reset-names = "core"; + + interconnects = <&gem_noc MASTER_APPSS_PROC QCOM_ICC_TAG_ACTIVE_ONLY + &config_noc SLAVE_VENUS_CFG QCOM_ICC_TAG_ACTIVE_ONLY>, + <&mmss_noc MASTER_VIDEO_P0 QCOM_ICC_TAG_ALWAYS + &mc_virt SLAVE_EBI1 QCOM_ICC_TAG_ALWAYS>, + <&mmss_noc MASTER_VIDEO_P0 QCOM_ICC_TAG_ALWAYS + &gem_noc SLAVE_LLCC QCOM_ICC_TAG_ALWAYS>; + interconnect-names = "cpu-cfg", + "video-mem", + "video-llcc"; + + operating-points-v2 = <&venus_opp_table>; + iommus = <&apps_smmu 0x2e00 0x400>; + memory-region = <&pil_video_mem>; + + status = "disabled"; + + venus_opp_table: opp-table { + compatible = "operating-points-v2"; + + opp-720000000 { + opp-hz = /bits/ 64 <720000000>; + required-opps = <&rpmhpd_opp_low_svs>; + }; + + opp-1014000000 { + opp-hz = /bits/ 64 <1014000000>; + required-opps = <&rpmhpd_opp_svs>; + }; + + opp-1098000000 { + opp-hz = /bits/ 64 <1098000000>; + required-opps = <&rpmhpd_opp_svs_l1>; + }; + + opp-1332000000 { + opp-hz = /bits/ 64 <1332000000>; + required-opps = <&rpmhpd_opp_nom>; + }; + }; + }; + + videocc: clock-controller@abf0000 { + compatible = "qcom,sc8280xp-videocc"; + reg = <0 0x0abf0000 0 0x10000>; + clocks = <&rpmhcc RPMH_CXO_CLK>, + <&rpmhcc RPMH_CXO_CLK_A>, + <&sleep_clk>; + power-domains = <&rpmhpd SC8280XP_MMCX>; + required-opps = <&rpmhpd_opp_low_svs>; + #clock-cells = <1>; + #reset-cells = <1>; + #power-domain-cells = <1>; + }; + cci0: cci@ac4a000 { compatible = "qcom,sc8280xp-cci", "qcom,msm8996-cci"; reg = <0 0x0ac4a000 0 0x1000>; From patchwork Tue Mar 4 13:07:14 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bryan O'Donoghue X-Patchwork-Id: 14000704 Received: from mail-wm1-f41.google.com (mail-wm1-f41.google.com [209.85.128.41]) (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 7D027205518 for ; Tue, 4 Mar 2025 13:07:21 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.128.41 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1741093643; cv=none; b=HdMHxXYuzTjXWL1QLVZ0bn9/0JTVYxumYmVOrv/uZsVXLSDExJaLSHmfkH/2TvU/Qp9VMfKeZg+efxVb3MZh+YB5EOuXZy/SNHHDnYfcr0/hTerOcz/6IvPsfbbAHqN+UGpklEDxW7ChO4bQ9GfGvbpAw7MfkKw0ldljFYScCLo= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1741093643; c=relaxed/simple; bh=hbTVezICqr8e2a2ELXb8vmVSM+zmKLpGBJ8kAi4wDWg=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=cyxvKBfejC5zzFG2KwvPTc0gK6aKgmMV9ZLBTYfT7hsr/++SqE0EZ5CB7DBrFA3F89rVqtSDMTOqvDaSUlK6VChTUDnnSurP5v0sZopZD7AhWbOuvnQrUXNlPMmHKZb0chdGJ1f4HUeUokdp4gKJAdgLOkpfjuGG7VjdduPsdj0= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linaro.org; spf=pass smtp.mailfrom=linaro.org; dkim=pass (2048-bit key) header.d=linaro.org header.i=@linaro.org header.b=tZTujuxP; arc=none smtp.client-ip=209.85.128.41 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linaro.org Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=linaro.org Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=linaro.org header.i=@linaro.org header.b="tZTujuxP" Received: by mail-wm1-f41.google.com with SMTP id 5b1f17b1804b1-43bc4b1603fso12867615e9.0 for ; Tue, 04 Mar 2025 05:07:21 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1741093640; x=1741698440; darn=vger.kernel.org; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:from:to:cc:subject:date:message-id :reply-to; bh=0sMLvCT1fnTWe+fQQZYyr06r8CMaLxKRmrVcKoI1NIQ=; b=tZTujuxPDg2GNgl1jcs1IhE7wLC4TNKfyI0C5rE9aBY7nF7r23ql5s22CPO2b1GTIY 1SpJ3jEtI7kG842OfqgYsFZoX6+4hErHw28dw75EtCTH7FfrjPsmqhoU6MsixhW9gcX9 zhA3bcUHoV1p3EAEaLMMD+V77FHr4k/nTHd4f7CYyLNPoYDWajUQ0JAbjsggkExNVIIF tCnO+x+wRgrZOt3QptBx2igALb3RY7wk7LYCTeP9kQle831yO18y7P75VJwP7trH6vZR 14mqh8e6Jl+b/mH6SItHvuPLT/d9H0Gok+Q7/lozlQGno8IupClXclvlvbRSoNj5k7Q0 wobw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1741093640; x=1741698440; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=0sMLvCT1fnTWe+fQQZYyr06r8CMaLxKRmrVcKoI1NIQ=; b=XiZb3Nq0xEltMqk0CuWD8AW+jlCskHebra07mYbzcmNuJUZ97rTz/cFT1RBsqA5Y+6 hyQsd8MWKz4VDExYsJv9eRYSeA1pKLkEa6Rp9sKsHCmly+qDVubYHj9Mw3ubV6eHEzOC fNqjlEeao7pHe+TBH7ak/2fellHoBXIf/+YM6NfIz3QsUcrdb6Ka5lat0ywWWUdUjHKl i2/puzScl9hsEBggYS7/Z/6F/FKsturNiBC67pgteKQxZNJlYqc4thRrsxQLysejF6xH Go3FUho+hO4greu6NH458s2ftlxLZEWxTJJhFgMBSMQhBlk573VqpDZ0nJOsbg/JEr8X m0uQ== X-Forwarded-Encrypted: i=1; AJvYcCVE8XC54NpY6OCdp0D2P9gBTcTDj6dV4EHYl7O3m2sbb/OIb+wjWoWJf7J+8vnhA/YSZzsi/lHe7ESE2iLV@vger.kernel.org X-Gm-Message-State: AOJu0YwZAEmBZKu0a2A+RIpDPwS/zLgZWog/Z16C/X/YEg/BrAlWrmuB 2lwHMzGpD/ZzUV4yVR5Q7CbpxCfuIUjGIv63kWfD7ZFamCSjH2LTpVUaTQOYbGs= X-Gm-Gg: ASbGncunC2iivktHkRYVTLK/3aBiSaQGAD+kQoDD3wjE/Fcg5gA6aVl4UylVYbjBzvU 6ErOAxhNTMTmCaNEUA294Zvju3SduloHkNWRDkQNFHixE3hhCawSm7CR398pkjtlA4Y9iygufpV a2BDdYj2xXGiZMeR1uNw9hX8J/qVXOr4teCTAZ6L/YkFwXNgKjvYrAr0hTCtZFWqGMMGWohqRlj qL4E5VKPz/Q0lOebzhWzu0D4ireiKY9Pj/KyJ8UfdJ4l21ywDVpdbeFkqCI88RugbLN79VUI4IB d3J/m5+uvcukG5aPLuaNmr7JfRAT9nOsirBHSjyEIVI1/iA0JBnf8qHAWdtXiJEjGGfApcMPTtR RMQ240Q== X-Google-Smtp-Source: AGHT+IG7Hqk+59fncwqRhoiQZI0qgVNSHDtmwiVCCcb9ZVYfhmFpPhJTWaXXdGtM/0s4DaDuW44HFQ== X-Received: by 2002:a05:6000:1789:b0:391:ab2:9e80 with SMTP id ffacd0b85a97d-3910ab2a206mr6605504f8f.24.1741093639862; Tue, 04 Mar 2025 05:07:19 -0800 (PST) Received: from [127.0.1.1] (188-141-3-146.dynamic.upc.ie. [188.141.3.146]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-390e47b6cd8sm17401715f8f.44.2025.03.04.05.07.18 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 04 Mar 2025 05:07:19 -0800 (PST) From: Bryan O'Donoghue Date: Tue, 04 Mar 2025 13:07:14 +0000 Subject: [PATCH 8/8] arm64: dts: qcom: sc8280xp-x13s: Enable Venus Precedence: bulk X-Mailing-List: linux-arm-msm@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Message-Id: <20250304-b4-linux-media-comitters-sc8280xp-venus-v1-8-279c7ea55493@linaro.org> References: <20250304-b4-linux-media-comitters-sc8280xp-venus-v1-0-279c7ea55493@linaro.org> In-Reply-To: <20250304-b4-linux-media-comitters-sc8280xp-venus-v1-0-279c7ea55493@linaro.org> To: Stanimir Varbanov , Vikash Garodia , Mauro Carvalho Chehab , Rob Herring , Krzysztof Kozlowski , Conor Dooley , Konrad Dybcio , Bjorn Andersson Cc: linux-media@vger.kernel.org, linux-arm-msm@vger.kernel.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, Bryan O'Donoghue , Johan Hovold , Konrad Dybcio X-Mailer: b4 0.15-dev-33ea6 From: Konrad Dybcio Enable Venus and point the driver to the correct firmware file. Signed-off-by: Konrad Dybcio Signed-off-by: Johan Hovold Signed-off-by: Bryan O'Donoghue --- arch/arm64/boot/dts/qcom/sc8280xp-lenovo-thinkpad-x13s.dts | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/arch/arm64/boot/dts/qcom/sc8280xp-lenovo-thinkpad-x13s.dts b/arch/arm64/boot/dts/qcom/sc8280xp-lenovo-thinkpad-x13s.dts index f3190f408f4b2..d4c53845eebb7 100644 --- a/arch/arm64/boot/dts/qcom/sc8280xp-lenovo-thinkpad-x13s.dts +++ b/arch/arm64/boot/dts/qcom/sc8280xp-lenovo-thinkpad-x13s.dts @@ -1477,6 +1477,11 @@ &vamacro { status = "okay"; }; +&venus { + firmware-name = "qcom/sc8280xp/LENOVO/21BX/qcvss8280.mbn"; + status = "okay"; +}; + &wsamacro { status = "okay"; };