[PATCH] ARM: tegra: Enable DMA CMA support

[PATCH] ARM: tegra: Enable DMA CMA support

[Thierry Reding]

Commit f825c73 ("mm/cma: Move dma contiguous changes into a seperate
config") renamed the CMA option to DMA_CMA but didn't update any default
configurations.

Signed-off-by: Thierry Reding <treding-DDmLM1+adcrQT0dZR+AlfA@public.gmane.org>
---
Note that this should be applied after 3.12-rc1, since the above patch
will presumably go into 3.12 during the merge window.

Ideally this would've gone into the original commit and in fact digging
through some archives it turns out that an initial version of the patch
did modify the default configurations, but the hunks were dropped when
the patch was applied because of the potential for merge conflicts...
---
 arch/arm/configs/tegra_defconfig | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/arch/arm/configs/tegra_defconfig b/arch/arm/configs/tegra_defconfig
index 8c284ff..c5224f0 100644
--- a/arch/arm/configs/tegra_defconfig
+++ b/arch/arm/configs/tegra_defconfig
@@ -37,6 +37,7 @@ CONFIG_PREEMPT=y
 CONFIG_AEABI=y
 # CONFIG_OABI_COMPAT is not set
 CONFIG_HIGHMEM=y
+CONFIG_CMA=y
 CONFIG_ZBOOT_ROM_TEXT=0x0
 CONFIG_ZBOOT_ROM_BSS=0x0
 CONFIG_KEXEC=y
@@ -82,7 +83,7 @@ CONFIG_RFKILL_GPIO=y
 CONFIG_DEVTMPFS=y
 CONFIG_DEVTMPFS_MOUNT=y
 # CONFIG_FIRMWARE_IN_KERNEL is not set
-CONFIG_CMA=y
+CONFIG_DMA_CMA=y
 CONFIG_MTD=y
 CONFIG_MTD_M25P80=y
 CONFIG_PROC_DEVICETREE=y
-- 
1.8.4

Re: [PATCH] ARM: tegra: Enable DMA CMA support

[Stephen Warren]

On 09/03/2013 02:05 AM, Thierry Reding wrote:
> Commit f825c73 ("mm/cma: Move dma contiguous changes into a seperate
> config") renamed the CMA option to DMA_CMA but didn't update any default
> configurations.
> 
> Signed-off-by: Thierry Reding <treding-DDmLM1+adcrQT0dZR+AlfA@public.gmane.org>
> ---
> Note that this should be applied after 3.12-rc1, since the above patch
> will presumably go into 3.12 during the merge window.
> 
> Ideally this would've gone into the original commit and in fact digging
> through some archives it turns out that an initial version of the patch
> did modify the default configurations, but the hunks were dropped when
> the patch was applied because of the potential for merge conflicts...

I think you should take this up with the original author/committer of
the problematic patch. If they rename something, they have to deal with
the fallout of the rename. If this causes merge conflicts, this is
something Linus wants to see.

If not, feel free to forward this to arm-DgEjT+Ai2ygdnm+yROfE0A@public.gmane.org with my ack below at
the appropriate time.
Acked-by: Stephen Warren <swarren-DDmLM1+adcrQT0dZR+AlfA@public.gmane.org>

Re: [PATCH] ARM: tegra: Enable DMA CMA support

[Thierry Reding]

[-- Attachment #1: Type: text/plain, Size: 1459 bytes --]

On Tue, Sep 03, 2013 at 11:51:32AM -0600, Stephen Warren wrote:
> On 09/03/2013 02:05 AM, Thierry Reding wrote:
> > Commit f825c73 ("mm/cma: Move dma contiguous changes into a seperate
> > config") renamed the CMA option to DMA_CMA but didn't update any default
> > configurations.
> > 
> > Signed-off-by: Thierry Reding <treding-DDmLM1+adcrQT0dZR+AlfA@public.gmane.org>
> > ---
> > Note that this should be applied after 3.12-rc1, since the above patch
> > will presumably go into 3.12 during the merge window.
> > 
> > Ideally this would've gone into the original commit and in fact digging
> > through some archives it turns out that an initial version of the patch
> > did modify the default configurations, but the hunks were dropped when
> > the patch was applied because of the potential for merge conflicts...
> 
> I think you should take this up with the original author/committer of
> the problematic patch. If they rename something, they have to deal with
> the fallout of the rename. If this causes merge conflicts, this is
> something Linus wants to see.
> 
> If not, feel free to forward this to arm-DgEjT+Ai2ygdnm+yROfE0A@public.gmane.org with my ack below at
> the appropriate time.
> Acked-by: Stephen Warren <swarren-DDmLM1+adcrQT0dZR+AlfA@public.gmane.org>

I brought up the issue in the pull request that contained the commit and
Linus fixed it up during the merge, so we shouldn't have any breakage.

Thierry

[-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --]