[PATCH 2/3] drm/i915: Always set HUC_LOADING_AGENT_GUC bit in WOPCM offset register
Jackie Li
yaodong.li at intel.com
Wed Mar 21 22:25:51 UTC 2018
The enable_guc modparam is used to enable/disable GuC/HuC FW during module
loading. if WOPCM offset register was locked without HUC_LOADING_AGENT_GUC
bit set to 1 when loading module with only GuC. the reloading module with
both GuC and HuC would fail.
Since HUC_LOADING_AGENT_GUC has no impact on GuC FW loading, this patch
update the register updating code to make sure the WOPCM offset register is
locked with HUC_LOADING_AGENT_GUC bit set to 1 no matter whether HuC FW is
enabled or not.
Signed-off-by: Jackie Li <yaodong.li at intel.com>
---
drivers/gpu/drm/i915/intel_wopcm.c | 8 +++-----
1 file changed, 3 insertions(+), 5 deletions(-)
diff --git a/drivers/gpu/drm/i915/intel_wopcm.c b/drivers/gpu/drm/i915/intel_wopcm.c
index 4117886..babb158 100644
--- a/drivers/gpu/drm/i915/intel_wopcm.c
+++ b/drivers/gpu/drm/i915/intel_wopcm.c
@@ -236,8 +236,6 @@ static inline int write_and_verify(struct drm_i915_private *dev_priv,
int intel_wopcm_init_hw(struct intel_wopcm *wopcm)
{
struct drm_i915_private *dev_priv = wopcm_to_i915(wopcm);
- u32 huc_agent;
- u32 mask;
int err;
if (!USES_GUC(dev_priv))
@@ -253,10 +251,10 @@ int intel_wopcm_init_hw(struct intel_wopcm *wopcm)
if (err)
goto err_out;
- huc_agent = USES_HUC(dev_priv) ? HUC_LOADING_AGENT_GUC : 0;
- mask = GUC_WOPCM_OFFSET_MASK | GUC_WOPCM_OFFSET_VALID | huc_agent;
err = write_and_verify(dev_priv, DMA_GUC_WOPCM_OFFSET,
- wopcm->guc.base | huc_agent, mask,
+ wopcm->guc.base | HUC_LOADING_AGENT_GUC,
+ GUC_WOPCM_OFFSET_MASK | HUC_LOADING_AGENT_GUC |
+ GUC_WOPCM_OFFSET_VALID,
GUC_WOPCM_OFFSET_VALID);
if (err)
goto err_out;
--
2.7.4
More information about the Intel-gfx-trybot
mailing list