diff mbox series

[v2,24/25] media: venus: helper: Decide work mode

Message ID 20210312173039.1387617-25-bryan.odonoghue@linaro.org
State Superseded
Headers show
Series media: venus: Enable 6xx support | expand

Commit Message

Bryan O'Donoghue March 12, 2021, 5:30 p.m. UTC 
From: Dikshita Agarwal <dikshita@codeaurora.org>

Decide work mode for encoder and decoder based on different
use-cases.

Signed-off-by: Dikshita Agarwal <dikshita@codeaurora.org>
Signed-off-by: Bryan O'Donoghue <bryan.odonoghue@linaro.org>
---
 drivers/media/platform/qcom/venus/helpers.c | 31 ++++++++++++++++++++-
 drivers/media/platform/qcom/venus/helpers.h |  2 +-
 drivers/media/platform/qcom/venus/vdec.c    |  2 +-
 drivers/media/platform/qcom/venus/venc.c    |  2 +-
 4 files changed, 33 insertions(+), 4 deletions(-)

Comments

Stanimir Varbanov March 22, 2021, 1:12 p.m. UTC | #1 
Hi,

On 3/12/21 7:30 PM, Bryan O'Donoghue wrote:
> From: Dikshita Agarwal <dikshita@codeaurora.org>

> 

> Decide work mode for encoder and decoder based on different

> use-cases.

> 

> Signed-off-by: Dikshita Agarwal <dikshita@codeaurora.org>

> Signed-off-by: Bryan O'Donoghue <bryan.odonoghue@linaro.org>

> ---

>  drivers/media/platform/qcom/venus/helpers.c | 31 ++++++++++++++++++++-

>  drivers/media/platform/qcom/venus/helpers.h |  2 +-

>  drivers/media/platform/qcom/venus/vdec.c    |  2 +-

>  drivers/media/platform/qcom/venus/venc.c    |  2 +-

>  4 files changed, 33 insertions(+), 4 deletions(-)

> 

> diff --git a/drivers/media/platform/qcom/venus/helpers.c b/drivers/media/platform/qcom/venus/helpers.c

> index 77ffb8fbb47f..dc8ef13d0c95 100644

> --- a/drivers/media/platform/qcom/venus/helpers.c

> +++ b/drivers/media/platform/qcom/venus/helpers.c

> @@ -18,6 +18,9 @@

>  #include "hfi_platform.h"

>  #include "hfi_parser.h"

>  

> +#define NUM_MBS_720P	(((1280 + 15) >> 4) * ((720 + 15) >> 4))

> +#define NUM_MBS_4K	(((4096 + 15) >> 4) * ((2304 + 15) >> 4))

> +

>  struct intbuf {

>  	struct list_head list;

>  	u32 type;

> @@ -1090,14 +1093,40 @@ int venus_helper_set_output_resolution(struct venus_inst *inst,

>  }

>  EXPORT_SYMBOL_GPL(venus_helper_set_output_resolution);

>  

> -int venus_helper_set_work_mode(struct venus_inst *inst, u32 mode)

> +static u32 venus_helper_get_work_mode(struct venus_inst *inst)

> +{

> +	u32 mode;

> +	u32 num_mbs;

> +

> +	mode = VIDC_WORK_MODE_2;

> +	if (IS_V6(inst->core)) {


Dikshita, I think the decisions made here are valid for v4 too? If so
this IS_V6 check is not needed.

> +		if (inst->session_type == VIDC_SESSION_TYPE_DEC) {

> +			num_mbs = (ALIGN(inst->height, 16) * ALIGN(inst->width, 16)) / 256;

> +			if (inst->hfi_codec == HFI_VIDEO_CODEC_MPEG2 ||

> +			    inst->pic_struct != HFI_INTERLACE_FRAME_PROGRESSIVE ||

> +			    num_mbs <= NUM_MBS_720P)

> +				mode = VIDC_WORK_MODE_1;

> +		} else {

> +			num_mbs = (ALIGN(inst->out_height, 16) * ALIGN(inst->out_width, 16)) / 256;

> +			if (inst->hfi_codec == HFI_VIDEO_CODEC_VP8 &&

> +			    num_mbs <= NUM_MBS_4K)

> +				mode = VIDC_WORK_MODE_1;

> +		}

> +	}

> +

> +	return mode;

> +}

> +

> +int venus_helper_set_work_mode(struct venus_inst *inst)

>  {

>  	const u32 ptype = HFI_PROPERTY_PARAM_WORK_MODE;

>  	struct hfi_video_work_mode wm;

> +	u32 mode;

>  

>  	if (!IS_V4(inst->core) && !IS_V6(inst->core))

>  		return 0;

>  

> +	mode = venus_helper_get_work_mode(inst);

>  	wm.video_work_mode = mode;

>  	return hfi_session_set_property(inst, ptype, &wm);

>  }

> diff --git a/drivers/media/platform/qcom/venus/helpers.h b/drivers/media/platform/qcom/venus/helpers.h

> index 98106e6eee85..e6269b4be3af 100644

> --- a/drivers/media/platform/qcom/venus/helpers.h

> +++ b/drivers/media/platform/qcom/venus/helpers.h

> @@ -32,7 +32,7 @@ int venus_helper_set_input_resolution(struct venus_inst *inst,

>  int venus_helper_set_output_resolution(struct venus_inst *inst,

>  				       unsigned int width, unsigned int height,

>  				       u32 buftype);

> -int venus_helper_set_work_mode(struct venus_inst *inst, u32 mode);

> +int venus_helper_set_work_mode(struct venus_inst *inst);

>  int venus_helper_set_format_constraints(struct venus_inst *inst);

>  int venus_helper_set_num_bufs(struct venus_inst *inst, unsigned int input_bufs,

>  			      unsigned int output_bufs,

> diff --git a/drivers/media/platform/qcom/venus/vdec.c b/drivers/media/platform/qcom/venus/vdec.c

> index fdc9984acb70..0fe4863371e2 100644

> --- a/drivers/media/platform/qcom/venus/vdec.c

> +++ b/drivers/media/platform/qcom/venus/vdec.c

> @@ -655,7 +655,7 @@ static int vdec_output_conf(struct venus_inst *inst)

>  	u32 ptype;

>  	int ret;

>  

> -	ret = venus_helper_set_work_mode(inst, VIDC_WORK_MODE_2);

> +	ret = venus_helper_set_work_mode(inst);

>  	if (ret)

>  		return ret;

>  

> diff --git a/drivers/media/platform/qcom/venus/venc.c b/drivers/media/platform/qcom/venus/venc.c

> index 505d092dc433..83425fa8df2d 100644

> --- a/drivers/media/platform/qcom/venus/venc.c

> +++ b/drivers/media/platform/qcom/venus/venc.c

> @@ -550,7 +550,7 @@ static int venc_set_properties(struct venus_inst *inst)

>  	u32 profile, level;

>  	int ret;

>  

> -	ret = venus_helper_set_work_mode(inst, VIDC_WORK_MODE_2);

> +	ret = venus_helper_set_work_mode(inst);

>  	if (ret)

>  		return ret;

>  

> 


-- 
regards,
Stan
diff mbox series

Patch

diff --git a/drivers/media/platform/qcom/venus/helpers.c b/drivers/media/platform/qcom/venus/helpers.c
index 77ffb8fbb47f..dc8ef13d0c95 100644
--- a/drivers/media/platform/qcom/venus/helpers.c
+++ b/drivers/media/platform/qcom/venus/helpers.c
@@ -18,6 +18,9 @@ 
 #include "hfi_platform.h"
 #include "hfi_parser.h"
 
+#define NUM_MBS_720P	(((1280 + 15) >> 4) * ((720 + 15) >> 4))
+#define NUM_MBS_4K	(((4096 + 15) >> 4) * ((2304 + 15) >> 4))
+
 struct intbuf {
 	struct list_head list;
 	u32 type;
@@ -1090,14 +1093,40 @@  int venus_helper_set_output_resolution(struct venus_inst *inst,
 }
 EXPORT_SYMBOL_GPL(venus_helper_set_output_resolution);
 
-int venus_helper_set_work_mode(struct venus_inst *inst, u32 mode)
+static u32 venus_helper_get_work_mode(struct venus_inst *inst)
+{
+	u32 mode;
+	u32 num_mbs;
+
+	mode = VIDC_WORK_MODE_2;
+	if (IS_V6(inst->core)) {
+		if (inst->session_type == VIDC_SESSION_TYPE_DEC) {
+			num_mbs = (ALIGN(inst->height, 16) * ALIGN(inst->width, 16)) / 256;
+			if (inst->hfi_codec == HFI_VIDEO_CODEC_MPEG2 ||
+			    inst->pic_struct != HFI_INTERLACE_FRAME_PROGRESSIVE ||
+			    num_mbs <= NUM_MBS_720P)
+				mode = VIDC_WORK_MODE_1;
+		} else {
+			num_mbs = (ALIGN(inst->out_height, 16) * ALIGN(inst->out_width, 16)) / 256;
+			if (inst->hfi_codec == HFI_VIDEO_CODEC_VP8 &&
+			    num_mbs <= NUM_MBS_4K)
+				mode = VIDC_WORK_MODE_1;
+		}
+	}
+
+	return mode;
+}
+
+int venus_helper_set_work_mode(struct venus_inst *inst)
 {
 	const u32 ptype = HFI_PROPERTY_PARAM_WORK_MODE;
 	struct hfi_video_work_mode wm;
+	u32 mode;
 
 	if (!IS_V4(inst->core) && !IS_V6(inst->core))
 		return 0;
 
+	mode = venus_helper_get_work_mode(inst);
 	wm.video_work_mode = mode;
 	return hfi_session_set_property(inst, ptype, &wm);
 }
diff --git a/drivers/media/platform/qcom/venus/helpers.h b/drivers/media/platform/qcom/venus/helpers.h
index 98106e6eee85..e6269b4be3af 100644
--- a/drivers/media/platform/qcom/venus/helpers.h
+++ b/drivers/media/platform/qcom/venus/helpers.h
@@ -32,7 +32,7 @@  int venus_helper_set_input_resolution(struct venus_inst *inst,
 int venus_helper_set_output_resolution(struct venus_inst *inst,
 				       unsigned int width, unsigned int height,
 				       u32 buftype);
-int venus_helper_set_work_mode(struct venus_inst *inst, u32 mode);
+int venus_helper_set_work_mode(struct venus_inst *inst);
 int venus_helper_set_format_constraints(struct venus_inst *inst);
 int venus_helper_set_num_bufs(struct venus_inst *inst, unsigned int input_bufs,
 			      unsigned int output_bufs,
diff --git a/drivers/media/platform/qcom/venus/vdec.c b/drivers/media/platform/qcom/venus/vdec.c
index fdc9984acb70..0fe4863371e2 100644
--- a/drivers/media/platform/qcom/venus/vdec.c
+++ b/drivers/media/platform/qcom/venus/vdec.c
@@ -655,7 +655,7 @@  static int vdec_output_conf(struct venus_inst *inst)
 	u32 ptype;
 	int ret;
 
-	ret = venus_helper_set_work_mode(inst, VIDC_WORK_MODE_2);
+	ret = venus_helper_set_work_mode(inst);
 	if (ret)
 		return ret;
 
diff --git a/drivers/media/platform/qcom/venus/venc.c b/drivers/media/platform/qcom/venus/venc.c
index 505d092dc433..83425fa8df2d 100644
--- a/drivers/media/platform/qcom/venus/venc.c
+++ b/drivers/media/platform/qcom/venus/venc.c
@@ -550,7 +550,7 @@  static int venc_set_properties(struct venus_inst *inst)
 	u32 profile, level;
 	int ret;
 
-	ret = venus_helper_set_work_mode(inst, VIDC_WORK_MODE_2);
+	ret = venus_helper_set_work_mode(inst);
 	if (ret)
 		return ret;