From patchwork Mon Jan 11 10:45:05 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Chris Wilson X-Patchwork-Id: 8001671 Return-Path: X-Original-To: patchwork-intel-gfx@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork2.web.kernel.org (Postfix) with ESMTP id 1A804BEEE5 for ; Mon, 11 Jan 2016 10:50:43 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 58CA620279 for ; Mon, 11 Jan 2016 10:50:42 +0000 (UTC) Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) by mail.kernel.org (Postfix) with ESMTP id 8108C2024D for ; Mon, 11 Jan 2016 10:50:38 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 743586E31B; Mon, 11 Jan 2016 02:50:32 -0800 (PST) X-Original-To: intel-gfx@lists.freedesktop.org Delivered-To: intel-gfx@lists.freedesktop.org Received: from mail-wm0-f68.google.com (mail-wm0-f68.google.com [74.125.82.68]) by gabe.freedesktop.org (Postfix) with ESMTPS id 1F6166E2D4 for ; Mon, 11 Jan 2016 02:47:07 -0800 (PST) Received: by mail-wm0-f68.google.com with SMTP id b14so25704335wmb.1 for ; Mon, 11 Jan 2016 02:47:07 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references; bh=ApydJJInAGuFMcrnbUERuAM9BARwConr6d9crA7DVJ0=; b=C2RdoOGRX+DesLs3M9YUhKh+XBd7wiXBctaSbO5aJptT5QXoqZwcDqJ+t31sxf53PL Uq9UynOgg9PxIIEm9NYh1HdWulc5meTABT8az8yccHCTryC/p98Mf+hXWRKBiJQQ6EyE DZcUkg3eZgbv3g7lnph54uxkMhCYLb2oOXioOkCYETtG31LxlS+tocJUxDUcgNZEuUWj SsudCpDJQjSwDvAIXz2QW3ON2BoNeb5sxTnlVcJZSiZz+a/fs/KFdnVyZTf1ENTMoOIL ofNDj4dsLnqNmyrNguRL9q3waz6Oiud1OqoHz0LhE0NSY72iQTJVlyet+afE0IpKokHt g00A== X-Received: by 10.194.47.231 with SMTP id g7mr135360300wjn.42.1452509226040; Mon, 11 Jan 2016 02:47:06 -0800 (PST) Received: from haswell.alporthouse.com ([78.156.65.138]) by smtp.gmail.com with ESMTPSA id t3sm118879383wjz.11.2016.01.11.02.47.05 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Mon, 11 Jan 2016 02:47:05 -0800 (PST) From: Chris Wilson To: intel-gfx@lists.freedesktop.org Date: Mon, 11 Jan 2016 10:45:05 +0000 Message-Id: <1452509174-16671-35-git-send-email-chris@chris-wilson.co.uk> X-Mailer: git-send-email 2.7.0.rc3 In-Reply-To: <1452509174-16671-1-git-send-email-chris@chris-wilson.co.uk> References: <1452503961-14837-1-git-send-email-chris@chris-wilson.co.uk> <1452509174-16671-1-git-send-email-chris@chris-wilson.co.uk> Subject: [Intel-gfx] [PATCH 121/190] drm/i915: Scan GGTT active list for context object X-BeenThere: intel-gfx@lists.freedesktop.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: Intel graphics driver community testing & development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: intel-gfx-bounces@lists.freedesktop.org Sender: "Intel-gfx" X-Spam-Status: No, score=-4.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_MED,RP_MATCHES_RCVD,T_DKIM_INVALID,UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP Signed-off-by: Chris Wilson --- drivers/gpu/drm/i915/i915_gpu_error.c | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) diff --git a/drivers/gpu/drm/i915/i915_gpu_error.c b/drivers/gpu/drm/i915/i915_gpu_error.c index a3090d7ac20a..9a18fc502145 100644 --- a/drivers/gpu/drm/i915/i915_gpu_error.c +++ b/drivers/gpu/drm/i915/i915_gpu_error.c @@ -940,19 +940,18 @@ static void i915_gem_record_active_context(struct intel_engine_cs *ring, struct drm_i915_error_state *error, struct drm_i915_error_ring *ering) { - struct drm_i915_private *dev_priv = ring->dev->dev_private; - struct drm_i915_gem_object *obj; + struct drm_i915_private *dev_priv = ring->i915; + struct i915_vma *vma; /* Currently render ring is the only HW context user */ if (ring->id != RCS || !error->ccid) return; - list_for_each_entry(obj, &dev_priv->mm.bound_list, global_list) { - if (!i915_gem_obj_ggtt_bound(obj)) - continue; - - if ((error->ccid & PAGE_MASK) == i915_gem_obj_ggtt_offset(obj)) { - ering->ctx = i915_error_ggtt_object_create(dev_priv, obj); + list_for_each_entry(vma, &dev_priv->gtt.base.active_list, vm_link) { + if ((error->ccid & PAGE_MASK) == vma->node.start) { + ering->ctx = i915_error_object_create(dev_priv, + vma->obj, + vma->vm); break; } }