Message ID | 1464084653-16684-9-git-send-email-gnuiyl@gmail.com (mailing list archive) |
---|---|
State | New, archived |
Headers | show
Return-Path: <dri-devel-bounces@lists.freedesktop.org> 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 26772607D5 for <patchwork-dri-devel@patchwork.kernel.org>; Tue, 24 May 2016 10:26:23 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 1FA3E28233 for <patchwork-dri-devel@patchwork.kernel.org>; Tue, 24 May 2016 10:26:23 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 14ABB28258; Tue, 24 May 2016 10:26:23 +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 D953428233 for <patchwork-dri-devel@patchwork.kernel.org>; Tue, 24 May 2016 10:26:21 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 650546E6FC; Tue, 24 May 2016 10:26:18 +0000 (UTC) X-Original-To: dri-devel@lists.freedesktop.org Delivered-To: dri-devel@lists.freedesktop.org Received: from na01-bn1-obe.outbound.protection.outlook.com (mail-bn1on0076.outbound.protection.outlook.com [157.56.110.76]) by gabe.freedesktop.org (Postfix) with ESMTPS id CDAC46E6FA for <dri-devel@lists.freedesktop.org>; Tue, 24 May 2016 10:26:09 +0000 (UTC) Received: from BY2PR03CA079.namprd03.prod.outlook.com (10.141.249.52) by DM2PR0301MB0606.namprd03.prod.outlook.com (10.160.95.22) with Microsoft SMTP Server (TLS) id 15.1.501.7; Tue, 24 May 2016 10:11:32 +0000 Received: from BN1AFFO11FD030.protection.gbl (2a01:111:f400:7c10::148) by BY2PR03CA079.outlook.office365.com (2a01:111:e400:2c5d::52) with Microsoft SMTP Server (TLS) id 15.1.497.12 via Frontend Transport; Tue, 24 May 2016 10:11:32 +0000 Authentication-Results: spf=softfail (sender IP is 192.88.168.50) smtp.mailfrom=gmail.com; arm.linux.org.uk; dkim=none (message not signed) header.d=none; arm.linux.org.uk; dmarc=fail action=none header.from=gmail.com; Received-SPF: SoftFail (protection.outlook.com: domain of transitioning gmail.com discourages use of 192.88.168.50 as permitted sender) Received: from tx30smr01.am.freescale.net (192.88.168.50) by BN1AFFO11FD030.mail.protection.outlook.com (10.58.52.168) with Microsoft SMTP Server (TLS) id 15.1.497.8 via Frontend Transport; Tue, 24 May 2016 10:11:31 +0000 Received: from victor.ap.freescale.net (victor.ap.freescale.net [10.192.241.62]) by tx30smr01.am.freescale.net (8.14.3/8.14.0) with ESMTP id u4OABCM7024148; Tue, 24 May 2016 03:11:29 -0700 From: Liu Ying <gnuiyl@gmail.com> To: <dri-devel@lists.freedesktop.org> Subject: [PATCH 08/14] drm/imx: atomic phase 2 step 2: Track plane_state->fb correctly in ->page_flip Date: Tue, 24 May 2016 18:10:47 +0800 Message-ID: <1464084653-16684-9-git-send-email-gnuiyl@gmail.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1464084653-16684-1-git-send-email-gnuiyl@gmail.com> References: <1464084653-16684-1-git-send-email-gnuiyl@gmail.com> X-EOPAttributedMessage: 0 X-Matching-Connectors: 131085582921282207; (91ab9b29-cfa4-454e-5278-08d120cd25b8); () X-Forefront-Antispam-Report: CIP:192.88.168.50; IPV:NLI; CTRY:US; EFV:NLI; SFV:NSPM; SFS:(10009020)(6009001)(2980300002)(199003)(189002)(9170700003)(61266001)(47776003)(189998001)(229853001)(76482005)(50466002)(11100500001)(2351001)(5003940100001)(48376002)(110136002)(87936001)(81442002)(73972006)(105596002)(2906002)(86362001)(50226002)(106466001)(586003)(73392002)(1220700001)(50986999)(76176999)(82202001)(87572001)(2950100001)(5008740100001)(36756003)(77096005)(83322999)(92566002)(19580395003)(19580405001)(6806005)(81166006)(4326007)(33646002)(8936002)(8676002)(104016004); DIR:OUT; SFP:1101; SCL:1; SRVR:DM2PR0301MB0606; H:tx30smr01.am.freescale.net; FPR:; SPF:SoftFail; MLV:sfv; A:1; MX:1; LANG:en; X-Microsoft-Exchange-Diagnostics: 1; BN1AFFO11FD030; 1:pBRAZ+PX5uckDu98IDAShqRk9dBWEhyl9vKjNSB1oeYD3yr+TV6uFjRLCQGCt2/je433L9t55a63pbO80NokVNM+iyMXgOYPrLXWOWInATndGcjBgAxHdxN8oOqO+dY1intuHPlTAZFwpZDXjwL9hDcVeYyHnMoa4Duk1+OxxhBjK52CQKveBrNP3EBw+Cdqp4qy89an57ddQSh2EBrHGBfUv5sELv8qiFp9QH+h8CnWs7ABjWJLuBx1ZIU/eZDLt+TUQ6rlaez6IuP+iY5ksWgUGtp73YQOsvcFZoqtrcyhqu7eZl9Se7JUKIofJdmBZA0OZ6PH1ba3Yv7i/TQkB77EUAB7rLO38tTsaAGinGrckI9gIkEYtCzSa9e5qLc/dftHiz1hXkkHhCO7mW2ym33koWm3d/7Dp9Asfx2EEd34farvrI+lEW+foFRKxowuSXnTHTlH33IKJZ4zIV4wUbNa9XvORomfJsyvAz88ldPRnoUedP72aO8eSmdvd7XRaJKO4Rwx7PQeTQkXB0ZB8n2PlZVNrwO49vqL/EV7qxCORz0K6cq7i2jeCwVHoz/e MIME-Version: 1.0 X-MS-Office365-Filtering-Correlation-Id: e0325535-0e72-4775-b29f-08d383bbc7a9 X-Microsoft-Exchange-Diagnostics: 1; DM2PR0301MB0606; 2:/xoJOM2D4kwPQaNcgDfldBalsN5onNKW43w38pVQ5/uN7XkYxQyVaQaAl5YhDHQfTZ8vgwJaCs+LNpdNt4GN/X61X5PlUrUKGbeQJ3LW+RGAG1J7SGZcy1wYVFgVVBLUVn7MkOcZzw4iyiGJ3wExNyBvhJIl5tYuFxH7hD8F8z0950qtXpeca29R3bVKohve; 3:TxGVOQkrculgO68Tj8zi7fVWQ9XTYeFDIrQuJAqFqWELVAKJTx25rJ64rMUaDMmL4cyAPuofBPBbv0NwU3kIvaiScaU96urXi7VnWwMMFP6I/Ma9sTERr2yfeIyjtALfOTcrIjy04w9aOZnsgntt9ln7GB8B8/VRmiryd1wenaZioBuDP5bAFkLH1JJfaPAybuiHmf7GjHoIW89v19pDXshi0ILsBuR+zBORDd1oe4I=; 25:WlkKNvythfJI439/rHTG48+fBULf3bwHfd+VogPu/cFaUvJUSYDFsnmZcY2Oa9rYcUOvrrTVTbUWWad1V8WpyLYMwYyL18m+H6QzLFOkrF6e9U/HC/KR5REbDDKPBjn5I52ocB/i9s8RXpFojqRG3SdfDOkmJVXkT7Re5l4+X82aSR4PQDnml6nAIIVT3GMkUbAKcEQeKTsGqhzEnINf3P+ZRSzs9mNH2SavnTx8HQ3edjARO22D+KhigA/07Dutk9U+mHxzTbHWUqrsPdPOtkm7xDrqjg4m+L9PzbIW0EuGjbpK/EyiOl7iFcuTvgq7pIiRVBTF7ctHrYS9hSpQaCTo8yhF01l6X4ETuBNcq1kGwk6MUNaq1QwS9yuOSyxrKQIDrD4yeei3go/We9HUBqwzHwm4DvK7jXvg9nTSUL8= X-Microsoft-Antispam: UriScan:;BCL:0;PCL:0;RULEID:;SRVR:DM2PR0301MB0606; X-Microsoft-Antispam-PRVS: <DM2PR0301MB0606ECDB91EA760AA2E1BF8DDB4F0@DM2PR0301MB0606.namprd03.prod.outlook.com> X-Exchange-Antispam-Report-Test: UriScan:; X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(601004)(2401047)(13023025)(13024025)(13018025)(13017025)(13015025)(5005006)(8121501046)(10201501046)(3002001)(6055026); SRVR:DM2PR0301MB0606; BCL:0; PCL:0; RULEID:(400006); SRVR:DM2PR0301MB0606; X-Microsoft-Exchange-Diagnostics: 1; DM2PR0301MB0606; 4:Qk8UlMjBNNExZMKe1iYX8RcWnNOcK5e45VjlJAkvKIMhYOcd0MgZ9zpHHWK18WD953bQri51bUHY5Zed4w8e+TMaJCHJm3M4/wM5nhSB3dWf+GrMaIQazJDSDLBrlltRQjtr32pdIhM3gWponjAc8aTohiWWiU+BBmFjVNoEuXGcdGv+NhdfE2tLw+X7f0+eVUf45jQpSI7VBhWhLrUHFwWWt9h1M6o4sYjTlzRa3yRobnthEuYxZxHvEzVXHLF2yN7OJpvFqyAbgqPBQmTcv1uXjideRu+y05JmQBbmuKBQGnNMR3aW5HP5m+y5dPEEEpT7LQo5YuUTmw635BNe22RJ3oPxFrJjqDzC8Z+k6jzG9e5ajom2YGBrKJ6l3XqVHPExZmSL5LnVm07fQg8zQVbNjTjMZVv7+BofprNS0GvUKZ2sagvHjUF4Gr2CIUC8KRaAlRBQfntsvH8SoU8Kb19Zy1VuMjHy+s6qGN0xIeQ= X-Forefront-PRVS: 09525C61DB X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; DM2PR0301MB0606; 23:wrgjzgl+nzSkyt+pxXhOjaKnXN2IwsR3YgpBgM+?= =?us-ascii?Q?L8VpyFkh/J4XR/oc2soMiX/W2qoFmPBcB3kY1uItC3+MTAcFRk1Z/3gBGl8k?= =?us-ascii?Q?jIeNX5EuAFlMSFc9GSx5h5doNzxBf7b4g0qpPAkliu+RKnkqqFg1e5xYDtzA?= =?us-ascii?Q?DVQGHlG7LYi/NNMWkAVFoY83rds169HPhrZM5d5MPDPo/GwzF8FOqQ7LwfOB?= =?us-ascii?Q?KSQLDwAdUKBuUysexJ9b1fw+fw1wr5I5FAlWnooZ1ulXeaLdnhCTHAnksu62?= =?us-ascii?Q?J7V42iBGMb9ARM5UfN1WKSSOBm52rhYIirKrk5Tn/qY+cUhUa4d2gsU02gIr?= =?us-ascii?Q?odNv7sv0n3ADMxf9fVwOTH1oXP7C51W6wWoQZyMEuwFN3Qdfdb1k3N1unpFS?= =?us-ascii?Q?b7ScJcwXlkD4L6cZ1cekg/XFJKB9quYUUkggPJjtDvC/QHFPr1voqP3g2Sxd?= =?us-ascii?Q?E2GrFSw6NjYB0kmacBWUwoABh89DfUeWCa3oX76YLQETK+Vlw4FwnSG6dkEH?= =?us-ascii?Q?k9QJHY+3dYT3lsLy64dAG2TzCTr/+7JeLgbVteowL708omyGtuQWNTveRVjW?= =?us-ascii?Q?A3G+DhBAdrlNvqUapk+ETaL/UOCdQscL1SGZZCSG4kZyUaEHanchYqHURjU3?= =?us-ascii?Q?SjqaxuuwRINeHcuUuYKQGQGyGyzDy4+JYCttHXXJ+6yK9sbgcS1z9JrbfbIu?= =?us-ascii?Q?R+65OReYyqIS1Q+8YievqPFAY35BhEABCnoIfsXNfTJlKivqWbM+w7UWHSgY?= =?us-ascii?Q?fb11LlS6SI/dNXsXiEa0vZpXLOU6BRtbWoxG+eeNKZ0IBQNSxlviE8kdAhSE?= =?us-ascii?Q?5SggY188Lw2Gl58s27dzbF4NSNHSAxYx4zfjsnU2FtMVfeR2US/YK1S1SB+r?= =?us-ascii?Q?KkBXUJSCB2lLvg7o8GSamuIH1acsRxUjRhtwzkEtNML0WlJp7Y78Wowgg2r2?= =?us-ascii?Q?VZKwxFCXQxUlDHrS/jgzAfhjquL3Ug9ZtiFLKz10i9pMzY0v0Iny4FkqwvKn?= =?us-ascii?Q?Tb1f9kTcaBxJIfZX10veUmrTskc25FdiE/IGvVHEYLpUAKEYZPb3ZdGFhvIM?= =?us-ascii?Q?ypTBvUz8AOftXR6D29KRB26gRjVVztPPDomxI9sPfk/LEGVw9p5jLCYemGOI?= =?us-ascii?Q?/djwWPWt1VBjADD1Ahj1ErjcUmJXJKpUFbVI4YevIq6Df92ix9X1bQWMxQOl?= =?us-ascii?Q?rxwvcf2frMN3UcSQ=3D?= X-Microsoft-Exchange-Diagnostics: 1; DM2PR0301MB0606; 5:7uMiwPAA96e8CAwO4fWv95MGo4Qv0Y0/8ykc6PafAcbKwerie+hTnmqtsmDoQ1iV3EMTZRdpdHOfvTW/XtSTa0eTJfmLwg2GXzzUO3Q/qPSjF/aUEz413PctmJnmXnKWMbJ+Gb9tDjEJXYHLgcOEqASkJ8rGTKwXw/+XYnUho1k=; 24:u4qOEREKv7L/fGGH8oJHu3UdrKH68x+ZSJX114inbdNeGpPWZyHVytyDpvF/gGq9Ykm6YfuXICQPeo4470Dk7pazmM3+YmzsjNoQi33wbmY=; 7:0C0i88qp6qkJooLroGAQ/ARYb+EguBwAsFL07CVhdYl0wJMKWYS98HNYRqOb8Q79s+7SsGWXn4HUMQH1S+eVt16gsDdfU0RKIY7vy0vyxBvNiKvyaGmtVa4W0c16vYs+/pDUUr612qG2jLweVjLhWOBkeQFVXJhiX0bjZH72vemjZVmfaAeqCV/WuTRbPoDE SpamDiagnosticOutput: 1:23 SpamDiagnosticMetadata: NSPM X-MS-Exchange-CrossTenant-OriginalArrivalTime: 24 May 2016 10:11:31.9254 (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.168.50]; Helo=[tx30smr01.am.freescale.net] X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: DM2PR0301MB0606 Cc: Russell King <rmk+kernel@arm.linux.org.uk> X-BeenThere: dri-devel@lists.freedesktop.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: Direct Rendering Infrastructure - Development <dri-devel.lists.freedesktop.org> List-Unsubscribe: <https://lists.freedesktop.org/mailman/options/dri-devel>, <mailto:dri-devel-request@lists.freedesktop.org?subject=unsubscribe> List-Archive: <https://lists.freedesktop.org/archives/dri-devel> List-Post: <mailto:dri-devel@lists.freedesktop.org> List-Help: <mailto:dri-devel-request@lists.freedesktop.org?subject=help> List-Subscribe: <https://lists.freedesktop.org/mailman/listinfo/dri-devel>, <mailto:dri-devel-request@lists.freedesktop.org?subject=subscribe> Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" <dri-devel-bounces@lists.freedesktop.org> X-Virus-Scanned: ClamAV using ClamSMTP |
diff --git a/drivers/gpu/drm/imx/ipuv3-crtc.c b/drivers/gpu/drm/imx/ipuv3-crtc.c index bd3b99e..6ef6c96 100644 --- a/drivers/gpu/drm/imx/ipuv3-crtc.c +++ b/drivers/gpu/drm/imx/ipuv3-crtc.c @@ -18,6 +18,7 @@ #include <linux/device.h> #include <linux/platform_device.h> #include <drm/drmP.h> +#include <drm/drm_atomic.h> #include <drm/drm_atomic_helper.h> #include <drm/drm_crtc_helper.h> #include <linux/fb.h> @@ -218,6 +219,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:
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 <gnuiyl@gmail.com> --- drivers/gpu/drm/imx/ipuv3-crtc.c | 4 ++++ 1 file changed, 4 insertions(+)