From patchwork Mon Jan 11 10:44:43 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Chris Wilson X-Patchwork-Id: 8001181 Return-Path: X-Original-To: patchwork-intel-gfx@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork1.web.kernel.org (Postfix) with ESMTP id 43BC49F1C0 for ; Mon, 11 Jan 2016 10:46:50 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 74B342028D for ; Mon, 11 Jan 2016 10:46:49 +0000 (UTC) Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) by mail.kernel.org (Postfix) with ESMTP id 74C3320251 for ; Mon, 11 Jan 2016 10:46:48 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 462456E2CE; Mon, 11 Jan 2016 02:46:46 -0800 (PST) X-Original-To: intel-gfx@lists.freedesktop.org Delivered-To: intel-gfx@lists.freedesktop.org Received: from mail-wm0-f65.google.com (mail-wm0-f65.google.com [74.125.82.65]) by gabe.freedesktop.org (Postfix) with ESMTPS id 9ECA66E2D6 for ; Mon, 11 Jan 2016 02:46:41 -0800 (PST) Received: by mail-wm0-f65.google.com with SMTP id l65so25640156wmf.3 for ; Mon, 11 Jan 2016 02:46:41 -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=vLqw9+uEhdfsVUhjoY56rl/6fBLbygsgG7u/pwGjJO8=; b=rcA5Kvcq0VmUfRxPasri+y1Tfx4oloGzsCp2UzcO1AdfSBqtV/mEUrOC9z8KPy08fS gi6s7h9FuiPmC5y+71bQxc9D1V5v+nB9YYieGr56uwRuq4hGC5F3sfNpM6dXfazj7wUI xA3+UaHnf3sszvX+APZFlxxW2aZDYzJlWWZqUZOvekqD7yGV1zL8qfzxkp56NfGwyC3L Y+tlkiHNkElhoG1v9hRk9Dbr7UZjIHaBzeePqa+W6EXWDOZLHGtS2ORM15y8BFA5r2qJ l9soR7FJ9PTT7BNI+sCzAj9f0GffRvK0PuH8NQJ/hhgWkJMFAAcWCL2w3hpJdAgHWypp JuIQ== X-Received: by 10.28.18.21 with SMTP id 21mr12080721wms.11.1452509200340; Mon, 11 Jan 2016 02:46:40 -0800 (PST) Received: from haswell.alporthouse.com ([78.156.65.138]) by smtp.gmail.com with ESMTPSA id t3sm118879383wjz.11.2016.01.11.02.46.38 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Mon, 11 Jan 2016 02:46:39 -0800 (PST) From: Chris Wilson To: intel-gfx@lists.freedesktop.org Date: Mon, 11 Jan 2016 10:44:43 +0000 Message-Id: <1452509174-16671-13-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 099/190] drm/i915: Check for request completion before choosing CS flips 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 Only queue a CS flip if the outstanding request is not complete, and in particular do not rely on the request tracking being fresh (since it is only updated when requests are retired). Signed-off-by: Chris Wilson --- drivers/gpu/drm/i915/intel_display.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c index eef858d5376f..f227cdaf38ec 100644 --- a/drivers/gpu/drm/i915/intel_display.c +++ b/drivers/gpu/drm/i915/intel_display.c @@ -11309,8 +11309,11 @@ static bool use_mmio_flip(struct intel_engine_cs *ring, !reservation_object_test_signaled_rcu(obj->base.dma_buf->resv, false)) return true; + else if (!obj->last_write.request || + i915_gem_request_completed(obj->last_write.request)) + return true; else - return ring != i915_gem_request_get_engine(obj->last_write.request); + return ring != obj->last_write.request->engine; } static void skl_do_mmio_flip(struct intel_crtc *intel_crtc,