From: Tom O'Rourke Date: Fri, 6 May 2016 10:42:52 +0000 (+0100) Subject: drm/i915/guc: Use major_minor version for filename X-Git-Tag: MMI-PSA29.97-13-9~7427^2~45^2~87 X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=4d3ba7e4456e5442df2bd0b77bd1aa4adc137835;p=GitHub%2FMotorolaMobilityLLC%2Fkernel-slsi.git drm/i915/guc: Use major_minor version for filename 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 Signed-off-by: Nick Hoath Acked-by: Jani Nikula Reviewed-by: peter.antoine@intel.com Signed-off-by: Tvrtko Ursulin --- diff --git a/drivers/gpu/drm/i915/intel_guc_loader.c b/drivers/gpu/drm/i915/intel_guc_loader.c index 876e5da44c4e..321bdbb9c578 100644 --- a/drivers/gpu/drm/i915/intel_guc_loader.c +++ b/drivers/gpu/drm/i915/intel_guc_loader.c @@ -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 */