On Tue, Mar 14, 2017 at 04:17:17PM +0100, Michal Wajdeczko wrote: > On Tue, Mar 14, 2017 at 03:28:14PM +0100, Arkadiusz Hiler wrote: > > `guc_firmware_path` and `huc_firmware_path` module parameters are added. > > > > Using the parameter disables version checks and loads desired firmware > > instead of the default one. > > > > v2: make params unsafe && notice about disabled fw check (J. Lahtinen) > > > > Cc: Chris Wilson <chris@xxxxxxxxxxxxxxxxxx> > > Cc: Joonas Lahtinen <joonas.lahtinen@xxxxxxxxxxxxxxx> > > Cc: Michal Winiarski <michal.winiarski@xxxxxxxxx> > > Signed-off-by: Arkadiusz Hiler <arkadiusz.hiler@xxxxxxxxx> > > Reviewed-by: Joonas Lahtinen <joonas.lahtinen@xxxxxxxxxxxxxxx> > > --- > > snip > > > @@ -356,8 +356,10 @@ void intel_uc_prepare_fw(struct drm_i915_private *dev_priv, > > goto fail; > > } > > > > - if (uc_fw->major_ver_found != uc_fw->major_ver_wanted || > > - uc_fw->minor_ver_found < uc_fw->minor_ver_wanted) { > > + if (uc_fw->major_ver_wanted == 0 && uc_fw->minor_ver_wanted == 0) { > > + DRM_NOTE("Skipping uC firmware version check\n"); > > Do we really need this explicit message? > I would rather promote DRM_DEBUG_DRIVER that prints loaded fw version to > DRM_NOTE to always trace what fw version driver will use (which is even more > important as user may specify any version that may cause driver go crazy) It's logged anyway, right below this if statement :-) I think it's useful that we are explicit about frimware version overriding in logs. Additional benefit is that the logical conditions are split and more readable. > -Michal > > > + } else if (uc_fw->major_ver_found != uc_fw->major_ver_wanted || > > + uc_fw->minor_ver_found < uc_fw->minor_ver_wanted) { > > DRM_NOTE("uC firmware version %d.%d, required %d.%d\n", > > uc_fw->major_ver_found, uc_fw->minor_ver_found, > > uc_fw->major_ver_wanted, uc_fw->minor_ver_wanted); > > -- > > 2.9.3 > > > > _______________________________________________ > > Intel-gfx mailing list > > Intel-gfx@xxxxxxxxxxxxxxxxxxxxx > > https://lists.freedesktop.org/mailman/listinfo/intel-gfx -- Cheers, Arek _______________________________________________ Intel-gfx mailing list Intel-gfx@xxxxxxxxxxxxxxxxxxxxx https://lists.freedesktop.org/mailman/listinfo/intel-gfx