Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

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>

authored by

Chen Gang S and committed by
Dave Airlie
db88c8f4 44df9c41

+7 -6
+2 -1
drivers/gpu/drm/Kconfig
··· 62 62 63 63 config DRM_GEM_CMA_HELPER 64 64 bool 65 - depends on DRM 65 + depends on DRM && HAVE_DMA_ATTRS 66 66 help 67 67 Choose this if you need the GEM CMA helper functions 68 68 69 69 config DRM_KMS_CMA_HELPER 70 70 bool 71 + depends on DRM && HAVE_DMA_ATTRS 71 72 select DRM_GEM_CMA_HELPER 72 73 select DRM_KMS_FB_HELPER 73 74 select FB_SYS_FILLRECT
+1 -1
drivers/gpu/drm/imx/Kconfig
··· 5 5 select VIDEOMODE_HELPERS 6 6 select DRM_GEM_CMA_HELPER 7 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 9 depends on IMX_IPUV3_CORE 10 10 help 11 11 enable i.MX graphics support
+1 -1
drivers/gpu/drm/rcar-du/Kconfig
··· 1 1 config DRM_RCAR_DU 2 2 tristate "DRM Support for R-Car Display Unit" 3 - depends on DRM && ARM 3 + depends on DRM && ARM && HAVE_DMA_ATTRS 4 4 depends on ARCH_SHMOBILE || COMPILE_TEST 5 5 select DRM_KMS_HELPER 6 6 select DRM_KMS_CMA_HELPER
+1 -1
drivers/gpu/drm/shmobile/Kconfig
··· 1 1 config DRM_SHMOBILE 2 2 tristate "DRM Support for SH Mobile" 3 - depends on DRM && ARM 3 + depends on DRM && ARM && HAVE_DMA_ATTRS 4 4 depends on ARCH_SHMOBILE || COMPILE_TEST 5 5 depends on FB_SH_MOBILE_MERAM || !FB_SH_MOBILE_MERAM 6 6 select BACKLIGHT_CLASS_DEVICE
+1 -1
drivers/gpu/drm/sti/Kconfig
··· 1 1 config DRM_STI 2 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 4 select RESET_CONTROLLER 5 5 select DRM_KMS_HELPER 6 6 select DRM_GEM_CMA_HELPER
+1 -1
drivers/gpu/drm/tilcdc/Kconfig
··· 1 1 config DRM_TILCDC 2 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 4 select DRM_KMS_HELPER 5 5 select DRM_KMS_FB_HELPER 6 6 select DRM_KMS_CMA_HELPER