Commit 85e634bc authored by Daniel Vetter's avatar Daniel Vetter

drm: Extract drm_drv.h

I want to move dumb buffer documentation into the right vfuncs, and
for that I first need to be able to pull that into kerneldoc without
having to clean up all of drmP.h. Also, header-splitting is nice.

While at it shuffle all the function declarations for drm_drv.c into
the right spots, and drop the kerneldoc for drm_minor_acquire/release
since it's only used internally.

v2: Keep all existing copyright notices (Chris).
Reviewed-by: default avatarChris Wilson <chris@chris-wilson.co.uk>
Signed-off-by: default avatarDaniel Vetter <daniel.vetter@intel.com>
parent 8a5846bf
...@@ -32,7 +32,10 @@ ...@@ -32,7 +32,10 @@
#include <linux/moduleparam.h> #include <linux/moduleparam.h>
#include <linux/mount.h> #include <linux/mount.h>
#include <linux/slab.h> #include <linux/slab.h>
#include <drm/drm_drv.h>
#include <drm/drmP.h> #include <drm/drmP.h>
#include "drm_crtc_internal.h" #include "drm_crtc_internal.h"
#include "drm_legacy.h" #include "drm_legacy.h"
#include "drm_internal.h" #include "drm_internal.h"
...@@ -257,10 +260,7 @@ static void drm_minor_unregister(struct drm_device *dev, unsigned int type) ...@@ -257,10 +260,7 @@ static void drm_minor_unregister(struct drm_device *dev, unsigned int type)
drm_debugfs_cleanup(minor); drm_debugfs_cleanup(minor);
} }
/** /*
* drm_minor_acquire - Acquire a DRM minor
* @minor_id: Minor ID of the DRM-minor
*
* Looks up the given minor-ID and returns the respective DRM-minor object. The * Looks up the given minor-ID and returns the respective DRM-minor object. The
* refence-count of the underlying device is increased so you must release this * refence-count of the underlying device is increased so you must release this
* object with drm_minor_release(). * object with drm_minor_release().
...@@ -268,10 +268,6 @@ static void drm_minor_unregister(struct drm_device *dev, unsigned int type) ...@@ -268,10 +268,6 @@ static void drm_minor_unregister(struct drm_device *dev, unsigned int type)
* As long as you hold this minor, it is guaranteed that the object and the * As long as you hold this minor, it is guaranteed that the object and the
* minor->dev pointer will stay valid! However, the device may get unplugged and * minor->dev pointer will stay valid! However, the device may get unplugged and
* unregistered while you hold the minor. * unregistered while you hold the minor.
*
* Returns:
* Pointer to minor-object with increased device-refcount, or PTR_ERR on
* failure.
*/ */
struct drm_minor *drm_minor_acquire(unsigned int minor_id) struct drm_minor *drm_minor_acquire(unsigned int minor_id)
{ {
...@@ -294,12 +290,6 @@ struct drm_minor *drm_minor_acquire(unsigned int minor_id) ...@@ -294,12 +290,6 @@ struct drm_minor *drm_minor_acquire(unsigned int minor_id)
return minor; return minor;
} }
/**
* drm_minor_release - Release DRM minor
* @minor: Pointer to DRM minor object
*
* Release a minor that was previously acquired via drm_minor_acquire().
*/
void drm_minor_release(struct drm_minor *minor) void drm_minor_release(struct drm_minor *minor)
{ {
drm_dev_unref(minor->dev); drm_dev_unref(minor->dev);
......
...@@ -46,6 +46,10 @@ void drm_prime_destroy_file_private(struct drm_prime_file_private *prime_fpriv); ...@@ -46,6 +46,10 @@ void drm_prime_destroy_file_private(struct drm_prime_file_private *prime_fpriv);
void drm_prime_remove_buf_handle_locked(struct drm_prime_file_private *prime_fpriv, void drm_prime_remove_buf_handle_locked(struct drm_prime_file_private *prime_fpriv,
struct dma_buf *dma_buf); struct dma_buf *dma_buf);
/* drm_drv.c */
struct drm_minor *drm_minor_acquire(unsigned int minor_id);
void drm_minor_release(struct drm_minor *minor);
/* drm_info.c */ /* drm_info.c */
int drm_name_info(struct seq_file *m, void *data); int drm_name_info(struct seq_file *m, void *data);
int drm_clients_info(struct seq_file *m, void* data); int drm_clients_info(struct seq_file *m, void* data);
......
This diff is collapsed.
This diff is collapsed.
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment