From patchwork Tue Feb 14 07:51:54 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Marek Szyprowski X-Patchwork-Id: 93926 Delivered-To: patch@linaro.org Received: by 10.140.20.99 with SMTP id 90csp1447333qgi; Mon, 13 Feb 2017 23:52:39 -0800 (PST) X-Received: by 10.99.143.90 with SMTP id r26mr31495179pgn.128.1487058759781; Mon, 13 Feb 2017 23:52:39 -0800 (PST) Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id 128si12354946pgg.245.2017.02.13.23.52.39; Mon, 13 Feb 2017 23:52:39 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of linux-media-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of linux-media-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-media-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752320AbdBNHwW (ORCPT + 4 others); Tue, 14 Feb 2017 02:52:22 -0500 Received: from mailout1.w1.samsung.com ([210.118.77.11]:39229 "EHLO mailout1.w1.samsung.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751453AbdBNHwT (ORCPT ); Tue, 14 Feb 2017 02:52:19 -0500 Received: from eucas1p1.samsung.com (unknown [182.198.249.206]) by mailout1.w1.samsung.com (Oracle Communications Messaging Server 7.0.5.31.0 64bit (built May 5 2014)) with ESMTP id <0OLC002L2TV4TB20@mailout1.w1.samsung.com>; Tue, 14 Feb 2017 07:52:16 +0000 (GMT) Received: from eusmges4.samsung.com (unknown [203.254.199.244]) by eucas1p1.samsung.com (KnoxPortal) with ESMTP id 20170214075215eucas1p10948afb21945ac790d3a074d56503259~jGAqKSo002457524575eucas1p1Y; Tue, 14 Feb 2017 07:52:15 +0000 (GMT) Received: from eucas1p2.samsung.com ( [182.198.249.207]) by eusmges4.samsung.com (EUCPMTA) with SMTP id 20.3B.28517.F27B2A85; Tue, 14 Feb 2017 07:52:15 +0000 (GMT) Received: from eusmgms1.samsung.com (unknown [182.198.249.179]) by eucas1p1.samsung.com (KnoxPortal) with ESMTP id 20170214075214eucas1p10569ef126fbab2e3f3ca2c9818c9b4d6~jGApYkP182142821428eucas1p1-; Tue, 14 Feb 2017 07:52:14 +0000 (GMT) X-AuditID: cbfec7f4-f79716d000006f65-f6-58a2b72f4975 Received: from eusync2.samsung.com ( [203.254.199.212]) by eusmgms1.samsung.com (EUCPMTA) with SMTP id FA.5E.06687.D77B2A85; Tue, 14 Feb 2017 07:53:33 +0000 (GMT) Received: from AMDC2765.digital.local ([106.116.147.25]) by eusync2.samsung.com (Oracle Communications Messaging Server 7.0.5.31.0 64bit (built May 5 2014)) with ESMTPA id <0OLC00FWGTUYP980@eusync2.samsung.com>; Tue, 14 Feb 2017 07:52:14 +0000 (GMT) From: Marek Szyprowski To: linux-media@vger.kernel.org, linux-samsung-soc@vger.kernel.org Cc: Marek Szyprowski , Sylwester Nawrocki , Andrzej Hajda , Krzysztof Kozlowski , Inki Dae , Seung-Woo Kim Subject: [PATCH 01/15] media: s5p-mfc: Remove unused structures and dead code Date: Tue, 14 Feb 2017 08:51:54 +0100 Message-id: <1487058728-16501-2-git-send-email-m.szyprowski@samsung.com> X-Mailer: git-send-email 1.9.1 In-reply-to: <1487058728-16501-1-git-send-email-m.szyprowski@samsung.com> X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFjrMIsWRmVeSWpSXmKPExsWy7djP87r62xdFGPz8yWdxa905VotJ9yew WJw/v4HdomfDVlaLGef3MVmsPXKX3eLwm3Ygd/JLNgcOj02rOtk8+rasYvT4vEkugDmKyyYl NSezLLVI3y6BK+P7rP/MBaeVK6as6WJrYLwk28XIySEhYCKxoWMZG4QtJnHh3nogm4tDSGAp o8SqvU9YIJzPjBI/739g7GLkAOvYtDcZIr6MUeLijAvsEE4Dk8TevgMsIKPYBAwlut52gY0V EXCSWDjrL1gRs8B3Rolvu0+zgiSEBfwlpp36xghiswioStx6/ZoFZAOvgIfErxlJECfJSZw8 NhmsnFPAU2LT5ymMIHMkBF6zSfROv80CcZGsxKYDzBD1LhLbPz5kgrCFJV4d38IOYctIdHYc hIr3M0o0tWpD2DMYJc695YWwrSUOH78ItotZgE9i0rbpzBDjeSU62oQgSjwkrs45zAhhO0pc fjILGkBzGCWmT5nNMoFRZgEjwypGkdTS4tz01GITveLE3OLSvHS95PzcTYzAqD397/iXHYyL j1kdYhTgYFTi4bXYtzBCiDWxrLgy9xCjBAezkggvQ++iCCHelMTKqtSi/Pii0pzU4kOM0hws SuK8exZcCRcSSE8sSc1OTS1ILYLJMnFwSjUwmqge+Held8ukt1ZHTPdJvPrxUmxT5wl/5v/T rj8rPfWV+X/O4+u5k+PN554wdfjp5Nmnrq12RUe6zGy6z+ystRPecdvecbjYVbV5T72H1sQT s28kxutVK563Zy2WCtptPpHpRerpm2ohf49Uvcq4OucWX/sMgb23FU/ciPnBK7l80f2lF47/ +a7EUpyRaKjFXFScCAAN9xbP1gIAAA== X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFnrELMWRmVeSWpSXmKPExsVy+t/xK7q12xdFGKyYr2Vxa905VotJ9yew WJw/v4HdomfDVlaLGef3MVmsPXKX3eLwm3Ygd/JLNgcOj02rOtk8+rasYvT4vEkugDnKzSYj NTEltUghNS85PyUzL91WKTTETddCSSEvMTfVVilC1zckSEmhLDGnFMgzMkADDs4B7sFK+nYJ bhnfZ/1nLjitXDFlTRdbA+Ml2S5GDg4JAROJTXuTuxg5gUwxiQv31rN1MXJxCAksYZTov7WV GcJpYpLoe7+DGaSKTcBQouttFxuILSLgJLFw1l92EJtZ4DujxLKbaSC2sICvxKu13WA1LAKq Erdev2YBWcYr4CHxa0YSxDI5iZPHJrOC2JwCnhKbPk9hBLGFgErOrtnBPoGRdwEjwypGkdTS 4tz03GJDveLE3OLSvHS95PzcTYzA8N127OfmHYyXNgYfYhTgYFTi4Z1wYGGEEGtiWXFl7iFG CQ5mJRFeht5FEUK8KYmVValF+fFFpTmpxYcYTYFumsgsJZqcD4ytvJJ4QxNDc0tDI2MLC3Mj IyVx3pIPV8KFBNITS1KzU1MLUotg+pg4OKUaGEWPGPeVlrYmW1qn7/nKYbHItv97pNWh7cdT OlVOVpX//6vuer7T40Bkqtq3rMfi2mrvBHZ9rXtQY+//wCGIpTJ077kr8TZ/ckKtHbd9euLx 1/3+89nlZ182CcvHhnL+2VkeaHa+rVH2eJXcpGk2c258iuYt1Nd9fC4n/MM1f6ctJmkGM9e0 KrEUZyQaajEXFScCACi7PIt1AgAA X-MTR: 20000000000000000@CPGS X-CMS-MailID: 20170214075214eucas1p10569ef126fbab2e3f3ca2c9818c9b4d6 X-Msg-Generator: CA X-Sender-IP: 182.198.249.179 X-Local-Sender: =?utf-8?q?Marek_Szyprowski=1BSRPOL-Kernel_=28TP=29=1B?= =?utf-8?b?7IK87ISx7KCE7J6QG1NlbmlvciBTb2Z0d2FyZSBFbmdpbmVlcg==?= X-Global-Sender: =?utf-8?q?Marek_Szyprowski=1BSRPOL-Kernel_=28TP=29=1BSam?= =?utf-8?q?sung_Electronics=1BSenior_Software_Engineer?= X-Sender-Code: =?utf-8?q?C10=1BEHQ=1BC10CD02CD027392?= CMS-TYPE: 201P X-HopCount: 7 X-CMS-RootMailID: 20170214075214eucas1p10569ef126fbab2e3f3ca2c9818c9b4d6 X-RootMTR: 20170214075214eucas1p10569ef126fbab2e3f3ca2c9818c9b4d6 References: <1487058728-16501-1-git-send-email-m.szyprowski@samsung.com> Sender: linux-media-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-media@vger.kernel.org Remove unused structures, definitions and functions that are no longer called from the driver code. Signed-off-by: Marek Szyprowski --- drivers/media/platform/s5p-mfc/s5p_mfc.c | 21 --------------------- drivers/media/platform/s5p-mfc/s5p_mfc_common.h | 13 ------------- drivers/media/platform/s5p-mfc/s5p_mfc_ctrl.h | 1 - 3 files changed, 35 deletions(-) -- 1.9.1 diff --git a/drivers/media/platform/s5p-mfc/s5p_mfc.c b/drivers/media/platform/s5p-mfc/s5p_mfc.c index 05fe82be6584..3e1f22eb4339 100644 --- a/drivers/media/platform/s5p-mfc/s5p_mfc.c +++ b/drivers/media/platform/s5p-mfc/s5p_mfc.c @@ -1422,16 +1422,11 @@ static int s5p_mfc_resume(struct device *dev) .priv = &mfc_buf_size_v5, }; -static struct s5p_mfc_buf_align mfc_buf_align_v5 = { - .base = MFC_BASE_ALIGN_ORDER, -}; - static struct s5p_mfc_variant mfc_drvdata_v5 = { .version = MFC_VERSION, .version_bit = MFC_V5_BIT, .port_num = MFC_NUM_PORTS, .buf_size = &buf_size_v5, - .buf_align = &mfc_buf_align_v5, .fw_name[0] = "s5p-mfc.fw", .clk_names = {"mfc", "sclk_mfc"}, .num_clocks = 2, @@ -1452,16 +1447,11 @@ static int s5p_mfc_resume(struct device *dev) .priv = &mfc_buf_size_v6, }; -static struct s5p_mfc_buf_align mfc_buf_align_v6 = { - .base = 0, -}; - static struct s5p_mfc_variant mfc_drvdata_v6 = { .version = MFC_VERSION_V6, .version_bit = MFC_V6_BIT, .port_num = MFC_NUM_PORTS_V6, .buf_size = &buf_size_v6, - .buf_align = &mfc_buf_align_v6, .fw_name[0] = "s5p-mfc-v6.fw", /* * v6-v2 firmware contains bug fixes and interface change @@ -1486,16 +1476,11 @@ static int s5p_mfc_resume(struct device *dev) .priv = &mfc_buf_size_v7, }; -static struct s5p_mfc_buf_align mfc_buf_align_v7 = { - .base = 0, -}; - static struct s5p_mfc_variant mfc_drvdata_v7 = { .version = MFC_VERSION_V7, .version_bit = MFC_V7_BIT, .port_num = MFC_NUM_PORTS_V7, .buf_size = &buf_size_v7, - .buf_align = &mfc_buf_align_v7, .fw_name[0] = "s5p-mfc-v7.fw", .clk_names = {"mfc", "sclk_mfc"}, .num_clocks = 2, @@ -1515,16 +1500,11 @@ static int s5p_mfc_resume(struct device *dev) .priv = &mfc_buf_size_v8, }; -static struct s5p_mfc_buf_align mfc_buf_align_v8 = { - .base = 0, -}; - static struct s5p_mfc_variant mfc_drvdata_v8 = { .version = MFC_VERSION_V8, .version_bit = MFC_V8_BIT, .port_num = MFC_NUM_PORTS_V8, .buf_size = &buf_size_v8, - .buf_align = &mfc_buf_align_v8, .fw_name[0] = "s5p-mfc-v8.fw", .clk_names = {"mfc"}, .num_clocks = 1, @@ -1535,7 +1515,6 @@ static int s5p_mfc_resume(struct device *dev) .version_bit = MFC_V8_BIT, .port_num = MFC_NUM_PORTS_V8, .buf_size = &buf_size_v8, - .buf_align = &mfc_buf_align_v8, .fw_name[0] = "s5p-mfc-v8.fw", .clk_names = {"pclk", "aclk", "aclk_xiu"}, .num_clocks = 3, diff --git a/drivers/media/platform/s5p-mfc/s5p_mfc_common.h b/drivers/media/platform/s5p-mfc/s5p_mfc_common.h index ab23236aa942..3e0e8eaf8bfe 100644 --- a/drivers/media/platform/s5p-mfc/s5p_mfc_common.h +++ b/drivers/media/platform/s5p-mfc/s5p_mfc_common.h @@ -44,14 +44,6 @@ #include -static inline dma_addr_t s5p_mfc_mem_cookie(void *a, void *b) -{ - /* Same functionality as the vb2_dma_contig_plane_paddr */ - dma_addr_t *paddr = vb2_dma_contig_memops.cookie(b); - - return *paddr; -} - /* MFC definitions */ #define MFC_MAX_EXTRA_DPB 5 #define MFC_MAX_BUFFERS 32 @@ -229,16 +221,11 @@ struct s5p_mfc_buf_size { void *priv; }; -struct s5p_mfc_buf_align { - unsigned int base; -}; - struct s5p_mfc_variant { unsigned int version; unsigned int port_num; u32 version_bit; struct s5p_mfc_buf_size *buf_size; - struct s5p_mfc_buf_align *buf_align; char *fw_name[MFC_FW_MAX_VERSIONS]; const char *clk_names[MFC_MAX_CLOCKS]; int num_clocks; diff --git a/drivers/media/platform/s5p-mfc/s5p_mfc_ctrl.h b/drivers/media/platform/s5p-mfc/s5p_mfc_ctrl.h index 8e5df041edf7..45c807bf19cc 100644 --- a/drivers/media/platform/s5p-mfc/s5p_mfc_ctrl.h +++ b/drivers/media/platform/s5p-mfc/s5p_mfc_ctrl.h @@ -18,7 +18,6 @@ int s5p_mfc_release_firmware(struct s5p_mfc_dev *dev); int s5p_mfc_alloc_firmware(struct s5p_mfc_dev *dev); int s5p_mfc_load_firmware(struct s5p_mfc_dev *dev); -int s5p_mfc_reload_firmware(struct s5p_mfc_dev *dev); int s5p_mfc_init_hw(struct s5p_mfc_dev *dev); void s5p_mfc_deinit_hw(struct s5p_mfc_dev *dev); From patchwork Tue Feb 14 07:52:04 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Marek Szyprowski X-Patchwork-Id: 93929 Delivered-To: patch@linaro.org Received: by 10.140.20.99 with SMTP id 90csp1447344qgi; Mon, 13 Feb 2017 23:52:42 -0800 (PST) X-Received: by 10.84.210.232 with SMTP id a95mr35116566pli.31.1487058762792; Mon, 13 Feb 2017 23:52:42 -0800 (PST) Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id 128si12354946pgg.245.2017.02.13.23.52.42; Mon, 13 Feb 2017 23:52:42 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of linux-media-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of linux-media-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-media-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752615AbdBNHwj (ORCPT + 4 others); Tue, 14 Feb 2017 02:52:39 -0500 Received: from mailout3.w1.samsung.com ([210.118.77.13]:39761 "EHLO mailout3.w1.samsung.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751635AbdBNHwZ (ORCPT ); Tue, 14 Feb 2017 02:52:25 -0500 Received: from eucas1p2.samsung.com (unknown [182.198.249.207]) by mailout3.w1.samsung.com (Oracle Communications Messaging Server 7.0.5.31.0 64bit (built May 5 2014)) with ESMTP id <0OLC004JRTV92U20@mailout3.w1.samsung.com>; Tue, 14 Feb 2017 07:52:21 +0000 (GMT) Received: from eusmges2.samsung.com (unknown [203.254.199.241]) by eucas1p1.samsung.com (KnoxPortal) with ESMTP id 20170214075220eucas1p13339aa6da54da809814938617711dd24~jGAu4KCll2457524575eucas1p1f; Tue, 14 Feb 2017 07:52:20 +0000 (GMT) Received: from eucas1p2.samsung.com ( [182.198.249.207]) by eusmges2.samsung.com (EUCPMTA) with SMTP id 5E.15.30614.437B2A85; Tue, 14 Feb 2017 07:52:20 +0000 (GMT) Received: from eusmgms2.samsung.com (unknown [182.198.249.180]) by eucas1p1.samsung.com (KnoxPortal) with ESMTP id 20170214075219eucas1p193de247c3127167d68a2cca922e83fb3~jGAuDO8pn2143621436eucas1p11; Tue, 14 Feb 2017 07:52:19 +0000 (GMT) X-AuditID: cbfec7f1-f793f6d000007796-95-58a2b734dbb7 Received: from eusync2.samsung.com ( [203.254.199.212]) by eusmgms2.samsung.com (EUCPMTA) with SMTP id 44.00.10233.737B2A85; Tue, 14 Feb 2017 07:52:23 +0000 (GMT) Received: from AMDC2765.digital.local ([106.116.147.25]) by eusync2.samsung.com (Oracle Communications Messaging Server 7.0.5.31.0 64bit (built May 5 2014)) with ESMTPA id <0OLC00FWGTUYP980@eusync2.samsung.com>; Tue, 14 Feb 2017 07:52:19 +0000 (GMT) From: Marek Szyprowski To: linux-media@vger.kernel.org, linux-samsung-soc@vger.kernel.org Cc: Marek Szyprowski , Sylwester Nawrocki , Andrzej Hajda , Krzysztof Kozlowski , Inki Dae , Seung-Woo Kim Subject: [PATCH 11/15] media: s5p-mfc: Split variant DMA memory configuration into separate functions Date: Tue, 14 Feb 2017 08:52:04 +0100 Message-id: <1487058728-16501-12-git-send-email-m.szyprowski@samsung.com> X-Mailer: git-send-email 1.9.1 In-reply-to: <1487058728-16501-1-git-send-email-m.szyprowski@samsung.com> X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFjrKIsWRmVeSWpSXmKPExsWy7djP87om2xdFGBxtELa4te4cq8Wk+xNY LM6f38Bu0bNhK6vFjPP7mCzWHrnLbnH4TTuQO/klmwOHx6ZVnWwefVtWMXp83iQXwBzFZZOS mpNZllqkb5fAlfFw1T62gnNqFRtWXGJpYHyq0MXIySEhYCLR0HiWHcIWk7hwbz1bFyMXh5DA UkaJ1uu/mSGcz4wSp+ccYYHpmLvjGwtEYhmjxIPl85kgnAYmiccLr4JVsQkYSnS97WIDsUUE nCQWzvrLDlLELPCdUeLb7tOsIAlhgXSJNV+WMYHYLAKqEj3L54E18wp4Svz/uQhqnZzEyWOT weo5geKbPk9hBBkkIfCcTeJe72OgZg4gR1Zi0wFmiHoXiSmblkLZwhKvjm+Bek5G4vLkbqiZ /YwSTa3aEPYMRolzb3khbGuJw8cvgu1iFuCTmLRtOjPEeF6JjjYhiBIPifP/L7BB2I4SVw+f gIbEHEaJO5O3sE1glFnAyLCKUSS1tDg3PbXYSK84Mbe4NC9dLzk/dxMjMHJP/zv+cQfj+xNW hxgFOBiVeHgt9i2MEGJNLCuuzD3EKMHBrCTCy9C7KEKINyWxsiq1KD++qDQntfgQozQHi5I4 754FV8KFBNITS1KzU1MLUotgskwcnFINjIar9z7bcWVX6rGCyzu27rJYf+TUZ/WDas3T5L9u +j6xU//osbM752391c4enSKuuELh+4X6WtuWtDMtBd+1H/C6CodpiwbIforapbtbaZ6T3rWq jisCYZZNX3uazh26ud/78MIHbXL7mGZvdnn6feWL3dqr5y2WMhbr9PcQt1eYJhk6U/ebDpsS S3FGoqEWc1FxIgAYg1bv2AIAAA== X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFnrCLMWRmVeSWpSXmKPExsVy+t/xK7rm2xdFGKw8z2Zxa905VotJ9yew WJw/v4HdomfDVlaLGef3MVmsPXKX3eLwm3Ygd/JLNgcOj02rOtk8+rasYvT4vEkugDnKzSYj NTEltUghNS85PyUzL91WKTTETddCSSEvMTfVVilC1zckSEmhLDGnFMgzMkADDs4B7sFK+nYJ bhkPV+1jKzinVrFhxSWWBsanCl2MnBwSAiYSc3d8Y4GwxSQu3FvP1sXIxSEksIRRovvOT2YI p4lJYt+93cwgVWwChhJdb7vYQGwRASeJhbP+soPYzALfGSWW3UwDsYUF0iUeLF0FFmcRUJXo WT4PbAOvgKfE/5+LoLbJSZw8NpkVxOYEim/6PIURxBYS8JA4u2YH+wRG3gWMDKsYRVJLi3PT c4uN9IoTc4tL89L1kvNzNzECQ3jbsZ9bdjB2vQs+xCjAwajEw2uxb2GEEGtiWXFl7iFGCQ5m JRFeht5FEUK8KYmVValF+fFFpTmpxYcYTYGOmsgsJZqcD4yvvJJ4QxNDc0tDI2MLC3MjIyVx 3qkfroQLCaQnlqRmp6YWpBbB9DFxcEo1MJr3VHar/UmL/WHe2s9zrFTBoYdnmj9D6cWUY/Ff ful8LykwncrOrTZjpfoROc4rX9Q6LlzWOvFs7sLrDkKRea8u11n+eDF3beuLyfvdxK26Gkzu XtwsNzcgI8KlpbJsEc/jmyK80wSVTtZ27q0rs1iU2rf15nl9ocYPfMVSPr891z2P68meqsRS nJFoqMVcVJwIAAzxP353AgAA X-MTR: 20000000000000000@CPGS X-CMS-MailID: 20170214075219eucas1p193de247c3127167d68a2cca922e83fb3 X-Msg-Generator: CA X-Sender-IP: 182.198.249.180 X-Local-Sender: =?utf-8?q?Marek_Szyprowski=1BSRPOL-Kernel_=28TP=29=1B?= =?utf-8?b?7IK87ISx7KCE7J6QG1NlbmlvciBTb2Z0d2FyZSBFbmdpbmVlcg==?= X-Global-Sender: =?utf-8?q?Marek_Szyprowski=1BSRPOL-Kernel_=28TP=29=1BSam?= =?utf-8?q?sung_Electronics=1BSenior_Software_Engineer?= X-Sender-Code: =?utf-8?q?C10=1BEHQ=1BC10CD02CD027392?= CMS-TYPE: 201P X-HopCount: 7 X-CMS-RootMailID: 20170214075219eucas1p193de247c3127167d68a2cca922e83fb3 X-RootMTR: 20170214075219eucas1p193de247c3127167d68a2cca922e83fb3 References: <1487058728-16501-1-git-send-email-m.szyprowski@samsung.com> Sender: linux-media-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-media@vger.kernel.org Move code for DMA memory configuration with IOMMU into separate function to make it easier to compare what is being done in each case. Signed-off-by: Marek Szyprowski --- drivers/media/platform/s5p-mfc/s5p_mfc.c | 102 ++++++++++++++++++------------- 1 file changed, 61 insertions(+), 41 deletions(-) -- 1.9.1 diff --git a/drivers/media/platform/s5p-mfc/s5p_mfc.c b/drivers/media/platform/s5p-mfc/s5p_mfc.c index 92a88c20b26d..a18740c81c55 100644 --- a/drivers/media/platform/s5p-mfc/s5p_mfc.c +++ b/drivers/media/platform/s5p-mfc/s5p_mfc.c @@ -1107,41 +1107,13 @@ static struct device *s5p_mfc_alloc_memdev(struct device *dev, return NULL; } -static int s5p_mfc_configure_dma_memory(struct s5p_mfc_dev *mfc_dev) +static int s5p_mfc_configure_2port_memory(struct s5p_mfc_dev *mfc_dev) { struct device *dev = &mfc_dev->plat_dev->dev; void *bank2_virt; dma_addr_t bank2_dma_addr; unsigned long align_size = 1 << MFC_BASE_ALIGN_ORDER; - struct s5p_mfc_priv_buf *fw_buf = &mfc_dev->fw_buf; - - /* - * When IOMMU is available, we cannot use the default configuration, - * because of MFC firmware requirements: address space limited to - * 256M and non-zero default start address. - * This is still simplified, not optimal configuration, but for now - * IOMMU core doesn't allow to configure device's IOMMUs channel - * separately. - */ - if (exynos_is_iommu_available(dev)) { - int ret = exynos_configure_iommu(dev, S5P_MFC_IOMMU_DMA_BASE, - S5P_MFC_IOMMU_DMA_SIZE); - if (ret) - return ret; - - mfc_dev->mem_dev[BANK1_CTX] = mfc_dev->mem_dev[BANK2_CTX] = dev; - ret = s5p_mfc_alloc_firmware(mfc_dev); - if (ret) { - exynos_unconfigure_iommu(dev); - return ret; - } - - mfc_dev->dma_base[BANK1_CTX] = mfc_dev->fw_buf.dma; - mfc_dev->dma_base[BANK2_CTX] = mfc_dev->fw_buf.dma; - vb2_dma_contig_set_max_seg_size(dev, DMA_BIT_MASK(32)); - - return 0; - } + int ret; /* * Create and initialize virtual devices for accessing @@ -1188,26 +1160,74 @@ static int s5p_mfc_configure_dma_memory(struct s5p_mfc_dev *mfc_dev) DMA_BIT_MASK(32)); vb2_dma_contig_set_max_seg_size(mfc_dev->mem_dev[BANK2_CTX], DMA_BIT_MASK(32)); - return 0; } -static void s5p_mfc_unconfigure_dma_memory(struct s5p_mfc_dev *mfc_dev) +static void s5p_mfc_unconfigure_2port_memory(struct s5p_mfc_dev *mfc_dev) { - struct device *dev = &mfc_dev->plat_dev->dev; + device_unregister(mfc_dev->mem_dev[BANK1_CTX]); + device_unregister(mfc_dev->mem_dev[BANK2_CTX]); + vb2_dma_contig_clear_max_seg_size(mfc_dev->mem_dev[BANK1_CTX]); + vb2_dma_contig_clear_max_seg_size(mfc_dev->mem_dev[BANK2_CTX]); +} - s5p_mfc_release_firmware(mfc_dev); +static int s5p_mfc_configure_common_memory(struct s5p_mfc_dev *mfc_dev) +{ + struct device *dev = &mfc_dev->plat_dev->dev; + /* + * When IOMMU is available, we cannot use the default configuration, + * because of MFC firmware requirements: address space limited to + * 256M and non-zero default start address. + * This is still simplified, not optimal configuration, but for now + * IOMMU core doesn't allow to configure device's IOMMUs channel + * separately. + */ + int ret = exynos_configure_iommu(dev, S5P_MFC_IOMMU_DMA_BASE, + S5P_MFC_IOMMU_DMA_SIZE); + if (ret) + return ret; - if (exynos_is_iommu_available(dev)) { + mfc_dev->mem_dev[BANK1_CTX] = mfc_dev->mem_dev[BANK2_CTX] = dev; + ret = s5p_mfc_alloc_firmware(mfc_dev); + if (ret) { exynos_unconfigure_iommu(dev); - vb2_dma_contig_clear_max_seg_size(dev); - return; + return ret; } - device_unregister(mfc_dev->mem_dev[BANK1_CTX]); - device_unregister(mfc_dev->mem_dev[BANK2_CTX]); - vb2_dma_contig_clear_max_seg_size(mfc_dev->mem_dev[BANK1_CTX]); - vb2_dma_contig_clear_max_seg_size(mfc_dev->mem_dev[BANK2_CTX]); + mfc_dev->dma_base[BANK1_CTX] = mfc_dev->fw_buf.dma; + mfc_dev->dma_base[BANK2_CTX] = mfc_dev->fw_buf.dma; + vb2_dma_contig_set_max_seg_size(dev, DMA_BIT_MASK(32)); + + return 0; +} + +static void s5p_mfc_unconfigure_common_memory(struct s5p_mfc_dev *mfc_dev) +{ + struct device *dev = &mfc_dev->plat_dev->dev; + + exynos_unconfigure_iommu(dev); + vb2_dma_contig_clear_max_seg_size(dev); +} + +static int s5p_mfc_configure_dma_memory(struct s5p_mfc_dev *mfc_dev) +{ + struct device *dev = &mfc_dev->plat_dev->dev; + + if (exynos_is_iommu_available(dev)) + return s5p_mfc_configure_common_memory(mfc_dev); + else + return s5p_mfc_configure_2port_memory(mfc_dev); +} + +static void s5p_mfc_unconfigure_dma_memory(struct s5p_mfc_dev *mfc_dev) +{ + struct device *dev = &mfc_dev->plat_dev->dev; + + s5p_mfc_release_firmware(mfc_dev); + if (exynos_is_iommu_available(dev)) + s5p_mfc_unconfigure_common_memory(mfc_dev); + else + s5p_mfc_unconfigure_2port_memory(mfc_dev); } /* MFC probe function */