From patchwork Mon Jul 4 07:40:34 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ying Liu X-Patchwork-Id: 9211841 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 4A16560752 for ; Mon, 4 Jul 2016 07:55:39 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 3BDD72656B for ; Mon, 4 Jul 2016 07:55:39 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 2EDFD284C5; Mon, 4 Jul 2016 07:55:39 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-4.2 required=2.0 tests=BAD_ENC_HEADER,BAYES_00, DKIM_ADSP_CUSTOM_MED,FREEMAIL_FROM,RCVD_IN_DNSWL_MED autolearn=ham version=3.3.1 Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id C6EEA2656B for ; Mon, 4 Jul 2016 07:55:38 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 9ADF76E3AC; Mon, 4 Jul 2016 07:55:37 +0000 (UTC) X-Original-To: dri-devel@lists.freedesktop.org Delivered-To: dri-devel@lists.freedesktop.org X-Greylist: delayed 878 seconds by postgrey-1.35 at gabe; Mon, 04 Jul 2016 07:55:36 UTC Received: from NAM01-BY2-obe.outbound.protection.outlook.com (mail-by2nam01on0069.outbound.protection.outlook.com [104.47.34.69]) by gabe.freedesktop.org (Postfix) with ESMTPS id 952676E3AC for ; Mon, 4 Jul 2016 07:55:36 +0000 (UTC) Received: from BLUPR0301CA0004.namprd03.prod.outlook.com (10.162.113.142) by BY2PR03MB587.namprd03.prod.outlook.com (10.141.144.148) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384_P384) id 15.1.528.16; Mon, 4 Jul 2016 07:41:07 +0000 Received: from BY2FFO11FD020.protection.gbl (2a01:111:f400:7c0c::115) by BLUPR0301CA0004.outlook.office365.com (2a01:111:e400:5259::14) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384_P384) id 15.1.534.14 via Frontend Transport; Mon, 4 Jul 2016 07:41:06 +0000 Authentication-Results: spf=softfail (sender IP is 192.88.158.2) smtp.mailfrom=gmail.com; ffwll.ch; dkim=none (message not signed) header.d=none; ffwll.ch; dmarc=fail action=none header.from=gmail.com; Received-SPF: SoftFail (protection.outlook.com: domain of transitioning gmail.com discourages use of 192.88.158.2 as permitted sender) Received: from az84smr01.freescale.net (192.88.158.2) by BY2FFO11FD020.mail.protection.outlook.com (10.1.14.137) with Microsoft SMTP Server (TLS) id 15.1.523.9 via Frontend Transport; Mon, 4 Jul 2016 07:41:05 +0000 Received: from victor.ap.freescale.net (victor.ap.freescale.net [10.192.241.62]) by az84smr01.freescale.net (8.14.3/8.14.0) with ESMTP id u647ep0U026135; Mon, 4 Jul 2016 00:41:03 -0700 From: Liu Ying To: Subject: [PATCH v3 05/10] drm/imx: atomic phase 2 step 2: Track plane_state->fb correctly in ->page_flip Date: Mon, 4 Jul 2016 15:40:34 +0800 Message-ID: <1467618039-7457-6-git-send-email-gnuiyl@gmail.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1467618039-7457-1-git-send-email-gnuiyl@gmail.com> References: <1467618039-7457-1-git-send-email-gnuiyl@gmail.com> X-EOPAttributedMessage: 0 X-Matching-Connectors: 131120916656634676; (91ab9b29-cfa4-454e-5278-08d120cd25b8); () X-Forefront-Antispam-Report: CIP:192.88.158.2; IPV:NLI; CTRY:US; EFV:NLI; SFV:NSPM; SFS:(10009020)(6009001)(7916002)(2980300002)(199003)(189002)(575784001)(86362001)(36756003)(2906002)(61266001)(47776003)(48376002)(73392002)(2351001)(106466001)(87936001)(83322999)(7846002)(229853001)(305945005)(50466002)(2950100001)(82202001)(77096005)(105596002)(19580395003)(68736007)(6260500002)(92566002)(4326007)(76176999)(55446002)(69596002)(356003)(97736004)(76482005)(5003940100001)(8936002)(110136002)(50226002)(6806005)(81166006)(81156014)(8676002)(81442002)(586003)(87572001)(50986999)(73972006)(104016004)(33646002)(189998001)(19580405001); DIR:OUT; SFP:1101; SCL:1; SRVR:BY2PR03MB587; H:az84smr01.freescale.net; FPR:; SPF:SoftFail; PTR:InfoDomainNonexistent; A:1; MX:1; LANG:en; X-Microsoft-Exchange-Diagnostics: 1; BY2FFO11FD020; 1:RU6o3CW5wRcC8H5fWKEcrcNXk5rNmx3tuGiX2/tlf91c3yGfw21bwMZ7MaiX4khHZ+QWG8uPMxHMnxMXPMdojPcyVcjCYnneBpCXY+fO9tGHEmAJVSt2wWDfLWtQkrPOLZ+vE5l0ycFnDzXeOErn2oaUKVqJdpb9Y5oO89wyJFRZPDGtPMUA6U5dtqtvC5HCZtobimdg/Z5KmmFdkjwe/X+Ph1/L16Te6Fjip0CPINHtXCDDrZ1JI0llmp4jQowCbjgyRM1IWlP0l7BZj627Lk7l+BMjH7sBJhADnzK9EIoqPgrtQuI8sWG98Bn9e8oYQpparuelv743PTnmbYZe8BWji4UgCmysKhlrqGs0L1z51v1fJ+YQnKBRuGY6jSPpSnFPgwHODu3q6OxMFfi5Q1IH78evwhgnTLfFfi7kK3w+zKhse39EvN6BIpN+smS3n9mZPZYm1Oq/FaZb2zI3Wrw1TLd3RDtBFtwk8R69lqttG8xIgdFdb5tHw7mxswFutaMTakyT162+JNkgL374UqCkwP1DqOlvYg/OJaE8IKKHsQuD4gVBsZZERZfT1Gf/u4G9BLxITuqGSfv0zB3wlA== MIME-Version: 1.0 X-MS-Office365-Filtering-Correlation-Id: b977cd45-bb7b-4500-3b34-08d3a3de8e68 X-Microsoft-Exchange-Diagnostics: 1; BY2PR03MB587; 2:A1nrr3ETg6q/rpBBDve0j/5ZZSTMXQvU3qD+XtzmHHDgYm2/F8mSu/8FSc8nTUbawUEDE23kKpXgPZSrPNmSS2V9twg/o+3eivnM9oJTS8Mbx2xZe/EpK8aNyiAmyrGyabppTZU67HsAw3fv6O0aoWPndy4hKgNrV7tIyPceQrZ3wz5j2dUIgDiwux5NAC+r; 3:Fq6Du+z1PLpbrP48pquck/lwvsgv7rC+HuNGpEVlWvOXw+rUHQLpINow3XSfcfDfhTrVNRBU6cjmBAjd3Rl4tF8dZGnxOXfbnYL3P0Kj7dx6ajLaFplQZJqkMIMcoXhxg7Ya7ljIgrcpsogO+7y0RXPT4ouEWy8t8FunZ0I21yCbipX4w+I1Rz7KuJhCTYoMDDHzKVyU3zTUEMTiJDxOOq5EStE8Mqk2NhtB2gk0Qyc= X-Microsoft-Antispam: UriScan:;BCL:0;PCL:0;RULEID:;SRVR:BY2PR03MB587; X-Microsoft-Exchange-Diagnostics: 1; BY2PR03MB587; 25:gjhvTiK/zlODi8uMuxNRRLI0FxPyrO9P3H5aCqra6RzCJ2GZTat+QM5sXuXGuEeU2o3OHeSXJrVsQnMsy4RogIA9dbpGvJqSW3a11jhYt4hK+OrOntYWijil+8IVxsx6d5QYZSzIUM9yK5H/1UAK54iZcyxfxPzZndk/37RKZqsJ84jsMAK+P2zuh+WkBy0ZC8HPjJbzytVarucfBqUPa5DtbiBFSQ42/JNovuFNMUwre95MVbgbhkDfAC5tYmYC43LI5ZbeO5CjI1PkgA0KRPxDa1Bz8qruNHlLLVz2A96jWZY51ND5IUOursAPQddXp2DMAYkZzHfRvEfmf//EE34whdg0jtfIkR5MYMgCR3TYByOulXNGvkvtTKndBduPtNRkEE8R77DFj/L+7t4O6l7X7ciyvNI68CbSotoy96Ip95xLYN7GRIF2VGAwaF46wOt49fsE9wWyRY+m7znHtyvfIDARW4NwzqLP4dsqjrt5PoWleynSKyh8N+ZqginXmy+9gvY9Tvpy1HDLgz7z4I30O+T1l2t23MzvkCUbzRS85EtgqvH+Jxn4Vs0HpB2C8IGwYIH6M+S+gvloyoONdhvUDrBisEPTlfAsD4BAvVdH2dL9wC8yRstHhNQTUANlEtz4NBA5XdR2l7YI4rtZKG7rBnq0+pEk7BW1dwhODIn8EUYxdVOLUlWtNYngUjTbUKNOaaVWp1QD0ppwdz3CsrAPbY9/SGBCInEDaJOgWZs=; 31:HhoUXo29bowScdLEiiUF+Nn9WMcSAUOhOksjw0d2WxVJYF+8Dx+kwoONtODE/gD9oE6GbS/rFllyHUjGUbcU0/WS5nFUd9/y3FSGhI0ggJDpFAu/JAGau0fIUlqNE+oy0EWHGYe2aENBpYCCUyMzvdI2lhDkE+Ekyw1dcc/IrxvPYzVAFBAUM3aOFkdX90/4bSFwaSu3e7UcjcNCcWIrHA== X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:; X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(601004)(2401047)(13024025)(13023025)(13017025)(13015025)(13018025)(5005006)(8121501046)(10201501046)(3002001)(6055026); SRVR:BY2PR03MB587; BCL:0; PCL:0; RULEID:(400006); SRVR:BY2PR03MB587; X-Microsoft-Exchange-Diagnostics: 1; BY2PR03MB587; 4:SsZOt48NmVweFS+t6tvnzHRYSl/pCT6zxybmfLebiuqm6upe1imMSEEX/aQCvNAL87ubYf4RUvSOtoLCULlpvpsWlkKUUF+52tPvxnxj2aDiydPg+YTBKxl5Jgw3sh/JRQBF+PMTiYKCxhDqup3Ue7DTxpD212AvQY3NwPZ/qWyjArgKM0yRQyAr8kEUii1WSegl6FGvTQm5Otk97T7ormeoDTpmwol9LLI4g2COztmmwHweYN6gaT4W1choumosOtSPGquMSSOI8iH4Qq9X0zkaalGc8oEWSY2x1eun3rYZTnXcs1/iEvYVtbTF5DMy89oTfYAD3Ky58g24Q66XBtu6L3YVxmjXwLwbzv+qkTDZHfusBIHGjCsLketHNac+2jZwn0VEuvUd70+p90xr1fCrPQZpOfvlCCul5+yOeO2sc3eEaQP7QqRWHAzBJXCVP0d7ZYvP0NIn3tM+OywU14LAROLuLQqrpoyrzsr9A4s= X-Forefront-PRVS: 0993689CD1 X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; BY2PR03MB587; 23:GxVLYwHYls1KY4nSuiExJ4duCO6YtuuWkywi9fFoKu?= =?us-ascii?Q?JlY1RePHuBbKvLuK5OYtfYpjRvO6bd1MGp5uvsbx3z1X3V8biDnAGE1yz3q+?= =?us-ascii?Q?c39tDhepHpj8D1pc/J/Vu1KFjmwb5C+EaK3LWMywZRcirqVPoPL0xVDFXS1i?= =?us-ascii?Q?L7rzBSPQceFCNhv4wfbKVDtA1Y77EpB26pleY8euEA0sBpCbhOhQRPAir5pV?= =?us-ascii?Q?RV4RBYriO9s9AXnEOF2a2ZG2FR+v04RHRl3yDuD435TLFfyAGGO3CdVN4YdY?= =?us-ascii?Q?RXQtH0gdOOeUijroSdzLFpLeZPO9pjT7kb6Ip2sD0ZJtpCoExgjt00/iYK46?= =?us-ascii?Q?tN93NXzgsPIrxmEBUV6fIHiUq7xUO8bRPqkexSCwz87VG+ocUwJ7vzn4Z6+0?= =?us-ascii?Q?zP8GmvC6naJjXunpa8y1FkoxN4h1YACys6tCwKq3fktFqPRS/Qvf8uoZuHiI?= =?us-ascii?Q?J6geH7CTR+IpVXAIFeB+VK4IvM5zF8SoufsEhf6BpYW9yxsiZRb1LZEOo4Zd?= =?us-ascii?Q?tPMOSgHwpHUJ+ese6gJkv8tPv2ziCZnlvdGP2ZbeAh70OLTwu94mg8Pf4XEm?= =?us-ascii?Q?Q6J4jO+o4SV+C4Yyj9abbddXUMc8IhKC6P0LzskJHuA3BsPMQRHUk/ynaePM?= =?us-ascii?Q?itPgWA587Be3Ne1X5z/ReSuf1Sekzl44iepfSL0fdraa7sVEfxXRcFk9D/q+?= =?us-ascii?Q?wu2VEAjGAh2mg0F2pneKFaOWEcbZJ//JZP83WnZpnAKGC/NZniH4Tsvto6B3?= =?us-ascii?Q?rrmAaW19sKG+jL/4NCluZtncj0jV0bhfKofsK7Pir6i30Nuvt7nMHoS0Rhri?= =?us-ascii?Q?gDU2Wg/jYHkw9b9kvUuVOfbntGqjcwkKMTuiHix1K0aEhPIawRo6H7mXzGCl?= =?us-ascii?Q?M22JS2SDal65F3PIjGB6KewuiN4Ae5mGBIO0eeSjTymussUGppXw90O+kfny?= =?us-ascii?Q?RwIfeFwTSviJ2TvF9U6/8TamPqQuj2NEYgEQYX25Sg+oWpAPlerQvidDWXPG?= =?us-ascii?Q?0u2cqsyZZyacpmnbkfmUGSuNvHq9vv62/+sLFtDHJgRquotEE4zrXc4SOKkC?= =?us-ascii?Q?qCjYREg/xII8r9TGlIsgV1NmvCVLRAmY5AAbJC0zmxgPa3MOU8w175l27KJQ?= =?us-ascii?Q?Yye5Gy08q8YfgFNLBgYwROitZ5PxQr/YpE8o4qcx2TIVhRTQRQl8bzz8Z7rd?= =?us-ascii?Q?cPtrhy/xsWeNpVuvhGBzdiQmzyQpfoYyH5lDeUzKzvxAvaZxCs0vlQQuoB//?= =?us-ascii?Q?OAOGKWZCt67M4qYpZoF+L+hgAebi/975ZkbFPj?= X-Microsoft-Exchange-Diagnostics: 1; BY2PR03MB587; 6:OBf5N9721oFupKn0AK5WJ5TfHrsXr4jAAdm73Bz6bcA0D3mmbOBog/w1d5uY+6FRjZ2bO8bAU5vvV9e3cJVhJULZQybN6R0tapeQc//+1balC+Iw5nckHn5IkVJmk+6Js2h2x83bwP0H2clKr8z8W1OYP2fd3Uv8iZnAh3UG3A7hsCu8qCEOW6HIXnByegclmEDnpl5FWe7cQy304lrOgEfeC8Bf6W3KmfldmEZVBRwFYxMWvjH06v4eN8xinmftqC4a9K243eOqYy7/JVwBIiWw1U0jQjd9dFo57rDuzIU=; 5:a/0pnMhKoCjjncG/hguCDhDCHx8hhLuoU0tr4jX0bEqC8L0yCz3K5+l64TxXHqRBirZCWKP7PSZ0GXws6WanOAB/In7SXV8ak2CHURTkIsS+KNKQbXnNK0CaRc2DMwac0e9aYdZHN4u8e2bKhQ8XdGZr4B41jDcbZrmnUb42tB0=; 24:/uxCpDeKksp4Z2igic6R4FqQLctGWZYUGlKyJnv3qGlRFB/CjtVLWUvMAZtyXJuQwRtiFb0zlKAwKinajn7fUHjTueHNFyiqX8cfipTmmCY=; 7:5uA5QLq1AlyQhyk73RVLxv/exXVSviK64yWJUriNJ8n26bc4n0NaUZOn7KHzALvasfS6G0umOWdBrZhTl0KQMJJKPxdi/ZuG8W6NPWwTWkhAht/luMWV2GhC+e74fO6BUHEav5zL0Fuyy29dORJkl8yIhQCu19K+J7ZsZt/BA0L8BLWPojRiy4S/GT+LTPH/tK0VPqJCQZTfymYjOZ6W9kapb9eaTxagUmxrmF9F2zvsUm117buXsdJqORh9vKuC SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-MS-Exchange-CrossTenant-OriginalArrivalTime: 04 Jul 2016 07:41:05.5542 (UTC) X-MS-Exchange-CrossTenant-Id: 5afe0b00-7697-4969-b663-5eab37d5f47e X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=5afe0b00-7697-4969-b663-5eab37d5f47e; Ip=[192.88.158.2]; Helo=[az84smr01.freescale.net] X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: BY2PR03MB587 Cc: Russell King , Daniel Vetter X-BeenThere: dri-devel@lists.freedesktop.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: Direct Rendering Infrastructure - Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" X-Virus-Scanned: ClamAV using ClamSMTP Use drm_atomic_set_fb_for_plane() in the legacy ->page_flip path to track the pointer plane_state->fb correctly. Signed-off-by: Liu Ying --- v2->v3: * None. v1->v2: * None. drivers/gpu/drm/imx/ipuv3-crtc.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/drivers/gpu/drm/imx/ipuv3-crtc.c b/drivers/gpu/drm/imx/ipuv3-crtc.c index 8a0ef13..7df51e8 100644 --- a/drivers/gpu/drm/imx/ipuv3-crtc.c +++ b/drivers/gpu/drm/imx/ipuv3-crtc.c @@ -18,6 +18,7 @@ #include #include #include +#include #include #include #include @@ -217,6 +218,9 @@ static int ipu_page_flip(struct drm_crtc *crtc, ipu_crtc->flip_state = IPU_FLIP_SUBMITTED; } + if (crtc->primary->state) + drm_atomic_set_fb_for_plane(crtc->primary->state, fb); + return 0; free_flip_work: