diff options
| author | Michal Wajdeczko <michal.wajdeczko@intel.com> | 2018-10-11 19:02:08 +0200 |
|---|---|---|
| committer | Tvrtko Ursulin <tvrtko.ursulin@intel.com> | 2019-05-01 10:40:20 +0100 |
| commit | eaf5dc55f8ddbf1a7418f3176a3da23452dab6bd (patch) | |
| tree | 365f76935c01414b8cff7163bbb17627d469e398 | |
| parent | b464d2ff4b20f181edd2e546c0656dd345bb76cf (diff) | |
drm/i915/guc: Disable GuC on pre-Gen11
Upcoming Gen11 GuC firmware release requires new interface that is
incompatible with existing pre-Gen11 firmwares. Updated firmwares for
pre-Gen11 will arrive later. In the meantime sanitize the enable_guc
option to disallow using GuC on these platforms.
v2: topic branch
Signed-off-by: Michal Wajdeczko <michal.wajdeczko@intel.com>
Cc: Joonas Lahtinen <joonas.lahtinen@linux.intel.com>
Cc: Tvrtko Ursulin <tvrtko.ursulin@intel.com>
| -rw-r--r-- | drivers/gpu/drm/i915/intel_uc.c | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/drivers/gpu/drm/i915/intel_uc.c b/drivers/gpu/drm/i915/intel_uc.c index 01ea36e3150c..1caa8c5a6c8a 100644 --- a/drivers/gpu/drm/i915/intel_uc.c +++ b/drivers/gpu/drm/i915/intel_uc.c @@ -63,7 +63,9 @@ static int __get_platform_enable_guc(struct drm_i915_private *i915) if (intel_uc_fw_is_selected(huc_fw)) enable_guc |= ENABLE_GUC_LOAD_HUC; - /* Any platform specific fine-tuning can be done here */ + /* Don't allow GuC submission on pre-Gen11 */ + if (INTEL_GEN(i915) < 11) + enable_guc = 0; return enable_guc; } @@ -289,6 +291,10 @@ int intel_uc_init(struct drm_i915_private *i915) if (!HAS_GUC(i915)) return -ENODEV; + /* Don't allow GuC submission on pre-Gen11 */ + if (USES_GUC(i915) && INTEL_GEN(i915) < 11) + return -EIO; + ret = intel_guc_init(guc); if (ret) return ret; |