* [PATCH] media: mtk-vpu: load vpu firmware from the new location
@ 2020-03-22 7:57 gtk_ruiwang
2020-03-24 12:20 ` Hans Verkuil
0 siblings, 1 reply; 3+ messages in thread
From: gtk_ruiwang @ 2020-03-22 7:57 UTC (permalink / raw)
To: Hans Verkuil, Alexandre Courbot, Mauro Carvalho Chehab,
Matthias Brugger, Tomasz Figa, linux-media, linux-arm-kernel,
linux-mediatek, linux-kernel
Cc: Andrew-CT Chen, Maoguang Meng, srv_heupstream, gtk_ruiwang,
Erin Lo, Houlong Wei, Sj Huang
From: gtk_ruiwang <gtk_ruiwang@mediatek.com>
mt8173 VPU firmware has been moved to a sub-folder of
linux-firmware, so load vpu-fw from the new location first,
if it fails, then from the old one.
Signed-off-by: Rui Wang <gtk_ruiwang@mediatek.com>
---
drivers/media/platform/mtk-vpu/mtk_vpu.c | 16 +++++++++++++---
1 file changed, 13 insertions(+), 3 deletions(-)
diff --git a/drivers/media/platform/mtk-vpu/mtk_vpu.c b/drivers/media/platform/mtk-vpu/mtk_vpu.c
index a768707abb94..89274842e07b 100644
--- a/drivers/media/platform/mtk-vpu/mtk_vpu.c
+++ b/drivers/media/platform/mtk-vpu/mtk_vpu.c
@@ -46,6 +46,8 @@
/* binary firmware name */
#define VPU_P_FW "vpu_p.bin"
#define VPU_D_FW "vpu_d.bin"
+#define VPU_P_FW_NEW "mediatek/mt8173/vpu_p.bin"
+#define VPU_D_FW_NEW "mediatek/mt8173/vpu_d.bin"
#define VPU_RESET 0x0
#define VPU_TCM_CFG 0x0008
@@ -477,16 +479,24 @@ static int load_requested_vpu(struct mtk_vpu *vpu,
size_t tcm_size = fw_type ? VPU_DTCM_SIZE : VPU_PTCM_SIZE;
size_t fw_size = fw_type ? VPU_D_FW_SIZE : VPU_P_FW_SIZE;
char *fw_name = fw_type ? VPU_D_FW : VPU_P_FW;
+ char *fw_new_name = fw_type ? VPU_D_FW_NEW : VPU_P_FW_NEW;
const struct firmware *vpu_fw;
size_t dl_size = 0;
size_t extra_fw_size = 0;
void *dest;
int ret;
- ret = request_firmware(&vpu_fw, fw_name, vpu->dev);
+ ret = request_firmware(&vpu_fw, fw_new_name, vpu->dev);
if (ret < 0) {
- dev_err(vpu->dev, "Failed to load %s, %d\n", fw_name, ret);
- return ret;
+ dev_info(vpu->dev, "Failed to load %s, %d, retry\n",
+ fw_new_name, ret);
+
+ ret = request_firmware(&vpu_fw, fw_name, vpu->dev);
+ if (ret < 0) {
+ dev_err(vpu->dev, "Failed to load %s, %d\n", fw_name,
+ ret);
+ return ret;
+ }
}
dl_size = vpu_fw->size;
if (dl_size > fw_size) {
--
2.18.0
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
^ permalink raw reply related [flat|nested] 3+ messages in thread* Re: [PATCH] media: mtk-vpu: load vpu firmware from the new location
2020-03-22 7:57 [PATCH] media: mtk-vpu: load vpu firmware from the new location gtk_ruiwang
@ 2020-03-24 12:20 ` Hans Verkuil
2020-03-24 12:56 ` gtk_ruiwang
0 siblings, 1 reply; 3+ messages in thread
From: Hans Verkuil @ 2020-03-24 12:20 UTC (permalink / raw)
To: gtk_ruiwang, Alexandre Courbot, Mauro Carvalho Chehab,
Matthias Brugger, Tomasz Figa, linux-media, linux-arm-kernel,
linux-mediatek, linux-kernel
Cc: Andrew-CT Chen, Maoguang Meng, srv_heupstream, Erin Lo,
Houlong Wei, Sj Huang
On 3/22/20 8:57 AM, gtk_ruiwang@mediatek.com wrote:
> From: gtk_ruiwang <gtk_ruiwang@mediatek.com>
>
> mt8173 VPU firmware has been moved to a sub-folder of
> linux-firmware, so load vpu-fw from the new location first,
> if it fails, then from the old one.
>
> Signed-off-by: Rui Wang <gtk_ruiwang@mediatek.com>
Hmm, I'm getting this from checkpatch.pl --strict:
WARNING: Missing Signed-off-by: line by nominal patch author 'gtk_ruiwang <gtk_ruiwang@mediatek.com>'
Rather than sending this from 'gtk_ruiwang@mediatek.com', can you send this from
'Rui Wang <gtk_ruiwang@mediatek.com>'?
Then the two are the same.
Regards,
Hans
> ---
> drivers/media/platform/mtk-vpu/mtk_vpu.c | 16 +++++++++++++---
> 1 file changed, 13 insertions(+), 3 deletions(-)
>
> diff --git a/drivers/media/platform/mtk-vpu/mtk_vpu.c b/drivers/media/platform/mtk-vpu/mtk_vpu.c
> index a768707abb94..89274842e07b 100644
> --- a/drivers/media/platform/mtk-vpu/mtk_vpu.c
> +++ b/drivers/media/platform/mtk-vpu/mtk_vpu.c
> @@ -46,6 +46,8 @@
> /* binary firmware name */
> #define VPU_P_FW "vpu_p.bin"
> #define VPU_D_FW "vpu_d.bin"
> +#define VPU_P_FW_NEW "mediatek/mt8173/vpu_p.bin"
> +#define VPU_D_FW_NEW "mediatek/mt8173/vpu_d.bin"
>
> #define VPU_RESET 0x0
> #define VPU_TCM_CFG 0x0008
> @@ -477,16 +479,24 @@ static int load_requested_vpu(struct mtk_vpu *vpu,
> size_t tcm_size = fw_type ? VPU_DTCM_SIZE : VPU_PTCM_SIZE;
> size_t fw_size = fw_type ? VPU_D_FW_SIZE : VPU_P_FW_SIZE;
> char *fw_name = fw_type ? VPU_D_FW : VPU_P_FW;
> + char *fw_new_name = fw_type ? VPU_D_FW_NEW : VPU_P_FW_NEW;
> const struct firmware *vpu_fw;
> size_t dl_size = 0;
> size_t extra_fw_size = 0;
> void *dest;
> int ret;
>
> - ret = request_firmware(&vpu_fw, fw_name, vpu->dev);
> + ret = request_firmware(&vpu_fw, fw_new_name, vpu->dev);
> if (ret < 0) {
> - dev_err(vpu->dev, "Failed to load %s, %d\n", fw_name, ret);
> - return ret;
> + dev_info(vpu->dev, "Failed to load %s, %d, retry\n",
> + fw_new_name, ret);
> +
> + ret = request_firmware(&vpu_fw, fw_name, vpu->dev);
> + if (ret < 0) {
> + dev_err(vpu->dev, "Failed to load %s, %d\n", fw_name,
> + ret);
> + return ret;
> + }
> }
> dl_size = vpu_fw->size;
> if (dl_size > fw_size) {
>
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
^ permalink raw reply [flat|nested] 3+ messages in thread* Re: [PATCH] media: mtk-vpu: load vpu firmware from the new location
2020-03-24 12:20 ` Hans Verkuil
@ 2020-03-24 12:56 ` gtk_ruiwang
0 siblings, 0 replies; 3+ messages in thread
From: gtk_ruiwang @ 2020-03-24 12:56 UTC (permalink / raw)
To: Hans Verkuil
Cc: Andrew-CT Chen, Maoguang Meng, srv_heupstream, Alexandre Courbot,
Erin Lo, linux-kernel, Houlong Wei, Tomasz Figa, Sj Huang,
linux-mediatek, Matthias Brugger, Mauro Carvalho Chehab,
linux-arm-kernel, linux-media
Dear Hans,
Patch V2 has sent, thanks a lot.
Sincerely Regards
On Tue, 2020-03-24 at 13:20 +0100, Hans Verkuil wrote:
> On 3/22/20 8:57 AM, gtk_ruiwang@mediatek.com wrote:
> > From: gtk_ruiwang <gtk_ruiwang@mediatek.com>
> >
> > mt8173 VPU firmware has been moved to a sub-folder of
> > linux-firmware, so load vpu-fw from the new location first,
> > if it fails, then from the old one.
> >
> > Signed-off-by: Rui Wang <gtk_ruiwang@mediatek.com>
>
> Hmm, I'm getting this from checkpatch.pl --strict:
>
> WARNING: Missing Signed-off-by: line by nominal patch author 'gtk_ruiwang <gtk_ruiwang@mediatek.com>'
>
> Rather than sending this from 'gtk_ruiwang@mediatek.com', can you send this from
> 'Rui Wang <gtk_ruiwang@mediatek.com>'?
>
> Then the two are the same.
>
> Regards,
>
> Hans
>
> > ---
> > drivers/media/platform/mtk-vpu/mtk_vpu.c | 16 +++++++++++++---
> > 1 file changed, 13 insertions(+), 3 deletions(-)
> >
> > diff --git a/drivers/media/platform/mtk-vpu/mtk_vpu.c b/drivers/media/platform/mtk-vpu/mtk_vpu.c
> > index a768707abb94..89274842e07b 100644
> > --- a/drivers/media/platform/mtk-vpu/mtk_vpu.c
> > +++ b/drivers/media/platform/mtk-vpu/mtk_vpu.c
> > @@ -46,6 +46,8 @@
> > /* binary firmware name */
> > #define VPU_P_FW "vpu_p.bin"
> > #define VPU_D_FW "vpu_d.bin"
> > +#define VPU_P_FW_NEW "mediatek/mt8173/vpu_p.bin"
> > +#define VPU_D_FW_NEW "mediatek/mt8173/vpu_d.bin"
> >
> > #define VPU_RESET 0x0
> > #define VPU_TCM_CFG 0x0008
> > @@ -477,16 +479,24 @@ static int load_requested_vpu(struct mtk_vpu *vpu,
> > size_t tcm_size = fw_type ? VPU_DTCM_SIZE : VPU_PTCM_SIZE;
> > size_t fw_size = fw_type ? VPU_D_FW_SIZE : VPU_P_FW_SIZE;
> > char *fw_name = fw_type ? VPU_D_FW : VPU_P_FW;
> > + char *fw_new_name = fw_type ? VPU_D_FW_NEW : VPU_P_FW_NEW;
> > const struct firmware *vpu_fw;
> > size_t dl_size = 0;
> > size_t extra_fw_size = 0;
> > void *dest;
> > int ret;
> >
> > - ret = request_firmware(&vpu_fw, fw_name, vpu->dev);
> > + ret = request_firmware(&vpu_fw, fw_new_name, vpu->dev);
> > if (ret < 0) {
> > - dev_err(vpu->dev, "Failed to load %s, %d\n", fw_name, ret);
> > - return ret;
> > + dev_info(vpu->dev, "Failed to load %s, %d, retry\n",
> > + fw_new_name, ret);
> > +
> > + ret = request_firmware(&vpu_fw, fw_name, vpu->dev);
> > + if (ret < 0) {
> > + dev_err(vpu->dev, "Failed to load %s, %d\n", fw_name,
> > + ret);
> > + return ret;
> > + }
> > }
> > dl_size = vpu_fw->size;
> > if (dl_size > fw_size) {
> >
>
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2020-03-24 12:56 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2020-03-22 7:57 [PATCH] media: mtk-vpu: load vpu firmware from the new location gtk_ruiwang
2020-03-24 12:20 ` Hans Verkuil
2020-03-24 12:56 ` gtk_ruiwang
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).