On 10/08/16 15:41, Rodrigo Vivi wrote:
With commit 4aa7fb9c ("drm/i915/dmc: Step away from symbolic links") we started loading the firmware version directly instead of symbolic links.With this VERSION_REQUIRED variables changed the meaning from minimal required to exact version required. Along with this change we started using the latest stable DMC firmware as the required one 1.26. That patch is correct. However in some merge this change got missed and it was overwritten by the old version. 1.23 is unstable and can cause blank screens so let's avoid it. v2: Also restore the file names instead keeping the symbolic links (Dave). Cc: [email protected] Cc: Dave Gordon <[email protected]> Cc: Jani Nikula <[email protected]> Cc: Daniel Vetter <[email protected]> Cc: Patrik Jakobsson <[email protected]> Cc: Matthew Atwood <[email protected]> Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=97182 Signed-off-by: Rodrigo Vivi <[email protected]> --- 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 fb27d18..1ea0e1f 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"
Does this really have to have a two-digit minor number? That makes it more difficult to autogenerate the string from the major+minor (see Tvrtko's patch "Consolidate firmware major-minor to one place"). .Dave.
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)
_______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
