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

Commit da509d7a authored by Dave Airlie's avatar Dave Airlie
Browse files

drm: remove DRM_GETSAREA and replace with drm_getsarea function 



Signed-off-by: default avatarDave Airlie <airlied@linux.ie>
parent bd1b331f

drivers/char/drm/drmP.h

+2 −0
Original line number Diff line number Diff line
@@ -1024,6 +1024,8 @@ extern drm_head_t **drm_heads; 
extern struct class *drm_class;

extern struct proc_dir_entry *drm_proc_root;



extern drm_local_map_t *drm_getsarea(struct drm_device *dev);



				/* Proc support (drm_proc.h) */

extern int drm_proc_init(drm_device_t * dev,

			 int minor,

drivers/char/drm/drm_drv.c

+14 −0
Original line number Diff line number Diff line
@@ -517,3 +517,17 @@ int drm_ioctl(struct inode *inode, struct file *filp, 
}



EXPORT_SYMBOL(drm_ioctl);



drm_local_map_t *drm_getsarea(struct drm_device *dev)

{

	drm_map_list_t *entry;



	list_for_each_entry(entry, &dev->maplist->head, head) {

		if (entry->map && entry->map->type == _DRM_SHM &&

		    (entry->map->flags & _DRM_CONTAINS_LOCK)) {

			return entry->map;

		}

	}

	return NULL;

}

EXPORT_SYMBOL(drm_getsarea);

drivers/char/drm/drm_os_linux.h

+0 −18
Original line number Diff line number Diff line
@@ -96,24 +96,6 @@ static __inline__ int mtrr_del(int reg, unsigned long base, unsigned long size) 


#define DRM_GET_PRIV_WITH_RETURN(_priv, _filp) _priv = _filp->private_data



/**

 * Get the pointer to the SAREA.

 *

 * Searches the SAREA on the mapping lists and points drm_device::sarea to it.

 */

#define DRM_GETSAREA()							 \

do { 									 \

	drm_map_list_t *entry;						 \

	list_for_each_entry( entry, &dev->maplist, head ) {		 \

		if ( entry->map &&					 \

		     entry->map->type == _DRM_SHM &&			 \

		     (entry->map->flags & _DRM_CONTAINS_LOCK) ) {	 \

			dev_priv->sarea = entry->map;			 \

 			break;						 \

 		}							 \

 	}								 \

} while (0)



#define DRM_HZ HZ



#define DRM_WAIT_ON( ret, queue, timeout, condition )		\

drivers/char/drm/i915_dma.c

+1 −1
Original line number Diff line number Diff line
@@ -132,7 +132,7 @@ static int i915_initialize(drm_device_t * dev, 
{

	memset(dev_priv, 0, sizeof(drm_i915_private_t));



	DRM_GETSAREA();

	dev_priv->sarea = drm_getsarea(dev);

	if (!dev_priv->sarea) {

		DRM_ERROR("can not find sarea!\n");

		dev->dev_private = (void *)dev_priv;

drivers/char/drm/mga_dma.c

+1 −2
Original line number Diff line number Diff line
@@ -823,8 +823,7 @@ static int mga_do_init_dma(drm_device_t * dev, drm_mga_init_t * init) 
	dev_priv->texture_offset = init->texture_offset[0];

	dev_priv->texture_size = init->texture_size[0];



	DRM_GETSAREA();



	dev_priv->sarea = drm_getsarea(dev);

	if (!dev_priv->sarea) {

		DRM_ERROR("failed to find sarea!\n");

		return DRM_ERR(EINVAL);