aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--drivers/gpu/drm/drm_irq.c10
-rw-r--r--include/drm/drmP.h2
2 files changed, 2 insertions, 10 deletions
diff --git a/drivers/gpu/drm/drm_irq.c b/drivers/gpu/drm/drm_irq.c
index 38cc7824ac72..76e39c50c90c 100644
--- a/drivers/gpu/drm/drm_irq.c
+++ b/drivers/gpu/drm/drm_irq.c
@@ -1108,7 +1108,7 @@ static int drm_vblank_enable(struct drm_device *dev, unsigned int pipe)
1108 * Returns: 1108 * Returns:
1109 * Zero on success or a negative error code on failure. 1109 * Zero on success or a negative error code on failure.
1110 */ 1110 */
1111int drm_vblank_get(struct drm_device *dev, unsigned int pipe) 1111static int drm_vblank_get(struct drm_device *dev, unsigned int pipe)
1112{ 1112{
1113 struct drm_vblank_crtc *vblank = &dev->vblank[pipe]; 1113 struct drm_vblank_crtc *vblank = &dev->vblank[pipe];
1114 unsigned long irqflags; 1114 unsigned long irqflags;
@@ -1134,7 +1134,6 @@ int drm_vblank_get(struct drm_device *dev, unsigned int pipe)
1134 1134
1135 return ret; 1135 return ret;
1136} 1136}
1137EXPORT_SYMBOL(drm_vblank_get);
1138 1137
1139/** 1138/**
1140 * drm_crtc_vblank_get - get a reference count on vblank events 1139 * drm_crtc_vblank_get - get a reference count on vblank events
@@ -1143,8 +1142,6 @@ EXPORT_SYMBOL(drm_vblank_get);
1143 * Acquire a reference count on vblank events to avoid having them disabled 1142 * Acquire a reference count on vblank events to avoid having them disabled
1144 * while in use. 1143 * while in use.
1145 * 1144 *
1146 * This is the native kms version of drm_vblank_get().
1147 *
1148 * Returns: 1145 * Returns:
1149 * Zero on success or a negative error code on failure. 1146 * Zero on success or a negative error code on failure.
1150 */ 1147 */
@@ -1164,7 +1161,7 @@ EXPORT_SYMBOL(drm_crtc_vblank_get);
1164 * 1161 *
1165 * This is the legacy version of drm_crtc_vblank_put(). 1162 * This is the legacy version of drm_crtc_vblank_put().
1166 */ 1163 */
1167void drm_vblank_put(struct drm_device *dev, unsigned int pipe) 1164static void drm_vblank_put(struct drm_device *dev, unsigned int pipe)
1168{ 1165{
1169 struct drm_vblank_crtc *vblank = &dev->vblank[pipe]; 1166 struct drm_vblank_crtc *vblank = &dev->vblank[pipe];
1170 1167
@@ -1185,7 +1182,6 @@ void drm_vblank_put(struct drm_device *dev, unsigned int pipe)
1185 jiffies + ((drm_vblank_offdelay * HZ)/1000)); 1182 jiffies + ((drm_vblank_offdelay * HZ)/1000));
1186 } 1183 }
1187} 1184}
1188EXPORT_SYMBOL(drm_vblank_put);
1189 1185
1190/** 1186/**
1191 * drm_crtc_vblank_put - give up ownership of vblank events 1187 * drm_crtc_vblank_put - give up ownership of vblank events
@@ -1193,8 +1189,6 @@ EXPORT_SYMBOL(drm_vblank_put);
1193 * 1189 *
1194 * Release ownership of a given vblank counter, turning off interrupts 1190 * Release ownership of a given vblank counter, turning off interrupts
1195 * if possible. Disable interrupts after drm_vblank_offdelay milliseconds. 1191 * if possible. Disable interrupts after drm_vblank_offdelay milliseconds.
1196 *
1197 * This is the native kms version of drm_vblank_put().
1198 */ 1192 */
1199void drm_crtc_vblank_put(struct drm_crtc *crtc) 1193void drm_crtc_vblank_put(struct drm_crtc *crtc)
1200{ 1194{
diff --git a/include/drm/drmP.h b/include/drm/drmP.h
index 9a76c7ce9736..04310cb08111 100644
--- a/include/drm/drmP.h
+++ b/include/drm/drmP.h
@@ -975,8 +975,6 @@ extern void drm_crtc_arm_vblank_event(struct drm_crtc *crtc,
975 struct drm_pending_vblank_event *e); 975 struct drm_pending_vblank_event *e);
976extern bool drm_handle_vblank(struct drm_device *dev, unsigned int pipe); 976extern bool drm_handle_vblank(struct drm_device *dev, unsigned int pipe);
977extern bool drm_crtc_handle_vblank(struct drm_crtc *crtc); 977extern bool drm_crtc_handle_vblank(struct drm_crtc *crtc);
978extern int drm_vblank_get(struct drm_device *dev, unsigned int pipe);
979extern void drm_vblank_put(struct drm_device *dev, unsigned int pipe);
980extern int drm_crtc_vblank_get(struct drm_crtc *crtc); 978extern int drm_crtc_vblank_get(struct drm_crtc *crtc);
981extern void drm_crtc_vblank_put(struct drm_crtc *crtc); 979extern void drm_crtc_vblank_put(struct drm_crtc *crtc);
982extern void drm_wait_one_vblank(struct drm_device *dev, unsigned int pipe); 980extern void drm_wait_one_vblank(struct drm_device *dev, unsigned int pipe);