From patchwork Sun Apr 17 19:42:46 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Chris Wilson X-Patchwork-Id: 8863491 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 6CCBDBF29F for ; Sun, 17 Apr 2016 19:43:01 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 91049201DD for ; Sun, 17 Apr 2016 19:43:00 +0000 (UTC) Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) by mail.kernel.org (Postfix) with ESMTP id C1131201E4 for ; Sun, 17 Apr 2016 19:42:59 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id BCEA46E35B; Sun, 17 Apr 2016 19:42:58 +0000 (UTC) X-Original-To: intel-gfx@lists.freedesktop.org Delivered-To: intel-gfx@lists.freedesktop.org Received: from mail-wm0-x242.google.com (mail-wm0-x242.google.com [IPv6:2a00:1450:400c:c09::242]) by gabe.freedesktop.org (Postfix) with ESMTPS id 84D8A6E35B for ; Sun, 17 Apr 2016 19:42:56 +0000 (UTC) Received: by mail-wm0-x242.google.com with SMTP id l6so19368979wml.3 for ; Sun, 17 Apr 2016 12:42:56 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=sender:from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=W1OOEtsocpxoxh/L444s81ZVsFcmx1XBXjqN3pSghjA=; b=Xo+bFAV1E1heDXbbkuIpzYbLzfqbdHPO28VB5Ao51FDXyIpPkQhIi9uaqoVsGSrhjc Q1K03Qxud4I3lqj80OrBpG3NWSSE6rQIAdWgev2g6H5lrW4MowyB+E4DjaekedBIeQ87 8ly1dNEpgtUomupDsweDcDKW6R7hnsPYoJtyIQkgNmMOhc5QT6MhFXPP7U94z+ivoYGZ U9lVLqaneMgR7i8IxFlOyXJqyMQIzduDGPsC25SWKZnaPuYiREMDKRyRu44KPMuxzRYK 5HVZuJ3Lv3Sz7rtozP1e82Jj2BTtDUSmN6yycoTyS7Pu37lgmFBlhTY3onqRNNCKdJKi esTg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :mime-version:content-transfer-encoding; bh=W1OOEtsocpxoxh/L444s81ZVsFcmx1XBXjqN3pSghjA=; b=UuLqbLWpimuYkfWDLHq3CKnQLoiuWo0615K4yyolkr5CkpF72NwWEiB4gErXfJ4o6h P8aXZ0o9Enn3X6tTZkXEJkVULvYjYyu6lylmUaW/6UIl+k2ywIvWlKqssHNdptLTNj4Y /fIpzh7tvNoX2QWNWrqciGBdMY2AotCQrTyegq5Q6FAnk0rD1DHCLh6xiReEqOQgXE5p 7CCByhqZO5vpH5rA2z1E/p+VYX91z55UksNRVWtUEWNZOMa8H7FWBE/sKklL/gnQX8hj aqQGk6Vc3Wa0EIh3RjdXJdpWjlMYRRbt0nSf5PTSelj/s6Kqfljz1vkYL2GwWcqMziYs /9fg== X-Gm-Message-State: AOPr4FWQe1dIFJCK0gag+PGsjY3GNt/vkmM9w3fsLJB8hK4NKEmY5ZO74ql7US/filI7Vg== X-Received: by 10.194.117.70 with SMTP id kc6mr34630665wjb.94.1460922174971; Sun, 17 Apr 2016 12:42:54 -0700 (PDT) Received: from haswell.alporthouse.com ([78.156.65.138]) by smtp.gmail.com with ESMTPSA id g141sm23075906wme.0.2016.04.17.12.42.52 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Sun, 17 Apr 2016 12:42:53 -0700 (PDT) From: Chris Wilson To: intel-gfx@lists.freedesktop.org Date: Sun, 17 Apr 2016 20:42:46 +0100 Message-Id: <1460922166-20292-1-git-send-email-chris@chris-wilson.co.uk> X-Mailer: git-send-email 2.8.0.rc3 MIME-Version: 1.0 Cc: Jani Nikula , Daniel Vetter , stable@vger.kernel.org Subject: [Intel-gfx] [PATCH] drm/i915: Avoid stalling on pending flips for legacy cursor updates 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: , Errors-To: intel-gfx-bounces@lists.freedesktop.org Sender: "Intel-gfx" X-Spam-Status: No, score=-5.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_MED,RP_MATCHES_RCVD,T_DKIM_INVALID,UNPARSEABLE_RELAY autolearn=ham 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 The legacy cursor ioctl expects to be asynchronous with respect to other screen updates, in particular page flips. As X updates the cursor from a signal context, if the cursor blocks then it will stall both the input and output chains causing bad stuttering and horrible UX. Reported-and-tested-by: Rafael Ristovski Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=94980 Fixes: 5008e874edd34 ("drm/i915: Make wait_for_flips interruptible.") Suggested-by: Maarten Lankhorst Signed-off-by: Chris Wilson Cc: Maarten Lankhorst Cc: Ville Syrjälä Cc: Daniel Vetter Cc: Jani Nikula Cc: stable@vger.kernel.org Reviewed-by: Maarten Lankhorst --- drivers/gpu/drm/i915/intel_display.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c index 4cca155376be..c5b9687091f4 100644 --- a/drivers/gpu/drm/i915/intel_display.c +++ b/drivers/gpu/drm/i915/intel_display.c @@ -13446,6 +13446,9 @@ static int intel_atomic_prepare_commit(struct drm_device *dev, } for_each_crtc_in_state(state, crtc, crtc_state, i) { + if (state->legacy_cursor_update) + continue; + ret = intel_crtc_wait_for_pending_flips(crtc); if (ret) return ret;