diff options
author | Chen Gang S <gang.chen@sunrus.com.cn> | 2015-02-01 09:08:33 -0500 |
---|---|---|
committer | Dave Airlie <airlied@redhat.com> | 2015-02-02 20:12:37 -0500 |
commit | db88c8f4e7e1d1c9e82bc5645a537782b8836cc0 (patch) | |
tree | a2aec1dcbc5ab7ee6dc5e0be1630258465d1bdd9 | |
parent | 44df9c417ddd0c66f62e99faf5af734495ceee50 (diff) |
drm: Kconfig: Let all DRM_GEM_CMA_HELPER related macros depend on HAVE_DMA_ATTRS
DRM_GEM_CMA_HELPER is depend on HAVE_DMA_ATTRS, or it will break the
building. The related error (with allmodconfig under xtensa):
CC [M] drivers/gpu/drm/drm_gem_cma_helper.o
drivers/gpu/drm/drm_gem_cma_helper.c: In function 'drm_gem_cma_create':
drivers/gpu/drm/drm_gem_cma_helper.c:110:19: error: implicit declaration of function 'dma_alloc_writecombine' [-Werror=implicit-function-declaration]
cma_obj->vaddr = dma_alloc_writecombine(drm->dev, size,
^
drivers/gpu/drm/drm_gem_cma_helper.c:110:17: warning: assignment makes pointer from integer without a cast [-Wint-conversion]
cma_obj->vaddr = dma_alloc_writecombine(drm->dev, size,
^
drivers/gpu/drm/drm_gem_cma_helper.c: In function 'drm_gem_cma_free_object':
drivers/gpu/drm/drm_gem_cma_helper.c:193:3: error: implicit declaration of function 'dma_free_writecombine' [-Werror=implicit-function-declaration]
dma_free_writecombine(gem_obj->dev->dev, cma_obj->base.size,
^
drivers/gpu/drm/drm_gem_cma_helper.c: In function 'drm_gem_cma_mmap_obj':
drivers/gpu/drm/drm_gem_cma_helper.c:330:8: error: implicit declaration of function 'dma_mmap_writecombine' [-Werror=implicit-function-declaration]
ret = dma_mmap_writecombine(cma_obj->base.dev->dev, vma,
^
Signed-off-by: Chen Gang <gang.chen.5i5j@gmail.com>
Signed-off-by: Dave Airlie <airlied@redhat.com>
-rw-r--r-- | drivers/gpu/drm/Kconfig | 3 | ||||
-rw-r--r-- | drivers/gpu/drm/imx/Kconfig | 2 | ||||
-rw-r--r-- | drivers/gpu/drm/rcar-du/Kconfig | 2 | ||||
-rw-r--r-- | drivers/gpu/drm/shmobile/Kconfig | 2 | ||||
-rw-r--r-- | drivers/gpu/drm/sti/Kconfig | 2 | ||||
-rw-r--r-- | drivers/gpu/drm/tilcdc/Kconfig | 2 |
6 files changed, 7 insertions, 6 deletions
diff --git a/drivers/gpu/drm/Kconfig b/drivers/gpu/drm/Kconfig index 308c104ccdbd..151a050129e7 100644 --- a/drivers/gpu/drm/Kconfig +++ b/drivers/gpu/drm/Kconfig | |||
@@ -62,12 +62,13 @@ config DRM_TTM | |||
62 | 62 | ||
63 | config DRM_GEM_CMA_HELPER | 63 | config DRM_GEM_CMA_HELPER |
64 | bool | 64 | bool |
65 | depends on DRM | 65 | depends on DRM && HAVE_DMA_ATTRS |
66 | help | 66 | help |
67 | Choose this if you need the GEM CMA helper functions | 67 | Choose this if you need the GEM CMA helper functions |
68 | 68 | ||
69 | config DRM_KMS_CMA_HELPER | 69 | config DRM_KMS_CMA_HELPER |
70 | bool | 70 | bool |
71 | depends on DRM && HAVE_DMA_ATTRS | ||
71 | select DRM_GEM_CMA_HELPER | 72 | select DRM_GEM_CMA_HELPER |
72 | select DRM_KMS_FB_HELPER | 73 | select DRM_KMS_FB_HELPER |
73 | select FB_SYS_FILLRECT | 74 | select FB_SYS_FILLRECT |
diff --git a/drivers/gpu/drm/imx/Kconfig b/drivers/gpu/drm/imx/Kconfig index 5d5e4092d40a..33cdddf26684 100644 --- a/drivers/gpu/drm/imx/Kconfig +++ b/drivers/gpu/drm/imx/Kconfig | |||
@@ -5,7 +5,7 @@ config DRM_IMX | |||
5 | select VIDEOMODE_HELPERS | 5 | select VIDEOMODE_HELPERS |
6 | select DRM_GEM_CMA_HELPER | 6 | select DRM_GEM_CMA_HELPER |
7 | select DRM_KMS_CMA_HELPER | 7 | select DRM_KMS_CMA_HELPER |
8 | depends on DRM && (ARCH_MXC || ARCH_MULTIPLATFORM) | 8 | depends on DRM && (ARCH_MXC || ARCH_MULTIPLATFORM) && HAVE_DMA_ATTRS |
9 | depends on IMX_IPUV3_CORE | 9 | depends on IMX_IPUV3_CORE |
10 | help | 10 | help |
11 | enable i.MX graphics support | 11 | enable i.MX graphics support |
diff --git a/drivers/gpu/drm/rcar-du/Kconfig b/drivers/gpu/drm/rcar-du/Kconfig index 2324a526de65..11485a4a16ae 100644 --- a/drivers/gpu/drm/rcar-du/Kconfig +++ b/drivers/gpu/drm/rcar-du/Kconfig | |||
@@ -1,6 +1,6 @@ | |||
1 | config DRM_RCAR_DU | 1 | config DRM_RCAR_DU |
2 | tristate "DRM Support for R-Car Display Unit" | 2 | tristate "DRM Support for R-Car Display Unit" |
3 | depends on DRM && ARM | 3 | depends on DRM && ARM && HAVE_DMA_ATTRS |
4 | depends on ARCH_SHMOBILE || COMPILE_TEST | 4 | depends on ARCH_SHMOBILE || COMPILE_TEST |
5 | select DRM_KMS_HELPER | 5 | select DRM_KMS_HELPER |
6 | select DRM_KMS_CMA_HELPER | 6 | select DRM_KMS_CMA_HELPER |
diff --git a/drivers/gpu/drm/shmobile/Kconfig b/drivers/gpu/drm/shmobile/Kconfig index 8d17d00ddb4b..b9202aa6f8ab 100644 --- a/drivers/gpu/drm/shmobile/Kconfig +++ b/drivers/gpu/drm/shmobile/Kconfig | |||
@@ -1,6 +1,6 @@ | |||
1 | config DRM_SHMOBILE | 1 | config DRM_SHMOBILE |
2 | tristate "DRM Support for SH Mobile" | 2 | tristate "DRM Support for SH Mobile" |
3 | depends on DRM && ARM | 3 | depends on DRM && ARM && HAVE_DMA_ATTRS |
4 | depends on ARCH_SHMOBILE || COMPILE_TEST | 4 | depends on ARCH_SHMOBILE || COMPILE_TEST |
5 | depends on FB_SH_MOBILE_MERAM || !FB_SH_MOBILE_MERAM | 5 | depends on FB_SH_MOBILE_MERAM || !FB_SH_MOBILE_MERAM |
6 | select BACKLIGHT_CLASS_DEVICE | 6 | select BACKLIGHT_CLASS_DEVICE |
diff --git a/drivers/gpu/drm/sti/Kconfig b/drivers/gpu/drm/sti/Kconfig index 20d5f7787667..fbccc105819b 100644 --- a/drivers/gpu/drm/sti/Kconfig +++ b/drivers/gpu/drm/sti/Kconfig | |||
@@ -1,6 +1,6 @@ | |||
1 | config DRM_STI | 1 | config DRM_STI |
2 | tristate "DRM Support for STMicroelectronics SoC stiH41x Series" | 2 | tristate "DRM Support for STMicroelectronics SoC stiH41x Series" |
3 | depends on DRM && (SOC_STIH415 || SOC_STIH416 || ARCH_MULTIPLATFORM) | 3 | depends on DRM && (SOC_STIH415 || SOC_STIH416 || ARCH_MULTIPLATFORM) && HAVE_DMA_ATTRS |
4 | select RESET_CONTROLLER | 4 | select RESET_CONTROLLER |
5 | select DRM_KMS_HELPER | 5 | select DRM_KMS_HELPER |
6 | select DRM_GEM_CMA_HELPER | 6 | select DRM_GEM_CMA_HELPER |
diff --git a/drivers/gpu/drm/tilcdc/Kconfig b/drivers/gpu/drm/tilcdc/Kconfig index 7c3ef79fcb37..8394a0b3993e 100644 --- a/drivers/gpu/drm/tilcdc/Kconfig +++ b/drivers/gpu/drm/tilcdc/Kconfig | |||
@@ -1,6 +1,6 @@ | |||
1 | config DRM_TILCDC | 1 | config DRM_TILCDC |
2 | tristate "DRM Support for TI LCDC Display Controller" | 2 | tristate "DRM Support for TI LCDC Display Controller" |
3 | depends on DRM && OF && ARM | 3 | depends on DRM && OF && ARM && HAVE_DMA_ATTRS |
4 | select DRM_KMS_HELPER | 4 | select DRM_KMS_HELPER |
5 | select DRM_KMS_FB_HELPER | 5 | select DRM_KMS_FB_HELPER |
6 | select DRM_KMS_CMA_HELPER | 6 | select DRM_KMS_CMA_HELPER |