On Tue, 23 Aug 2016, Maarten Lankhorst <maarten.lankhorst@xxxxxxxxxxxxxxx> wrote: > Merge commit 5e580523d9128a4d8 reverts the version bumping parts of > commit 4aa7fb9c3c4fa0. Bump the versions again and request the specific > firmware version. > > The currently recommended versions are: SKL 1.26, KBL 1.01 and BXT 1.07. > > Cc: Patrik Jakobsson <patrik.jakobsson@xxxxxxxxxxxxxxx> > Cc: Imre Deak <imre.deak@xxxxxxxxx> > Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=97242 > Cc: drm-intel-fixes@xxxxxxxxxxxxxxxxxxxxx > Fixes: 5e580523d912 ("Backmerge tag 'v4.7' into drm-next") > Signed-off-by: Maarten Lankhorst <maarten.lankhorst@xxxxxxxxxxxxxxx> This is already in dinq as 536ab3ca19ef ("drm/i915: Fix botched merge that downgrades CSR versions."), and cherry-picked to fixes as 177d91aaea4b ("drm/i915: Fix botched merge that downgrades CSR versions."). It's also in my today's pull request to Dave. BR, Jani. > --- > drivers/gpu/drm/i915/intel_csr.c | 8 ++++---- > 1 file changed, 4 insertions(+), 4 deletions(-) > > diff --git a/drivers/gpu/drm/i915/intel_csr.c b/drivers/gpu/drm/i915/intel_csr.c > index fb27d187876c..1ea0e1f43397 100644 > --- a/drivers/gpu/drm/i915/intel_csr.c > +++ b/drivers/gpu/drm/i915/intel_csr.c > @@ -34,15 +34,15 @@ > * low-power state and comes back to normal. > */ > > -#define I915_CSR_KBL "i915/kbl_dmc_ver1.bin" > +#define I915_CSR_KBL "i915/kbl_dmc_ver1_01.bin" > MODULE_FIRMWARE(I915_CSR_KBL); > #define KBL_CSR_VERSION_REQUIRED CSR_VERSION(1, 1) > > -#define I915_CSR_SKL "i915/skl_dmc_ver1.bin" > +#define I915_CSR_SKL "i915/skl_dmc_ver1_26.bin" > MODULE_FIRMWARE(I915_CSR_SKL); > -#define SKL_CSR_VERSION_REQUIRED CSR_VERSION(1, 23) > +#define SKL_CSR_VERSION_REQUIRED CSR_VERSION(1, 26) > > -#define I915_CSR_BXT "i915/bxt_dmc_ver1.bin" > +#define I915_CSR_BXT "i915/bxt_dmc_ver1_07.bin" > MODULE_FIRMWARE(I915_CSR_BXT); > #define BXT_CSR_VERSION_REQUIRED CSR_VERSION(1, 7) -- Jani Nikula, Intel Open Source Technology Center _______________________________________________ Intel-gfx mailing list Intel-gfx@xxxxxxxxxxxxxxxxxxxxx https://lists.freedesktop.org/mailman/listinfo/intel-gfx
