Received: by 2002:ad5:474a:0:0:0:0:0 with SMTP id i10csp565380imu; Thu, 20 Dec 2018 01:28:02 -0800 (PST) X-Google-Smtp-Source: AFSGD/XNmxHjEFoIL0P3Ui7Gn+rzjRpkgIh7UTyKg/pzxxp03aCNprGZcq+4vhudqMYTTSe1LSI/ X-Received: by 2002:a63:70c:: with SMTP id 12mr21777071pgh.352.1545298082286; Thu, 20 Dec 2018 01:28:02 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1545298082; cv=none; d=google.com; s=arc-20160816; b=NQ+eouSmxCrUTo15Vlih70ZpOyKTvyR9dkIbsL8omHIh5daT9GcXf8+G4ObecSuqZT /S1YM4skOwtcNcqGm8UzxTIQm4IEE7jmCSHGhS6sBGxMM4ClxlhPVOAguGyeci7OU/L5 bUQqow8Q7oYlNIgo8hEaBpE6/6anwfWniKrHozlkmlCD589bR2+nVUumSTl/SyZ2OOYf SXx17H+T40WSrNGc0uUlL4T2wImSoE5vv3HAnOq6srDi2v4daB2wFzvt78HHCvvMzH5c xPt5Dy23yBQTMDl6P5i1sAHnkGta2oMma7ZlDcNDGAJVsq0r6FcN+vVtSu9nS7Khh+gf mx2g== 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=xTbJmXonT0+UjerIsLw5SFki2/B0CJoJE3OhOTzBBRo=; b=r0jNmmqCBwaWADGk7UyOzbQ0zS0Zd8TqSEKKb4YnpDi8Nktk9txkvW4mvcepAyTCLb XbOqhCAKPiQ7BwgyT/lrXXeEJbbvOD13x4qv9HJZdnLcfQb3CAqvEf5NfFtGgfaxMM1t J7+sT/l/NQ55M+XLR0GVGj7CZgLdt1u2GWQAui+vlBr7AqS0wvc2Yf3uE+VQ7zXZF+cN udiD2kLrLq7qElbfUvPTiB8aMLK8H8BmrynO/Cu6WCPd/OVsRtfIZSXukKac7Vh48zjt S01qbAzyxYjQPQhkQ3MGLb5AZw8zrf6OFEu5bRtRSnXfTsqvCAwPwJ5CptZIP3VCh+wk /Bvg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b="zh6P8/Yq"; 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 x1si18151985pfn.111.2018.12.20.01.27.46; Thu, 20 Dec 2018 01:28:02 -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="zh6P8/Yq"; 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 S1731746AbeLTJYB (ORCPT + 99 others); Thu, 20 Dec 2018 04:24:01 -0500 Received: from mail.kernel.org ([198.145.29.99]:58768 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1731728AbeLTJX6 (ORCPT ); Thu, 20 Dec 2018 04:23: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 0555F2177B; Thu, 20 Dec 2018 09:23:56 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1545297837; bh=No/3/WtrRb1c1E+wGqRsr53qeK8fHr7sbuyh2mBQetk=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=zh6P8/Yq2Wy1T6iHwjJwTumkzEDWDxtfbcHzAeEw8gHg0EFYHxxrB69WwQzthxfcg Bud/Nw1ys8QDPZqYCby7RbNmBo872DAWyJhKe98cvcnHMRwIRIxuWpbk81NXlqQaAK 0AZ+cpSNSRrVgUdfBZBl4wLqpPpJ4OuF6F2yjAGI= 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.9 35/61] drm/msm: Grab a vblank reference when waiting for commit_done Date: Thu, 20 Dec 2018 10:18:35 +0100 Message-Id: <20181220085845.163060980@linuxfoundation.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20181220085843.743900603@linuxfoundation.org> References: <20181220085843.743900603@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.9-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 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