From patchwork Fri Jul 8 09:41:00 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ying Liu X-Patchwork-Id: 9220367 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 9D09F6044F for ; Fri, 8 Jul 2016 09:56:37 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 8C6C228619 for ; Fri, 8 Jul 2016 09:56:37 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 802AE28649; Fri, 8 Jul 2016 09:56:37 +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 0D78028619 for ; Fri, 8 Jul 2016 09:56:36 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 3EC336E8E2; Fri, 8 Jul 2016 09:56:32 +0000 (UTC) X-Original-To: dri-devel@lists.freedesktop.org Delivered-To: dri-devel@lists.freedesktop.org Received: from NAM03-CO1-obe.outbound.protection.outlook.com (mail-co1nam03on0041.outbound.protection.outlook.com [104.47.40.41]) by gabe.freedesktop.org (Postfix) with ESMTPS id 123C46E8E2 for ; Fri, 8 Jul 2016 09:56:30 +0000 (UTC) Received: from BN3PR0301CA0039.namprd03.prod.outlook.com (10.160.180.177) by BLUPR0301MB2020.namprd03.prod.outlook.com (10.164.22.22) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384_P384) id 15.1.528.16; Fri, 8 Jul 2016 09:41:36 +0000 Received: from BL2FFO11FD050.protection.gbl (2a01:111:f400:7c09::118) by BN3PR0301CA0039.outlook.office365.com (2a01:111:e400:4000::49) 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; Fri, 8 Jul 2016 09:41:36 +0000 Authentication-Results: spf=softfail (sender IP is 192.88.168.50) 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.168.50 as permitted sender) Received: from tx30smr01.am.freescale.net (192.88.168.50) by BL2FFO11FD050.mail.protection.outlook.com (10.173.161.212) with Microsoft SMTP Server (TLS) id 15.1.523.9 via Frontend Transport; Fri, 8 Jul 2016 09:41:35 +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 u689fBMu003192; Fri, 8 Jul 2016 02:41:33 -0700 From: Liu Ying To: Subject: [PATCH v4 08/10] drm/bridge: dw-hdmi: Remove the legacy drm_connector_funcs structure Date: Fri, 8 Jul 2016 17:41:00 +0800 Message-ID: <1467970862-28012-9-git-send-email-gnuiyl@gmail.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1467970862-28012-1-git-send-email-gnuiyl@gmail.com> References: <1467970862-28012-1-git-send-email-gnuiyl@gmail.com> X-EOPAttributedMessage: 0 X-Matching-Connectors: 131124444960080370; (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)(7916002)(2980300002)(199003)(189002)(2950100001)(6806005)(55446002)(50466002)(87936001)(586003)(356003)(48376002)(104016004)(2906002)(19580405001)(305945005)(4326007)(77096005)(86362001)(6260500002)(7846002)(189998001)(8676002)(8936002)(61266001)(47776003)(5890100001)(110136002)(92566002)(83322999)(81442002)(81166006)(82202001)(76482005)(97736004)(229853001)(76176999)(36756003)(50986999)(11100500001)(33646002)(105596002)(106466001)(5003940100001)(73972006)(2351001)(87572001)(73392002)(50226002)(81156014)(68736007)(19580395003); DIR:OUT; SFP:1101; SCL:1; SRVR:BLUPR0301MB2020; H:tx30smr01.am.freescale.net; FPR:; SPF:SoftFail; PTR:InfoDomainNonexistent; A:1; MX:1; LANG:en; X-Microsoft-Exchange-Diagnostics: 1; BL2FFO11FD050; 1:Fft+IjuCIXJ+S1L8hiNhgXK0VLHgegOsTZRo3wgEeSkXMbyiEJGXCdQXdQu7BD9lCW3GNNaY1C2ulCbvuLWE3mEJhYavUPVZ9nAn9iB59WtDFBgRYhZmWFeba4IAvaENnnMLfgOIOAeLqGKf/MBSP/97SnS6QWDYCpQy8YbcDQPGC0OhAiQsNG+cYBKQqtTua/KAzeX++T1sDzP6lhJZdS7yOgaCp477Bb1BGWfgSnr+PxLg7B7HJtGdzV6cCCX7t7dsFNgYvhGFJY0Mtc2Gzk6F0TjwP4Zs+S6Oazh48X7+i1BvWZpnvpuyqDA5Qoel0lfEQIIoIqYiklTCa5/Lt0F+VqdlyT26yhTFt5/3/AV+CJ/TY+7DlBJK1Vq+1xjDwyjTXrUr8cM8tAU8fYmlS9PKOc24mmJMgaLu7ueDBwHL0OI+SIbUQRKfLDzv2io8mpi2yaFGLnOHMRRO1KAG+cp03nzpcwCf1GSa+MdNbLAzMk8M26JQwt0g2WWlt5mnpkA+cwWPY6i01H4Xn2dlp8TTEgSOxN6TxKrFSIH8bfNyCLuCnubbvBnN/HGC8lT+ZWONqFPrAjPUWGvTbcd2Xw== MIME-Version: 1.0 X-MS-Office365-Filtering-Correlation-Id: bee7e3bd-5df3-454a-e093-08d3a7140dab X-Microsoft-Exchange-Diagnostics: 1; BLUPR0301MB2020; 2:ZjaTyncGr2HmH8jXpWAF5K4PEFkiDQ/gNBzxRGztLxlYsMotSrsNFuBDeLfo/AM8RMMd8O/lGrbAnP0DMGWmiV/v+jbRLH2uH0fEo8sFECIdkm2FsKmoPe5vuOHdqZCp+vLk5IGp/EvTlN+euzKejw6zZxELCXFG8WE+qsQNIFg7/ExwiAqKhvnAkatR8Q3s; 3:gEFvvFL+RfnaagWBJaQQugFIyHqDogsQ01v2CFi2PBckEQEOu0c5ghLAthvsu1M6Vo9nAO9aG78vY/ekePlF0yRM/ydPlgz4mMmQlz2qQadXVMnw66c24ghlEW7IYwUQuxoiq2ovyNEgKtX6GURBct8/AC7eSOHDlq1RJmS2Znr0QI2QKN80xk6N3b7DgSRBMV3pHXLjpDmkyNyjAQWKhDN7m44p26Zd33AjyVviDBQ=; 25:Tj9p8O8WUEMHRrJZQcOKKk42Z3GyLGoU1ogeuXrmgJq40Hphw12iQG/v1Me2g4YaPLCt/qgVNuqOuPq+sv2LK8vL69IHVT902CPodMH0Wt+VZUroXAHB3TH39lckkui+WJ5MAslFsRrJEaSRVZO3xm3i/Dna/gkjhL2gxd20yghZXbZNEVHlpfp7NrEvQIarJI1IchU55oIzwhnPNwzr+BxeAh/kvoxlnDuyCeyduzDhPuT05O0hXAuc/31sdza/XueFH4uqbOd6PUjG4pYSEg6OV1Hx5+FdvdTPgvUpzVRx8JSyVF5eDn7eG2xvPMCdY1dXAGP8CtaZdFJ54CxSdECBtUPq0x0iITFom05cJQHCGPlY0EVPa3Zob1u7uD0RO47Jid+wXhwStep5XAzua0yyr4obXwmWRrAmPFb17KY= X-Microsoft-Antispam: UriScan:;BCL:0;PCL:0;RULEID:;SRVR:BLUPR0301MB2020; X-Microsoft-Exchange-Diagnostics: 1; BLUPR0301MB2020; 31:T8HX9IYMqYearaSTFgBvx4KSbXktlXqfHr26gYLKOosx45paKRskk8foWXw0Q0jfIQvrTZqGuMrrLl9luodtl77O2SgJZ2kn1X65j8//emISvLZDrG0jgHsrSbfTHR5An97VDrhy1DnN6tscQiQXzXX6EGn0Xu5NEd232yIHhkttt3TFXC6nFUBw2VlMGTCzxRi5L5TbB+CSQz2oDBv9hA==; 4:yzCoU/Q57rD2NQ6YVnyQ8MnczaZFaNQeQknsgS3aCSvKvsioWnEj8oUtpjNzMojGSZx6RtRv5m637SCRsMSH/KEci2N09vtMTdl+PiC3SvKgAqvN/XkbcUx5yfwmKhmqi8NZnI9MvP1elTSk7EkwzyErXmTCDHJtMlbeIKbzao1iDj1zmL+yx8dlhp7ptj/sbzrY7WTcRAqun2slHrZcgHWdAxwoddVz48iY+6RBpZSUnrLZRv0E0j7rPw/zNcqOm96PnXy+0/iRm2ExRJXX3WA3A477KS9Ox4LKzMGkmwxnmg0Hs72YEVooyhLAMsnm8C+tDhgQu+5oI9qjprqsimGXa1X+sE+S8GW7NPMavYCqa/er7R1DtFHnEKizT7qLFyOkFpgsEk5SlC4xbKW2sDL9iq93uOH1kc6ZNz1K7dwjfzv1uYcdRF615mBUZEr5HpCJW8hPaZmu1blJqdAguXJRw/DCNcgecnFBcsSgm+0= X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:; X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(601004)(2401047)(13023025)(13018025)(13024025)(13015025)(13017025)(5005006)(8121501046)(10201501046)(3002001)(6055026); SRVR:BLUPR0301MB2020; BCL:0; PCL:0; RULEID:(400006); SRVR:BLUPR0301MB2020; X-Forefront-PRVS: 0997523C40 X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; BLUPR0301MB2020; 23:kOtlxGawr9IWowLFUn5G6zzsb+pRZLoYsBTO4wg?= =?us-ascii?Q?nO6luekVcJ8jV9XoNjoHnu4Nw0M3qwHD4BmOwVaYchz8z5WcEywp3XnGLoFa?= =?us-ascii?Q?YLTd4JYH+/aPECPZz6elvxPOPxLtm4W7z5N9gfOfiycHE5c7Ki+cTdI56EML?= =?us-ascii?Q?nNHdPHSJhDVQk2tseg5/VB4bbGOmEM5Kx8LAjhPjuRGIHCwIseVHVRXN+SeG?= =?us-ascii?Q?SSxWdmoSgWZaIE422BnDQPY/zk/sIIKeV44vceBVvzGhsethlYKyIXsxayp1?= =?us-ascii?Q?cBQY5adpWr+oRn/edLeqM65QZvnjNU4RPLV53kAB4AGa7+o5LY5wsf/FoagY?= =?us-ascii?Q?n24F/zPaPFTqajSYcNfba3Q43Yu4P71yo5TFBha11cyo7NrohaRGJHs/wRHb?= =?us-ascii?Q?pG/qy/UBqK+RVEDcJ8Fmi2SAeiJulDBNYe4bZF+LVhtYNESDxNqOw9GE7W30?= =?us-ascii?Q?qtmxuucCmHLWVGNb3yYx+2Zz/BkcMKkNBV4WomQvayuXqPyGhDxtbMPwp/kW?= =?us-ascii?Q?h0qPwrbwA2TTfCfJgUL3xMJ5ZPwi46gp0eWkrZnKhspHtEDbNZy5UVD8oV+j?= =?us-ascii?Q?uAsrd4Vz+mf2fA74/cSFnAvAXcUo0jMny/h09TTAu582NS//1efPrZ9fSz2g?= =?us-ascii?Q?bIgthkMRLvq1irpdvUdNZpyBXIHKkgYydcHhMXd3dkplxTxNhNmTHuZyLZGu?= =?us-ascii?Q?+p/vybEa6ATkfK4YBXQt0+MkuDQJq+9b0fO642RSx+BNSaKj9ZXolW3tJnpo?= =?us-ascii?Q?pYTY2feASWXOjUOThKZWBtJQU8RafX1TOjW4NQAGLM5Cl8oIQPesoBgEfhT/?= =?us-ascii?Q?14vsLZFKjs3Igb6Hwz1Vfx8l+Vv6g7qtbqixkrTl1uyVUSow4j+Htt+icIBV?= =?us-ascii?Q?w14gudaNKvxZDiPyQ2pb7+5aM6yVl+tQkMhh9GlU5TlzeIZ72SgA4Z0pr/E/?= =?us-ascii?Q?K6HuLgGBTU3w519d+VJN9SpTP9AnAP30SGywhL/KA6fiWDO/smytiz7j/mSw?= =?us-ascii?Q?VxJAEcju0OVXa7XK23iedEIxBzxXs3uopieCcR/GXz1ZvuD32NHa97NyQXL0?= =?us-ascii?Q?gEQt1pPO9C42RjWqNclYch+zz062c8Rjpz9YwVXhGjj5qew2Jukp9iZR9eC/?= =?us-ascii?Q?dErjSM9FTIq4IV0Fh/A/GKrcQfQyM518EiOinuzBFRGevMjhZjKas5Nx6BTK?= =?us-ascii?Q?jXyoHIYR3W+VInLqU2A2vQ+RrZLqsRRQbdNY8oMR3T5MNUAeSCNnA9XQUO9d?= =?us-ascii?Q?hK0AS51yc8r30z64rJEjTXL5cTEaJ4FitqQhRlAOw?= X-Microsoft-Exchange-Diagnostics: 1; BLUPR0301MB2020; 6:VRlLNlIU81WrZTGbE1roXQ4GaBuOTJNQ+Mvq2ANrsD5cn9GxkpOPpu/04ew0oqVwy4QPZ1JIFlJPNu4DWxaa92cC9Ibkx3GCA6PKprTWNv0eUseAdC8N7HikeCFmA2bno3YCl/tSWaPe9DCxEQgYpteNGvczbZiMhhK6j9WEh4XmtFLSvDxMoL/lkTh7gbx9NXsHh/Y+3asRTFc/Q+MO7in4isRYWYRKUiMLPzbN+V8eeXfWYGdxFhGXPvOvh7Egf7ds8IoBUcuQKQgTTSyf9gLNSdprwwr0CQbGny5nUrI=; 5:9sBJVYfSGrWRNcNhcQH3gkn2MHyKJ8D1ZE6LKKnHCjpuV+A5Za0Of0oaGLKUPzldJCiOiFnCnB6saOi7uTz2fEJ6rAQT/qidxFLz44G9DL5YA54l4MfVFmpVhN7k+KX4tFPd3PSYvOtVaGSzNmIvjxcpO52xDEw7YHiHgD9PX2U=; 24:PNZ8FrrSWuQihsA82x6FiLYyIT/UOZQMjWOytedefkzY4dDSKchxso8YHtYum8Nwh/Cfj24Gzkebz/GOOQgqu2ad/hG7u9MNW0J7gTFkXBs=; 7:ymZiOu4/NKtRN8C8aK21sMu7A2pVEWKHSCUmj274NK+gUjW2rPZJe0hlMIMDoXyCVh0plyTZ1cXKra+qlfLBZacwYH5ZrfUxbRCp55vhinDuGOzK4sIaj54e6pOlPDqXDfC7caKsWktEQ2Bh2KF8uaW7DnpSvHqOFB9XmSs1y3VXsulPtrpXvFLFIJwn/C8O8fN8Lb68TPuRVMVOmT91Dhu5SjdwH3cEf8/mHgQ85l80LlKoGMRYKyqvbBhO7mKP SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-MS-Exchange-CrossTenant-OriginalArrivalTime: 08 Jul 2016 09:41:35.8208 (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: BLUPR0301MB2020 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 --- v3->v4: * None. 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);