diff options
Diffstat (limited to 'drivers/gpu/drm/i915/intel_guc_loader.c')
-rw-r--r-- | drivers/gpu/drm/i915/intel_guc_loader.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/gpu/drm/i915/intel_guc_loader.c b/drivers/gpu/drm/i915/intel_guc_loader.c index 3accd914490f..82a3c03fbc0e 100644 --- a/drivers/gpu/drm/i915/intel_guc_loader.c +++ b/drivers/gpu/drm/i915/intel_guc_loader.c | |||
@@ -199,7 +199,7 @@ static void set_guc_init_params(struct drm_i915_private *dev_priv) | |||
199 | * the value matches either of two values representing completion | 199 | * the value matches either of two values representing completion |
200 | * of the GuC boot process. | 200 | * of the GuC boot process. |
201 | * | 201 | * |
202 | * This is used for polling the GuC status in a wait_for_atomic() | 202 | * This is used for polling the GuC status in a wait_for() |
203 | * loop below. | 203 | * loop below. |
204 | */ | 204 | */ |
205 | static inline bool guc_ucode_response(struct drm_i915_private *dev_priv, | 205 | static inline bool guc_ucode_response(struct drm_i915_private *dev_priv, |
@@ -259,14 +259,14 @@ static int guc_ucode_xfer_dma(struct drm_i915_private *dev_priv) | |||
259 | I915_WRITE(DMA_CTRL, _MASKED_BIT_ENABLE(UOS_MOVE | START_DMA)); | 259 | I915_WRITE(DMA_CTRL, _MASKED_BIT_ENABLE(UOS_MOVE | START_DMA)); |
260 | 260 | ||
261 | /* | 261 | /* |
262 | * Spin-wait for the DMA to complete & the GuC to start up. | 262 | * Wait for the DMA to complete & the GuC to start up. |
263 | * NB: Docs recommend not using the interrupt for completion. | 263 | * NB: Docs recommend not using the interrupt for completion. |
264 | * Measurements indicate this should take no more than 20ms, so a | 264 | * Measurements indicate this should take no more than 20ms, so a |
265 | * timeout here indicates that the GuC has failed and is unusable. | 265 | * timeout here indicates that the GuC has failed and is unusable. |
266 | * (Higher levels of the driver will attempt to fall back to | 266 | * (Higher levels of the driver will attempt to fall back to |
267 | * execlist mode if this happens.) | 267 | * execlist mode if this happens.) |
268 | */ | 268 | */ |
269 | ret = wait_for_atomic(guc_ucode_response(dev_priv, &status), 100); | 269 | ret = wait_for(guc_ucode_response(dev_priv, &status), 100); |
270 | 270 | ||
271 | DRM_DEBUG_DRIVER("DMA status 0x%x, GuC status 0x%x\n", | 271 | DRM_DEBUG_DRIVER("DMA status 0x%x, GuC status 0x%x\n", |
272 | I915_READ(DMA_CTRL), status); | 272 | I915_READ(DMA_CTRL), status); |