media: staging: ipu3-imgu: Update firmware path
Subsystems (3)
Sakari Ailus
maintainerPATCH 1/1 media: staging: ipu3-imgu: Update firmware path
Use the current firmware path in linux-firmware repository. Check the older paths still in order to avoid causing issues to the users.
--- drivers/staging/media/ipu3/ipu3-css-fw.c | 4 +++- drivers/staging/media/ipu3/ipu3-css-fw.h | 2 ++ 2 files changed, 5 insertions(+), 1 deletion(-)
drivers/staging/media/ipu3/ipu3-css-fw.c +3 -1
@@ -117,7 +117,9 @@ int imgu_css_fw_init(struct imgu_css *css)unsigned int i, j, binary_nr;int r; - r =request_firmware (&css->fw,IMGU_FW_NAME_20161208 , css->dev); + r =request_firmware (&css->fw,IMGU_FW_NAME_IPU_20161208 , css->dev); +if (r == -ENOENT ) + r =request_firmware (&css->fw,IMGU_FW_NAME_20161208 , css->dev);if (r == -ENOENT ) r =request_firmware (&css->fw,IMGU_FW_NAME , css->dev);if (r)
drivers/staging/media/ipu3/ipu3-css-fw.h +2 -0
@@ -9,6 +9,8 @@#define IMGU_FW_NAME "intel/ipu3-fw.bin"#define IMGU_FW_NAME_20161208 \ "intel/irci_irci_ecr-master_20161208_0213_20170112_1500.bin" +#define IMGU_FW_NAME_IPU_20161208 \ + "intel/ipu/irci_irci_ecr-master_20161208_0213_20170112_1500.bin"typedef u32 imgu_fw_ptr ;
Signature · 1 line
2.39.2
Sakari,
Quoted 2 lines · Sakari Ailus
Use the current firmware path in linux-firmware repository. Check the older paths still in order to avoid causing issues to the users.
We also meet similiar issues for IPU6(github driver), I am wondering as the WHENCE file create link and do we still need such patch for IPU6?
Quoted 36 lines
Signed-off-by Sakari Ailus <[email protected]>--- drivers/staging/media/ipu3/ipu3-css-fw.c | 4 +++- drivers/staging/media/ipu3/ipu3-css-fw.h | 2 ++ 2 files changed, 5 insertions(+), 1 deletion(-)drivers/staging/media/ipu3/ipu3-css-fw.c +3
-1@@ -117,7 +117,9 @@ int imgu_css_fw_init(struct imgu_css *css)unsigned int i, j, binary_nr;int r; - r =request_firmware (&css->fw,IMGU_FW_NAME_20161208 , css->dev); + r =request_firmware (&css->fw,IMGU_FW_NAME_IPU_20161208 , css->dev); +if (r == -ENOENT ) + r =request_firmware (&css->fw,IMGU_FW_NAME_20161208 , css->dev);if (r == -ENOENT ) r =request_firmware (&css->fw,IMGU_FW_NAME , css->dev);if (r)drivers/staging/media/ipu3/ipu3-css-fw.h +2
-0@@ -9,6 +9,8 @@#define IMGU_FW_NAME "intel/ipu3-fw.bin"#define IMGU_FW_NAME_20161208 \ "intel/irci_irci_ecr-master_20161208_0213_20170112_1500.bin" +#define IMGU_FW_NAME_IPU_20161208 \ + "intel/ipu/irci_irci_ecr-master_20161208_0213_20170112_1500.bin"typedef u32 imgu_fw_ptr ;
Signature · 2 lines
Best regards, Bingbu Cao
Sakari Ailus
maintainerHi Bingbu,
Quoted 8 lines · Bingbu Cao
Sakari,
Quoted 2 lines · Sakari Ailus
Use the current firmware path in linux-firmware repository. Check the older paths still in order to avoid causing issues to the users.
We also meet similiar issues for IPU6(github driver), I am wondering as the WHENCE file create link and do we still need such patch for IPU6?
Good question. This was still never found in the upstream Linux kernel.
I don't have a strong opinion about it though. Something like that was done to the ipu3-cio2 driver, too. So perhaps we could just take Hao Yao's patch and get it to linux-firmware (with a bit more elaborate commit message)?
Quoted 38 lines
Quoted 37 lines
Signed-off-by Sakari Ailus <[email protected]>--- drivers/staging/media/ipu3/ipu3-css-fw.c | 4 +++- drivers/staging/media/ipu3/ipu3-css-fw.h | 2 ++ 2 files changed, 5 insertions(+), 1 deletion(-)drivers/staging/media/ipu3/ipu3-css-fw.c +3
-1@@ -117,7 +117,9 @@ int imgu_css_fw_init(struct imgu_css *css)unsigned int i, j, binary_nr;int r; - r =request_firmware (&css->fw,IMGU_FW_NAME_20161208 , css->dev); + r =request_firmware (&css->fw,IMGU_FW_NAME_IPU_20161208 , css->dev); +if (r == -ENOENT ) + r =request_firmware (&css->fw,IMGU_FW_NAME_20161208 , css->dev);if (r == -ENOENT ) r =request_firmware (&css->fw,IMGU_FW_NAME , css->dev);if (r)drivers/staging/media/ipu3/ipu3-css-fw.h +2
-0@@ -9,6 +9,8 @@#define IMGU_FW_NAME "intel/ipu3-fw.bin"#define IMGU_FW_NAME_20161208 \ "intel/irci_irci_ecr-master_20161208_0213_20170112_1500.bin" +#define IMGU_FW_NAME_IPU_20161208 \ + "intel/ipu/irci_irci_ecr-master_20161208_0213_20170112_1500.bin"typedef u32 imgu_fw_ptr ;
Signature · 3 lines
Regards, Sakari Ailus