drm/i915/guc: Use major_minor version for filename
authorTom O'Rourke <Tom.O'Rourke@intel.com>
Fri, 6 May 2016 10:42:52 +0000 (11:42 +0100)
committerTvrtko Ursulin <tvrtko.ursulin@intel.com>
Thu, 12 May 2016 15:34:36 +0000 (16:34 +0100)
Load guc firmware from file with major_minor number
in filename instead of using symolic link with only
major number.

This change is so that new firmwares can only be used
with a kernel change. This in case there is a regression
with a new firmware, it won't be used by default without
some testing.

Issue: VIZ-7713
Signed-off-by: Tom O'Rourke <Tom.O'Rourke@intel.com>
Signed-off-by: Nick Hoath <nicholas.hoath@intel.com>
Acked-by: Jani Nikula <jani.nikula@intel.com>
Reviewed-by: peter.antoine@intel.com
Signed-off-by: Tvrtko Ursulin <tvrtko.ursulin@intel.com>
drivers/gpu/drm/i915/intel_guc_loader.c

index 876e5da44c4e01ec1cfe225f1b3bc8fc844a939e..321bdbb9c57840b72e846897bd0a81bacf7ae78e 100644 (file)
@@ -59,7 +59,7 @@
  *
  */
 
-#define I915_SKL_GUC_UCODE "i915/skl_guc_ver6.bin"
+#define I915_SKL_GUC_UCODE "i915/skl_guc_ver6_1.bin"
 MODULE_FIRMWARE(I915_SKL_GUC_UCODE);
 
 /* User-friendly representation of an enum */