| Message ID | 1621417008-6117-6-git-send-email-dikshita@codeaurora.org |
|---|---|
| State | Accepted |
| Commit | 6483a8cbea54854dfa8fa0e9c9673e564bc0b971 |
| Headers | show |
| Series | media: venus: Enable venus support on sc7280 | expand |
On 5/19/21 12:36 PM, Dikshita Agarwal wrote: > Set work route to FW based on num of vpp pipes. > > Signed-off-by: Dikshita Agarwal <dikshita@codeaurora.org> > --- > drivers/media/platform/qcom/venus/hfi_cmds.c | 7 +++++++ > drivers/media/platform/qcom/venus/hfi_helper.h | 5 +++++ > drivers/media/platform/qcom/venus/vdec.c | 21 +++++++++++++++++++++ > 3 files changed, 33 insertions(+) > > diff --git a/drivers/media/platform/qcom/venus/hfi_cmds.c b/drivers/media/platform/qcom/venus/hfi_cmds.c > index 11a8347..837fb80 100644 > --- a/drivers/media/platform/qcom/venus/hfi_cmds.c > +++ b/drivers/media/platform/qcom/venus/hfi_cmds.c > @@ -1290,6 +1290,13 @@ pkt_session_set_property_6xx(struct hfi_session_set_property_pkt *pkt, > pkt->shdr.hdr.size += sizeof(u32) + sizeof(*color); > break; > } > + case HFI_PROPERTY_PARAM_WORK_ROUTE: { > + struct hfi_video_work_route *in = pdata, *wr = prop_data; > + > + wr->video_work_route = in->video_work_route; > + pkt->shdr.hdr.size += sizeof(u32) + sizeof(*wr); > + break; > + } > default: > return pkt_session_set_property_4xx(pkt, cookie, ptype, pdata); > } > diff --git a/drivers/media/platform/qcom/venus/hfi_helper.h b/drivers/media/platform/qcom/venus/hfi_helper.h > index 63cd347..185c302 100644 > --- a/drivers/media/platform/qcom/venus/hfi_helper.h > +++ b/drivers/media/platform/qcom/venus/hfi_helper.h > @@ -451,6 +451,7 @@ > #define HFI_PROPERTY_PARAM_MVC_BUFFER_LAYOUT 0x100f > #define HFI_PROPERTY_PARAM_MAX_SESSIONS_SUPPORTED 0x1010 > #define HFI_PROPERTY_PARAM_WORK_MODE 0x1015 > +#define HFI_PROPERTY_PARAM_WORK_ROUTE 0x1017 > > /* > * HFI_PROPERTY_CONFIG_COMMON_START > @@ -864,6 +865,10 @@ struct hfi_video_work_mode { > u32 video_work_mode; > }; > > +struct hfi_video_work_route { > + u32 video_work_route; > +}; > + > struct hfi_h264_vui_timing_info { > u32 enable; > u32 fixed_framerate; > diff --git a/drivers/media/platform/qcom/venus/vdec.c b/drivers/media/platform/qcom/venus/vdec.c > index ddb7cd3..a674281 100644 > --- a/drivers/media/platform/qcom/venus/vdec.c > +++ b/drivers/media/platform/qcom/venus/vdec.c > @@ -653,6 +653,21 @@ static int vdec_set_properties(struct venus_inst *inst) > return 0; > } > > +static int vdec_set_work_route(struct venus_inst *inst) > +{ > + struct hfi_video_work_route wr; > + u32 ptype; > + int ret; > + > + wr.video_work_route = inst->core->res->num_vpp_pipes; > + > + ptype = HFI_PROPERTY_PARAM_WORK_ROUTE; > + ret = hfi_session_set_property(inst, ptype, &wr); > + if (ret) > + return ret; > + return 0; > +} > + > #define is_ubwc_fmt(fmt) (!!((fmt) & HFI_COLOR_FORMAT_UBWC_BASE)) > > static int vdec_output_conf(struct venus_inst *inst) > @@ -1039,6 +1054,12 @@ static int vdec_start_output(struct venus_inst *inst) > if (ret) > return ret; > > + if (IS_V6(inst->core)) { Please move this IS_V6 check in vdec_set_work_route(). > + ret = vdec_set_work_route(inst); > + if (ret) > + return ret; > + } > + > ret = vdec_output_conf(inst); > if (ret) > return ret; > -- regards, Stan
diff --git a/drivers/media/platform/qcom/venus/hfi_cmds.c b/drivers/media/platform/qcom/venus/hfi_cmds.c index 11a8347..837fb80 100644 --- a/drivers/media/platform/qcom/venus/hfi_cmds.c +++ b/drivers/media/platform/qcom/venus/hfi_cmds.c @@ -1290,6 +1290,13 @@ pkt_session_set_property_6xx(struct hfi_session_set_property_pkt *pkt, pkt->shdr.hdr.size += sizeof(u32) + sizeof(*color); break; } + case HFI_PROPERTY_PARAM_WORK_ROUTE: { + struct hfi_video_work_route *in = pdata, *wr = prop_data; + + wr->video_work_route = in->video_work_route; + pkt->shdr.hdr.size += sizeof(u32) + sizeof(*wr); + break; + } default: return pkt_session_set_property_4xx(pkt, cookie, ptype, pdata); } diff --git a/drivers/media/platform/qcom/venus/hfi_helper.h b/drivers/media/platform/qcom/venus/hfi_helper.h index 63cd347..185c302 100644 --- a/drivers/media/platform/qcom/venus/hfi_helper.h +++ b/drivers/media/platform/qcom/venus/hfi_helper.h @@ -451,6 +451,7 @@ #define HFI_PROPERTY_PARAM_MVC_BUFFER_LAYOUT 0x100f #define HFI_PROPERTY_PARAM_MAX_SESSIONS_SUPPORTED 0x1010 #define HFI_PROPERTY_PARAM_WORK_MODE 0x1015 +#define HFI_PROPERTY_PARAM_WORK_ROUTE 0x1017 /* * HFI_PROPERTY_CONFIG_COMMON_START @@ -864,6 +865,10 @@ struct hfi_video_work_mode { u32 video_work_mode; }; +struct hfi_video_work_route { + u32 video_work_route; +}; + struct hfi_h264_vui_timing_info { u32 enable; u32 fixed_framerate; diff --git a/drivers/media/platform/qcom/venus/vdec.c b/drivers/media/platform/qcom/venus/vdec.c index ddb7cd3..a674281 100644 --- a/drivers/media/platform/qcom/venus/vdec.c +++ b/drivers/media/platform/qcom/venus/vdec.c @@ -653,6 +653,21 @@ static int vdec_set_properties(struct venus_inst *inst) return 0; } +static int vdec_set_work_route(struct venus_inst *inst) +{ + struct hfi_video_work_route wr; + u32 ptype; + int ret; + + wr.video_work_route = inst->core->res->num_vpp_pipes; + + ptype = HFI_PROPERTY_PARAM_WORK_ROUTE; + ret = hfi_session_set_property(inst, ptype, &wr); + if (ret) + return ret; + return 0; +} + #define is_ubwc_fmt(fmt) (!!((fmt) & HFI_COLOR_FORMAT_UBWC_BASE)) static int vdec_output_conf(struct venus_inst *inst) @@ -1039,6 +1054,12 @@ static int vdec_start_output(struct venus_inst *inst) if (ret) return ret; + if (IS_V6(inst->core)) { + ret = vdec_set_work_route(inst); + if (ret) + return ret; + } + ret = vdec_output_conf(inst); if (ret) return ret;
Set work route to FW based on num of vpp pipes. Signed-off-by: Dikshita Agarwal <dikshita@codeaurora.org> --- drivers/media/platform/qcom/venus/hfi_cmds.c | 7 +++++++ drivers/media/platform/qcom/venus/hfi_helper.h | 5 +++++ drivers/media/platform/qcom/venus/vdec.c | 21 +++++++++++++++++++++ 3 files changed, 33 insertions(+)