Received: by 2002:ad5:474a:0:0:0:0:0 with SMTP id i10csp430769imu; Wed, 12 Dec 2018 20:42:07 -0800 (PST) X-Google-Smtp-Source: AFSGD/V405imUiIXsLrt12o3fpEyIu7HHLoBPC+5EYlFeVEVKmFDiEFeBTXcKFDfo+LqCAm7Yk9T X-Received: by 2002:a63:bd51:: with SMTP id d17mr20998480pgp.443.1544676127732; Wed, 12 Dec 2018 20:42:07 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1544676127; cv=none; d=google.com; s=arc-20160816; b=0mIoyTx6zm6yp8q82pR1UMoqlKrBcnglWGTHooj8bXZfCMcLwo+4IdUw2IBPLgd0Ky tg9kReBIFXcGl3RV0AKmfAhU5K/TXUoIyP/nPwjcWDx+TFRdUzCIZMN4lOoKlh3rYOw+ RxHuDsGbeDo881sBahx7okDrWXqfaFKLOa6lomY1uxWSQ+ImvRA9mQTwglD8hBpoj5Gs MzxX8Y05015QVEewGQXqSSBQ5ZzffhiYwvnCIKzuAVk7OBmJfLbfp076ZrgXhg0Wif1z iFqJ0QOVhR+my8LVSfF+bANcKtbLCPrJ/+BhaWc2/fP+/vh3R80xAjR056YupVHXXx3K OY5A== 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 :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=oq9UGz55z6HHAHfiyG0V1cD8uW7WNRJqdGqy53r5/z4=; b=x70q2gmzZiurpeJqLn9tcMbGtln1UTgpJ6SSYXode/d4C+oU8L/2e/pA37dIHARm5Z ATmv8ROjPbKKHLI3k7WIJvGsT5x8Aa2MCIP1lxV3odu8GCtjlwfaBqqWnq9Ar+Ownn+Z M+mJ6rE1U33p7Ah8bgu6x8LLXsk4KMqnVnF6kjocKDpSbyDN+YEg+pz14Bf8RwszY11v 1Ox1q02CpmM2t3IrmysZXG0fQZN7HrLgmxtKlrvEZMNszvQ3ucV/dRBuPjZzx8yKNZN2 sgXjR6z2Vd0vGPAJFokMmVE/hWM42KWQyscgatUBSvkd+mbq5n7n6dU8TFnQqII1js6O 6uhw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=ZhlZlkDG; 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; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id p11si638112pgb.219.2018.12.12.20.41.53; Wed, 12 Dec 2018 20:42:07 -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=ZhlZlkDG; 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; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728473AbeLMElF (ORCPT + 99 others); Wed, 12 Dec 2018 23:41:05 -0500 Received: from mail.kernel.org ([198.145.29.99]:45096 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728940AbeLMEcI (ORCPT ); Wed, 12 Dec 2018 23:32:08 -0500 Received: from sasha-vm.mshome.net (c-73-47-72-35.hsd1.nh.comcast.net [73.47.72.35]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 92AFF20873; Thu, 13 Dec 2018 04:32:07 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1544675528; bh=ttrfBu99qtgWpRc0a/8Ui+TleXiT555AvdMlbmPBL0c=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=ZhlZlkDGxJ9UoDkHUjM63u6x38moGCmBa4QyGuJ2ewEBn5qa2go/+00/wbMS1rgAt E5k/zXMzRnoITOwO0CcKYdulZt1SsvqKkio7S6GZhWqa4USKvqRB5a/jzgB24guLUr 1smfet6qBII5xo4Ig+qvQa6P3n+uirVDSeJTv/jU= From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Sean Paul , Rob Clark , Sasha Levin , linux-arm-msm@vger.kernel.org, dri-devel@lists.freedesktop.org, freedreno@lists.freedesktop.org Subject: [PATCH AUTOSEL 4.9 05/34] drm/msm: Grab a vblank reference when waiting for commit_done Date: Wed, 12 Dec 2018 23:31:31 -0500 Message-Id: <20181213043200.76295-5-sashal@kernel.org> X-Mailer: git-send-email 2.19.1 In-Reply-To: <20181213043200.76295-1-sashal@kernel.org> References: <20181213043200.76295-1-sashal@kernel.org> MIME-Version: 1.0 X-Patchwork-Hint: Ignore Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Sean Paul [ 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 73bae382eac3..5c58a98f67c0 100644 --- a/drivers/gpu/drm/msm/msm_atomic.c +++ b/drivers/gpu/drm/msm/msm_atomic.c @@ -98,7 +98,12 @@ static void msm_atomic_wait_for_commit_done(struct drm_device *dev, if (old_state->legacy_cursor_update) 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