drm/i915: dgfx cards need to wait on pcode's uncore init done

In discrete cards, the graphics driver shouldn't proceed with the probe
or resume unless PCODE indicated everything is done, including memory
training and gt bring up.

For this reason, the driver probe and resume paths needs to be blocked
until PCODE indicates it is done. Also, it needs to aborted if the
notification never arrives.

In general, the few miliseconds would be enough and the regular PCODE
recommendation for the timeout was 10 seconds. However there are some
rare cases where this initialization can take up to 1 minute. So,
PCODE has increased the recommendation to 3 minutes so we don't fully
block the device utilization when something just got delayed for
whatever reason. To be on the safest side, let's accept this
recommendation, since on the regular case it won't delay or block the
driver initialization and resume flows

Cc: Rodrigo Vivi <rodrigo.vivi@intel.com>
Signed-off-by: Badal Nilawar <badal.nilawar@intel.com>
Reviewed-by: Rodrigo Vivi <rodrigo.vivi@intel.com>
Signed-off-by: Rodrigo Vivi <rodrigo.vivi@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20210727173338.901264-1-badal.nilawar@intel.com

diff --git a/drivers/gpu/drm/i915/i915_drv.c b/drivers/gpu/drm/i915/i915_drv.c
index 05e043dfeb1de0e36c1c91337b8f547b8a5ff1ca..4e44c98e5db8998149d811cda49d1a285a8b4824 100644 (file)
--- a/drivers/gpu/drm/i915/i915_drv.c
+++ b/drivers/gpu/drm/i915/i915_drv.c
@@ -620,7 +620,9 @@ static int i915_driver_hw_probe(struct drm_i915_private *dev_priv)
 
        intel_opregion_setup(dev_priv);
 
-       intel_pcode_init(dev_priv);
+       ret = intel_pcode_init(dev_priv);
+       if (ret)
+               goto err_msi;
 
        /*
         * Fill the dram structure to get the system dram info. This will be
@@ -1231,6 +1233,10 @@ static int i915_drm_resume(struct drm_device *dev)
 
        disable_rpm_wakeref_asserts(&dev_priv->runtime_pm);
 
+       ret = intel_pcode_init(dev_priv);
+       if (ret)
+               return ret;
+
        sanitize_gpu(dev_priv);
 
        ret = i915_ggtt_enable_hw(dev_priv);

diff --git a/drivers/gpu/drm/i915/intel_sideband.c b/drivers/gpu/drm/i915/intel_sideband.c
index f0a82b37bd1ac6a49f17f39b1e191bd36a208c50..e304bf44e1ff88968075399def51a69df3fc7aa1 100644 (file)
--- a/drivers/gpu/drm/i915/intel_sideband.c
+++ b/drivers/gpu/drm/i915/intel_sideband.c
@@ -556,17 +556,22 @@ out:
 #undef COND
 }
 
-void intel_pcode_init(struct drm_i915_private *i915)
+int intel_pcode_init(struct drm_i915_private *i915)
 {
-       int ret;
+       int ret = 0;
 
        if (!IS_DGFX(i915))
-               return;
+               return ret;
 
        ret = skl_pcode_request(i915, DG1_PCODE_STATUS,
                                DG1_UNCORE_GET_INIT_STATUS,
                                DG1_UNCORE_INIT_STATUS_COMPLETE,
-                               DG1_UNCORE_INIT_STATUS_COMPLETE, 50);
+                               DG1_UNCORE_INIT_STATUS_COMPLETE, 180000);
+
+       drm_dbg(&i915->drm, "PCODE init status %d\n", ret);
+
        if (ret)
                drm_err(&i915->drm, "Pcode did not report uncore initialization completion!\n");
+
+       return ret;
 }

diff --git a/drivers/gpu/drm/i915/intel_sideband.h b/drivers/gpu/drm/i915/intel_sideband.h
index 094c7b19c5d42e7ebfbd107019a7915d63df2d75..d1d14bcb8f56e86424a4308c05e0bf925bed4eae 100644 (file)
--- a/drivers/gpu/drm/i915/intel_sideband.h
+++ b/drivers/gpu/drm/i915/intel_sideband.h
@@ -138,6 +138,6 @@ int sandybridge_pcode_write_timeout(struct drm_i915_private *i915, u32 mbox,
 int skl_pcode_request(struct drm_i915_private *i915, u32 mbox, u32 request,
                      u32 reply_mask, u32 reply, int timeout_base_ms);
 
-void intel_pcode_init(struct drm_i915_private *i915);
+int intel_pcode_init(struct drm_i915_private *i915);
 
 #endif /* _INTEL_SIDEBAND_H */