projects
/
firefly-linux-kernel-4.4.55.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
UPSTREAM: drm/rockchip: support non-iommu buffer path
[firefly-linux-kernel-4.4.55.git]
/
drivers
/
gpu
/
drm
/
rockchip
/
rockchip_drm_fbdev.h
diff --git
a/drivers/gpu/drm/rockchip/rockchip_drm_fbdev.h
b/drivers/gpu/drm/rockchip/rockchip_drm_fbdev.h
index 9052e2364416ccc5ea77ad6a158568cc2d1628e9..73718c5f5bbf720ca6151fc44ca670fc8646c6a9 100644
(file)
--- a/
drivers/gpu/drm/rockchip/rockchip_drm_fbdev.h
+++ b/
drivers/gpu/drm/rockchip/rockchip_drm_fbdev.h
@@
-1,8
+1,6
@@
/*
/*
- * Copyright (C) ROCKCHIP, Inc.
- * Author:yzq<yzq@rock-chips.com>
- *
- * based on exynos_drm_fbdev.h
+ * Copyright (C) Fuzhou Rockchip Electronics Co.Ltd
+ * Author:Mark Yao <mark.yao@rock-chips.com>
*
* This software is licensed under the terms of the GNU General Public
* License version 2, as published by the Free Software Foundation, and
*
* This software is licensed under the terms of the GNU General Public
* License version 2, as published by the Free Software Foundation, and
@@
-13,12
+11,22
@@
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*/
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*/
-#ifndef _ROCKCHIP_DRM_FBDEV_H_
-#define _ROCKCHIP_DRM_FBDEV_H_
+#ifndef _ROCKCHIP_DRM_FBDEV_H
+#define _ROCKCHIP_DRM_FBDEV_H
+
+#ifdef CONFIG_DRM_FBDEV_EMULATION
int rockchip_drm_fbdev_init(struct drm_device *dev);
int rockchip_drm_fbdev_init(struct drm_device *dev);
-int rockchip_drm_fbdev_reinit(struct drm_device *dev);
void rockchip_drm_fbdev_fini(struct drm_device *dev);
void rockchip_drm_fbdev_fini(struct drm_device *dev);
-void rockchip_drm_fbdev_restore_mode(struct drm_device *dev);
+#else
+static inline int rockchip_drm_fbdev_init(struct drm_device *dev)
+{
+ return 0;
+}
+static inline void rockchip_drm_fbdev_fini(struct drm_device *dev)
+{
+}
#endif
#endif
+
+#endif /* _ROCKCHIP_DRM_FBDEV_H */