Received: by 2002:a05:6a11:4021:0:0:0:0 with SMTP id ky33csp1566601pxb; Thu, 16 Sep 2021 10:03:16 -0700 (PDT) X-Google-Smtp-Source: ABdhPJwb+ihva1RyLQTzOJljJTTo/K25uiWVBuRsMgU4TZdkk1vm2xe0bx6/Qdkjae0kFl6VQ8d9 X-Received: by 2002:a5d:6551:: with SMTP id z17mr7227523wrv.414.1631811796329; Thu, 16 Sep 2021 10:03:16 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1631811796; cv=none; d=google.com; s=arc-20160816; b=R5W1Lj5s73PFi+VBPU2AEE5Ov1pjS8+jj8opx9d9PthQtKDO06On2PrDuNsb3F7MB4 zyJNL6VCqw78JKpzW8QNTn7+cDtLYqejAExmshNOD3wKrIA8p73u6dcFgf+1Xv9xibI2 18Z45OhR7r2ShlSdlaJ0AL/t85GT7KsJJubnEsikatozlFiHc0wSoLF1z/bx44Zfd1r5 5EEd2rYNCWekeD6Js82gpxE+vzmy+PaKNoTTngW/sSCr2RBmalqwHU6HAG+dUmPf4p5W 5kXNxE7SmbNG8qWcIJ4oH6svTnQ7mABdiT1tfPPc7Eb6lWNIN/E1mniL98NEgqsq+DAn dW2Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :user-agent:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=+BKh9GQ+4HxyCROisR3V4e5TXNyB4VFEEnTNcTECFE0=; b=MfsnLWODPIoaqDkNMh2cYhroesGXoXsOFZGq6FruAqevhxMFEVR/TrnmKfTl0Zi7RO F6vxLAH0FyWBlj7bNMVJ9/TtCVpJ2UUoX2aETY3JMrUeTl5+NjcifrgQN1cTcSd6XgQc WTMn2iqR6ANngXDguqhNZnvDhWnvlzK67LXZSRMeCdXp6ynTSTnUewLpsIOy6s9Yt2iE +JTwGq567DuaarXx6S6prcyBKXLnKFarqkGxfnymHTmr035h8RkL/jzGF76z0ZDnrbeV 3C6+uf77R+7wG7IlCDJH8FLef4mf72Fgo8wdMHP9rw98TE2AbfAeIaA7eOIwAPbllKga 1QPg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=YXINOXMp; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id u4si5151535ejy.271.2021.09.16.10.02.49; Thu, 16 Sep 2021 10:03:16 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=YXINOXMp; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1344036AbhIPQ5f (ORCPT + 99 others); Thu, 16 Sep 2021 12:57:35 -0400 Received: from mail.kernel.org ([198.145.29.99]:40180 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S243815AbhIPQwJ (ORCPT ); Thu, 16 Sep 2021 12:52:09 -0400 Received: by mail.kernel.org (Postfix) with ESMTPSA id 38B1061A87; Thu, 16 Sep 2021 16:28:54 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1631809734; bh=0VuDnS1DAK7hb8SAqykRlDJ6nfW5xSYDmzzXZ/RcX50=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=YXINOXMpHdghY80ChhUHmEaeZZ04uPq62kYr3CZn9KSEcUdqP0wlwULTU74grLsgr VayZ+RCcaRoi0jyX8qsJwRVoYaq3+i2s8xP5/YrGhGR+hnOqaKAuxeXS6diIhdAGix /5yBwGM4Q93TdfL8sQCXd4WqOIKN/Cn+ew57ZsDU= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, David Heidelberg , Dmitry Baryshkov , Rob Clark , Sasha Levin Subject: [PATCH 5.13 246/380] drm/msm: mdp4: drop vblank get/put from prepare/complete_commit Date: Thu, 16 Sep 2021 18:00:03 +0200 Message-Id: <20210916155812.450749890@linuxfoundation.org> X-Mailer: git-send-email 2.33.0 In-Reply-To: <20210916155803.966362085@linuxfoundation.org> References: <20210916155803.966362085@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: David Heidelberg [ Upstream commit 56bd931ae506730c9ab1e4cc4bfefa43fc2d18fa ] msm_atomic is doing vblank get/put's already, currently there no need to duplicate the effort in MDP4 Fix warning: ... WARNING: CPU: 3 PID: 79 at drivers/gpu/drm/drm_vblank.c:1194 drm_vblank_put+0x1cc/0x1d4 ... and multiple vblank time-outs: ... msm 5100000.mdp: vblank time out, crtc=1 ... Tested on Nexus 7 2013 (deb), LTS 5.10.50. Introduced by: 119ecb7fd3b5 ("drm/msm/mdp4: request vblank during modeset") Signed-off-by: David Heidelberg Link: https://lore.kernel.org/r/20210715060925.7880-1-david@ixit.cz Signed-off-by: Dmitry Baryshkov Signed-off-by: Rob Clark Signed-off-by: Sasha Levin --- drivers/gpu/drm/msm/disp/mdp4/mdp4_kms.c | 13 ------------- 1 file changed, 13 deletions(-) diff --git a/drivers/gpu/drm/msm/disp/mdp4/mdp4_kms.c b/drivers/gpu/drm/msm/disp/mdp4/mdp4_kms.c index 0712752742f4..1f12bccee2b8 100644 --- a/drivers/gpu/drm/msm/disp/mdp4/mdp4_kms.c +++ b/drivers/gpu/drm/msm/disp/mdp4/mdp4_kms.c @@ -89,13 +89,6 @@ static void mdp4_disable_commit(struct msm_kms *kms) static void mdp4_prepare_commit(struct msm_kms *kms, struct drm_atomic_state *state) { - int i; - struct drm_crtc *crtc; - struct drm_crtc_state *crtc_state; - - /* see 119ecb7fd */ - for_each_new_crtc_in_state(state, crtc, crtc_state, i) - drm_crtc_vblank_get(crtc); } static void mdp4_flush_commit(struct msm_kms *kms, unsigned crtc_mask) @@ -114,12 +107,6 @@ static void mdp4_wait_flush(struct msm_kms *kms, unsigned crtc_mask) static void mdp4_complete_commit(struct msm_kms *kms, unsigned crtc_mask) { - struct mdp4_kms *mdp4_kms = to_mdp4_kms(to_mdp_kms(kms)); - struct drm_crtc *crtc; - - /* see 119ecb7fd */ - for_each_crtc_mask(mdp4_kms->dev, crtc, crtc_mask) - drm_crtc_vblank_put(crtc); } static long mdp4_round_pixclk(struct msm_kms *kms, unsigned long rate, -- 2.30.2