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

Commit d7d2c48e authored by David Herrmann's avatar David Herrmann Committed by Dave Airlie
Browse files

drm: move remaining includes in drmP.h to the top 



Including headers somewhere else but at the top is ugly, deprecated and
was used in early days only to speed up compile-times. Those days are
over. Make headers independent and then move the inclusions to the top.

Signed-off-by: default avatarDavid Herrmann <dh.herrmann@gmail.com>
Reviewed-by: default avatarThierry Reding <treding@nvidia.com>
Signed-off-by: default avatarDave Airlie <airlied@redhat.com>
parent 69d516c0

include/drm/drmP.h

+12 −19
Original line number Diff line number Diff line 
/**

 * \file drmP.h

 * Private header for Direct Rendering Manager

 *

 * \author Rickard E. (Rik) Faith <faith@valinux.com>

 * \author Gareth Hughes <gareth@valinux.com>

 */



/*

 * Internal Header for the Direct Rendering Manager

 *

 * 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
@@ -64,8 +61,14 @@ 
#include <asm/pgalloc.h>

#include <asm/uaccess.h>



#include <drm/drm.h>

#include <uapi/drm/drm.h>

#include <uapi/drm/drm_mode.h>



#include <drm/drm_agpsupport.h>

#include <drm/drm_crtc.h>

#include <drm/drm_global.h>

#include <drm/drm_hashtab.h>

#include <drm/drm_mem_util.h>

#include <drm/drm_mm.h>

#include <drm/drm_os_linux.h>

#include <drm/drm_sarea.h>
@@ -564,8 +567,6 @@ struct drm_gem_object { 
	struct dma_buf_attachment *import_attach;

};



#include <drm/drm_crtc.h>



/**

 * struct drm_master - drm master structure

 *
@@ -1228,10 +1229,6 @@ extern void drm_vblank_post_modeset(struct drm_device *dev, int crtc); 
extern int drm_modeset_ctl(struct drm_device *dev, void *data,

			   struct drm_file *file_priv);



				/* AGP/GART support (drm_agpsupport.h) */



#include <drm/drm_agpsupport.h>



				/* Stub support (drm_stub.h) */

extern int drm_setmaster_ioctl(struct drm_device *dev, void *data,

			       struct drm_file *file_priv);
@@ -1397,8 +1394,6 @@ int drm_gem_mmap_obj(struct drm_gem_object *obj, unsigned long obj_size, 
		     struct vm_area_struct *vma);

int drm_gem_mmap(struct file *filp, struct vm_area_struct *vma);



#include <drm/drm_global.h>



static inline void

drm_gem_object_reference(struct drm_gem_object *obj)

{
@@ -1472,8 +1467,6 @@ static __inline__ void drm_core_dropmap(struct drm_local_map *map) 
{

}



#include <drm/drm_mem_util.h>



struct drm_device *drm_dev_alloc(struct drm_driver *driver,

				 struct device *parent);

void drm_dev_ref(struct drm_device *dev);

include/drm/drm_agpsupport.h

+8 −2
Original line number Diff line number Diff line 
#ifndef _DRM_AGPSUPPORT_H_

#define _DRM_AGPSUPPORT_H_



#include <linux/agp_backend.h>

#include <linux/kernel.h>

#include <linux/list.h>

#include <linux/mm.h>

#include <linux/mutex.h>

#include <linux/types.h>

#include <linux/agp_backend.h>

#include <drm/drmP.h>

#include <uapi/drm/drm.h>



struct drm_device;

struct drm_file;



#define __OS_HAS_AGP (defined(CONFIG_AGP) || (defined(CONFIG_AGP_MODULE) && \

					      defined(MODULE)))
@@ -61,6 +65,7 @@ int drm_agp_unbind_ioctl(struct drm_device *dev, void *data, 
int drm_agp_bind(struct drm_device *dev, struct drm_agp_binding *request);

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

		       struct drm_file *file_priv);



#else /* __OS_HAS_AGP */



static inline void drm_free_agp(struct agp_memory * handle, int pages)
@@ -188,6 +193,7 @@ static inline int drm_agp_bind_ioctl(struct drm_device *dev, void *data, 
{

	return -ENODEV;

}



#endif /* __OS_HAS_AGP */



#endif /* _DRM_AGPSUPPORT_H_ */

include/drm/drm_crtc.h

+2 −2
Original line number Diff line number Diff line
@@ -31,8 +31,8 @@ 
#include <linux/idr.h>

#include <linux/fb.h>

#include <linux/hdmi.h>

#include <drm/drm_mode.h>

#include <drm/drm_fourcc.h>

#include <uapi/drm/drm_mode.h>

#include <uapi/drm/drm_fourcc.h>

#include <drm/drm_modeset_lock.h>



struct drm_device;