From patchwork Thu Sep 19 13:30:02 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mihail Atanassov X-Patchwork-Id: 11152405 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 3A56976 for ; Thu, 19 Sep 2019 13:30:18 +0000 (UTC) Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 20E7E2196F for ; Thu, 19 Sep 2019 13:30:18 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 20E7E2196F Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=arm.com Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=dri-devel-bounces@lists.freedesktop.org Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 54EA76F477; Thu, 19 Sep 2019 13:30:17 +0000 (UTC) X-Original-To: dri-devel@lists.freedesktop.org Delivered-To: dri-devel@lists.freedesktop.org Received: from EUR03-AM5-obe.outbound.protection.outlook.com (mail-eopbgr30058.outbound.protection.outlook.com [40.107.3.58]) by gabe.freedesktop.org (Postfix) with ESMTPS id 3AEE66F477 for ; Thu, 19 Sep 2019 13:30:15 +0000 (UTC) Received: from AM6PR08CA0031.eurprd08.prod.outlook.com (2603:10a6:20b:c0::19) by AM5PR0801MB1972.eurprd08.prod.outlook.com (2603:10a6:203:4b::11) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.2263.23; Thu, 19 Sep 2019 13:30:12 +0000 Received: from AM5EUR03FT015.eop-EUR03.prod.protection.outlook.com (2a01:111:f400:7e08::200) by AM6PR08CA0031.outlook.office365.com (2603:10a6:20b:c0::19) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.2284.19 via Frontend Transport; Thu, 19 Sep 2019 13:30:12 +0000 Received-SPF: TempError (protection.outlook.com: error in processing during lookup of arm.com: DNS Timeout) Received: from 64aa7808-outbound-1.mta.getcheckrecipient.com (63.35.35.123) by AM5EUR03FT015.mail.protection.outlook.com (10.152.16.132) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.2284.20 via Frontend Transport; Thu, 19 Sep 2019 13:30:10 +0000 Received: ("Tessian outbound 968ab6b62146:v31"); Thu, 19 Sep 2019 13:30:10 +0000 X-CheckRecipientChecked: true X-CR-MTA-CID: e39eb3f5e2db9d4b X-CR-MTA-TID: 64aa7808 Received: from 89a7ef77e105.2 (ip-172-16-0-2.eu-west-1.compute.internal [104.47.9.59]) by 64aa7808-outbound-1.mta.getcheckrecipient.com id B6C1D978-6BE4-4BC7-8366-47303AC00B9A.1; Thu, 19 Sep 2019 13:30:04 +0000 Received: from EUR03-VE1-obe.outbound.protection.outlook.com (mail-ve1eur03lp2059.outbound.protection.outlook.com [104.47.9.59]) by 64aa7808-outbound-1.mta.getcheckrecipient.com with ESMTPS id 89a7ef77e105.2 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-SHA384); Thu, 19 Sep 2019 13:30:04 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=Fbnfar14x+TN/yvAhpH/dTYMLqVHoeMB5jk7LlKghTwrnKIKo0GdcJgj46ymwQnpW0jwBz0+Q4EYWmyAkjKqUPNB1NOR9ss6NifRsXkVT7EjWJEz4hG6ogv+qn56WfcofOWt5UJnxiUfAPdn1e5XJpIgYvv1skFAfT49Gkv6+C/NmFtoG3ALhlJnZ7Wf5vuFCq81G5shFtTvm31RMdk4m7A5MlPBtNlQ+72m9HsIB68lonZh6B+3FyglhrK3qs6mtF7mk4kc3jpUJLdsxXObhg2Oe/8q5Q7ZKCtz2y/IpuNyheiMr9AevsLEQdGHN9t5AAoa1iSTvdQc/RtdwWmqNw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=y9I+5xCgF7GzoOP7Rozly63quyjihAUCy1HrvQlGWj8=; b=JXd+DJuyjPNnkDYDz65KkdVUIgQzxFRywBozbLF3ZEIvmZtse2ZqLX4g6+gPkoo+edemNPewsVQmhPQ1nrQZoSj1Ye+GIkbOmu9vmuAJ4OJYueFNU5aPxi6xalsLuHqdR92EkC1y3Ks5iIaw85o/jEOWFzJfKAAMr+ed6Adubm8gjCH0imYRATj7QBQKFoA7lZDoVp7KcQN1nSjLO3yDnNB1liJxnNeqmSrTrDSor0VvbJCcLmp5YVMk6tnrcSQ1+YROn8QUiNCWN7VUX617uoPV1in3qQkd24mw3r7aPivdCzORiGIXLSsjcFz1bb07/h0tYemLZuu6+LEwvTEZ6g== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=arm.com; dmarc=pass action=none header.from=arm.com; dkim=pass header.d=arm.com; arc=none Received: from VI1PR08MB4078.eurprd08.prod.outlook.com (20.178.127.92) by VI1PR08MB5376.eurprd08.prod.outlook.com (52.133.244.200) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.2284.20; Thu, 19 Sep 2019 13:30:03 +0000 Received: from VI1PR08MB4078.eurprd08.prod.outlook.com ([fe80::f164:4d79:79f:dc6f]) by VI1PR08MB4078.eurprd08.prod.outlook.com ([fe80::f164:4d79:79f:dc6f%7]) with mapi id 15.20.2263.023; Thu, 19 Sep 2019 13:30:03 +0000 From: Mihail Atanassov To: "dri-devel@lists.freedesktop.org" Subject: [PATCH] drm/komeda: Fix FLIP_COMPLETE timestamp on CRTC enable Thread-Topic: [PATCH] drm/komeda: Fix FLIP_COMPLETE timestamp on CRTC enable Thread-Index: AQHVbu5XybbezBNH+kaEyHcWelehfw== Date: Thu, 19 Sep 2019 13:30:02 +0000 Message-ID: <20190919132759.18358-1-mihail.atanassov@arm.com> Accept-Language: en-GB, en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-originating-ip: [217.140.106.55] x-clientproxiedby: LO2P265CA0215.GBRP265.PROD.OUTLOOK.COM (2603:10a6:600:9e::35) To VI1PR08MB4078.eurprd08.prod.outlook.com (2603:10a6:803:e5::28) x-mailer: git-send-email 2.23.0 Authentication-Results-Original: spf=none (sender IP is ) smtp.mailfrom=Mihail.Atanassov@arm.com; x-ms-exchange-messagesentrepresentingtype: 1 x-ms-publictraffictype: Email X-MS-Office365-Filtering-Correlation-Id: af15bb49-6d31-4118-2d18-08d73d057eca X-MS-Office365-Filtering-HT: Tenant X-Microsoft-Antispam-Untrusted: BCL:0; PCL:0; RULEID:(2390118)(7020095)(4652040)(8989299)(4534185)(4627221)(201703031133081)(201702281549075)(8990200)(5600167)(711020)(4605104)(1401327)(4618075)(2017052603328)(7193020); SRVR:VI1PR08MB5376; X-MS-TrafficTypeDiagnostic: VI1PR08MB5376:|VI1PR08MB5376:|AM5PR0801MB1972: x-ms-exchange-transport-forked: True X-Microsoft-Antispam-PRVS: x-checkrecipientrouted: true x-ms-oob-tlc-oobclassifiers: OLM:7219;OLM:7219; x-forefront-prvs: 016572D96D X-Forefront-Antispam-Report-Untrusted: SFV:NSPM; SFS:(10009020)(4636009)(396003)(366004)(376002)(136003)(39860400002)(346002)(199004)(189003)(6916009)(6486002)(25786009)(476003)(6116002)(66066001)(99286004)(71200400001)(71190400001)(6436002)(6512007)(7736002)(2501003)(50226002)(186003)(86362001)(2616005)(26005)(4326008)(8676002)(81156014)(66556008)(66446008)(305945005)(486006)(386003)(5640700003)(316002)(44832011)(478600001)(8936002)(102836004)(1076003)(6506007)(2351001)(54906003)(66476007)(3846002)(2906002)(5660300002)(256004)(14454004)(66946007)(36756003)(81166006)(64756008)(52116002); DIR:OUT; SFP:1101; SCL:1; SRVR:VI1PR08MB5376; H:VI1PR08MB4078.eurprd08.prod.outlook.com; FPR:; SPF:None; LANG:en; PTR:InfoNoRecords; A:1; MX:1; received-spf: None (protection.outlook.com: arm.com does not designate permitted sender hosts) X-MS-Exchange-SenderADCheck: 1 X-Microsoft-Antispam-Message-Info-Original: 821jgBgaCEODxjT3BMGCDKb9ct2ZvvtxDysN711bzYSBrc9M4c87jNsaax68BnCnFHoijHXT2h/VaAYeLW9UM5YYWBZNBv01u8Wora4r87P6qpQmaZHuK1ASCXo3s1tNRaKICrdE+98V/ys4iqVJQpsBrIABWVR/19AISKQ89NPVb7gQp6wf2rFQQHJRpBRC2EtYGtqIhT/mcLPF/s67+TeVBBe9HhCeIBSjXcqLCjr210DtnNGwBCvx676mtphtvdxufWQ2yQuMSzOk5xta1ZAdg2v3GIzT67VcQq66erWmg4uGTyn0k9C4Y9RpotEkUgeeG/GbBPAGAWBaJlNGvCBEIHSXWaZkctIWaNVqES4R1V6LidvfFls4a5mkBEKUYep6eLf7OkKHQySAUJ3fBAlLZbhbEqdXJlAUOWfjotE= MIME-Version: 1.0 X-MS-Exchange-Transport-CrossTenantHeadersStamped: VI1PR08MB5376 Original-Authentication-Results: spf=none (sender IP is ) smtp.mailfrom=Mihail.Atanassov@arm.com; X-EOPAttributedMessage: 0 X-MS-Exchange-Transport-CrossTenantHeadersStripped: AM5EUR03FT015.eop-EUR03.prod.protection.outlook.com X-Forefront-Antispam-Report: CIP:63.35.35.123; IPV:CAL; SCL:-1; CTRY:IE; EFV:NLI; SFV:NSPM; SFS:(10009020)(4636009)(346002)(376002)(39860400002)(136003)(396003)(199004)(189003)(316002)(36906005)(5660300002)(5640700003)(478600001)(2351001)(25786009)(23756003)(336012)(76130400001)(1076003)(4326008)(54906003)(2501003)(107886003)(356004)(186003)(66066001)(6512007)(47776003)(486006)(26005)(6506007)(386003)(102836004)(7736002)(26826003)(50466002)(81166006)(22756006)(8746002)(8936002)(50226002)(81156014)(70206006)(305945005)(99286004)(70586007)(63350400001)(86362001)(6916009)(126002)(36756003)(476003)(2906002)(14454004)(8676002)(6486002)(2616005)(3846002)(6116002); DIR:OUT; SFP:1101; SCL:1; SRVR:AM5PR0801MB1972; H:64aa7808-outbound-1.mta.getcheckrecipient.com; FPR:; SPF:TempError; LANG:en; PTR:ec2-63-35-35-123.eu-west-1.compute.amazonaws.com; A:1; MX:1; X-MS-Office365-Filtering-Correlation-Id-Prvs: 8cf62777-ffce-496a-7fa8-08d73d057a00 X-Microsoft-Antispam: BCL:0; PCL:0; RULEID:(2390118)(7020095)(4652040)(8989299)(4534185)(4627221)(201703031133081)(201702281549075)(8990200)(5600167)(710020)(711020)(4605104)(1401327)(4618075)(2017052603328)(7193020); SRVR:AM5PR0801MB1972; NoDisclaimer: True X-Forefront-PRVS: 016572D96D X-Microsoft-Antispam-Message-Info: 993aeL+5Yw3d66YvvDApN15MHVv/vNaPR6MpLZ0iqEaYKqt/Pbm9ZpuThA9XdNo09xgwKHgm4VZNNn3oeeXloFRrK580hl+RrIYfI9Qmy4kR0ReMDwV0MMzB87N10kPOqa0tNyYPatSTJi55ekYi/7AOWhOGL1mYbCPdqcmvMQuHGwZwsTz94o5iTCRqdqbT4VUcCFQjadksW9ljYoJZehmIn/YKqIkmWEHoklWX2/R6sqPC+asVgGXQlCUcpCWjcyRva4y76N2yefvpNqc9d2PwZaE48dwnl/nrEkRFPmP0KMEreIMDdeiEPXJwt2p8yyn/ekB5qEm9WGlPN6lN3LAxX3j+x5pwgIztbm7ISDA95/rPyUlpq3jrTp2Qvr8gkGSm1LniHzID56Gkt0MyhZ/JU4zAktCR9JiW4zC9P/U= X-OriginatorOrg: arm.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 19 Sep 2019 13:30:10.6727 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: af15bb49-6d31-4118-2d18-08d73d057eca X-MS-Exchange-CrossTenant-Id: f34e5979-57d9-4aaa-ad4d-b122a662184d X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=f34e5979-57d9-4aaa-ad4d-b122a662184d; Ip=[63.35.35.123]; Helo=[64aa7808-outbound-1.mta.getcheckrecipient.com] X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM5PR0801MB1972 X-Mailman-Original-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=armh.onmicrosoft.com; s=selector2-armh-onmicrosoft-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=y9I+5xCgF7GzoOP7Rozly63quyjihAUCy1HrvQlGWj8=; b=Oof3RtY5t0OsqzEugsK9f9kXXpXPmjmGiZUyBRr9HeIcwy+GgOEOOX3DnSIlfQPe+eRXrM1DXtZzzccAt+10EhiTYPniW1o4bWq1MZob/Iy6x6kU6seiVhhWEm185HHbX8RZ2ZT1ZrET6q1Ng5mlvD1u5/IJ3J2Z84saKkR6ZNk= X-Mailman-Original-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=armh.onmicrosoft.com; s=selector2-armh-onmicrosoft-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=y9I+5xCgF7GzoOP7Rozly63quyjihAUCy1HrvQlGWj8=; b=Oof3RtY5t0OsqzEugsK9f9kXXpXPmjmGiZUyBRr9HeIcwy+GgOEOOX3DnSIlfQPe+eRXrM1DXtZzzccAt+10EhiTYPniW1o4bWq1MZob/Iy6x6kU6seiVhhWEm185HHbX8RZ2ZT1ZrET6q1Ng5mlvD1u5/IJ3J2Z84saKkR6ZNk= X-Mailman-Original-Authentication-Results: spf=temperror (sender IP is 63.35.35.123) smtp.mailfrom=arm.com; lists.freedesktop.org; dkim=pass (signature was verified) header.d=armh.onmicrosoft.com;lists.freedesktop.org; dmarc=none action=none header.from=arm.com; X-BeenThere: dri-devel@lists.freedesktop.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: Direct Rendering Infrastructure - Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Mihail Atanassov , David Airlie , Liviu Dudau , "linux-kernel@vger.kernel.org" , "james qian wang \(Arm Technology China\)" , nd Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" When initially turning a crtc on, drm_reset_vblank_timestamp will set the vblank timestamp to 0 for any driver that doesn't provide a ->get_vblank_timestamp() hook. Unfortunately, the FLIP_COMPLETE event depends on that timestamp, and the only way to regenerate a valid one is to have vblank interrupts enabled and have a valid in-ISR call to drm_crtc_handle_vblank. Wrap the call to komeda_crtc_do_flush in ->atomic_enable() with a drm_crtc_vblank_{get,put} pair so we can have a vblank ISR prior to the FLIP_COMPLETE ISR (or more likely, they'll get handled in the same ISR, which is equally valid). Cc: Daniel Vetter Cc: Liviu Dudau Signed-off-by: Mihail Atanassov --- drivers/gpu/drm/arm/display/komeda/komeda_crtc.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/drivers/gpu/drm/arm/display/komeda/komeda_crtc.c b/drivers/gpu/drm/arm/display/komeda/komeda_crtc.c index f4400788ab94..87420a767bc4 100644 --- a/drivers/gpu/drm/arm/display/komeda/komeda_crtc.c +++ b/drivers/gpu/drm/arm/display/komeda/komeda_crtc.c @@ -258,7 +258,9 @@ komeda_crtc_atomic_enable(struct drm_crtc *crtc, { komeda_crtc_prepare(to_kcrtc(crtc)); drm_crtc_vblank_on(crtc); + WARN_ON(drm_crtc_vblank_get(crtc)); komeda_crtc_do_flush(crtc, old); + drm_crtc_vblank_put(crtc); } static void