diff options
| author | Chris Wilson | 2019-04-08 11:17:01 +0200 |
|---|---|---|
| committer | Chris Wilson | 2019-04-08 18:03:45 +0200 |
| commit | bfd04533138427846ab711c68320c71c6275a0a3 (patch) | |
| tree | 628c739633c5bd42e779ee479b2d41a6714df1dc /drivers/gpu/drm/i915/intel_guc_submission.c | |
| parent | drm/i915/icl: Simplify release of encoder power refs (diff) | |
| download | kernel-qcow2-linux-bfd04533138427846ab711c68320c71c6275a0a3.tar.gz kernel-qcow2-linux-bfd04533138427846ab711c68320c71c6275a0a3.tar.xz kernel-qcow2-linux-bfd04533138427846ab711c68320c71c6275a0a3.zip | |
drm/i915/guc: Replace WARN with a DRM_ERROR
Replace the WARN with a simple if() + error message to squech the sparse
warning that entire wait_for() macro was being stringified:
drivers/gpu/drm/i915/intel_guc_submission.c:658:9: error: too long token expansion
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
Reviewed-by: Tvrtko Ursulin <tvrtko.ursulin@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20190408091728.20207-2-chris@chris-wilson.co.uk
Diffstat (limited to 'drivers/gpu/drm/i915/intel_guc_submission.c')
| -rw-r--r-- | drivers/gpu/drm/i915/intel_guc_submission.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/drivers/gpu/drm/i915/intel_guc_submission.c b/drivers/gpu/drm/i915/intel_guc_submission.c index c58922226d47..42fcd622d7a3 100644 --- a/drivers/gpu/drm/i915/intel_guc_submission.c +++ b/drivers/gpu/drm/i915/intel_guc_submission.c @@ -650,9 +650,10 @@ static void wait_for_guc_preempt_report(struct intel_engine_cs *engine) struct guc_ctx_report *report = &data->preempt_ctx_report[engine->guc_id]; - WARN_ON(wait_for_atomic(report->report_return_status == - INTEL_GUC_REPORT_STATUS_COMPLETE, - GUC_PREEMPT_POSTPROCESS_DELAY_MS)); + if (wait_for_atomic(report->report_return_status == + INTEL_GUC_REPORT_STATUS_COMPLETE, + GUC_PREEMPT_POSTPROCESS_DELAY_MS)) + DRM_ERROR("Timed out waiting for GuC preemption report\n"); /* * GuC is expecting that we're also going to clear the affected context * counter, let's also reset the return status to not depend on GuC |