From 34c16a783b687075c56fe134fa4ec780cd67903a Mon Sep 17 00:00:00 2001 From: Hyungwon Hwang Date: Thu, 27 Nov 2014 14:40:05 +0900 Subject: drm/exynos: fix build error which occurs in FIMD without IPP MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This patch fixes build error which occurs when FIMD is turned on withou IPP. In file included from drivers/gpu/drm/exynos/exynos_drm_drv.c:32:0: drivers/gpu/drm/exynos/exynos_drm_ipp.h:220:19: error: static declaration of ‘exynos_drm_ippnb_register’ follows non-static declaration In file included from drivers/gpu/drm/exynos/exynos_drm_drv.c:22:0: drivers/gpu/drm/exynos/exynos_drm_drv.h:383:12: note: previous declaration of ‘exynos_drm_ippnb_register’ was here In file included from drivers/gpu/drm/exynos/exynos_drm_drv.c:32:0: drivers/gpu/drm/exynos/exynos_drm_ipp.h:225:19: error: static declaration of ‘exynos_drm_ippnb_unregister’ follows non-static declaration In file included from drivers/gpu/drm/exynos/exynos_drm_drv.c:22:0: drivers/gpu/drm/exynos/exynos_drm_drv.h:384:12: note: previous declaration of ‘exynos_drm_ippnb_unregister’ was here Change-Id: I2427ca269805f3fbeabb29e9c7f63fbe4824a661 Signed-off-by: Hyungwon Hwang --- drivers/gpu/drm/exynos/exynos_drm_drv.h | 3 --- drivers/gpu/drm/exynos/exynos_drm_fimd.c | 1 + drivers/gpu/drm/exynos/exynos_drm_ipp.h | 6 ++++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/drivers/gpu/drm/exynos/exynos_drm_drv.h b/drivers/gpu/drm/exynos/exynos_drm_drv.h index 1a790b1aa1c..c3421cd10ea 100644 --- a/drivers/gpu/drm/exynos/exynos_drm_drv.h +++ b/drivers/gpu/drm/exynos/exynos_drm_drv.h @@ -380,9 +380,6 @@ int exynos_platform_device_ipp_register(void); */ void exynos_platform_device_ipp_unregister(void); -extern int exynos_drm_ippnb_register(struct notifier_block *nb); -extern int exynos_drm_ippnb_unregister(struct notifier_block *nb); - #ifdef CONFIG_DRM_EXYNOS_DPI int exynos_dpi_probe(struct device *dev); int exynos_dpi_remove(struct device *dev); diff --git a/drivers/gpu/drm/exynos/exynos_drm_fimd.c b/drivers/gpu/drm/exynos/exynos_drm_fimd.c index 8b3c7a43447..cf8d974a1ac 100644 --- a/drivers/gpu/drm/exynos/exynos_drm_fimd.c +++ b/drivers/gpu/drm/exynos/exynos_drm_fimd.c @@ -28,6 +28,7 @@ #include #include "exynos_drm_drv.h" +#include "exynos_drm_ipp.h" #include "exynos_drm_fbdev.h" #include "exynos_drm_crtc.h" #include "exynos_drm_iommu.h" diff --git a/drivers/gpu/drm/exynos/exynos_drm_ipp.h b/drivers/gpu/drm/exynos/exynos_drm_ipp.h index f76f03d9b7a..34cf188109f 100644 --- a/drivers/gpu/drm/exynos/exynos_drm_ipp.h +++ b/drivers/gpu/drm/exynos/exynos_drm_ipp.h @@ -174,6 +174,8 @@ extern int exynos_drm_ipp_queue_buf(struct drm_device *drm_dev, void *data, struct drm_file *file); extern int exynos_drm_ipp_cmd_ctrl(struct drm_device *drm_dev, void *data, struct drm_file *file); +extern int exynos_drm_ippnb_register(struct notifier_block *nb); +extern int exynos_drm_ippnb_unregister(struct notifier_block *nb); extern int exynos_drm_ippnb_send_event(unsigned long val, void *v); extern void ipp_sched_cmd(struct work_struct *work); extern void ipp_sched_event(struct work_struct *work); @@ -219,12 +221,12 @@ static inline int exynos_drm_ipp_cmd_ctrl(struct drm_device *drm_dev, static inline int exynos_drm_ippnb_register(struct notifier_block *nb) { - return -ENODEV; + return 0; } static inline int exynos_drm_ippnb_unregister(struct notifier_block *nb) { - return -ENODEV; + return 0; } static inline int exynos_drm_ippnb_send_event(unsigned long val, void *v) -- cgit v1.2.3