staging: media: ipu3-imgu: Request specific firmware binary
Subsystems (3)
Sakari Ailus
maintainerPATCH 1/1 staging: media: ipu3-imgu: Request specific firmware binary
Primarily request a specific revision of the IPU3 firmware that the driver is known to work with, irci_irci_ecr-master_20161208_0213_20170112_1500.bin. Some distros only ship this while others provide a symlink called ipu3-fw.bin, which the driver only requested previously.
--- drivers/staging/media/ipu3/ipu3-css-fw.c | 4 +++- drivers/staging/media/ipu3/ipu3-css-fw.h | 4 +++- 2 files changed, 6 insertions(+), 2 deletions(-)
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 , css->dev); + 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)return r;
drivers/staging/media/ipu3/ipu3-css-fw.h +3 -1
@@ -6,7 +6,9 @@/******************* Firmware file definitions *******************/ -#define IMGU_FW_NAME "intel/ipu3-fw.bin" +#define IMGU_FW_NAME "intel/ipu3-fw.bin" +#define IMGU_FW_NAME_20161208 \ + "intel/irci_irci_ecr-master_20161208_0213_20170112_1500.bin"typedef u32 imgu_fw_ptr ;
Signature · 1 line
2.30.2
Hi Sakari,
Thank you for the patch.
Quoted 5 lines · Sakari Ailus
Primarily request a specific revision of the IPU3 firmware that the driver is known to work with, irci_irci_ecr-master_20161208_0213_20170112_1500.bin. Some distros only ship this while others provide a symlink called ipu3-fw.bin, which the driver only requested previously.
Are there distros that ship ipu3-fw.bin but not irci_irci_ecr-master_20161208_0213_20170112_1500.bin ? If not, w could avoid the fallback to IMGU_FW_NAME.
Quoted 39 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 | 4 +++- 2 files changed, 6 insertions(+), 2 deletions(-)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 , css->dev); + 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)return r;drivers/staging/media/ipu3/ipu3-css-fw.h +3
-1@@ -6,7 +6,9 @@/******************* Firmware file definitions *******************/ -#define IMGU_FW_NAME "intel/ipu3-fw.bin" +#define IMGU_FW_NAME "intel/ipu3-fw.bin" +#define IMGU_FW_NAME_20161208 \ + "intel/irci_irci_ecr-master_20161208_0213_20170112_1500.bin"typedef u32 imgu_fw_ptr ;Signature · 1 line
2.30.2
Signature · 3 lines
Regards, Laurent Pinchart
Sakari Ailus
maintainerQuoted 11 lines · Laurent Pinchart
Hi Sakari,
Thank you for the patch.
Quoted 5 lines · Sakari Ailus
Primarily request a specific revision of the IPU3 firmware that the driver is known to work with, irci_irci_ecr-master_20161208_0213_20170112_1500.bin. Some distros only ship this while others provide a symlink called ipu3-fw.bin, which the driver only requested previously.
Quoted 3 lines
Are there distros that ship ipu3-fw.bin but not irci_irci_ecr-master_20161208_0213_20170112_1500.bin ? If not, w could avoid the fallback to
IMGU_FW_NAME.
At least some systems will break if I remove the old name altogether. Some instructions (for MS Surface AFAIR) only include the shorter symlink name.
Signature · 1 line
Sakari Ailus