From patchwork Mon Jul 4 07:40:37 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ying Liu X-Patchwork-Id: 9211849 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 EAAFC60572 for ; Mon, 4 Jul 2016 07:57:13 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id DC5A4284CB for ; Mon, 4 Jul 2016 07:57:13 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id D0F4A28572; Mon, 4 Jul 2016 07:57:13 +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 8DB13284CB for ; Mon, 4 Jul 2016 07:57:13 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id B39646E3BB; Mon, 4 Jul 2016 07:57:12 +0000 (UTC) X-Original-To: dri-devel@lists.freedesktop.org Delivered-To: dri-devel@lists.freedesktop.org X-Greylist: delayed 966 seconds by postgrey-1.35 at gabe; Mon, 04 Jul 2016 07:57:10 UTC Received: from NAM02-BL2-obe.outbound.protection.outlook.com (mail-bl2nam02on0084.outbound.protection.outlook.com [104.47.38.84]) by gabe.freedesktop.org (Postfix) with ESMTPS id A68A06E3BD for ; Mon, 4 Jul 2016 07:57:10 +0000 (UTC) Received: from BLUPR0301CA0034.namprd03.prod.outlook.com (10.162.113.172) by BL2PR03MB579.namprd03.prod.outlook.com (10.141.93.11) 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:13 +0000 Received: from BL2FFO11FD048.protection.gbl (2a01:111:f400:7c09::178) by BLUPR0301CA0034.outlook.office365.com (2a01:111:e400:5259::44) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384_P384) id 15.1.528.16 via Frontend Transport; Mon, 4 Jul 2016 07:41:12 +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 BL2FFO11FD048.mail.protection.outlook.com (10.173.161.210) with Microsoft SMTP Server (TLS) id 15.1.523.9 via Frontend Transport; Mon, 4 Jul 2016 07:41:12 +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 u647ep0X026135; Mon, 4 Jul 2016 00:41:10 -0700 From: Liu Ying To: Subject: [PATCH v3 08/10] drm/bridge: dw-hdmi: Remove the legacy drm_connector_funcs structure Date: Mon, 4 Jul 2016 15:40:37 +0800 Message-ID: <1467618039-7457-9-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: 131120916726262858; (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)(5003940100001)(61266001)(86362001)(87936001)(33646002)(76176999)(6260500002)(50986999)(97736004)(4326007)(77096005)(87572001)(48376002)(50226002)(55446002)(2906002)(8936002)(73972006)(50466002)(92566002)(110136002)(81442002)(6806005)(2351001)(104016004)(83322999)(69596002)(2950100001)(81166006)(19580395003)(105596002)(5890100001)(73392002)(36756003)(19580405001)(82202001)(68736007)(8676002)(47776003)(81156014)(106466001)(356003)(189998001)(11100500001)(586003)(305945005)(229853001)(7846002)(76482005); DIR:OUT; SFP:1101; SCL:1; SRVR:BL2PR03MB579; H:az84smr01.freescale.net; FPR:; SPF:SoftFail; PTR:InfoDomainNonexistent; A:1; MX:1; LANG:en; X-Microsoft-Exchange-Diagnostics: 1; BL2FFO11FD048; 1:1j60S10xv3gJa3E2Vzf7e7LN79LP8T+xFr8LDDTvqZRfnxZwlrh1X3XC82BQC/0yiLX1O8aKlybIBq/n/zqGxnRR0ctPNBP/wz5zD+FhOdjnnNPFfg/91HuJbQ0cFvaCNNsfE6PtS20j0jb0KjalxyQB3ldb3xfUO2CQb3xUm0ZvTG5X+bleA5mjx5GG4+4Hw2hTt69FlzHXK9+v5zBMYMU6lS8KlA6JV1/hdljtcJz6NYaHGtWXJ+BV1moiOo+1lGu10um5iUp4C/vfcyol0yQZqp5DO5u4Xy7ZdCzZ0EvYzQE0G5TYj47kvNtlOHp9SSKNHoog6pfoEbnpxnTES4tFDi9le2KQPZqtfJbnavXsm70srDS5ikjoOf/fyK1WX7H4ZSOMf9JM5kTM4s/26DzuyQkZSO4tXxf8MZrmmdaqUKsRDzNyZPTWBj/ZkmNyD/mmO/ZOjK/ExY7QC/3mUPtvG1iQbHPIXZiT6mOUYZQ9Nez+Ige11ISm5JE2odQHLEJbr6cI50NDYo2aaXDh0syhgWOLwfoKfXn594yOUO877dfFeDWN7fDv2Zfk8sLVQujxbH6m5RdX4FgPN66GmA== MIME-Version: 1.0 X-MS-Office365-Filtering-Correlation-Id: ca062d02-229f-4a4f-4aed-08d3a3de928c X-Microsoft-Exchange-Diagnostics: 1; BL2PR03MB579; 2:ILHIQrH1afUPAxLRP4Am87nSddHUIcDDFtr3GGb6qp4Oc31wabAkRM0wX6f4BRrJlS0wR9NbD+DTWqrkFFD9AbjIsTPL+QDj11sjywnYqUdH3IMvrigTlnUjYkH+HpApX5YygK2rRyPf/kt3Ose+qBJX8G0DjIpfEfwrcE07luWeYUyiKFGxFFhXXoeyehVW; 3:ullawUUKqSXUcAC6AJDjRpjUZgJlSlXRw+JS5Q6VXupoUAdUS+i9zYwX7zZUeD/j8WQH+xDqGW/b3I81ydtmVnO8jS6CdkMAHRICY/U7pvhsC1VlYRZtWDebBwGCWqREPlxbT1Qh2JgSf17ZbQNM/1QQDNDYuEVTAJkU4goyAPalk3YhW98LewooJIFHChA4dSlVlCSXXO6Kvh2kDKpQdE6+NnU7ouVfZPV/22J3so8= X-Microsoft-Antispam: UriScan:;BCL:0;PCL:0;RULEID:;SRVR:BL2PR03MB579; X-Microsoft-Exchange-Diagnostics: 1; BL2PR03MB579; 25:rFTRHmNw6f6cWnpLExK/cTarV0DSWiMAyGab4TPzjV0U+gL58SDv1JSZyD//4WZlI5ZlHFQWzwVpr43auDw6weeg1YYXtq/pYc6nwKtRot5ck8xikQBqFVcwmvQjcEMjNk+TsHr9NyXgrIOQJg2sWOegCNTAi2K1fj3hKXxPIQqG3SeWBElzXkPB9hDepIs4de5bAu0v+7zk7fk5NkdTmMryUK2tkzH0J24GU8oyauN6k0ZFUhfFtfqEu80GvOoY97+21Ct67FBXCySf+2TosljpB3l6fgC6q6C/NKA4ke+JXMDOoqOxByRX/fWZlRPUab0Ru49v2nnpjyCjmI49jyYV87Y4vHwTqD7oTj+eRIOjTvZWmTyqDk3XhFX83K17wfTjdRXlLsQC3Qw8ei0YeV2vQFUnnj1z+aMwEywVB6V3gRYSH+bjKr8NhBAiycSd8FzoVHzFX4WRw0Osi50Jje1jytJOtAK+GBvqf7RI47FUx0cXP0kdTlwzIg29slb1mQ/8ivvgR6JTru3knz6KZ2gkW0/PurWIznVfUb5h+cV+7GT55WNeb5IGs9acTZE6Z3ZW6K8UqYFxvwpqJbqS9zQwop6wbD1FTmYiyb3uaGzBuGxEsow5xnidePMyCOTj03I0McR/xAnyWvAEsI8RalCs2JZ6XEd2YwveQoqaIAKEl/gLGrqKxznYB2+edNnUfTkbDEks4rM2DmWQVNXE7tH+EocuSqYLVZPWHTkeCZg=; 31:VbFPLi/lPNdsKgPKz2POWfyU6drr2RzoqwhDrkuBwkzg6/NJ/DR0MNO/PDeI1OqNx/K/JT9x3C4TZnQiNmXEyij7feB2zKSe01oeN6AAV7u3fU+ZztEDUxOXcbwQmE10mf/ls1teROK+dwxfNcTYxIsE3ZobN+Jxi+rFfrHeTj0lk2mgvv/GZBGRQEHpC/oczugRIe8XIBPPkuqIQJRtLQ== 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:BL2PR03MB579; BCL:0; PCL:0; RULEID:(400006); SRVR:BL2PR03MB579; X-Microsoft-Exchange-Diagnostics: 1; BL2PR03MB579; 4:5sCvCvDtZMdYsBASprGgZ/CAQf/EWG8IV5OdXd5UdtCmz/rbxZo7grTNUL4entFJtaQlAAq36WFpEYyt1i/t3yXNRsZbUql1b4jOK2UyoIFuzHCn+sGwYqOQXQcD1Jm4/IPUMxedrqm43K/gbKXnO1uMUyhETvHnIARqtpkCeFZ3CCI+/GktAPN24LpsKCIYue7xEJIvesyC6AbsssuILG1M33tovHh+NTnAIBYyK6RSu6rpQzWKXDG6LTQ0Y+cPEoEakLf0qsKiYFm8A2wF1a9v6HluIOJmpjntpKSRHBbKXVtbjZMiwy0hO5Iu5fTz08IF9hgGvXysFYsRE6/ThEkO1QOLiwb4qLneTfQK6wF5LYqXOzgcCkYwhFEFCWOTaUZo2ikoKZXP0ALDjPbtLgvNJUJ+AggSDbqBHugQQ+dJqC+xWBjdSSFZJj5A1VPX8gvte/w+fh1dHI+/ygXu+FFQtECUmnZw0k6uJl6vwYw= X-Forefront-PRVS: 0993689CD1 X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; BL2PR03MB579; 23:B3LBafOpOXLuElHQGOa0Ug2crAbeLZfrzrBbZXwm0q?= =?us-ascii?Q?WqRwYS5GOsiyrT+rfkfmOZI5RLOUrhKLbxtWSZMLvf5SrkwZdKGCFeH1gCA2?= =?us-ascii?Q?iwJ8s7T+W/YP6B8RyLpUGnzYPsxPxMKQxn6RQRV73WPWFE6xrA4g9m6Eeqw3?= =?us-ascii?Q?UNkGFClHpDhjDAVUNaimWfX2avZX8Us7T8yvzYSkXxAJXUXYB4B1jFWSxx/s?= =?us-ascii?Q?OnDQZHo+U2CUWAYVtWI8gVdLsfd5Hr9c7CboZASNU5/FxpGPHITTMD+2bWYJ?= =?us-ascii?Q?cdB/o9uzfJXBSo+fvzAqWeFBigd+Y0bLAbtFap8pAcNzXELbaS+3SQ8LoMxS?= =?us-ascii?Q?Unx9Nw7dkDEvnp983fkJQFjiLrgrFAXPueHJLo90s4b/Lq1nlKJ8treRwXVA?= =?us-ascii?Q?0nlNphCfZf6mvVv2Pw6qHpXfkM6QQkNP1mK0/gNP5dHUPP5zwqgI2v0B+C6/?= =?us-ascii?Q?fmZ0qF4lDXIR8qxOfWD6XMaJ7LOYYTFUdzPLUkkD7x1OFYSDKOzlBJwKN45Y?= =?us-ascii?Q?0UMVc9NVhLniQVrJ5EWypFDCtXlpWlnvH4NJ1OoEW97up0YzGIbcTM489Q9X?= =?us-ascii?Q?2/Ymi6Jhv5NkryNUedrHyqF4B3Zq7A8i7og4Jn9jMX8hjGmlbDYp+eyuOs+y?= =?us-ascii?Q?JeKEpA9hYGQpdbgcKYrbkU9x58A0aazBtM0dd7McuLw5bbiuXH2YKCMtSHIZ?= =?us-ascii?Q?/N2G6Dp+aJeDlNsQmQUS/QsT++z6nUOzILkhcRT9bI1Tpd7v30jIKHET9zPI?= =?us-ascii?Q?uvfXIXrImeVzt98/++xx7Yv0zcYYvLWq+BA+oprrqVN8/6q/UaQ0XhZtpwkF?= =?us-ascii?Q?JweCMHFEzhrinJAA6HfD+16E49ZdCblIbhNowmca5b50mJAYkNUsWcHD4Run?= =?us-ascii?Q?SG6nJlHfogisNJazR0u45c4k38gws0bY7efkaFtMPld4QdPuk62oDnSa8J3Y?= =?us-ascii?Q?zzMdUBbH0Qs4s3hQtNheSYWWnqWkodEtDEtCLKpCA92YDp8nNFzz5UQBNDHd?= =?us-ascii?Q?NmFjXvPPnN7kUB2oAHwxtEayhLP9zjmGn7f7abN99N4jMSelqWVhdGlgw1tV?= =?us-ascii?Q?YqsJftSXUB73kMskhFw19FbMy/MTGIQVtgKXZ5DHImFd/X6ltBXeSPUYm8/8?= =?us-ascii?Q?Rq/SZHk4ApXFCCMJkU62uWlCTPcPVrSr6h7N++lU/QcM8nXXwsqE0qcxXIa9?= =?us-ascii?Q?EnRxfJ0oXufIxQmT4/eLpCoqpapQJrMnewPrHTdEW61J7w1ZaNQKuGlJjAiJ?= =?us-ascii?Q?KJiVobl4oynE2YBcfUxKL9gZ14kFBycDLlNND+PzQ95V7RwVCqdjR2DL3dqA?= =?us-ascii?Q?=3D=3D?= X-Microsoft-Exchange-Diagnostics: 1; BL2PR03MB579; 6:/bz+o2RoMvFAkYEpRT6WjzcBEYinmOrbBHPAfKhoBCP4WaP8RvnicYalPbu+tUeVXw9sEnG4JbyAc7jgghV2sxwv3DqiMgpoCgmbqWrgp0DyRSygk0Mq6b3XV+sWd4b7tNGh1mIWF+37ZQDQ3VyBhJbsTwEoOzWR87Az+qFPonO/Hlg38GRogJkFS1LzMVX15mXDXVui7EAXe33JgKPwQL5b3EXvZp3AMsR95QTNgqw1TLZKzCoqQ97pEOn4y70opOf6K2NyPPiR2ame4KxGNFuXq0OYzKZj7ATbF/cwoVI=; 5:QV/8u1crZX3AxeuR5ZMcexxQHznrDbRAw1IHYoQxeL29BRMLZoXiWbhxsojChmYOkyY+aGhzPLzrhbGjMYp38FDRLt742zWlq2kJkBPDIW6O4nNkG6Nw8rWmouhD1FfQ8roFc7SWnqdEw7QhOQSzYmG4a2+hcRvBj8HLWGDiFHo=; 24:BZowldkL4UleP+L6z+lQZysROgXQhvIeUemd1TXeBVZHp41k5xAJ0DjoOr5z5A1082QiieEGnhUdLc1t9sCfyV+4dUjSCrDdmT9/qEKY5PQ=; 7:m6J4jPlLujgeSBC+DuwwhfrJuyuo5GeK7ckc+de3Oddg46LaEfT8AfWEtIMKn6bW1idckcQrQz4y45VLL2FGjuTXFY2cScHz33etg9H/pzqiG2s6yf093PfensBoDziOJnc9BMN0dMOQTjCUoo++UDzt7EvXe1W+JkeS0FfF3PjXdKbLe27ke3wkHFJkbWuKV3xZrj9iVQOd8W506BZvON1n4Hs6qn9wBCP81OBeObnCS/jExBgymMM0vwvMx94z SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-MS-Exchange-CrossTenant-OriginalArrivalTime: 04 Jul 2016 07:41:12.4078 (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: BL2PR03MB579 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 There is no one using the legacy drm_connector_funcs structure since the imx-drm has been converted to atomic, so we may remove it. Signed-off-by: Liu Ying --- v2->v3: * Newly introduced to remove the legacy drm_connector_funcs structure step-by-step. drivers/gpu/drm/bridge/dw-hdmi.c | 22 +++------------------- 1 file changed, 3 insertions(+), 19 deletions(-) diff --git a/drivers/gpu/drm/bridge/dw-hdmi.c b/drivers/gpu/drm/bridge/dw-hdmi.c index dd5b21a..77ab473 100644 --- a/drivers/gpu/drm/bridge/dw-hdmi.c +++ b/drivers/gpu/drm/bridge/dw-hdmi.c @@ -1495,17 +1495,6 @@ static void dw_hdmi_connector_force(struct drm_connector *connector) } static const struct drm_connector_funcs dw_hdmi_connector_funcs = { - .dpms = drm_helper_connector_dpms, - .fill_modes = drm_helper_probe_single_connector_modes, - .detect = dw_hdmi_connector_detect, - .destroy = dw_hdmi_connector_destroy, - .force = dw_hdmi_connector_force, - .reset = drm_atomic_helper_connector_reset, - .atomic_duplicate_state = drm_atomic_helper_connector_duplicate_state, - .atomic_destroy_state = drm_atomic_helper_connector_destroy_state, -}; - -static const struct drm_connector_funcs dw_hdmi_atomic_connector_funcs = { .dpms = drm_atomic_helper_connector_dpms, .fill_modes = drm_helper_probe_single_connector_modes, .detect = dw_hdmi_connector_detect, @@ -1637,14 +1626,9 @@ static int dw_hdmi_register(struct drm_device *drm, struct dw_hdmi *hdmi) drm_connector_helper_add(&hdmi->connector, &dw_hdmi_connector_helper_funcs); - if (drm_core_check_feature(drm, DRIVER_ATOMIC)) - drm_connector_init(drm, &hdmi->connector, - &dw_hdmi_atomic_connector_funcs, - DRM_MODE_CONNECTOR_HDMIA); - else - drm_connector_init(drm, &hdmi->connector, - &dw_hdmi_connector_funcs, - DRM_MODE_CONNECTOR_HDMIA); + drm_connector_init(drm, &hdmi->connector, + &dw_hdmi_connector_funcs, + DRM_MODE_CONNECTOR_HDMIA); drm_mode_connector_attach_encoder(&hdmi->connector, encoder);