Paper over the patches adding debug messages to dinq, applied before their appropiate backmerge, with a smattering of C casts.
These broken merge artifacts should evaporate after a cycle of pushing and pulling, but before we can send the PR we need to test dinq itself! Reported-by: Tomi Sarvela <[email protected]> Signed-off-by: Chris Wilson <[email protected]> Cc: Tomi Sarvela <[email protected]> Cc: Jani Nikula <[email protected]> Cc: Rodrigo Vivi <[email protected]> --- drivers/gpu/drm/i915/i915_reset.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/gpu/drm/i915/i915_reset.c b/drivers/gpu/drm/i915/i915_reset.c index 342d9ee42601..05ad16a412cc 100644 --- a/drivers/gpu/drm/i915/i915_reset.c +++ b/drivers/gpu/drm/i915/i915_reset.c @@ -688,7 +688,7 @@ reset_request(struct intel_engine_cs *engine, if (i915_request_completed(rq)) { GEM_TRACE("%s pardoned global=%d (fence %llx:%lld), current %d\n", engine->name, rq->global_seqno, - rq->fence.context, rq->fence.seqno, + (u64)rq->fence.context, (u64)rq->fence.seqno, intel_engine_get_seqno(engine)); stalled = false; } @@ -803,7 +803,7 @@ static void nop_submit_request(struct i915_request *request) GEM_TRACE("%s fence %llx:%lld -> -EIO\n", request->engine->name, - request->fence.context, request->fence.seqno); + (u64)request->fence.context, (u64)request->fence.seqno); dma_fence_set_error(&request->fence, -EIO); spin_lock_irqsave(&request->engine->timeline.lock, flags); -- 2.20.1 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
