[ATTN] Re: [PATCH v4 5/7] ARM: Exynos: remove code for MFC custom reserved memory handling
Message ID | 5751550D.3080404@samsung.com (mailing list archive) |
---|---|
State | Accepted, archived |
Headers |
Received: from mail.tu-berlin.de ([130.149.7.33]) by www.linuxtv.org with esmtp (Exim 4.84_2) (envelope-from <linux-media-owner@vger.kernel.org>) id 1b8luA-000726-Gd; Fri, 03 Jun 2016 10:00:38 +0000 X-tubIT-Incoming-IP: 209.132.180.67 Received: from vger.kernel.org ([209.132.180.67]) by mail.tu-berlin.de (exim-4.84_2/mailfrontend-7) with esmtp id 1b8lu4-0002Os-31; Fri, 03 Jun 2016 12:00:35 +0200 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932168AbcFCKAF (ORCPT <rfc822;mkrufky@linuxtv.org> + 1 other); Fri, 3 Jun 2016 06:00:05 -0400 Received: from mailout2.w1.samsung.com ([210.118.77.12]:13906 "EHLO mailout2.w1.samsung.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752792AbcFCJ77 (ORCPT <rfc822; linux-media@vger.kernel.org>); Fri, 3 Jun 2016 05:59:59 -0400 Received: from eucpsbgm1.samsung.com (unknown [203.254.199.244]) by mailout2.w1.samsung.com (Oracle Communications Messaging Server 7.0.5.31.0 64bit (built May 5 2014)) with ESMTP id <0O8600H1OX3VM460@mailout2.w1.samsung.com>; Fri, 03 Jun 2016 10:59:55 +0100 (BST) X-AuditID: cbfec7f4-f796c6d000001486-42-5751551b08cb Received: from eusync1.samsung.com ( [203.254.199.211]) by eucpsbgm1.samsung.com (EUCPMTA) with SMTP id 22.AF.05254.B1551575; Fri, 3 Jun 2016 10:59:55 +0100 (BST) Received: from [106.116.147.32] by eusync1.samsung.com (Oracle Communications Messaging Server 7.0.5.31.0 64bit (built May 5 2014)) with ESMTPA id <0O860036IX3UXB50@eusync1.samsung.com>; Fri, 03 Jun 2016 10:59:55 +0100 (BST) Subject: [ATTN] Re: [PATCH v4 5/7] ARM: Exynos: remove code for MFC custom reserved memory handling To: Krzysztof Kozlowski <k.kozlowski@samsung.com>, Javier Martinez Canillas <javier@osg.samsung.com>, linux-media@vger.kernel.org References: <1464096690-23605-1-git-send-email-m.szyprowski@samsung.com> <1464096690-23605-6-git-send-email-m.szyprowski@samsung.com> <574BEBB8.8040606@samsung.com> <5a12a8be-0402-dc0c-d242-5d9f3145e001@osg.samsung.com> <57505F5B.90101@samsung.com> <e715a7d0-eb25-9d68-27ad-25cf03c499ca@osg.samsung.com> <57512A6A.1050209@samsung.com> Cc: Marek Szyprowski <m.szyprowski@samsung.com>, linux-samsung-soc@vger.kernel.org, devicetree@vger.kernel.org, Kamil Debski <k.debski@samsung.com>, Kukjin Kim <kgene@kernel.org>, Uli Middelberg <uli@middelberg.de>, Bartlomiej Zolnierkiewicz <b.zolnierkie@samsung.com> From: Sylwester Nawrocki <s.nawrocki@samsung.com> Message-id: <5751550D.3080404@samsung.com> Date: Fri, 03 Jun 2016 11:59:41 +0200 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:38.0) Gecko/20100101 Thunderbird/38.6.0 MIME-version: 1.0 In-reply-to: <57512A6A.1050209@samsung.com> Content-type: text/plain; charset=windows-1252 Content-transfer-encoding: 7bit X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFnrJLMWRmVeSWpSXmKPExsVy+t/xy7rSoYHhBg2bVSw2zljPajH/yDlW izdv1zBZ/Hh9gc3i9QtDi/7Hr5ktejZsZbWYcX4fk8XaI3fZLR5tEXPg8ti0qpPNY8PFjawe W/rvsnv0bVnF6PF5k1wAaxSXTUpqTmZZapG+XQJXxqX3G1gKZmlVfD+8ja2B8YJiFyMHh4SA iUT7n/ouRk4gU0ziwr31bF2MXBxCAksZJe7OWMcK4TxnlDj0byUjSJWwQKrEkbX3WEASIgLN jBJNz99CVd1ikpiwvJsJxGEWmMIkseTPLCaQFjYBQ4neo31g7bwCWhIvfs1kBbFZBFQl/r/d zQJiiwpESDyZexKqRlDix+R7YHFOAW2JpYvfs4HcyiygJ3H/ohZImFlAXmLzmrfMExgFZiHp mIVQNQtJ1QJG5lWMoqmlyQXFSem5hnrFibnFpXnpesn5uZsYIRHwZQfj4mNWhxgFOBiVeHhX LAgIF2JNLCuuzD3EKMHBrCTCyxoQGC7Em5JYWZValB9fVJqTWnyIUZqDRUmcd+6u9yFCAumJ JanZqakFqUUwWSYOTqkGxtSL30Wtd8wsWJF4nv3ka5Yze5/cbSz5LyU54d+5XG/7FU87eRm/ xApP/28WcXhVflPuvh6d//u7Hn8NXMw8Rcrx09I9j6/v6ap9o1rfelBXWrNkkSlX9Y5qPr1p Nvr7Xms69by6/FptybZ51TNW3UnNNZLI+sD0tpDD+eb5CsMP6nqH7y5a2qbEUpyRaKjFXFSc CADn0d4jfAIAAA== Sender: linux-media-owner@vger.kernel.org Precedence: bulk List-ID: <linux-media.vger.kernel.org> X-Mailing-List: linux-media@vger.kernel.org X-PMX-Version: 6.0.0.2142326, Antispam-Engine: 2.7.2.2107409, Antispam-Data: 2016.6.3.94816 X-PMX-Spam: Gauge=IIIIIIII, Probability=8%, Report=' MULTIPLE_RCPTS 0.1, HTML_00_01 0.05, HTML_00_10 0.05, BODY_SIZE_5000_5999 0, BODY_SIZE_7000_LESS 0, IN_REP_TO 0, LEGITIMATE_NEGATE 0, MSG_THREAD 0, MULTIPLE_RCPTS_RND 0, REFERENCES 0, URI_ENDS_IN_HTML 0, __ANY_URI 0, __CP_MEDIA_BODY 0, __CP_URI_IN_BODY 0, __CT 0, __CTE 0, __CT_TEXT_PLAIN 0, __FORWARDED_MSG 0, __FRAUD_INTRO 0, __FRAUD_SUBJ_A 0, __HAS_CC_HDR 0, __HAS_FROM 0, __HAS_MSGID 0, __HAS_X_MAILING_LIST 0, __HTTPS_URI 0, __INT_PROD_TV 0, __IN_REP_TO 0, __MIME_TEXT_ONLY 0, __MIME_VERSION 0, __MOZILLA_MSGID 0, __MOZILLA_USER_AGENT 0, __MULTIPLE_RCPTS_CC_X2 0, __MULTIPLE_URI_TEXT 0, __PHISH_SPEAR_GREETING 0, __PHISH_SPEAR_SUBJECT 0, __REFERENCES 0, __SANE_MSGID 0, __SUBJ_ALPHA_END 0, __TO_MALFORMED_2 0, __URI_IN_BODY 0, __URI_NO_WWW 0, __URI_NS , __URI_WITH_PATH 0, __USER_AGENT 0' |
Pull-request
git://linuxtv.org/snawrocki/samsung.git for-v4.8/media/exynos-mfcMessage
Sylwester Nawrocki
June 3, 2016, 9:59 a.m. UTC
On 06/03/2016 08:57 AM, Krzysztof Kozlowski wrote: > On 06/02/2016 07:25 PM, Javier Martinez Canillas wrote: >> On 06/02/2016 12:31 PM, Krzysztof Kozlowski wrote: >>> On 06/02/2016 05:20 PM, Javier Martinez Canillas wrote: >>>> On 05/30/2016 03:28 AM, Krzysztof Kozlowski wrote: >>>>> On 05/24/2016 03:31 PM, Marek Szyprowski wrote: >>>>>> Once MFC driver has been converted to generic reserved memory bindings, >>>>>> there is no need for custom memory reservation code. >>>>>> >>>>>> Signed-off-by: Marek Szyprowski <m.szyprowski@samsung.com> >>>>>> --- >>>>>> arch/arm/mach-exynos/Makefile | 2 - >>>>>> arch/arm/mach-exynos/exynos.c | 19 -------- >>>>>> arch/arm/mach-exynos/mfc.h | 16 ------- >>>>>> arch/arm/mach-exynos/s5p-dev-mfc.c | 93 ----------------------------- >>>>>> 4 files changed, 130 deletions(-) >>>>>> delete mode 100644 arch/arm/mach-exynos/mfc.h >>>>>> delete mode 100644 arch/arm/mach-exynos/s5p-dev-mfc.c >>>>> >>>>> Thanks, applied. >>>> >>>> This patch can't be applied before patches 2/5 and 3/5, or the custom >>>> memory regions reservation will break with the current s5p-mfc driver. >>> >>> Yes, I know. As I understood from talk with Marek, the driver is broken >>> now so continuous work was not chosen. If it is not correct and full >> >> It's true that the driven is currently broken in mainline and is not really >> stable, I posted fixes for all the issues I found (mostly in module removal >> and insert paths). >> >> But with just the following patch from Ayaka on top of mainline, I'm able to >> have video decoding working: https://lkml.org/lkml/2016/5/6/577 > > Which is still a "future" patch, not current state... >> >> Marek mentioned that bisectability is only partially broken because the old >> binding will still work after this series if IOMMU is enabled (because the >> properties are ignored in this case). But will break if IOMMU isn't enabled >> which will be the case for some boards that fails to boot with IOMMU due the >> bootloader leaving the FIMD enabled doing DMA operations automatically AFAIU. >> >> Now, I'm OK with not keeping backwards compatibility for the MFC dt bindings >> since arguably the driver has been broken for a long time and nobody cared >> and also I don't think anyone in practice boots a new kernel with an old DTB >> for Exynos. >> >> But I don't think is correct to introduce a new issue as is the case if this >> patch is applied before the previous patches in the series since this causes >> the driver to probe to fail and the following warn on boot (while it used to >> at least probe correctly in mainline): > > Okay but the patches will go through separate tree. This is not a > problem, as I said, I just need a stable tag from media tree with first > four patches (Mauro?). I have prepared a topic branch including media patches from this patch series and the dependency fix patches from Javier and Marek. So this could be used as a topic branch to pull into media master branch and a dependency topic branch for Krzysztof's samsung-soc tree. Mauro, can we do it this way? I already talked to Kamil about this. ---8<---- The following changes since commit 1a695a905c18548062509178b98bc91e67510864: Linux 4.7-rc1 (2016-05-29 09:29:24 -0700) are available in the git repository at: git://linuxtv.org/snawrocki/samsung.git for-v4.8/media/exynos-mfc for you to fetch changes up to 04f776734c4e03e33111d3d5a994b589870df623: media: s5p-mfc: add iommu support (2016-06-03 11:13:45 +0200) ---------------------------------------------------------------- Javier Martinez Canillas (3): s5p-mfc: Set device name for reserved memory region devs s5p-mfc: Add release callback for memory region devs s5p-mfc: Fix race between s5p_mfc_probe() and s5p_mfc_open() Marek Szyprowski (6): media: vb2-dma-contig: add helper for setting dma max seg size media: set proper max seg size for devices on Exynos SoCs of: reserved_mem: add support for using more than one region for given device media: s5p-mfc: use generic reserved memory bindings media: s5p-mfc: replace custom reserved memory handling code with generic one media: s5p-mfc: add iommu support Documentation/devicetree/bindings/media/s5p-mfc.txt | 39 ++++- drivers/media/platform/exynos-gsc/gsc-core.c | 2 + drivers/media/platform/exynos4-is/fimc-core.c | 2 + drivers/media/platform/exynos4-is/fimc-is.c | 2 + drivers/media/platform/exynos4-is/fimc-lite.c | 2 + drivers/media/platform/s5p-g2d/g2d.c | 2 + drivers/media/platform/s5p-jpeg/jpeg-core.c | 2 + drivers/media/platform/s5p-mfc/s5p_mfc.c | 198 ++++++++++++++----------- drivers/media/platform/s5p-mfc/s5p_mfc_iommu.h | 79 ++++++++++ drivers/media/platform/s5p-tv/mixer_video.c | 2 + drivers/media/v4l2-core/videobuf2-dma-contig.c | 53 +++++++ drivers/of/of_reserved_mem.c | 85 ++++++++--- include/linux/of_reserved_mem.h | 25 +++- include/media/videobuf2-dma-contig.h | 2 + 14 files changed, 379 insertions(+), 116 deletions(-) create mode 100644 drivers/media/platform/s5p-mfc/s5p_mfc_iommu.h ---8<----
Comments
On 06/03/2016 11:59 AM, Sylwester Nawrocki wrote: > On 06/03/2016 08:57 AM, Krzysztof Kozlowski wrote: >> On 06/02/2016 07:25 PM, Javier Martinez Canillas wrote: >>> On 06/02/2016 12:31 PM, Krzysztof Kozlowski wrote: >>>> On 06/02/2016 05:20 PM, Javier Martinez Canillas wrote: >>>>> On 05/30/2016 03:28 AM, Krzysztof Kozlowski wrote: >>>>>> On 05/24/2016 03:31 PM, Marek Szyprowski wrote: >>>>>>> Once MFC driver has been converted to generic reserved memory bindings, >>>>>>> there is no need for custom memory reservation code. >>>>>>> >>>>>>> Signed-off-by: Marek Szyprowski <m.szyprowski@samsung.com> >>>>>>> --- >>>>>>> arch/arm/mach-exynos/Makefile | 2 - >>>>>>> arch/arm/mach-exynos/exynos.c | 19 -------- >>>>>>> arch/arm/mach-exynos/mfc.h | 16 ------- >>>>>>> arch/arm/mach-exynos/s5p-dev-mfc.c | 93 ----------------------------- >>>>>>> 4 files changed, 130 deletions(-) >>>>>>> delete mode 100644 arch/arm/mach-exynos/mfc.h >>>>>>> delete mode 100644 arch/arm/mach-exynos/s5p-dev-mfc.c >>>>>> >>>>>> Thanks, applied. >>>>> >>>>> This patch can't be applied before patches 2/5 and 3/5, or the custom >>>>> memory regions reservation will break with the current s5p-mfc driver. >>>> >>>> Yes, I know. As I understood from talk with Marek, the driver is broken >>>> now so continuous work was not chosen. If it is not correct and full >>> >>> It's true that the driven is currently broken in mainline and is not really >>> stable, I posted fixes for all the issues I found (mostly in module removal >>> and insert paths). >>> >>> But with just the following patch from Ayaka on top of mainline, I'm able to >>> have video decoding working: https://lkml.org/lkml/2016/5/6/577 >> >> Which is still a "future" patch, not current state... >>> >>> Marek mentioned that bisectability is only partially broken because the old >>> binding will still work after this series if IOMMU is enabled (because the >>> properties are ignored in this case). But will break if IOMMU isn't enabled >>> which will be the case for some boards that fails to boot with IOMMU due the >>> bootloader leaving the FIMD enabled doing DMA operations automatically AFAIU. >>> >>> Now, I'm OK with not keeping backwards compatibility for the MFC dt bindings >>> since arguably the driver has been broken for a long time and nobody cared >>> and also I don't think anyone in practice boots a new kernel with an old DTB >>> for Exynos. >>> >>> But I don't think is correct to introduce a new issue as is the case if this >>> patch is applied before the previous patches in the series since this causes >>> the driver to probe to fail and the following warn on boot (while it used to >>> at least probe correctly in mainline): >> >> Okay but the patches will go through separate tree. This is not a >> problem, as I said, I just need a stable tag from media tree with first >> four patches (Mauro?). > > I have prepared a topic branch including media patches from this patch > series and the dependency fix patches from Javier and Marek. > So this could be used as a topic branch to pull into media master branch > and a dependency topic branch for Krzysztof's samsung-soc tree. > Mauro, can we do it this way? I already talked to Kamil about this. > > ---8<---- > The following changes since commit 1a695a905c18548062509178b98bc91e67510864: > > Linux 4.7-rc1 (2016-05-29 09:29:24 -0700) > > are available in the git repository at: > > git://linuxtv.org/snawrocki/samsung.git for-v4.8/media/exynos-mfc > > for you to fetch changes up to 04f776734c4e03e33111d3d5a994b589870df623: > > media: s5p-mfc: add iommu support (2016-06-03 11:13:45 +0200) Thanks Sylwester! Although this is branch not a tag but I believe it will stay stable. Pulled. I will apply Exynos-specific patches on top of it. Best regards, Krzysztof -- To unsubscribe from this list: send the line "unsubscribe linux-media" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html