Commit 2a46fbb2 authored by Michal Wajdeczko's avatar Michal Wajdeczko Committed by Chris Wilson

drm/i915/guc: Upgrade to GuC 33.0.0

New GuC firmware is available. Let's use it.
Signed-off-by: default avatarMichal Wajdeczko <michal.wajdeczko@intel.com>
Cc: Daniele Ceraolo Spurio <daniele.ceraolospurio@intel.com>
Reviewed-by: default avatarDaniele Ceraolo Spurio <daniele.ceraolospurio@intel.com>
Signed-off-by: default avatarChris Wilson <chris@chris-wilson.co.uk>
Link: https://patchwork.freedesktop.org/patch/msgid/20190703113640.31100-1-michal.wajdeczko@intel.com
parent ae1c5fd7
...@@ -38,37 +38,37 @@ ...@@ -38,37 +38,37 @@
__stringify(KEY##_GUC_FW_PATCH) ".bin" __stringify(KEY##_GUC_FW_PATCH) ".bin"
#define SKL_GUC_FW_PREFIX skl #define SKL_GUC_FW_PREFIX skl
#define SKL_GUC_FW_MAJOR 32 #define SKL_GUC_FW_MAJOR 33
#define SKL_GUC_FW_MINOR 0 #define SKL_GUC_FW_MINOR 0
#define SKL_GUC_FW_PATCH 3 #define SKL_GUC_FW_PATCH 0
#define SKL_GUC_FIRMWARE_PATH __MAKE_GUC_FW_PATH(SKL) #define SKL_GUC_FIRMWARE_PATH __MAKE_GUC_FW_PATH(SKL)
MODULE_FIRMWARE(SKL_GUC_FIRMWARE_PATH); MODULE_FIRMWARE(SKL_GUC_FIRMWARE_PATH);
#define BXT_GUC_FW_PREFIX bxt #define BXT_GUC_FW_PREFIX bxt
#define BXT_GUC_FW_MAJOR 32 #define BXT_GUC_FW_MAJOR 33
#define BXT_GUC_FW_MINOR 0 #define BXT_GUC_FW_MINOR 0
#define BXT_GUC_FW_PATCH 3 #define BXT_GUC_FW_PATCH 0
#define BXT_GUC_FIRMWARE_PATH __MAKE_GUC_FW_PATH(BXT) #define BXT_GUC_FIRMWARE_PATH __MAKE_GUC_FW_PATH(BXT)
MODULE_FIRMWARE(BXT_GUC_FIRMWARE_PATH); MODULE_FIRMWARE(BXT_GUC_FIRMWARE_PATH);
#define KBL_GUC_FW_PREFIX kbl #define KBL_GUC_FW_PREFIX kbl
#define KBL_GUC_FW_MAJOR 32 #define KBL_GUC_FW_MAJOR 33
#define KBL_GUC_FW_MINOR 0 #define KBL_GUC_FW_MINOR 0
#define KBL_GUC_FW_PATCH 3 #define KBL_GUC_FW_PATCH 0
#define KBL_GUC_FIRMWARE_PATH __MAKE_GUC_FW_PATH(KBL) #define KBL_GUC_FIRMWARE_PATH __MAKE_GUC_FW_PATH(KBL)
MODULE_FIRMWARE(KBL_GUC_FIRMWARE_PATH); MODULE_FIRMWARE(KBL_GUC_FIRMWARE_PATH);
#define GLK_GUC_FW_PREFIX glk #define GLK_GUC_FW_PREFIX glk
#define GLK_GUC_FW_MAJOR 32 #define GLK_GUC_FW_MAJOR 33
#define GLK_GUC_FW_MINOR 0 #define GLK_GUC_FW_MINOR 0
#define GLK_GUC_FW_PATCH 3 #define GLK_GUC_FW_PATCH 0
#define GLK_GUC_FIRMWARE_PATH __MAKE_GUC_FW_PATH(GLK) #define GLK_GUC_FIRMWARE_PATH __MAKE_GUC_FW_PATH(GLK)
MODULE_FIRMWARE(GLK_GUC_FIRMWARE_PATH); MODULE_FIRMWARE(GLK_GUC_FIRMWARE_PATH);
#define ICL_GUC_FW_PREFIX icl #define ICL_GUC_FW_PREFIX icl
#define ICL_GUC_FW_MAJOR 32 #define ICL_GUC_FW_MAJOR 33
#define ICL_GUC_FW_MINOR 0 #define ICL_GUC_FW_MINOR 0
#define ICL_GUC_FW_PATCH 3 #define ICL_GUC_FW_PATCH 0
#define ICL_GUC_FIRMWARE_PATH __MAKE_GUC_FW_PATH(ICL) #define ICL_GUC_FIRMWARE_PATH __MAKE_GUC_FW_PATH(ICL)
MODULE_FIRMWARE(ICL_GUC_FIRMWARE_PATH); MODULE_FIRMWARE(ICL_GUC_FIRMWARE_PATH);
......
...@@ -43,13 +43,8 @@ ...@@ -43,13 +43,8 @@
#define GUC_VIDEO_ENGINE2 4 #define GUC_VIDEO_ENGINE2 4
#define GUC_MAX_ENGINES_NUM (GUC_VIDEO_ENGINE2 + 1) #define GUC_MAX_ENGINES_NUM (GUC_VIDEO_ENGINE2 + 1)
/*
* XXX: Beware that Gen9 firmware 32.x uses wrong definition for
* GUC_MAX_INSTANCES_PER_CLASS (1) but this is harmless for us now
* as we are not enabling GuC submission mode where this will be used
*/
#define GUC_MAX_ENGINE_CLASSES 5 #define GUC_MAX_ENGINE_CLASSES 5
#define GUC_MAX_INSTANCES_PER_CLASS 4 #define GUC_MAX_INSTANCES_PER_CLASS 16
#define GUC_DOORBELL_INVALID 256 #define GUC_DOORBELL_INVALID 256
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment