From patchwork Mon Mar 14 08:10:10 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ying Liu X-Patchwork-Id: 8577301 Return-Path: X-Original-To: patchwork-dri-devel@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork1.web.kernel.org (Postfix) with ESMTP id 0CBEE9F3D1 for ; Mon, 14 Mar 2016 08:19:47 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 1FB812044C for ; Mon, 14 Mar 2016 08:19:46 +0000 (UTC) Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) by mail.kernel.org (Postfix) with ESMTP id 3AB3D20434 for ; Mon, 14 Mar 2016 08:19:45 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 552816E616; Mon, 14 Mar 2016 08:19:42 +0000 (UTC) X-Original-To: dri-devel@lists.freedesktop.org Delivered-To: dri-devel@lists.freedesktop.org X-Greylist: delayed 951 seconds by postgrey-1.35 at gabe; Mon, 14 Mar 2016 08:19:39 UTC Received: from na01-by2-obe.outbound.protection.outlook.com (mail-by2on0071.outbound.protection.outlook.com [207.46.100.71]) by gabe.freedesktop.org (Postfix) with ESMTPS id 9FE0F6E616 for ; Mon, 14 Mar 2016 08:19:39 +0000 (UTC) Received: from BLUPR0301CA0036.namprd03.prod.outlook.com (10.162.113.174) by CY1PR0301MB2042.namprd03.prod.outlook.com (10.164.2.24) with Microsoft SMTP Server (TLS) id 15.1.434.16; Mon, 14 Mar 2016 08:03:43 +0000 Received: from BN1BFFO11FD055.protection.gbl (2a01:111:f400:7c10::1:173) by BLUPR0301CA0036.outlook.office365.com (2a01:111:e400:5259::46) with Microsoft SMTP Server (TLS) id 15.1.434.16 via Frontend Transport; Mon, 14 Mar 2016 08:03:43 +0000 Authentication-Results: spf=softfail (sender IP is 192.88.168.50) smtp.mailfrom=gmail.com; linux.ie; dkim=none (message not signed) header.d=none; linux.ie; 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 BN1BFFO11FD055.mail.protection.outlook.com (10.58.145.10) with Microsoft SMTP Server (TLS) id 15.1.434.11 via Frontend Transport; Mon, 14 Mar 2016 08:03:43 +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 u2E83aDD021368; Mon, 14 Mar 2016 01:03:41 -0700 From: Liu Ying To: Subject: [PATCH 3/4] gpu: ipu-v3: ipu-dmfc: Rename ipu_dmfc_init_channel to ipu_dmfc_config_wait4eot Date: Mon, 14 Mar 2016 16:10:10 +0800 Message-ID: <1457943011-20542-3-git-send-email-gnuiyl@gmail.com> X-Mailer: git-send-email 2.5.0 In-Reply-To: <1457943011-20542-1-git-send-email-gnuiyl@gmail.com> References: <1457943011-20542-1-git-send-email-gnuiyl@gmail.com> X-EOPAttributedMessage: 0 X-Matching-Connectors: 131024162233102849; (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)(48376002)(4326007)(1096002)(87936001)(106466001)(1220700001)(55446002)(11100500001)(50226001)(47776003)(50466002)(104016004)(6806005)(189998001)(5008740100001)(92566002)(19580395003)(76482005)(86362001)(83322999)(81166005)(2950100001)(110136002)(5003940100001)(77096005)(6260500002)(73392002)(73972006)(81442002)(586003)(2906002)(2351001)(36756003)(82202001)(105596002)(33646002)(229853001)(87572001)(76176999)(50986999)(15760500001); DIR:OUT; SFP:1101; SCL:1; SRVR:CY1PR0301MB2042; H:tx30smr01.am.freescale.net; FPR:; SPF:SoftFail; MLV:sfv; A:1; MX:1; LANG:en; X-Microsoft-Exchange-Diagnostics: 1; BN1BFFO11FD055; 1:mh/5BAlUSYQCFHit4mN9EDC2Zz9VDHttPphs4MICD27ZUSK7Izj9ZyqZRU+5HJ4deNeO2YSRER9LBd3EyaaQhja5PlG2thr+dlIK+E8XcfAEwUDqtmd0e7lssJk19W36Dhm1NV/Y1+a6gpGY8D79fvAqqvBn403HPq3Z0lYEjYdeRmPFZUmKjGFahJahW3PXkjXlPdVXPmYXQnI5+JxFKeIU5W3zLGloR9ArSVkDbf8iv2WJx5qOlk9iRJpi13tlR3Cr4bO6mMXaEXz7NYCI4dV0LwluiwUOBosVkK6e3kQ0ArsjT7ZFJ2OlL8/1LNRCsqHCQbmtsACuURnpQBtvdUH3Ovvy50wwPIQOe0CMF3WRhXJEpe7ZYKdrsK7YwEbMzrEzke5vjg124t+RlC2jy4zKIynue9mRziIqFjyCUpdsTJjA3O+tEW5emUwJS0x48ZehrzXd368sNrwBffZtsibSdsNPeR7HQxKFlG4XrZXIxUd3WaU31Lcio63qPLSQ MIME-Version: 1.0 X-MS-Office365-Filtering-Correlation-Id: 0278339a-f168-4e31-b201-08d34bdf295c X-Microsoft-Exchange-Diagnostics: 1; CY1PR0301MB2042; 2:1HjudCrIomsEMzs9yb/ag3uqqFbc+R0t6iF/gih9CNwUNzJtPHcQWPyBUhgP6/ofJB9KApHhcLyoWqAkCZYdRpejxdQwTm517FcVjyIMsB/p+QDS1jW4YlPriFBg4EOcmhLAHCd2WWJrFuvWkAM9PurY6P8OtY9C8SdlWiJAgbHlFjziao9MJX/8QLF6Vyra; 3:4YOb94Ef3rewKQQSwVCBFA5lNhFnWEVfqTj5nxMvxnlD1JKArkEjd/mh9L2tEN4uXyGdlfyQ5vz5rN0mC9uU/MWKrGzq79Dhz7qapasxquMOVBV6Zk46brOsCCdaOWDc4WDnglDx5G8hucwFr938oZ7rUcJFAIapEt7uUb6geWNqZPpXjbxwj0XMzStTfXwP3Mv0rZhleMfH9f0X80CkDe96iQn0GhQOZldiznAYxWY=; 25:I56HNFMyetzFKIE5hQLDo2Dk7axW//QGR9dGJMeX6k7SwVFZWWqQDP7vF+rEl8k15+blNbwvq3fXBBIYAr4osEY3xixDmI27nBPiQG3TSJTiiqBsP3vTbYgfmhIghYcmewCezHjhIP+0yH5R2BkCYUSrEx4t9a9j/CUesfIUqUKcEs2/AERoD+UJdZ44ADMjUF/AblhLXtmOH+KfSjDpKQvK9XeHcz/b3mR4zQVMrar7qnOGOTtHu2AuAezjPHd7wLox/JP4Ak5WbYG2Gb/MJAgJgEeS1X1K9498yxYwgs/x7pf4Sjm7JZjFjVdDYHLxA9tsOVyfzOmEAsZjfbO1iw== X-Microsoft-Antispam: UriScan:;BCL:0;PCL:0;RULEID:;SRVR:CY1PR0301MB2042; X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:; X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(601004)(2401047)(13015025)(13017025)(13023025)(13024025)(5005006)(8121501046)(13018025)(3002001)(10201501046); SRVR:CY1PR0301MB2042; BCL:0; PCL:0; RULEID:(400006); SRVR:CY1PR0301MB2042; X-Microsoft-Exchange-Diagnostics: 1; CY1PR0301MB2042; 4:drWdCqvtnsIjCjqoozwfNqGX7koDEQ997kyeJD9CvVUMLLCbK6BDGHTFRxnC1zl/7866PsjeTA8dML5bFaXAOwQm2150mfCIUQrqejxZJfYIGlUDZiAyHzFbPa5mkUrPUpHVfWONRf70X5eNbeXlN0It4ZLt3ON6yEatH0SGw6LBFyhS/fZPjWZuHDUpsrhAwX5eHF751RyeUsEi3h4T61boaKS+ZkO17l3sU2eFUsZ+ts/5ScSvRudpE1liQDifJY0s5w9W0aeUi3bR94mLgCp9jhHK2UERi+t6L4dhThqM+g6p5Y3rMMbwvQNIGEbj4KJzD/c3XXlTeyQJ+918RjmQ5e/fzjxWHuBMt8orWSFvAL2Wm7rH38KIOHhv9gjlzvgrzB7dXS5GfzsbmUL+0yzowamnwDPv8IoGkrnEqfjbO0rVVneg7pid/sFST9e6iMi6No3lxkABZtKoaVWkIw== X-Forefront-PRVS: 0881A7A935 X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; CY1PR0301MB2042; 23:5CEPUG8dIKp+lQVqqkznxkzf2ajePnwgT1M5vBo?= =?us-ascii?Q?efuUMaNMoxIaB8gQWACK3+fvdoqe1XdelHnJFXDw86PtVYefWzM7U9Ufs/1z?= =?us-ascii?Q?BU/9mdmF+jdULhLqJOHngnNU6J0dcVGL7uXgicjIUTLEuZyt/g6YQJ6dsDw6?= =?us-ascii?Q?JsWPey7fJu7cjoZSpqMCf96Dfw7pIYXx/8i2XfTDSY0GPMRBv/mRCMeCQxpy?= =?us-ascii?Q?Db48SatPmxXbU1fAycd2mYzoQoXNGEIjODVKqsNvijUEOrj6VlrMdC6YDUam?= =?us-ascii?Q?3RXS53QbYBvOeSKr8SXN1hu0ynPdMEX3hrj3HBYQAGLofJkKmdxe+YZ2hUoK?= =?us-ascii?Q?aUND4tw/N9ITs2+aih/X/Et/aJLrntkuYcTLeBZTPtmWYtRL+ib3XqIl7IJx?= =?us-ascii?Q?MXq0+cqBpAxoy/SGNkoMdctmBqpoalKDbpSgNRUMUKEZkwPST51P+L5WLIRX?= =?us-ascii?Q?fO3rPr3atgqvfnBlf+ZRHPo3gQAiP27BRZPXfZu+Hp7kUVqAqxNRJpQ8HFGy?= =?us-ascii?Q?hqA/pzU6Mi2L1p1lA0u9FQGSM96ZPP1RxQY7EOeHmUd80En7lmLe+J/1E2YK?= =?us-ascii?Q?atq2ftCEyb8TaiViTpuGne837SZGuy/JmFg6xLJNfzXOVx4bL1AxvD2uxafx?= =?us-ascii?Q?Nos+mKZ+e1UTLCiV6wr4eVfXbxbOd8fFIPNuoyD/V/ajTuca7P1Z2QTcWvtl?= =?us-ascii?Q?KS4uSpKRg+R7feY/QBMo4DUZh4WVv414DZq9HW5NKrplx3eaBb16zwLgnIdT?= =?us-ascii?Q?hTMuL/qKbCv26b+eF0UKK1FXqIgTgKH74/KZHLYn1Ubm40GzYguwAYptYXmh?= =?us-ascii?Q?00AzKpfIGyKyY0Wj1FnorstBR37T8uMT6DgM3nKN5kLHnmYxL5q4ux1PDl8F?= =?us-ascii?Q?J50Wppl+rvKvqoMIW9VOj5OfExM3A8bJ22RsWwYb6hRe9mSDoQSjSMt6JL4x?= =?us-ascii?Q?pRr6QHvC9GmNRDlo6lD4TY3pNIzRUa/BUc6JeGJ9Z/1rddyliAiCVjZOybf6?= =?us-ascii?Q?4fJVO4klABL+RGkz3lWXONk5poEGe1KxW95UMxipFblWqDzCEcYUeBhnbyqg?= =?us-ascii?Q?CUtCtAgHZGziSdNOWbPLgUpMqTWu4OVyx0YBp0fSn7JwknNNcbBf7cm9VxG0?= =?us-ascii?Q?F2FhBlsiacA4lSjg1LthY5Dx2VjU6Sj/1wDWVq6vYbaVUVxNpOzyp0A=3D?= =?us-ascii?Q?=3D?= X-Microsoft-Exchange-Diagnostics: 1; CY1PR0301MB2042; 5:29+RGZI8uD9KMSQ91ZvOet1LHp3PTNIgz2hDeV69V6HpVNwTaoOveIwzW1cwvroKOU3Zx/vzj50JJ2uKZR4j2z64AmDypHXe/8JCUxjwjUYx9nlPII2hnamq/neDJ3x4FYyssN3szTw51c0qEvvf5kceJK8v5uOs5awvY01r1Ac=; 24:CYsg/8szUhJPnCYiU/5bLHRrWlz8InjBQFxbfSRQy1NU8qj+W8A74bL3qU8bYioJ437QS8Ml1XuLrJ0Xbz104kjqgyjYWC+dYhFVSt4C9+A= SpamDiagnosticOutput: 1:23 SpamDiagnosticMetadata: NSPM X-MS-Exchange-CrossTenant-OriginalArrivalTime: 14 Mar 2016 08:03:43.0918 (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: CY1PR0301MB2042 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-Spam-Status: No, score=-4.2 required=5.0 tests=BAD_ENC_HEADER,BAYES_00, DKIM_ADSP_CUSTOM_MED, FREEMAIL_FROM, RCVD_IN_DNSWL_MED, RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP The function name 'ipu_dmfc_config_wait4eot' matches the implementation of the function better than 'ipu_dmfc_init_channel', since it only touches the wait4eot bits. Signed-off-by: Liu Ying --- drivers/gpu/drm/imx/ipuv3-plane.c | 2 +- drivers/gpu/ipu-v3/ipu-dmfc.c | 4 ++-- include/video/imx-ipu-v3.h | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/drivers/gpu/drm/imx/ipuv3-plane.c b/drivers/gpu/drm/imx/ipuv3-plane.c index 0faf84a..cab8a45 100644 --- a/drivers/gpu/drm/imx/ipuv3-plane.c +++ b/drivers/gpu/drm/imx/ipuv3-plane.c @@ -200,7 +200,7 @@ int ipu_plane_mode_set(struct ipu_plane *ipu_plane, struct drm_crtc *crtc, } } - ipu_dmfc_init_channel(ipu_plane->dmfc, crtc_w); + ipu_dmfc_config_wait4eot(ipu_plane->dmfc, crtc_w); ret = ipu_dmfc_alloc_bandwidth(ipu_plane->dmfc, calc_bandwidth(crtc_w, crtc_h, diff --git a/drivers/gpu/ipu-v3/ipu-dmfc.c b/drivers/gpu/ipu-v3/ipu-dmfc.c index 3aa9878..837b1ec2 100644 --- a/drivers/gpu/ipu-v3/ipu-dmfc.c +++ b/drivers/gpu/ipu-v3/ipu-dmfc.c @@ -350,7 +350,7 @@ out: } EXPORT_SYMBOL_GPL(ipu_dmfc_alloc_bandwidth); -void ipu_dmfc_init_channel(struct dmfc_channel *dmfc, int width) +void ipu_dmfc_config_wait4eot(struct dmfc_channel *dmfc, int width) { struct ipu_dmfc_priv *priv = dmfc->priv; u32 dmfc_gen1; @@ -368,7 +368,7 @@ void ipu_dmfc_init_channel(struct dmfc_channel *dmfc, int width) mutex_unlock(&priv->mutex); } -EXPORT_SYMBOL_GPL(ipu_dmfc_init_channel); +EXPORT_SYMBOL_GPL(ipu_dmfc_config_wait4eot); struct dmfc_channel *ipu_dmfc_get(struct ipu_soc *ipu, int ipu_channel) { diff --git a/include/video/imx-ipu-v3.h b/include/video/imx-ipu-v3.h index 07dfc41..8abf16b 100644 --- a/include/video/imx-ipu-v3.h +++ b/include/video/imx-ipu-v3.h @@ -236,7 +236,7 @@ void ipu_dmfc_disable_channel(struct dmfc_channel *dmfc); int ipu_dmfc_alloc_bandwidth(struct dmfc_channel *dmfc, unsigned long bandwidth_mbs, int burstsize); void ipu_dmfc_free_bandwidth(struct dmfc_channel *dmfc); -void ipu_dmfc_init_channel(struct dmfc_channel *dmfc, int width); +void ipu_dmfc_config_wait4eot(struct dmfc_channel *dmfc, int width); struct dmfc_channel *ipu_dmfc_get(struct ipu_soc *ipu, int ipuv3_channel); void ipu_dmfc_put(struct dmfc_channel *dmfc);