summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorHyungwon Hwang <human.hwang@samsung.com>2014-11-27 05:40:05 (GMT)
committerHyungwon Hwang <human.hwang@samsung.com>2014-12-23 02:09:29 (GMT)
commit34c16a783b687075c56fe134fa4ec780cd67903a (patch)
treeee92a69df0eebcf11f589d0a9f931606bc82aff9
parent57fb460b61ff21cc1a594c0bb77688ae02653401 (diff)
downloadlinux-3.10-34c16a783b687075c56fe134fa4ec780cd67903a.zip
linux-3.10-34c16a783b687075c56fe134fa4ec780cd67903a.tar.gz
linux-3.10-34c16a783b687075c56fe134fa4ec780cd67903a.tar.bz2
drm/exynos: fix build error which occurs in FIMD without IPP
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 <human.hwang@samsung.com>
-rw-r--r--drivers/gpu/drm/exynos/exynos_drm_drv.h3
-rw-r--r--drivers/gpu/drm/exynos/exynos_drm_fimd.c1
-rw-r--r--drivers/gpu/drm/exynos/exynos_drm_ipp.h6
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 1a790b1..c3421cd 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 8b3c7a4..cf8d974 100644
--- a/drivers/gpu/drm/exynos/exynos_drm_fimd.c
+++ b/drivers/gpu/drm/exynos/exynos_drm_fimd.c
@@ -28,6 +28,7 @@
#include <drm/exynos_drm.h>
#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 f76f03d..34cf188 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)