Merge branch 'linux-linaro-lsk' into linux-linaro-lsk-android

[firefly-linux-kernel-4.4.55.git] / include / video / adf_fbdev.h

diff --git a/include/video/adf_fbdev.h b/include/video/adf_fbdev.h
index 9c349144b5cdccc61839573db2aea3bb40c28a11..b722c6b3ab028bdaafb75995d633efb4717248ae 100644 (file)
--- a/include/video/adf_fbdev.h
+++ b/include/video/adf_fbdev.h
@@ -16,6 +16,7 @@
 #define _VIDEO_ADF_FBDEV_H_
 
 #include <linux/fb.h>
+#include <linux/mutex.h>
 #include <video/adf.h>
 
 struct adf_fbdev {
@@ -24,7 +25,8 @@ struct adf_fbdev {
        struct fb_info *info;
        u32 pseudo_palette[16];
 
-       bool open;
+       unsigned int refcount;
+       struct mutex refcount_lock;
 
        struct dma_buf *dma_buf;
        u32 offset;
@@ -37,6 +39,7 @@ struct adf_fbdev {
        u32 default_format;
 };
 
+#if IS_ENABLED(CONFIG_ADF_FBDEV)
 void adf_modeinfo_to_fb_videomode(const struct drm_mode_modeinfo *mode,
                struct fb_videomode *vmode);
 void adf_modeinfo_from_fb_videomode(const struct fb_videomode *vmode,
@@ -55,5 +58,67 @@ int adf_fbdev_set_par(struct fb_info *info);
 int adf_fbdev_blank(int blank, struct fb_info *info);
 int adf_fbdev_pan_display(struct fb_var_screeninfo *var, struct fb_info *info);
 int adf_fbdev_mmap(struct fb_info *info, struct vm_area_struct *vma);
+#else
+static inline void adf_modeinfo_to_fb_videomode(const struct drm_mode_modeinfo *mode,
+               struct fb_videomode *vmode)
+{
+       WARN_ONCE(1, "%s: CONFIG_ADF_FBDEV is disabled\n", __func__);
+}
+
+static inline void adf_modeinfo_from_fb_videomode(const struct fb_videomode *vmode,
+               struct drm_mode_modeinfo *mode)
+{
+       WARN_ONCE(1, "%s: CONFIG_ADF_FBDEV is disabled\n", __func__);
+}
+
+static inline int adf_fbdev_init(struct adf_fbdev *fbdev,
+               struct adf_interface *interface,
+               struct adf_overlay_engine *eng,
+               u16 xres_virtual, u16 yres_virtual, u32 format,
+               struct fb_ops *fbops, const char *fmt, ...)
+{
+       return -ENODEV;
+}
+
+static inline void adf_fbdev_destroy(struct adf_fbdev *fbdev) { }
+
+static inline int adf_fbdev_open(struct fb_info *info, int user)
+{
+       return -ENODEV;
+}
+
+static inline int adf_fbdev_release(struct fb_info *info, int user)
+{
+       return -ENODEV;
+}
+
+static inline int adf_fbdev_check_var(struct fb_var_screeninfo *var,
+               struct fb_info *info)
+{
+       return -ENODEV;
+}
+
+static inline int adf_fbdev_set_par(struct fb_info *info)
+{
+       return -ENODEV;
+}
+
+static inline int adf_fbdev_blank(int blank, struct fb_info *info)
+{
+       return -ENODEV;
+}
+
+static inline int adf_fbdev_pan_display(struct fb_var_screeninfo *var,
+               struct fb_info *info)
+{
+       return -ENODEV;
+}
+
+static inline int adf_fbdev_mmap(struct fb_info *info,
+               struct vm_area_struct *vma)
+{
+       return -ENODEV;
+}
+#endif
 
 #endif /* _VIDEO_ADF_FBDEV_H_ */