On Tue, Nov 22, 2022 at 12:59:36PM -0800, Matt Roper wrote: > On Mon, Nov 21, 2022 at 06:18:15PM -0300, Gustavo Sousa wrote: > > Release notes: > > > > 1. Fixes for Register noclaims and few restore. > > > > Signed-off-by: Gustavo Sousa <gustavo.sousa@xxxxxxxxx> > > Now that we've removed force_probe from DG2, in general we're past the > point where we can just directly update firmware versions like this; if > someone has a working system with the current kernel + DMC 2.07 and then > they update to a new kernel containing this patch (but without > installing DMC 2.08), they'd see a regression. > > In this case, maybe there's still time to sneak this specific update > into -fixes so that it lands in the same kernel release that removes the > force_probe protection on DG2? But in general we need to start > providing backwards-compatible support for all firmware updates going > forward. The GuC/HuC guys just went through an overhaul of their > firmware handling to deal with this; we probably need something similar > on the DMC side now too, although I suspect DMC should be simpler to > deal with since most (all?) DMC firmwares are just drop-in replacements > and there's no constantly changing firmware<->driver interface like > there is with the GuC. > > See Documentation/driver-api/firmware/firmware-usage-guidelines.rst for > the official rules about firmware usage. Matt is right here. But this update is an important fix and I will propagate through the -fixes flow, so we don't need for now to support the 2.07 as fallback. The 6.2 will be released only with the 2.08. But please make sure you add a "Fixes:" tag to this patch. Then please let us know when the fw file got accepted in the linux-firmware.git so we can merge and propagate. Moving forward we will need to support the fallback version like GuC, or even better, remove the versioning from the filename entirely like HuC. > > > Matt > > > --- > > drivers/gpu/drm/i915/display/intel_dmc.c | 4 ++-- > > 1 file changed, 2 insertions(+), 2 deletions(-) > > > > diff --git a/drivers/gpu/drm/i915/display/intel_dmc.c b/drivers/gpu/drm/i915/display/intel_dmc.c > > index 081a4d0083b1..697196368fbb 100644 > > --- a/drivers/gpu/drm/i915/display/intel_dmc.c > > +++ b/drivers/gpu/drm/i915/display/intel_dmc.c > > @@ -52,8 +52,8 @@ > > > > #define DISPLAY_VER12_DMC_MAX_FW_SIZE ICL_DMC_MAX_FW_SIZE > > > > -#define DG2_DMC_PATH DMC_PATH(dg2, 2, 07) > > -#define DG2_DMC_VERSION_REQUIRED DMC_VERSION(2, 07) > > +#define DG2_DMC_PATH DMC_PATH(dg2, 2, 08) > > +#define DG2_DMC_VERSION_REQUIRED DMC_VERSION(2, 08) > > MODULE_FIRMWARE(DG2_DMC_PATH); > > > > #define ADLP_DMC_PATH DMC_PATH(adlp, 2, 16) > > -- > > 2.38.1 > > > > -- > Matt Roper > Graphics Software Engineer > VTT-OSGC Platform Enablement > Intel Corporation