From mboxrd@z Thu Jan 1 00:00:00 1970 From: Sasha Levin Subject: [PATCH AUTOSEL 5.2 046/171] drm/omap: don't check dispc timings for DSI Date: Thu, 18 Jul 2019 23:54:37 -0400 Message-ID: <20190719035643.14300-46-sashal@kernel.org> References: <20190719035643.14300-1-sashal@kernel.org> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by gabe.freedesktop.org (Postfix) with ESMTPS id DF9216E4CB for ; Fri, 19 Jul 2019 03:58:28 +0000 (UTC) In-Reply-To: <20190719035643.14300-1-sashal@kernel.org> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Sasha Levin , Tony Lindgren , Sebastian Reichel , dri-devel@lists.freedesktop.org, Tomi Valkeinen , Pavel Machek List-Id: dri-devel@lists.freedesktop.org RnJvbTogU2ViYXN0aWFuIFJlaWNoZWwgPHNlYmFzdGlhbi5yZWljaGVsQGNvbGxhYm9yYS5jb20+ CgpbIFVwc3RyZWFtIGNvbW1pdCBhZDlkZjdkOTFiNGE2ZThmNGIyMGMyYmY1MzlhYzA5YjNiMmFk NmViIF0KCldoaWxlIG1vc3QgZGlzcGxheSB0eXBlcyBvbmx5IGZvcndhcmQgdGhlaXIgVk0gdG8g dGhlIERJU1BDLCB0aGlzCmlzIG5vdCB0cnVlIGZvciBEU0kuIERTSSBjYWxjdWxhdGVzIHRoZSBW TSBmb3IgRElTUEMgYmFzZWQgb24gaXRzCm93biwgYnV0IGl0J3Mgbm90IGlkZW50aWNhbC4gQWN0 dWFsbHkgdGhlIERTSSBWTSBpcyBub3QgZXZlbiBhIHZhbGlkCkRJU1BDIFZNIG1ha2luZyB0aGlz IGNoZWNrIGZhaWwuIExldCdzIHJlc3RvcmUgdGhlIG9sZCBiZWhhdmlvdXIKYW5kIGF2b2lkIGNo ZWNraW5nIHRoZSBESVNQQyBWTSBmb3IgRFNJIGhlcmUuCgpGaXhlczogN2MyN2ZhNTdlZjMxICgi ZHJtL29tYXA6IENhbGwgZGlzcGMgdGltaW5ncyBjaGVjayBvcGVyYXRpb24gZGlyZWN0bHkiKQpB Y2tlZC1ieTogUGF2ZWwgTWFjaGVrIDxwYXZlbEB1Y3cuY3o+ClRlc3RlZC1ieTogVG9ueSBMaW5k Z3JlbiA8dG9ueUBhdG9taWRlLmNvbT4KVGVzdGVkLWJ5OiBQYXZlbCBNYWNoZWsgPHBhdmVsQHVj dy5jej4KU2lnbmVkLW9mZi1ieTogU2ViYXN0aWFuIFJlaWNoZWwgPHNlYmFzdGlhbi5yZWljaGVs QGNvbGxhYm9yYS5jb20+ClNpZ25lZC1vZmYtYnk6IFRvbWkgVmFsa2VpbmVuIDx0b21pLnZhbGtl aW5lbkB0aS5jb20+ClNpZ25lZC1vZmYtYnk6IFNhc2hhIExldmluIDxzYXNoYWxAa2VybmVsLm9y Zz4KLS0tCiBkcml2ZXJzL2dwdS9kcm0vb21hcGRybS9vbWFwX2NydGMuYyB8IDE4ICsrKysrKysr KysrKysrLS0tLQogMSBmaWxlIGNoYW5nZWQsIDE0IGluc2VydGlvbnMoKyksIDQgZGVsZXRpb25z KC0pCgpkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL29tYXBkcm0vb21hcF9jcnRjLmMgYi9k cml2ZXJzL2dwdS9kcm0vb21hcGRybS9vbWFwX2NydGMuYwppbmRleCA4NzEyYWY3OWE0OWMuLjRj NDNkZDI4MmFjYyAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJtL29tYXBkcm0vb21hcF9jcnRj LmMKKysrIGIvZHJpdmVycy9ncHUvZHJtL29tYXBkcm0vb21hcF9jcnRjLmMKQEAgLTM4NCwxMCAr Mzg0LDIwIEBAIHN0YXRpYyBlbnVtIGRybV9tb2RlX3N0YXR1cyBvbWFwX2NydGNfbW9kZV92YWxp ZChzdHJ1Y3QgZHJtX2NydGMgKmNydGMsCiAJaW50IHI7CiAKIAlkcm1fZGlzcGxheV9tb2RlX3Rv X3ZpZGVvbW9kZShtb2RlLCAmdm0pOwotCXIgPSBwcml2LT5kaXNwY19vcHMtPm1ncl9jaGVja190 aW1pbmdzKHByaXYtPmRpc3BjLCBvbWFwX2NydGMtPmNoYW5uZWwsCi0JCQkJCSAgICAgICAmdm0p OwotCWlmIChyKQotCQlyZXR1cm4gcjsKKworCS8qCisJICogRFNJIG1pZ2h0IG5vdCBjYWxsIHRo aXMsIHNpbmNlIHRoZSBzdXBwbGllZCBtb2RlIGlzIG5vdCBhCisJICogdmFsaWQgRElTUEMgbW9k ZS4gRFNJIHdpbGwgY2FsY3VsYXRlIGFuZCBjb25maWd1cmUgdGhlCisJICogcHJvcGVyIERJU1BD IG1vZGUgbGF0ZXIuCisJICovCisJaWYgKG9tYXBfY3J0Yy0+cGlwZS0+b3V0cHV0LT5uZXh0ID09 IE5VTEwgfHwKKwkgICAgb21hcF9jcnRjLT5waXBlLT5vdXRwdXQtPm5leHQtPnR5cGUgIT0gT01B UF9ESVNQTEFZX1RZUEVfRFNJKSB7CisJCXIgPSBwcml2LT5kaXNwY19vcHMtPm1ncl9jaGVja190 aW1pbmdzKHByaXYtPmRpc3BjLAorCQkJCQkJICAgICAgIG9tYXBfY3J0Yy0+Y2hhbm5lbCwKKwkJ CQkJCSAgICAgICAmdm0pOworCQlpZiAocikKKwkJCXJldHVybiByOworCX0KIAogCS8qIENoZWNr IGZvciBiYW5kd2lkdGggbGltaXQgKi8KIAlpZiAocHJpdi0+bWF4X2JhbmR3aWR0aCkgewotLSAK Mi4yMC4xCgpfX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fXwpk cmktZGV2ZWwgbWFpbGluZyBsaXN0CmRyaS1kZXZlbEBsaXN0cy5mcmVlZGVza3RvcC5vcmcKaHR0 cHM6Ly9saXN0cy5mcmVlZGVza3RvcC5vcmcvbWFpbG1hbi9saXN0aW5mby9kcmktZGV2ZWw= From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-10.1 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 0B05CC76188 for ; Fri, 19 Jul 2019 04:39:51 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id D45E02077C for ; Fri, 19 Jul 2019 04:39:50 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1563511190; bh=8VpvaTC8NGBlITD/Wn03BWKljQg/sjAOb1QSXenJhhk=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=bkPkaYCKkU+25eYwJtqDvLj+F4O8ff4ZVVnG4bnnuDweBbRiRrIgFrzfOIC5eCEUd JAZpzwRfxiYy5sJrWtyP70CgXs4mHIp/Nd5xDMIynFAIS4tyAXEjW+L0krpqFhyDii Po866iCMj3Kxom9QOJ0KsMaMyBNICITITtYNEeHM= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1730836AbfGSEju (ORCPT ); Fri, 19 Jul 2019 00:39:50 -0400 Received: from mail.kernel.org ([198.145.29.99]:57854 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728096AbfGSD63 (ORCPT ); Thu, 18 Jul 2019 23:58:29 -0400 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 EE8BD21883; Fri, 19 Jul 2019 03:58:27 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1563508708; bh=8VpvaTC8NGBlITD/Wn03BWKljQg/sjAOb1QSXenJhhk=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=IfK1L2aRPJe+SmVnxRY49Xs2fzSDSxdvqCpQkZFwgRXW+K/RZWjVId929XL0kBDFH kbAiib1D+ZsPOJkucTqsZzXaSiaLGNPDfm/YHdtGOoepdsv6jPHh/I0ZzZ7wUdTOKG 1rEfanwEktf19MQ0NZp+2/ggmPIKyAE5lphUcXmk= From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Sebastian Reichel , Pavel Machek , Tony Lindgren , Tomi Valkeinen , Sasha Levin , dri-devel@lists.freedesktop.org Subject: [PATCH AUTOSEL 5.2 046/171] drm/omap: don't check dispc timings for DSI Date: Thu, 18 Jul 2019 23:54:37 -0400 Message-Id: <20190719035643.14300-46-sashal@kernel.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190719035643.14300-1-sashal@kernel.org> References: <20190719035643.14300-1-sashal@kernel.org> MIME-Version: 1.0 X-stable: review 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: Sebastian Reichel [ Upstream commit ad9df7d91b4a6e8f4b20c2bf539ac09b3b2ad6eb ] While most display types only forward their VM to the DISPC, this is not true for DSI. DSI calculates the VM for DISPC based on its own, but it's not identical. Actually the DSI VM is not even a valid DISPC VM making this check fail. Let's restore the old behaviour and avoid checking the DISPC VM for DSI here. Fixes: 7c27fa57ef31 ("drm/omap: Call dispc timings check operation directly") Acked-by: Pavel Machek Tested-by: Tony Lindgren Tested-by: Pavel Machek Signed-off-by: Sebastian Reichel Signed-off-by: Tomi Valkeinen Signed-off-by: Sasha Levin --- drivers/gpu/drm/omapdrm/omap_crtc.c | 18 ++++++++++++++---- 1 file changed, 14 insertions(+), 4 deletions(-) diff --git a/drivers/gpu/drm/omapdrm/omap_crtc.c b/drivers/gpu/drm/omapdrm/omap_crtc.c index 8712af79a49c..4c43dd282acc 100644 --- a/drivers/gpu/drm/omapdrm/omap_crtc.c +++ b/drivers/gpu/drm/omapdrm/omap_crtc.c @@ -384,10 +384,20 @@ static enum drm_mode_status omap_crtc_mode_valid(struct drm_crtc *crtc, int r; drm_display_mode_to_videomode(mode, &vm); - r = priv->dispc_ops->mgr_check_timings(priv->dispc, omap_crtc->channel, - &vm); - if (r) - return r; + + /* + * DSI might not call this, since the supplied mode is not a + * valid DISPC mode. DSI will calculate and configure the + * proper DISPC mode later. + */ + if (omap_crtc->pipe->output->next == NULL || + omap_crtc->pipe->output->next->type != OMAP_DISPLAY_TYPE_DSI) { + r = priv->dispc_ops->mgr_check_timings(priv->dispc, + omap_crtc->channel, + &vm); + if (r) + return r; + } /* Check for bandwidth limit */ if (priv->max_bandwidth) { -- 2.20.1