From patchwork Thu Jan 29 09:14:30 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Ajay Kumar X-Patchwork-Id: 5744071 Return-Path: X-Original-To: patchwork-dri-devel@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork2.web.kernel.org (Postfix) with ESMTP id E2055BF6C3 for ; Thu, 29 Jan 2015 17:03:35 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 11FE2200F4 for ; Thu, 29 Jan 2015 17:03:35 +0000 (UTC) Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) by mail.kernel.org (Postfix) with ESMTP id D5B2C20108 for ; Thu, 29 Jan 2015 17:03:33 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id D1E2F7209B; Thu, 29 Jan 2015 09:03:32 -0800 (PST) X-Original-To: dri-devel@lists.freedesktop.org Delivered-To: dri-devel@lists.freedesktop.org Received: from mailout1.samsung.com (mailout1.samsung.com [203.254.224.24]) by gabe.freedesktop.org (Postfix) with ESMTP id C3A336E6F4 for ; Thu, 29 Jan 2015 01:22:50 -0800 (PST) MIME-version: 1.0 Received: from epcpsbgr5.samsung.com (u145.gpu120.samsung.co.kr [203.254.230.145]) by mailout1.samsung.com (Oracle Communications Messaging Server 7u4-24.01 (7.0.4.24.0) 64bit (built Nov 17 2011)) with ESMTP id <0NIX003GWM215T10@mailout1.samsung.com> for dri-devel@lists.freedesktop.org; Thu, 29 Jan 2015 18:22:49 +0900 (KST) Received: from epcpsbgm2.samsung.com ( [172.20.52.124]) by epcpsbgr5.samsung.com (EPCPMTA) with SMTP id F0.04.19034.9EBF9C45; Thu, 29 Jan 2015 18:22:49 +0900 (KST) X-AuditID: cbfee691-f79b86d000004a5a-87-54c9fbe9f137 Received: from epmmp1.local.host ( [203.254.227.16]) by epcpsbgm2.samsung.com (EPCPMTA) with SMTP id 76.77.09430.8EBF9C45; Thu, 29 Jan 2015 18:22:49 +0900 (KST) Received: from chromebld-server.sisodomain.com ([107.108.73.106]) by mmp1.samsung.com (Oracle Communications Messaging Server 7u4-24.01(7.0.4.24.0) 64bit (built Nov 17 2011)) with ESMTPA id <0NIX000H9M1D3P40@mmp1.samsung.com>; Thu, 29 Jan 2015 18:22:48 +0900 (KST) From: Ajay Kumar To: dri-devel@lists.freedesktop.org, linux-next@vger.kernel.org Subject: [PATCH] drm/bridge: sti_dvo: adapt to updated bridge API Date: Thu, 29 Jan 2015 14:44:30 +0530 Message-id: <1422522870-25693-1-git-send-email-ajaykumar.rs@samsung.com> X-Mailer: git-send-email 2.2.0 X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFlrCIsWRmVeSWpSXmKPExsWyRsSkRvfl75MhBrsncllcvbWAyeLA+4Ms FhveLGS2WLb2H4vFla/v2Swm3Z/AYnFwYRujxbW9x5ktVh3ewG4x92Cuxc9d81gcuD12zrrL 7rFgU6nH/e7jTB7v911l8+jbsorR4/MmOY/1W7YyBbBHcdmkpOZklqUW6dslcGVs/b+FraBB tGLeXrkGxslCXYycHBICJhI9b/oZIWwxiQv31rOB2EICSxklnr+th6npuvCZtYuRCyi+iFFi 24LXrCAJXgFBiR+T77F0MXJwMAvISxy5lA0SZhZQl5g0bxEzRP0EJonP+9+xgyTYBLQltk2/ yQJiiwjYSzRfmMkOUsQs8IpR4l/7TjaQQcICjhIHb8qA1LAIqEp8fniKDWKXh8TUo4eYIQ6S k9hy6xFYr4TAI3aJttNfWSAaBCS+TT4EdpCEgKzEpgNQ9ZISB1fcYJnAKDILydmzEM6eheTs BYzMqxhFUwuSC4qT0otM9YoTc4tL89L1kvNzNzECI+/0v2cTdzDeP2B9iFGAg1GJhzeh8WSI EGtiWXFl7iFGU6AjJjJLiSbnA+M7ryTe0NjMyMLUxNTYyNzSTEmcV0f6Z7CQQHpiSWp2ampB alF8UWlOavEhRiYOTqkGxjlXzNuaVvL1CMtabSu4eTH884dbr87yc7/am3W8UIvhg6KQyOLi o/d99hx6XmGcUfk53WyvwtFvMt8iunimS5T8Kf5goqmfc2nR9Ve5c61+XD3D0jhLvfve4/lB /aZ/rz21XdQrvHDvtROsOr3rMvo2mnFc2Xi5bfqOBfb2dnc/cxfsOrv+yWolluKMREMt5qLi RADfditvtwIAAA== X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFnrPIsWRmVeSWpSXmKPExsVy+t9jAd2Xv0+GGHxqZrK4emsBk8WB9wdZ LDa8WchssWztPxaLK1/fs1lMuj+BxeLgwjZGi2t7jzNbrDq8gd1i7sFci5+75rE4cHvsnHWX 3WPBplKP+93HmTze77vK5tG3ZRWjx+dNch7rt2xlCmCPamC0yUhNTEktUkjNS85PycxLt1Xy Do53jjc1MzDUNbS0MFdSyEvMTbVVcvEJ0HXLzAG6UUmhLDGnFCgUkFhcrKRvh2lCaIibrgVM Y4Sub0gQXI+RARpIWMOYsfX/FraCBtGKeXvlGhgnC3UxcnJICJhIdF34zAphi0lcuLeerYuR i0NIYBGjxLYFr8ESvAKCEj8m32PpYuTgYBaQlzhyKRskzCygLjFp3iJmiPoJTBKf979jB0mw CWhLbJt+kwXEFhGwl2i+MJMdpIhZ4BWjxL/2nWwgg4QFHCUO3pQBqWERUJX4/PAUG8QuD4mp Rw8xQxwkJ7Hl1iP2CYx8s5CcMQvhjFlIzljAyLyKUTS1ILmgOCk910ivODG3uDQvXS85P3cT Iziyn0nvYFzVYHGIUYCDUYmHN6HxZIgQa2JZcWXuIUYJDmYlEV7xN0Ah3pTEyqrUovz4otKc 1OJDjKZAB05klhJNzgcmnbySeENjE3NTY1NLEwsTM0slcV4l+7YQIYH0xJLU7NTUgtQimD4m Dk6pBsYucemD+QvXu+zTuTbZOub5O39FHz33lugjXrr83Gdf3nd3+2Xvb1i6s+9PmZqJy5yf s8wUK42u77+3M0nb5puLtVZ4ucmnNd+T9Gc7Ljx2ddnsLR/iRRP7L665X1/N8Feh+1qap+fh +UcbZv3YsuFJltRugYKDElVhDGI1LMemB+Uc0lXfxqzEUpyRaKjFXFScCAC0PC3DAgMAAA== DLP-Filter: Pass X-MTR: 20000000000000000@CPGS X-CFilter-Loop: Reflected X-Mailman-Approved-At: Thu, 29 Jan 2015 09:03:27 -0800 Cc: seanpaul@google.com, paul.gortmaker@windriver.com, ajaynumb@gmail.com, airlied@redhat.com, bhushan.r@samsung.com, prashanth.g@samsung.com, Ajay Kumar 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=BAYES_00, RCVD_IN_DNSWL_MED, T_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 Commits 8eb17f05bc1802b50f8b536406357b87f63cf61d ("drm/bridge: do not pass drm_bridge_funcs to drm_bridge_init") and fbc4572e9c48e45bdfeb2ee8c8f0198b3e70c030 ("drm/bridge: make bridge registration independent of drm flow") changed the bridge API without taking into account sti_dvo bridge which caused the following build breakage on linux-next: drivers/gpu/drm/sti/sti_dvo.c: In function ‘sti_dvo_brigde_destroy’: drivers/gpu/drm/sti/sti_dvo.c:277:2: error: implicit declaration of function ‘drm_bridge_cleanup’ drivers/gpu/drm/sti/sti_dvo.c: At top level: drivers/gpu/drm/sti/sti_dvo.c:287:2: error: unknown field ‘destroy’ specified in initializer drivers/gpu/drm/sti/sti_dvo.c: In function ‘sti_dvo_bind’: drivers/gpu/drm/sti/sti_dvo.c:419:2: error: implicit declaration of function ‘drm_bridge_init’ Make the necessary changes to sti_dvo bridge in order to fix the build breakage. Signed-off-by: Ajay Kumar --- This patch contains the minimal changes needed instead of having this: http://cgit.freedesktop.org/~airlied/linux/commit/?h=drm-next&id=384764c3611645d96889742a079168c86a6fc4c4 drivers/gpu/drm/sti/sti_dvo.c | 11 ++--------- 1 file changed, 2 insertions(+), 9 deletions(-) diff --git a/drivers/gpu/drm/sti/sti_dvo.c b/drivers/gpu/drm/sti/sti_dvo.c index 651afad..1088fc5 100644 --- a/drivers/gpu/drm/sti/sti_dvo.c +++ b/drivers/gpu/drm/sti/sti_dvo.c @@ -272,19 +272,12 @@ static void sti_dvo_bridge_nope(struct drm_bridge *bridge) /* do nothing */ } -static void sti_dvo_brigde_destroy(struct drm_bridge *bridge) -{ - drm_bridge_cleanup(bridge); - kfree(bridge); -} - static const struct drm_bridge_funcs sti_dvo_bridge_funcs = { .pre_enable = sti_dvo_pre_enable, .enable = sti_dvo_bridge_nope, .disable = sti_dvo_disable, .post_disable = sti_dvo_bridge_nope, .mode_set = sti_dvo_set_mode, - .destroy = sti_dvo_brigde_destroy, }; static int sti_dvo_connector_get_modes(struct drm_connector *connector) @@ -416,7 +409,8 @@ static int sti_dvo_bind(struct device *dev, struct device *master, void *data) return -ENOMEM; bridge->driver_private = dvo; - drm_bridge_init(drm_dev, bridge, &sti_dvo_bridge_funcs); + bridge->funcs = &sti_dvo_bridge_funcs; + drm_bridge_attach(drm_dev, bridge); encoder->bridge = bridge; connector->encoder = encoder; @@ -446,7 +440,6 @@ static int sti_dvo_bind(struct device *dev, struct device *master, void *data) err_sysfs: drm_connector_unregister(drm_connector); err_connector: - drm_bridge_cleanup(bridge); drm_connector_cleanup(drm_connector); return -EINVAL; }