From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mx0b-0031df01.pphosted.com (mx0b-0031df01.pphosted.com [205.220.180.131]) (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 2EC4534F47E for ; Thu, 29 Jan 2026 05:50:17 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=205.220.180.131 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1769665820; cv=none; b=eix/3yL+bkkrGDE/G/cPyl+ua7v5cu7X33VbvYe5mnC02TostCP+W/4+ectxb6pTdr9Q2a07+yCurYECof9+VBPFeG43ZCjHJHtj+UmgsQ/++oU7VwH7erl/V9QbXMxhUde9aUbDTBDXYgePP9bj8gekQ3P3N2c31vNpbljIYAQ= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1769665820; c=relaxed/simple; bh=TuI0R9m/8R/nxiEr+3IMtBamo8oUpSsnx1QjfHef34A=; h=Message-ID:Date:MIME-Version:Subject:To:Cc:References:From: In-Reply-To:Content-Type; b=ly7F+b0rxvdBKQoxcs0UV5YeUeQ0ScJCQbQ8lGgrpPxGfhpSC8pLgj0d3x5yLuSKesXNhLBgEfO07snczT3ivAxpPh5k9WlUmPcCb8gEYV+iTkUucSVpcR0WtcQZXubP2pPTL2Y66zXxXjSbo5FgEzYpzjECh/uUDiNxU2Hk6+c= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=oss.qualcomm.com; spf=pass smtp.mailfrom=oss.qualcomm.com; dkim=pass (2048-bit key) header.d=qualcomm.com header.i=@qualcomm.com header.b=ACVr9MM5; dkim=pass (2048-bit key) header.d=oss.qualcomm.com header.i=@oss.qualcomm.com header.b=Hr4sYyvw; arc=none smtp.client-ip=205.220.180.131 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=oss.qualcomm.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=oss.qualcomm.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=qualcomm.com header.i=@qualcomm.com header.b="ACVr9MM5"; dkim=pass (2048-bit key) header.d=oss.qualcomm.com header.i=@oss.qualcomm.com header.b="Hr4sYyvw" Received: from pps.filterd (m0279868.ppops.net [127.0.0.1]) by mx0a-0031df01.pphosted.com (8.18.1.11/8.18.1.11) with ESMTP id 60T2olKW2033346 for ; Thu, 29 Jan 2026 05:50:15 GMT DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=qualcomm.com; h= cc:content-transfer-encoding:content-type:date:from:in-reply-to :message-id:mime-version:references:subject:to; s=qcppdkim1; bh= LWYbjI5aVzoNHdidcSzzzigC0tluOOBxWM/OQF4xuiI=; b=ACVr9MM5JPCOdkrE b2W1jqhfaFTMYJrn/PjqkY0eO5Wjx32E+U7q4DcO9KhVHVhNRLT4JuWatQJx4S9G EWeSy/dyvIVlCpWH6glIhbcPpZUI14Elxvz4pBY4NI6Nwp+CEKm62jBo3Tt2disF A6QvPLgolN6cbeCORQahH35oyhqBUfX3dFuSjZy1k45P1xeIOTnkV1PmYF26S5B4 KckMy4Fz5h6dNxknNgQH2K4VagwFofxJAKS0LtgvCTJx67F4u6HWrvHFlrHmhu5R YzhtZ/lV9eACaiKfddjQC5appHFuUS9k7tq7vO8rA7S36xWYMS0oKW9w0Aisemk/ g1zFHQ== Received: from mail-pj1-f71.google.com (mail-pj1-f71.google.com [209.85.216.71]) by mx0a-0031df01.pphosted.com (PPS) with ESMTPS id 4byna7jc73-1 (version=TLSv1.3 cipher=TLS_AES_128_GCM_SHA256 bits=128 verify=NOT) for ; Thu, 29 Jan 2026 05:50:14 +0000 (GMT) Received: by mail-pj1-f71.google.com with SMTP id 98e67ed59e1d1-34ea5074935so504903a91.0 for ; Wed, 28 Jan 2026 21:50:14 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=oss.qualcomm.com; s=google; t=1769665814; x=1770270614; darn=vger.kernel.org; h=content-transfer-encoding:in-reply-to:from:content-language :references:cc:to:subject:user-agent:mime-version:date:message-id :from:to:cc:subject:date:message-id:reply-to; bh=LWYbjI5aVzoNHdidcSzzzigC0tluOOBxWM/OQF4xuiI=; b=Hr4sYyvwKyTjPYsgNQ+vPRma7EwRv9wHqWT+0mbJGaCkRrYqi0DpIRSekNE+5HIz2x qkBiDzQCR0HYCxxD/+VKDvAINMXihWdVMJu3MF1mUhgoKB1B9cZl9mAm2+0Rvmhx6aZ/ AwHqMN9Lf9tt7KknIddRxFuKtl0lSvKnFtAw9NiXToW1qvjnHaDLhn/mSR6lhuc5WAW+ vLqH+3t61WUDVOC5piQTU+pP+j7lDWMY1kKb8GKtkWmxKYJy+0sVmfQXmvocdKeshU4R HRIaKNXa4z9ZGC7eTZ07XEAKIj0cPXE71N02I0lC1MbsKGjFKbaooyNd+GnLPfq7SGhj g5zg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1769665814; x=1770270614; h=content-transfer-encoding:in-reply-to:from:content-language :references:cc:to:subject:user-agent:mime-version:date:message-id :x-gm-gg:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=LWYbjI5aVzoNHdidcSzzzigC0tluOOBxWM/OQF4xuiI=; b=asOBO3HiomFA94SjSa68UNOTWHLGtWzaHz3fR5v2agr88pRnaOutS8J+6kfyvKFet5 7NRetj39gutMIPCTBYaPndRv7+UETGvTckOhDHgs1RK7IIsG4DAkw+xSdG6LJNA7Bf+9 uyf7oUuVCvQ94mJq7VtemFMNfphAw7oIt/eQqVs/wx3dKugj0jyFMO2HcrrhuNi7M5lU Q7Bf3RvWfrCTDVeQw3xB/Cn5cquYzBuwz6CCjpxk+YbiymwtYJr0dkpeQUo69rvhFCez YjS0GGYcJISNqa9a3qdMbuN8BDCOy5QQVVJaeKz0BsvUbVGEiw4veJ7BlkVsiH/YRtYx l4zg== X-Forwarded-Encrypted: i=1; AJvYcCUgvv6OyJcRQBShiJ3Pnwp6c2HFekCkYLUdB64qL8XqhGC4JP2ElAtHJuoTOQcimEr5+4xrRVZ/HcrKat8=@vger.kernel.org X-Gm-Message-State: AOJu0YyzA9AIWL8g8S1Po6G50gEt7Ga48SJrTwe0wvkbg9GnTTvG52+6 CJMianJaE05idJnsa7DmMFMtLj7Ks31HlQ5x7GE3PGQ2UW7HJetpWlKYXoMiVfqMMTA7pTdCvrw ShUkPp9myDlxlVryjPtSk6iK9KyIUl4Ae0MyaTmAF+cN8j3vDO/Gad+HwOywG+zu5500= X-Gm-Gg: AZuq6aLZ+EMAN0jpFyLC74LQUWnoeIxkm3PSCVf2d2Qb9y9RU4fSFMjd1rQ14qyqO4r KvLyxjMrUB97shu4x8olQeBW1BgWdtQhGZJKGvC7WXNWsR3zx3BdVJG4uAp9y4cqTAAT289Ye84 qLgGSU8SPRBm8FCVZdt3BC9SOMa0Q5/wCw4yOJwFZ5R5IHKy0lhm5goxtl7uSYvGzLJVUdy9G9A 4YfUlDKspeRVfwzh2HTIdxDuu3rre41e7p0GDteRWvK1a6/U/Gm0pg2o8pXY3RC2orZVdZtN4R9 yvEQLoFwxAhDHejC6LxP2EvAZhPp98ej2eE9HHzlhniI23X0hMAUCTVprnNprVfXG9lCBd9eEyQ HOSe82GsECyFKK/+uW2QzYvi6kWDpOOP/OIo7wyM= X-Received: by 2002:a17:90b:2d83:b0:34c:6124:3616 with SMTP id 98e67ed59e1d1-353fed87b05mr7031879a91.27.1769665813813; Wed, 28 Jan 2026 21:50:13 -0800 (PST) X-Received: by 2002:a17:90b:2d83:b0:34c:6124:3616 with SMTP id 98e67ed59e1d1-353fed87b05mr7031858a91.27.1769665813288; Wed, 28 Jan 2026 21:50:13 -0800 (PST) Received: from [10.0.0.3] ([106.222.235.0]) by smtp.gmail.com with ESMTPSA id 98e67ed59e1d1-3540f3cc74dsm3909276a91.9.2026.01.28.21.50.08 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Wed, 28 Jan 2026 21:50:12 -0800 (PST) Message-ID: <4257fb6f-280d-1866-b531-c25efe155d04@oss.qualcomm.com> Date: Thu, 29 Jan 2026 11:20:06 +0530 Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 User-Agent: Mozilla/5.0 (Windows NT 10.0; Win64; x64; rv:102.0) Gecko/20100101 Thunderbird/102.13.0 Subject: Re: [PATCH v3 4/4] media: qcom: venus: flip the venus/iris switch To: Dmitry Baryshkov , Vikash Garodia , Abhinav Kumar , Bryan O'Donoghue , Mauro Carvalho Chehab , cros-qcom-dts-watchers@chromium.org, Bjorn Andersson , Konrad Dybcio , Rob Herring , Krzysztof Kozlowski , Conor Dooley , Stanimir Varbanov Cc: linux-media@vger.kernel.org, linux-arm-msm@vger.kernel.org, linux-kernel@vger.kernel.org, devicetree@vger.kernel.org, Konrad Dybcio References: <20260127-venus-iris-flip-switch-v3-0-7f37689f4b39@oss.qualcomm.com> <20260127-venus-iris-flip-switch-v3-4-7f37689f4b39@oss.qualcomm.com> Content-Language: en-US From: Dikshita Agarwal In-Reply-To: <20260127-venus-iris-flip-switch-v3-4-7f37689f4b39@oss.qualcomm.com> Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 7bit X-Proofpoint-GUID: siKD7BmkUHEGjJNL8DE2rDLOGQgF1Dhy X-Authority-Analysis: v=2.4 cv=J72nLQnS c=1 sm=1 tr=0 ts=697af516 cx=c_pps a=UNFcQwm+pnOIJct1K4W+Mw==:117 a=6cH4IgXjao/mkWo6W7aGpA==:17 a=IkcTkHD0fZMA:10 a=vUbySO9Y5rIA:10 a=s4-Qcg_JpJYA:10 a=VkNPw1HP01LnGYTKEx00:22 a=EUspDBNiAAAA:8 a=tiI1SodC8CJpEoPmcAoA:9 a=QEXdDO2ut3YA:10 a=uKXjsCUrEbL0IQVhDsJ9:22 X-Proofpoint-ORIG-GUID: siKD7BmkUHEGjJNL8DE2rDLOGQgF1Dhy X-Proofpoint-Spam-Details-Enc: AW1haW4tMjYwMTI5MDAzNCBTYWx0ZWRfX5o1/GfIzGHj4 enBgSef72Jt+8t+nnX5+Pyy66YSjXQtKmYHWknS9eWCb9XZdSTR4CrbUDDZg8zX8JRnw2GF2JQW 1Q/ial2FHSLhBMjNNMEMj3u50USRXC9KafL0GNJ20oh5h/oeR7WyZK3IR9GcFbZuojCID4LIoHZ 09qaY7bZ+eHBznlsjTn0E6bQyceZwVd4ECpoHnsomj+b6XtDzB2JSh+9Qx7eLVANhEFvWQQGn/j sJtOKJp6PQE2qurZLXa5Vp71cCTLZsQR0+uc6qLMMkhsizVegXsR5k6Wz247Nq8v5DL82yCg8tN pZKxWd9ryLsUdDfHfm5qqz5zmh945jmOQw8nu3STpDcMS5q5pf3NB38x4cI9GGvutHCNzXhNln3 cB4jV4J5gjkVwBUH7LZKr+8M3ZIqeMSfvg+v2msCvH4EHbqeJ+MOQ6U845STOqVsBjEk8DBstn+ nw19u7lLOE+Ul0kHfjw== X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.293,Aquarius:18.0.1121,Hydra:6.1.51,FMLib:17.12.100.49 definitions=2026-01-28_06,2026-01-28_03,2025-10-01_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 clxscore=1015 phishscore=0 malwarescore=0 lowpriorityscore=0 spamscore=0 priorityscore=1501 bulkscore=0 impostorscore=0 suspectscore=0 adultscore=0 classifier=typeunknown authscore=0 authtc= authcc= route=outbound adjust=0 reason=mlx scancount=1 engine=8.22.0-2601150000 definitions=main-2601290034 On 1/27/2026 5:53 PM, Dmitry Baryshkov wrote: > With the Iris and Venus driver having more or less feature parity for > "HFI 6xx" platforms and with Iris gaining support for SC7280, flip the > switch. Use Iris by default for SM8250 and SC7280, the platforms which > are supported by both drivers, and use Venus only if Iris is not > compiled at all. Use IS_ENABLED to strip out the code and data > structures which are used by the disabled platforms. > > Reviewed-by: Konrad Dybcio > Signed-off-by: Dmitry Baryshkov > --- > drivers/media/platform/qcom/iris/iris_probe.c | 2 -- > drivers/media/platform/qcom/venus/core.c | 6 ++++++ > drivers/media/platform/qcom/venus/core.h | 11 +++++++++++ > 3 files changed, 17 insertions(+), 2 deletions(-) > > diff --git a/drivers/media/platform/qcom/iris/iris_probe.c b/drivers/media/platform/qcom/iris/iris_probe.c > index ddaacda523ec..7b612ad37e4f 100644 > --- a/drivers/media/platform/qcom/iris/iris_probe.c > +++ b/drivers/media/platform/qcom/iris/iris_probe.c > @@ -352,7 +352,6 @@ static const struct of_device_id iris_dt_match[] = { > .compatible = "qcom,qcs8300-iris", > .data = &qcs8300_data, > }, > -#if (!IS_ENABLED(CONFIG_VIDEO_QCOM_VENUS)) > { > .compatible = "qcom,sc7280-venus", > .data = &sc7280_data, > @@ -361,7 +360,6 @@ static const struct of_device_id iris_dt_match[] = { > .compatible = "qcom,sm8250-venus", > .data = &sm8250_data, > }, > -#endif > { > .compatible = "qcom,sm8550-iris", > .data = &sm8550_data, > diff --git a/drivers/media/platform/qcom/venus/core.c b/drivers/media/platform/qcom/venus/core.c > index 24d2b2fd0340..646dae3407b4 100644 > --- a/drivers/media/platform/qcom/venus/core.c > +++ b/drivers/media/platform/qcom/venus/core.c > @@ -949,6 +949,7 @@ static const struct venus_resources sc7180_res = { > .enc_nodename = "video-encoder", > }; > > +#if (!IS_ENABLED(CONFIG_VIDEO_QCOM_IRIS)) > static const struct freq_tbl sm8250_freq_table[] = { > { 0, 444000000 }, > { 0, 366000000 }, > @@ -1069,6 +1070,7 @@ static const struct venus_resources sc7280_res = { > .dec_nodename = "video-decoder", > .enc_nodename = "video-encoder", > }; > +#endif > > static const struct bw_tbl qcm2290_bw_table_dec[] = { > { 352800, 597000, 0, 746000, 0 }, /* 1080p@30 + 720p@30 */ > @@ -1125,11 +1127,15 @@ static const struct of_device_id venus_dt_match[] = { > { .compatible = "qcom,msm8998-venus", .data = &msm8998_res, }, > { .compatible = "qcom,qcm2290-venus", .data = &qcm2290_res, }, > { .compatible = "qcom,sc7180-venus", .data = &sc7180_res, }, > +#if (!IS_ENABLED(CONFIG_VIDEO_QCOM_IRIS)) > { .compatible = "qcom,sc7280-venus", .data = &sc7280_res, }, > +#endif > { .compatible = "qcom,sdm660-venus", .data = &sdm660_res, }, > { .compatible = "qcom,sdm845-venus", .data = &sdm845_res, }, > { .compatible = "qcom,sdm845-venus-v2", .data = &sdm845_res_v2, }, > +#if (!IS_ENABLED(CONFIG_VIDEO_QCOM_IRIS)) > { .compatible = "qcom,sm8250-venus", .data = &sm8250_res, }, > +#endif > { } > }; > MODULE_DEVICE_TABLE(of, venus_dt_match); > diff --git a/drivers/media/platform/qcom/venus/core.h b/drivers/media/platform/qcom/venus/core.h > index 7506f5d0f609..c7acacaa53b8 100644 > --- a/drivers/media/platform/qcom/venus/core.h > +++ b/drivers/media/platform/qcom/venus/core.h > @@ -54,8 +54,10 @@ enum vpu_version { > VPU_VERSION_AR50, > VPU_VERSION_AR50_LITE, > VPU_VERSION_IRIS1, > +#if (!IS_ENABLED(CONFIG_VIDEO_QCOM_IRIS)) > VPU_VERSION_IRIS2, > VPU_VERSION_IRIS2_1, > +#endif > }; > > struct firmware_version { > @@ -525,13 +527,22 @@ struct venus_inst { > #define IS_V1(core) ((core)->res->hfi_version == HFI_VERSION_1XX) > #define IS_V3(core) ((core)->res->hfi_version == HFI_VERSION_3XX) > #define IS_V4(core) ((core)->res->hfi_version == HFI_VERSION_4XX) > +#if (!IS_ENABLED(CONFIG_VIDEO_QCOM_IRIS)) > #define IS_V6(core) ((core)->res->hfi_version == HFI_VERSION_6XX) > +#else > +#define IS_V6(core) (0) > +#endif > > #define IS_AR50(core) ((core)->res->vpu_version == VPU_VERSION_AR50) > #define IS_AR50_LITE(core) ((core)->res->vpu_version == VPU_VERSION_AR50_LITE) > #define IS_IRIS1(core) ((core)->res->vpu_version == VPU_VERSION_IRIS1) > +#if (!IS_ENABLED(CONFIG_VIDEO_QCOM_IRIS)) > #define IS_IRIS2(core) ((core)->res->vpu_version == VPU_VERSION_IRIS2) > #define IS_IRIS2_1(core) ((core)->res->vpu_version == VPU_VERSION_IRIS2_1) > +#else > +#define IS_IRIS2(core) (0) > +#define IS_IRIS2_1(core) (0) > +#endif > > static inline bool is_lite(struct venus_core *core) > { > compilation fails with this change. ERROR: modpost: "sm8250_data" [drivers/media/platform/qcom/iris/qcom-iris.ko] undefined! ERROR: modpost: "sc7280_data" [drivers/media/platform/qcom/iris/qcom-iris.ko] undefined! to fix this: ============================================== --- a/drivers/media/platform/qcom/iris/Makefile +++ b/drivers/media/platform/qcom/iris/Makefile @@ -10,6 +10,7 @@ qcom-iris-objs += iris_buffer.o \ iris_hfi_gen2_packet.o \ iris_hfi_gen2_response.o \ iris_hfi_queue.o \ + iris_platform_gen1.o \ iris_platform_gen2.o \ iris_power.o \ iris_probe.o \ @@ -26,8 +27,4 @@ qcom-iris-objs += iris_buffer.o \ iris_vpu_buffer.o \ iris_vpu_common.o \ -ifeq ($(CONFIG_VIDEO_QCOM_VENUS),) -qcom-iris-objs += iris_platform_gen1.o -endif - obj-$(CONFIG_VIDEO_QCOM_IRIS) += qcom-iris.o ================================================== Thanks, Dikshita