Skip to contentSkip to conversation

ARM: tegra: Enable DMA CMA support

PATCH In review Thierry Reding 2 participants 3 messages Sep 3, 2013 – Sep 9, 2013 2 messages not in the archive

Subsystems (2)
lore
Share & tools
lore
#0 lore raw

PATCH 1/1 ARM: tegra: Enable DMA CMA support

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.

---
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(-)
arch/arm/configs/tegra_defconfig +2 -1
index 8c284ff..c5224f0 100644
@@ -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
Signature · 1 line
1.8.4

A message that is not in the archive (sent off-list or not yet received): 1378195505-28753-1-git-send-email-treding-DDmLM1+adcrQT0dZR+AlfA@public.gmane.org

#2 lore raw
Quoted 5 lines · 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.

Quoted 8 lines

---
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 [email protected] with my ack below at the appropriate time.

A message that is not in the archive (sent off-list or not yet received): [email protected]

#4 lore raw
Quoted 15 lines · Stephen Warren
Quoted 5 lines · 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.

Quoted 8 lines

---
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...

Quoted 8 lines

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 [email protected] with my ack below at the appropriate time.

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