From: Alex Dai Date: Wed, 16 Mar 2016 22:24:13 +0000 (-0700) Subject: drm/i915/guc: Support GuC SKL v6.1 X-Git-Tag: v4.14-rc1~2738^2~45^2~505 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=ab65cce821cc46ccdc0b62f99bb79f75c1c7412c;p=platform%2Fkernel%2Flinux-rpi.git drm/i915/guc: Support GuC SKL v6.1 This version of GuC firmware fixes the engine reset issue where golden context LRC address is treated as page index by mistake. It also fixes the problem that scheduler stops submiting to one engine when the other engine work queue is full. Signed-off-by: Alex Dai Reviewed-by: Dave Gordon Signed-off-by: Rodrigo Vivi --- diff --git a/drivers/gpu/drm/i915/intel_guc_loader.c b/drivers/gpu/drm/i915/intel_guc_loader.c index 9f30921..e1aff62 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_ver4.bin" +#define I915_SKL_GUC_UCODE "i915/skl_guc_ver6.bin" MODULE_FIRMWARE(I915_SKL_GUC_UCODE); /* User-friendly representation of an enum */ @@ -595,8 +595,8 @@ void intel_guc_ucode_init(struct drm_device *dev) fw_path = NULL; } else if (IS_SKYLAKE(dev)) { fw_path = I915_SKL_GUC_UCODE; - guc_fw->guc_fw_major_wanted = 4; - guc_fw->guc_fw_minor_wanted = 3; + guc_fw->guc_fw_major_wanted = 6; + guc_fw->guc_fw_minor_wanted = 1; } else { i915.enable_guc_submission = false; fw_path = ""; /* unknown device */