OSDN Git Service

drm/i915/uc: Move uC WOPCM setup in uc_init_hw
authorDaniele Ceraolo Spurio <daniele.ceraolospurio@intel.com>
Tue, 30 Jul 2019 23:07:40 +0000 (16:07 -0700)
committerChris Wilson <chris@chris-wilson.co.uk>
Wed, 31 Jul 2019 09:19:28 +0000 (10:19 +0100)
commit63064d822c964c04107ead05b64eddccfa142005
tree5d6b45e58de6d2d3c7f9f500ba1f9f1af72b909a
parent602776f96bfa50a6107af017522501c43a82b29a
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
drivers/gpu/drm/i915/gt/uc/intel_uc.c
drivers/gpu/drm/i915/i915_drv.h
drivers/gpu/drm/i915/i915_gem.c
drivers/gpu/drm/i915/intel_uncore.h
drivers/gpu/drm/i915/intel_wopcm.c
drivers/gpu/drm/i915/intel_wopcm.h