Received: by 2002:ad5:474a:0:0:0:0:0 with SMTP id i10csp437677imu; Wed, 12 Dec 2018 20:54:24 -0800 (PST) X-Google-Smtp-Source: AFSGD/XJ8uWpjvixbnCnyDwhP9SA/3ccHZkLxbVNnnHmqFyaKm7YJQWSY6214SDr/NWv+pOKvh/h X-Received: by 2002:a63:8d44:: with SMTP id z65mr20739390pgd.57.1544676864110; Wed, 12 Dec 2018 20:54:24 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1544676864; cv=none; d=google.com; s=arc-20160816; b=KuVBoQ5f9huIdlZgOOqaiadOZ9K9aXWLp5zF2doDbmEM8YPhS+RxruT7NRlKMIgkvk fLuIwMaj1fnwgdjdtzC/DXdlA7TtghcyliOF7cn1MLYg8URQ8ANawhp66D27+8+3axoq inW/rd1cDwcCxxoBNXkLZVcXI6/EOgptvm7VeD54g9OoY7eyALPet7G/tdHQAkq0vMNq Id1MZGG+pQuJMOgu7YbvqQsGaq7buLTVoApbeagVDThZBKdUxble12rT+mM3kdeMdw0b Rw9b8vzHyMNvCdsojwr7d245+3L1YixBFiY0P3cDgo4fHAWh98pHMT0hc3Q6P+y/YyVO dMOg== 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=Ag5gYF9AAJF6EaP/iip1XcOOUXe3b/1YemPGdJ76dsw=; b=GrTqQSy2MdqiF/soV8QBOLqe8gLK4U/ZbXPXftrSbLhx7lI469sAGlkxpAYJJkJ14Y qVQVSjSsqE69fr71Ka4OZFRUZB5pMJGeziFjYUMUkMSwsd+5WlP1vXYfLlngDlXealAr l9HcVfIGsh3QdWkJA1Ui5kRmkzC73fi2bcz6nJOsyu6ArHkZZYZ0L7Pvh5R9TmkHiPYw 1rFZKra4igYiCvPaQC64xGCrXVIQ9Vj7PfyEe6BLflwSvdNQ4+LQA92koiqnCR3HEAxa LmKeYi7+7K7kR0dYlIb2LUzZZ9T9AXQWQed9ZM30UIGtOnTbyeyHRksRb9UOODPQsAM+ +Nzg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=d+lR2YP1; 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 l8si603190pgm.250.2018.12.12.20.54.09; Wed, 12 Dec 2018 20:54:24 -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=d+lR2YP1; 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 S1728444AbeLMEvn (ORCPT + 99 others); Wed, 12 Dec 2018 23:51:43 -0500 Received: from mail.kernel.org ([198.145.29.99]:42070 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727340AbeLME3F (ORCPT ); Wed, 12 Dec 2018 23:29:05 -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 02B3620879; Thu, 13 Dec 2018 04:29:03 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1544675344; bh=87wMa19j3zV9fhlC6uKzNhaqNhRh5ySWn9cJ3RS0zc8=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=d+lR2YP18yMmSdaraIoykjOBbrf8tcfwngvCGeLXfHwhMTElEP0bF8Z0Jbc889Ylq IGLrW5AsDy1itskMpZeDBBKl+FdHfDczDfXYM9r91fpiZG4V1+UPvntT0Yo28caAkx GfL78PWY5OoadAWHfzZnIbe7Pwe/1GoSPaorksio= 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.19 16/73] drm/msm: Grab a vblank reference when waiting for commit_done Date: Wed, 12 Dec 2018 23:27:41 -0500 Message-Id: <20181213042838.75160-16-sashal@kernel.org> X-Mailer: git-send-email 2.19.1 In-Reply-To: <20181213042838.75160-1-sashal@kernel.org> References: <20181213042838.75160-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 c1f1779c980f..2b7bb6e166d3 100644 --- a/drivers/gpu/drm/msm/msm_atomic.c +++ b/drivers/gpu/drm/msm/msm_atomic.c @@ -32,7 +32,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