drm/i915/uc: Move uC WOPCM setup in uc_init_hw
The register we write are not WOPCM regs but uC ones related to how GuC and HuC are going to use the WOPCM, so it makes logical sense for them to be programmed as part of uc_init_hw. The WOPCM map on the other side is not uC-specific (although that is our main use-case), so keep that separate. v2: move write_and_verify to uncore, fix log, re-use err_out tag, add intel_wopcm_guc_base, fix log Signed-off-by: Daniele Ceraolo Spurio <daniele.ceraolospurio@intel.com> Cc: Michal Wajdeczko <michal.wajdeczko@intel.com> Cc: Chris Wilson <chris@chris-wilson.co.uk> Reviewed-by: Chris Wilson <chris@chris-wilson.co.uk> Reviewed-by: Michal Wajdeczko <michal.wajdeczko@intel.com> Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk> Link: https://patchwork.freedesktop.org/patch/msgid/20190730230743.19542-2-daniele.ceraolospurio@intel.com
Этот коммит содержится в:

коммит произвёл
Chris Wilson

родитель
602776f96b
Коммит
63064d822c
@@ -1240,14 +1240,8 @@ int i915_gem_init_hw(struct drm_i915_private *i915)
|
||||
goto out;
|
||||
}
|
||||
|
||||
ret = intel_wopcm_init_hw(&i915->wopcm, gt);
|
||||
if (ret) {
|
||||
DRM_ERROR("Enabling WOPCM failed (%d)\n", ret);
|
||||
goto out;
|
||||
}
|
||||
|
||||
/* We can't enable contexts until all firmware is loaded */
|
||||
ret = intel_uc_init_hw(&i915->gt.uc);
|
||||
ret = intel_uc_init_hw(>->uc);
|
||||
if (ret) {
|
||||
DRM_ERROR("Enabling uc failed (%d)\n", ret);
|
||||
goto out;
|
||||
|
Ссылка в новой задаче
Block a user