Hi Sakari, Thank you for the patch. On Wed, Apr 13, 2022 at 01:37:39PM +0300, Sakari Ailus wrote: > 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. > Signed-off-by: Sakari Ailus <sakari.ailus@xxxxxxxxxxxxxxx> > --- > 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(-) > > diff --git a/drivers/staging/media/ipu3/ipu3-css-fw.c b/drivers/staging/media/ipu3/ipu3-css-fw.c > index 981693eed8155..2b659b0ccca14 100644 > --- a/drivers/staging/media/ipu3/ipu3-css-fw.c > +++ b/drivers/staging/media/ipu3/ipu3-css-fw.c > @@ -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; > > diff --git a/drivers/staging/media/ipu3/ipu3-css-fw.h b/drivers/staging/media/ipu3/ipu3-css-fw.h > index c0bc57fd678a7..f9403da757851 100644 > --- a/drivers/staging/media/ipu3/ipu3-css-fw.h > +++ b/drivers/staging/media/ipu3/ipu3-css-fw.h > @@ -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; > > -- > 2.30.2 > -- Regards, Laurent Pinchart
