Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit a8f8b1d9 authored by Daniel Vetter's avatar Daniel Vetter
Browse files

drm: Extract drm_file.h 



I'm torn on whether drm_minor really should be here or somewhere else.
Maybe with more clarity after untangling drmP.h more this is easier to
decide, for now I've put a FIXME comment right next to it. Right now
we need struct drm_minor for the inline drm_file type helpers, and so
it does kinda make sense to have them here.

Next patch will kerneldoc-ify the entire pile.

Reviewed-by: default avatarGustavo Padovan <gustavo.padovan@collabora.com>
Signed-off-by: default avatarDaniel Vetter <daniel.vetter@intel.com>
Link: http://patchwork.freedesktop.org/patch/msgid/20170308141257.12119-10-daniel.vetter@ffwll.ch
parent 721dacbb

drivers/gpu/drm/drm_file.c

+4 −1
Original line number Diff line number Diff line
@@ -31,10 +31,13 @@ 
 * OTHER DEALINGS IN THE SOFTWARE.

 */



#include <drm/drmP.h>

#include <linux/poll.h>

#include <linux/slab.h>

#include <linux/module.h>



#include <drm/drm_file.h>

#include <drm/drmP.h>



#include "drm_legacy.h"

#include "drm_internal.h"

#include "drm_crtc_internal.h"

include/drm/drmP.h

+1 −126
Original line number Diff line number Diff line
@@ -77,10 +77,10 @@ 
#include <drm/drm_drv.h>

#include <drm/drm_prime.h>

#include <drm/drm_pci.h>

#include <drm/drm_file.h>



struct module;



struct drm_file;

struct drm_device;

struct drm_agp_head;

struct drm_local_map;
@@ -360,76 +360,6 @@ struct drm_ioctl_desc { 
		.name = #ioctl						\

	 }



/* Event queued up for userspace to read */

struct drm_pending_event {

	struct completion *completion;

	void (*completion_release)(struct completion *completion);

	struct drm_event *event;

	struct dma_fence *fence;

	struct list_head link;

	struct list_head pending_link;

	struct drm_file *file_priv;

	pid_t pid; /* pid of requester, no guarantee it's valid by the time

		      we deliver the event, for tracing only */

};



/** File private data */

struct drm_file {

	unsigned authenticated :1;

	/* true when the client has asked us to expose stereo 3D mode flags */

	unsigned stereo_allowed :1;

	/*

	 * true if client understands CRTC primary planes and cursor planes

	 * in the plane list

	 */

	unsigned universal_planes:1;

	/* true if client understands atomic properties */

	unsigned atomic:1;

	/*

	 * This client is the creator of @master.

	 * Protected by struct drm_device::master_mutex.

	 */

	unsigned is_master:1;



	struct pid *pid;

	drm_magic_t magic;

	struct list_head lhead;

	struct drm_minor *minor;

	unsigned long lock_count;



	/** Mapping of mm object handles to object pointers. */

	struct idr object_idr;

	/** Lock for synchronization of access to object_idr. */

	spinlock_t table_lock;



	struct file *filp;

	void *driver_priv;



	struct drm_master *master; /* master this node is currently associated with

				      N.B. not always dev->master */

	/**

	 * fbs - List of framebuffers associated with this file.

	 *

	 * Protected by fbs_lock. Note that the fbs list holds a reference on

	 * the fb object to prevent it from untimely disappearing.

	 */

	struct list_head fbs;

	struct mutex fbs_lock;



	/** User-created blob properties; this retains a reference on the

	 *  property. */

	struct list_head blobs;



	wait_queue_head_t event_wait;

	struct list_head pending_event_list;

	struct list_head event_list;

	int event_space;



	struct mutex event_read_lock;



	struct drm_prime_file_private prime;

};



/* Flags and return codes for get_vblank_timestamp() driver function. */

#define DRM_CALLED_FROM_VBLIRQ 1

#define DRM_VBLANKTIME_SCANOUTPOS_METHOD (1 << 0)
@@ -440,12 +370,6 @@ struct drm_file { 
#define DRM_SCANOUTPOS_IN_VBLANK    (1 << 1)

#define DRM_SCANOUTPOS_ACCURATE     (1 << 2)



enum drm_minor_type {

	DRM_MINOR_PRIMARY,

	DRM_MINOR_CONTROL,

	DRM_MINOR_RENDER,

};



/**

 * Info file list entry. This structure represents a debugfs or proc file to

 * be created by the drm core
@@ -467,21 +391,6 @@ struct drm_info_node { 
	struct dentry *dent;

};



/**

 * DRM minor structure. This structure represents a drm minor number.

 */

struct drm_minor {

	int index;			/**< Minor device number */

	int type;                       /**< Control or render */

	struct device *kdev;		/**< Linux device */

	struct drm_device *dev;



	struct dentry *debugfs_root;



	struct list_head debugfs_list;

	struct mutex debugfs_lock; /* Protects debugfs_list. */

};



/**

 * DRM device structure. This structure represent a complete card that

 * may contain multiple heads.
@@ -656,21 +565,6 @@ static inline int drm_device_is_unplugged(struct drm_device *dev) 
	return ret;

}



static inline bool drm_is_render_client(const struct drm_file *file_priv)

{

	return file_priv->minor->type == DRM_MINOR_RENDER;

}



static inline bool drm_is_control_client(const struct drm_file *file_priv)

{

	return file_priv->minor->type == DRM_MINOR_CONTROL;

}



static inline bool drm_is_primary_client(const struct drm_file *file_priv)

{

	return file_priv->minor->type == DRM_MINOR_PRIMARY;

}



/******************************************************************/

/** \name Internal function definitions */

/*@{*/
@@ -688,25 +582,6 @@ extern long drm_compat_ioctl(struct file *filp, 
#endif

extern bool drm_ioctl_flags(unsigned int nr, unsigned int *flags);



/* File Operations (drm_file.c) */

int drm_open(struct inode *inode, struct file *filp);

ssize_t drm_read(struct file *filp, char __user *buffer,

		 size_t count, loff_t *offset);

int drm_release(struct inode *inode, struct file *filp);

unsigned int drm_poll(struct file *filp, struct poll_table_struct *wait);

int drm_event_reserve_init_locked(struct drm_device *dev,

				  struct drm_file *file_priv,

				  struct drm_pending_event *p,

				  struct drm_event *e);

int drm_event_reserve_init(struct drm_device *dev,

			   struct drm_file *file_priv,

			   struct drm_pending_event *p,

			   struct drm_event *e);

void drm_event_cancel_free(struct drm_device *dev,

			   struct drm_pending_event *p);

void drm_send_event_locked(struct drm_device *dev, struct drm_pending_event *e);

void drm_send_event(struct drm_device *dev, struct drm_pending_event *e);



/* Misc. IOCTL support (drm_ioctl.c) */

int drm_noop(struct drm_device *dev, void *data,

	     struct drm_file *file_priv);

include/drm/drm_file.h

0 → 100644
+172 −0
Original line number Diff line number Diff line 
/*

 * Copyright 1999 Precision Insight, Inc., Cedar Park, Texas.

 * Copyright 2000 VA Linux Systems, Inc., Sunnyvale, California.

 * Copyright (c) 2009-2010, Code Aurora Forum.

 * All rights reserved.

 *

 * Author: Rickard E. (Rik) Faith <faith@valinux.com>

 * Author: Gareth Hughes <gareth@valinux.com>

 *

 * Permission is hereby granted, free of charge, to any person obtaining a

 * copy of this software and associated documentation files (the "Software"),

 * to deal in the Software without restriction, including without limitation

 * the rights to use, copy, modify, merge, publish, distribute, sublicense,

 * and/or sell copies of the Software, and to permit persons to whom the

 * Software is furnished to do so, subject to the following conditions:

 *

 * The above copyright notice and this permission notice (including the next

 * paragraph) shall be included in all copies or substantial portions of the

 * Software.

 *

 * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR

 * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,

 * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL

 * VA LINUX SYSTEMS AND/OR ITS SUPPLIERS BE LIABLE FOR ANY CLAIM, DAMAGES OR

 * OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,

 * ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR

 * OTHER DEALINGS IN THE SOFTWARE.

 */



#ifndef _DRM_FILE_H_

#define _DRM_FILE_H_



#include <linux/types.h>

#include <linux/completion.h>



#include <uapi/drm/drm.h>



#include <drm/drm_prime.h>



struct dma_fence;

struct drm_file;

struct drm_device;



/*

 * FIXME: Not sure we want to have drm_minor here in the end, but to avoid

 * header include loops we need it here for now.

 */

enum drm_minor_type {

	DRM_MINOR_PRIMARY,

	DRM_MINOR_CONTROL,

	DRM_MINOR_RENDER,

};



/**

 * DRM minor structure. This structure represents a drm minor number.

 */

struct drm_minor {

	int index;			/**< Minor device number */

	int type;                       /**< Control or render */

	struct device *kdev;		/**< Linux device */

	struct drm_device *dev;



	struct dentry *debugfs_root;



	struct list_head debugfs_list;

	struct mutex debugfs_lock; /* Protects debugfs_list. */

};



/* Event queued up for userspace to read */

struct drm_pending_event {

	struct completion *completion;

	void (*completion_release)(struct completion *completion);

	struct drm_event *event;

	struct dma_fence *fence;

	struct list_head link;

	struct list_head pending_link;

	struct drm_file *file_priv;

	pid_t pid; /* pid of requester, no guarantee it's valid by the time

		      we deliver the event, for tracing only */

};



/** File private data */

struct drm_file {

	unsigned authenticated :1;

	/* true when the client has asked us to expose stereo 3D mode flags */

	unsigned stereo_allowed :1;

	/*

	 * true if client understands CRTC primary planes and cursor planes

	 * in the plane list

	 */

	unsigned universal_planes:1;

	/* true if client understands atomic properties */

	unsigned atomic:1;

	/*

	 * This client is the creator of @master.

	 * Protected by struct drm_device::master_mutex.

	 */

	unsigned is_master:1;



	struct pid *pid;

	drm_magic_t magic;

	struct list_head lhead;

	struct drm_minor *minor;

	unsigned long lock_count;



	/** Mapping of mm object handles to object pointers. */

	struct idr object_idr;

	/** Lock for synchronization of access to object_idr. */

	spinlock_t table_lock;



	struct file *filp;

	void *driver_priv;



	struct drm_master *master; /* master this node is currently associated with

				      N.B. not always dev->master */

	/**

	 * fbs - List of framebuffers associated with this file.

	 *

	 * Protected by fbs_lock. Note that the fbs list holds a reference on

	 * the fb object to prevent it from untimely disappearing.

	 */

	struct list_head fbs;

	struct mutex fbs_lock;



	/** User-created blob properties; this retains a reference on the

	 *  property. */

	struct list_head blobs;



	wait_queue_head_t event_wait;

	struct list_head pending_event_list;

	struct list_head event_list;

	int event_space;



	struct mutex event_read_lock;



	struct drm_prime_file_private prime;

};



static inline bool drm_is_render_client(const struct drm_file *file_priv)

{

	return file_priv->minor->type == DRM_MINOR_RENDER;

}



static inline bool drm_is_control_client(const struct drm_file *file_priv)

{

	return file_priv->minor->type == DRM_MINOR_CONTROL;

}



static inline bool drm_is_primary_client(const struct drm_file *file_priv)

{

	return file_priv->minor->type == DRM_MINOR_PRIMARY;

}



int drm_open(struct inode *inode, struct file *filp);

ssize_t drm_read(struct file *filp, char __user *buffer,

		 size_t count, loff_t *offset);

int drm_release(struct inode *inode, struct file *filp);

unsigned int drm_poll(struct file *filp, struct poll_table_struct *wait);

int drm_event_reserve_init_locked(struct drm_device *dev,

				  struct drm_file *file_priv,

				  struct drm_pending_event *p,

				  struct drm_event *e);

int drm_event_reserve_init(struct drm_device *dev,

			   struct drm_file *file_priv,

			   struct drm_pending_event *p,

			   struct drm_event *e);

void drm_event_cancel_free(struct drm_device *dev,

			   struct drm_pending_event *p);

void drm_send_event_locked(struct drm_device *dev, struct drm_pending_event *e);

void drm_send_event(struct drm_device *dev, struct drm_pending_event *e);



#endif /* _DRM_FILE_H_ */

include/drm/drm_prime.h

+1 −0
Original line number Diff line number Diff line
@@ -34,6 +34,7 @@ 


#include <linux/mutex.h>

#include <linux/rbtree.h>

#include <linux/scatterlist.h>



/**

 * struct drm_prime_file_private - per-file tracking for PRIME