1. Patchew
  2. linux
  3. [PATCH v3 0/4] media: qcom: flip the switch between Venus and Iris drivers
  4. View patch

[PATCH v3 4/4] media: qcom: venus: flip the venus/iris switch

Dmitry Baryshkov posted 4 patches 1 week, 5 days ago
There is a newer version of this series
[PATCH v3 4/4] media: qcom: venus: flip the venus/iris switch
Posted by Dmitry Baryshkov 1 week, 5 days ago 
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 <konrad.dybcio@oss.qualcomm.com>
Signed-off-by: Dmitry Baryshkov <dmitry.baryshkov@oss.qualcomm.com>
---
 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)
 {

-- 
2.47.3
Re: [PATCH v3 4/4] media: qcom: venus: flip the venus/iris switch
Posted by Dikshita Agarwal 1 week, 4 days ago 

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 <konrad.dybcio@oss.qualcomm.com>
> Signed-off-by: Dmitry Baryshkov <dmitry.baryshkov@oss.qualcomm.com>
> ---
>  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
Re: [PATCH v3 4/4] media: qcom: venus: flip the venus/iris switch
Posted by Dmitry Baryshkov 1 week, 1 day ago 
On Thu, Jan 29, 2026 at 11:20:06AM +0530, Dikshita Agarwal wrote:
> 
> 
> 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 <konrad.dybcio@oss.qualcomm.com>
> > Signed-off-by: Dmitry Baryshkov <dmitry.baryshkov@oss.qualcomm.com>
> > ---
> >  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
> 
> ==================================================

Argh, this was a part of the other series (the sc8280xp) and it got lost
in rebase to next/master.

-- 
With best wishes
Dmitry
Re: [PATCH v3 4/4] media: qcom: venus: flip the venus/iris switch
Posted by Vikash Garodia 1 week, 4 days ago 
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<konrad.dybcio@oss.qualcomm.com>
> Signed-off-by: Dmitry Baryshkov<dmitry.baryshkov@oss.qualcomm.com>
> ---
>   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(-)

Reviewed-by: Vikash Garodia <vikash.garodia@oss.qualcomm.com>

Patchew 2.1-devel-b67e4c2

© 2016 - 2026 Red Hat, Inc.