linux-next: build failure after merge of the final tree (drm treerelated)

[Stephen Rothwell]

Hi all,

After merging the final tree, today's linux-next build (powerpc
allyesconfig) failed like this:

drivers/gpu/drm/drm_gem_cma_helper.c: In function 'drm_gem_cma_buf_destroy':
drivers/gpu/drm/drm_gem_cma_helper.c:38:2: error: implicit declaration of function 'dma_free_writecombine' [-Werror=implicit-function-declaration]
drivers/gpu/drm/drm_gem_cma_helper.c: In function 'drm_gem_cma_create':
drivers/gpu/drm/drm_gem_cma_helper.c:61:2: error: implicit declaration of function 'dma_alloc_writecombine' [-Werror=implicit-function-declaration]

Probably caused by commit 16ea975eac67 ("drm/tilcdc: add TI LCD
Controller DRM driver (v4)") which forced CONFIG_DRM_GEM_CMA_HELPER to
'y'.  dma_alloc/free_writecombine are only defined on ARM.

I added this patch for today.

From: Stephen Rothwell <sfr@xxxxxxxxxxxxxxxx>
Date: Fri, 22 Feb 2013 15:14:50 +1100
Subject: [PATCH] drm/tilcdc: only build on arm

Signed-off-by: Stephen Rothwell <sfr@xxxxxxxxxxxxxxxx>
---
 drivers/gpu/drm/tilcdc/Kconfig | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/gpu/drm/tilcdc/Kconfig b/drivers/gpu/drm/tilcdc/Kconfig
index ae14fd6..d24d040 100644
--- a/drivers/gpu/drm/tilcdc/Kconfig
+++ b/drivers/gpu/drm/tilcdc/Kconfig
@@ -1,6 +1,6 @@
 config DRM_TILCDC
 	tristate "DRM Support for TI LCDC Display Controller"
-	depends on DRM && OF
+	depends on DRM && OF && ARM
 	select DRM_KMS_HELPER
 	select DRM_KMS_CMA_HELPER
 	select DRM_GEM_CMA_HELPER
-- 
1.8.1

-- 
Cheers,
Stephen Rothwell                    sfr@xxxxxxxxxxxxxxxx

Attachment: pgp00000.pgp
Description: PGP signature