提交 5f275026 编写于 作者: D Daniel Vetter

drm: Make drm_modeset_lock_crtc internal

This is only for legacy paths that need to grab the crtc/plane lock
combo. If you want to lock a crtc, just use drm_modeset_lock().
Reviewed-by: NHarry Wentland <harry.wentland@amd.com>
Reviewed-by: NMaarten Lankhorst <maarten.lankhorst@linux.intel.com>
Signed-off-by: NDaniel Vetter <daniel.vetter@intel.com>
Link: http://patchwork.freedesktop.org/patch/msgid/20170403083304.9083-2-daniel.vetter@ffwll.ch
上级 5db06a8a
...@@ -61,6 +61,9 @@ int drm_mode_getresources(struct drm_device *dev, ...@@ -61,6 +61,9 @@ int drm_mode_getresources(struct drm_device *dev,
void *data, struct drm_file *file_priv); void *data, struct drm_file *file_priv);
/* drm_modeset_lock.c */
void drm_modeset_lock_crtc(struct drm_crtc *crtc,
struct drm_plane *plane);
/* drm_dumb_buffers.c */ /* drm_dumb_buffers.c */
/* IOCTLs */ /* IOCTLs */
int drm_mode_create_dumb_ioctl(struct drm_device *dev, int drm_mode_create_dumb_ioctl(struct drm_device *dev,
......
...@@ -148,19 +148,6 @@ void drm_modeset_unlock_all(struct drm_device *dev) ...@@ -148,19 +148,6 @@ void drm_modeset_unlock_all(struct drm_device *dev)
} }
EXPORT_SYMBOL(drm_modeset_unlock_all); EXPORT_SYMBOL(drm_modeset_unlock_all);
/**
* drm_modeset_lock_crtc - lock crtc with hidden acquire ctx for a plane update
* @crtc: DRM CRTC
* @plane: DRM plane to be updated on @crtc
*
* This function locks the given crtc and plane (which should be either the
* primary or cursor plane) using a hidden acquire context. This is necessary so
* that drivers internally using the atomic interfaces can grab further locks
* with the lock acquire context.
*
* Note that @plane can be NULL, e.g. when the cursor support hasn't yet been
* converted to universal planes yet.
*/
void drm_modeset_lock_crtc(struct drm_crtc *crtc, void drm_modeset_lock_crtc(struct drm_crtc *crtc,
struct drm_plane *plane) struct drm_plane *plane)
{ {
...@@ -205,7 +192,6 @@ void drm_modeset_lock_crtc(struct drm_crtc *crtc, ...@@ -205,7 +192,6 @@ void drm_modeset_lock_crtc(struct drm_crtc *crtc,
goto retry; goto retry;
} }
} }
EXPORT_SYMBOL(drm_modeset_lock_crtc);
/** /**
* drm_modeset_legacy_acquire_ctx - find acquire ctx for legacy ioctls * drm_modeset_legacy_acquire_ctx - find acquire ctx for legacy ioctls
......
...@@ -121,8 +121,6 @@ struct drm_plane; ...@@ -121,8 +121,6 @@ struct drm_plane;
void drm_modeset_lock_all(struct drm_device *dev); void drm_modeset_lock_all(struct drm_device *dev);
void drm_modeset_unlock_all(struct drm_device *dev); void drm_modeset_unlock_all(struct drm_device *dev);
void drm_modeset_lock_crtc(struct drm_crtc *crtc,
struct drm_plane *plane);
void drm_modeset_unlock_crtc(struct drm_crtc *crtc); void drm_modeset_unlock_crtc(struct drm_crtc *crtc);
void drm_warn_on_modeset_not_all_locked(struct drm_device *dev); void drm_warn_on_modeset_not_all_locked(struct drm_device *dev);
struct drm_modeset_acquire_ctx * struct drm_modeset_acquire_ctx *
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册