Received: by 2002:ad5:474a:0:0:0:0:0 with SMTP id i10csp574430imu; Thu, 20 Dec 2018 01:38:55 -0800 (PST) X-Google-Smtp-Source: AFSGD/Vy1+189D4AC8NIf7Mg4iTI2fMcVMXWWEluO2D4YlVUeDXgzRQMTpx+ogleVyjq1PWWio6D X-Received: by 2002:a17:902:e085:: with SMTP id cb5mr23166340plb.24.1545298735535; Thu, 20 Dec 2018 01:38:55 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1545298735; cv=none; d=google.com; s=arc-20160816; b=nz/m/qS0FuUQhDM++ke+BMqQzJTcsgKIOwIuuO1zyS3jB6WNoEZDxTBrEJhpjy1B1Z RhQwFD0AOhAp1+8USej2xf8IOZc9Dz/htRLKq4aX5if6fxEBb1RfsBh8Nz17FfFMYzQ2 oBnzywFgCIx0WS4NF3f4Hczoex/qeq13fo1iN/E4y1nGvlra5Dl0tvSRNfzMEEDWDzKt S6zO/nU0pbilLXzsk4c/2fhynflNPY52H/z5snjwHZy6E64/PDKiCrr+OOithB18Rwkw 8qAqib1x8o8/Qt6UUZ9K3x4oO4VEChRxkryekgp7ysZ3d59axF3YshXmMV5PMzEyFo6+ OANw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:content-transfer-encoding:mime-version :user-agent:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=H15RwjhO5t/AJ0sp1cCpaO+fgIxgb8CI5f9GTDJraek=; b=VhTe31yinSb14hnjQx8SaBQ2IVX2Ch21CtDhXwgIbHvW2dzVX8UUBods9qBCH3pkyu 518Gi4csBFE5aSrbHVigUq4lVFjf4ieUsliUP7VJVblyeEXpHSYrwhvhCON0vrDcwLts pmCYNZZnB1xWsWv225RKtqhPghMLmdcqF527RrTr7hCe0dApHu9Xn4J8ii7XWlMBqUH4 XKmfbG3Q8L690/ZzhWxoTasd6ygYYs24rF84dRzDXDoutmnhEMCaopEYmTjgfn8VQm7O lvmu8j4g5e0ztdc3xmxqTU7UssRm01nWsNo8b5y0cMFF3dQlU6Dqt4Y+bDH545wn7Bgc vbdw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=yMa34ZYb; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id x12si17737118plo.164.2018.12.20.01.38.40; Thu, 20 Dec 2018 01:38:55 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=yMa34ZYb; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1732231AbeLTJ1F (ORCPT + 99 others); Thu, 20 Dec 2018 04:27:05 -0500 Received: from mail.kernel.org ([198.145.29.99]:60100 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1730828AbeLTJ06 (ORCPT ); Thu, 20 Dec 2018 04:26:58 -0500 Received: from localhost (5356596B.cm-6-7b.dynamic.ziggo.nl [83.86.89.107]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 01E6B21852; Thu, 20 Dec 2018 09:26:56 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1545298017; bh=DuJdRJFnvgBOzjGz58IHAaAXXvIzCiAYC+naEfaLZJY=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=yMa34ZYbeVwNAWvf3rgH/VXo5HTNuSIflOsARyKzVEwbQh1Y11WjEbGlwbs2ECsYt 1/lOCDbD7hmlbP8n6wRtfp1keSidcusi8Dr+RAe/3dliiU5Za83z2+VYlflzTPbXWg XQsz4bSTSJp6Bh+4A52VzZixiiqCNo2cLYMtVoCU= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Abhinav Kumar , Sean Paul , Rob Clark , Sasha Levin Subject: [PATCH 4.14 41/72] drm/msm: Grab a vblank reference when waiting for commit_done Date: Thu, 20 Dec 2018 10:18:40 +0100 Message-Id: <20181220085923.966567772@linuxfoundation.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20181220085922.332225035@linuxfoundation.org> References: <20181220085922.332225035@linuxfoundation.org> User-Agent: quilt/0.65 X-stable: review X-Patchwork-Hint: ignore MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 4.14-stable review patch. If anyone has any objections, please let me know. ------------------ [ Upstream commit 3b712e43e3876b42b38321ecf790a1f5fe59c834 ] Similar to the atomic helpers, we should enable vblank while we're waiting for the commit to finish. DPU needs this, MDP5 seems to work fine without it. Reviewed-by: Abhinav Kumar Signed-off-by: Sean Paul Signed-off-by: Rob Clark Signed-off-by: Sasha Levin --- drivers/gpu/drm/msm/msm_atomic.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/drivers/gpu/drm/msm/msm_atomic.c b/drivers/gpu/drm/msm/msm_atomic.c index 025d454163b0..8f77047a226d 100644 --- a/drivers/gpu/drm/msm/msm_atomic.c +++ b/drivers/gpu/drm/msm/msm_atomic.c @@ -93,7 +93,12 @@ static void msm_atomic_wait_for_commit_done(struct drm_device *dev, if (!new_crtc_state->active) continue; + if (drm_crtc_vblank_get(crtc)) + continue; + kms->funcs->wait_for_crtc_commit_done(kms, crtc); + + drm_crtc_vblank_put(crtc); } } -- 2.19.1