Commit d5c1f011 authored by Sam Ravnborg's avatar Sam Ravnborg Committed by Thomas Hellstrom
Browse files

drm/vmwgfx: drop use of drmP.h in header files 



To facilitate removal of drmP.h in the .c
files remove the use from header files first.
Fix fallout in the other files.

Sorted include files in blocks and sorted files
within each block in alphabetical order.

This revealed a dependency from an uapi header to a header
located below drivers/gpu/drm/vmwgfx/.
Added FIXME to remind someone to fix this.

Signed-off-by: default avatarSam Ravnborg <sam@ravnborg.org>
Cc: VMware Graphics <linux-graphics-maintainer@vmware.com>
Cc: Thomas Hellstrom <thellstrom@vmware.com>
Cc: David Airlie <airlied@linux.ie>
Cc: Daniel Vetter <daniel@ffwll.ch>
Reviewed-by: default avatarDeepak Rawat <drawat@vmware.com>
Signed-off-by: default avatarDeepak Rawat <drawat@vmware.com>
Signed-off-by: default avatarThomas Hellstrom <thellstrom@vmware.com>
parent 9c84aeba

drivers/gpu/drm/vmwgfx/ttm_lock.h

+1 −1
Original line number Diff line number Diff line
@@ -49,8 +49,8 @@ 
#ifndef _TTM_LOCK_H_

#define _TTM_LOCK_H_



#include <linux/wait.h>

#include <linux/atomic.h>

#include <linux/wait.h>



#include "ttm_object.h"

drivers/gpu/drm/vmwgfx/ttm_object.h

+4 −3
Original line number Diff line number Diff line
@@ -37,11 +37,12 @@ 
#ifndef _TTM_OBJECT_H_

#define _TTM_OBJECT_H_



#include <linux/list.h>

#include <drm/drm_hashtab.h>

#include <linux/dma-buf.h>

#include <linux/kref.h>

#include <linux/list.h>

#include <linux/rcupdate.h>

#include <linux/dma-buf.h>



#include <drm/drm_hashtab.h>

#include <drm/ttm/ttm_memory.h>



/**

drivers/gpu/drm/vmwgfx/vmwgfx_binding.h

+2 −1
Original line number Diff line number Diff line
@@ -27,9 +27,10 @@ 
#ifndef _VMWGFX_BINDING_H_

#define _VMWGFX_BINDING_H_



#include "device_include/svga3d_reg.h"

#include <linux/list.h>



#include "device_include/svga3d_reg.h"



#define VMW_MAX_VIEW_BINDINGS 128



struct vmw_private;

drivers/gpu/drm/vmwgfx/vmwgfx_cmdbuf.c

+3 −0
Original line number Diff line number Diff line
@@ -25,6 +25,9 @@ 
 *

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



#include <linux/dmapool.h>

#include <linux/pci.h>



#include <drm/ttm/ttm_bo_api.h>



#include "vmwgfx_drv.h"

drivers/gpu/drm/vmwgfx/vmwgfx_drv.h

+21 −9
Original line number Diff line number Diff line
@@ -28,20 +28,32 @@ 
#ifndef _VMWGFX_DRV_H_

#define _VMWGFX_DRV_H_



#include "vmwgfx_validation.h"

#include "vmwgfx_reg.h"

#include <drm/drmP.h>

#include <drm/vmwgfx_drm.h>

#include <drm/drm_hashtab.h>

#include <drm/drm_auth.h>

#include <linux/suspend.h>

#include <linux/sync_file.h>



#include <drm/drm_auth.h>

#include <drm/drm_device.h>

#include <drm/drm_file.h>

#include <drm/drm_hashtab.h>

#include <drm/drm_rect.h>



#include <drm/ttm/ttm_bo_driver.h>

#include <drm/ttm/ttm_execbuf_util.h>

#include <drm/ttm/ttm_module.h>

#include "vmwgfx_fence.h"

#include "ttm_object.h"



#include "ttm_lock.h"

#include <linux/sync_file.h>

#include "ttm_object.h"



#include "vmwgfx_fence.h"

#include "vmwgfx_reg.h"

#include "vmwgfx_validation.h"



/*

 * FIXME: vmwgfx_drm.h needs to be last due to dependencies.

 * uapi headers should not depend on header files outside uapi/.

 */

#include <drm/vmwgfx_drm.h>





#define VMWGFX_DRIVER_NAME "vmwgfx"

#define VMWGFX_DRIVER_DATE "20180704"

CRA Git | Maintained and supported by SUSTech CRA and CCSE