On Wed, Sep 08, 2021 at 09:37:08AM -0500, joshua stein wrote:
> On Wed, 08 Sep 2021 at 14:48:26 +0100, Stuart Henderson wrote:
> > On 2021/09/08 15:33, Alex Fedorov wrote:
> > > Hello.
> > > 
> > > This is bug with load DMC firmware i915/kbl_dmc_ver1_04.bin
> > 
> > Is the file /etc/firmware/i915/kbl_dmc_ver1_04.bin present?
> > If not, run fw_update.
> > 
> > 
> > > Notebook Lenovo IdeaPad 530S.
> > > 
> > > Thank you.
> > > 
> > > ......
> > > 
> > > drm:pid49999:csr_load_work_fn *NOTICE* [drm] Failed to load DMC firmware
> > > i915/kbl_dmc_ver1_04.bin. Disabling runtime power management.
> > > drm:pid49999:csr_load_work_fn *NOTICE* [drm] DMC firmware homepage: 
> > > https://git.kernel.org/pub/scm/linux/kernel/git/firmware/linux-firmware.git/tree/i915inteldrm0:
> > > 1920x1080, 32bpp
> > > wsdisplay0 at inteldrm0 mux 1: console (std, vt100 emulation), using 
> > > wskbd0
> > > ......
> 
> Maybe we can improve these error messages on OpenBSD?  (Especially 
> since the last one is missing a newline)

fw_update is run by rc.firsttime post install after the message
is displayed so perhaps we just skip them without a replacement?

> 
> 
> diff --git sys/dev/pci/drm/i915/display/intel_csr.c 
> sys/dev/pci/drm/i915/display/intel_csr.c
> index f173fe33ede..531866b82e2 100644
> --- sys/dev/pci/drm/i915/display/intel_csr.c
> +++ sys/dev/pci/drm/i915/display/intel_csr.c
> @@ -657,8 +657,13 @@ static void csr_load_work_fn(struct work_struct *work)
>                          "Failed to load DMC firmware %s."
>                          " Disabling runtime power management.\n",
>                          csr->fw_path);
> +#ifdef __OpenBSD__
> +             drm_notice(&dev_priv->drm,
> +                        "Use fw_update(1) to install firmware.\n");
> +#else
>               drm_notice(&dev_priv->drm, "DMC firmware homepage: %s",
>                          INTEL_UC_FIRMWARE_URL);
> +#endif
>       }
>  
>       release_firmware(fw);
> diff --git sys/dev/pci/drm/i915/gt/uc/intel_uc_fw.c 
> sys/dev/pci/drm/i915/gt/uc/intel_uc_fw.c
> index d0c82382f2e..f68ab663f26 100644
> --- sys/dev/pci/drm/i915/gt/uc/intel_uc_fw.c
> +++ sys/dev/pci/drm/i915/gt/uc/intel_uc_fw.c
> @@ -391,8 +391,13 @@ fail:
>  
>       drm_notice(&i915->drm, "%s firmware %s: fetch failed with error %d\n",
>                  intel_uc_fw_type_repr(uc_fw->type), uc_fw->path, err);
> +#ifdef __OpenBSD__
> +     drm_info(&i915->drm, "%s firmware(s) can be installed with "
> +         "fw_update(1)\n", intel_uc_fw_type_repr(uc_fw->type));
> +#else
>       drm_info(&i915->drm, "%s firmware(s) can be downloaded from %s\n",
>                intel_uc_fw_type_repr(uc_fw->type), INTEL_UC_FIRMWARE_URL);
> +#endif
>  
>       release_firmware(fw);           /* OK even if fw is NULL */
>       return err;
> 

Reply via email to