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

drm/vmwgfx: drop reminaing users of drmP.h 



Drop use of the deprecated drmP.h file from the
remaining files.
In several cases the drmP.h include could be removed without
furter fixes. Other files required a few header files to be added.

In all files divided includes files in blocks and sort them.

v2:
- fix warning in i386 build wiht HIGHMEM disabled

Signed-off-by: default avatarSam Ravnborg <sam@ravnborg.org>
Reported-by: kbuild test robot <lkp@intel.com> [warning in i386 build]
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 d5c1f011

drivers/gpu/drm/vmwgfx/vmwgfx_bo.c

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


#include <drm/ttm/ttm_placement.h>



#include <drm/drmP.h>

#include "vmwgfx_drv.h"

#include "ttm_object.h"

drivers/gpu/drm/vmwgfx/vmwgfx_drv.c

+11 −6
Original line number Diff line number Diff line
@@ -24,17 +24,22 @@ 
 * USE OR OTHER DEALINGS IN THE SOFTWARE.

 *

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

#include <linux/module.h>



#include <linux/console.h>

#include <linux/dma-mapping.h>

#include <linux/module.h>



#include <drm/drmP.h>

#include "vmwgfx_drv.h"

#include "vmwgfx_binding.h"

#include "ttm_object.h"

#include <drm/ttm/ttm_placement.h>

#include <drm/drm_drv.h>

#include <drm/drm_ioctl.h>

#include <drm/drm_pci.h>

#include <drm/drm_sysfs.h>

#include <drm/ttm/ttm_bo_driver.h>

#include <drm/ttm/ttm_module.h>

#include <drm/ttm/ttm_placement.h>



#include "ttm_object.h"

#include "vmwgfx_binding.h"

#include "vmwgfx_drv.h"



#define VMWGFX_DRIVER_DESC "Linux drm driver for VMware graphics devices"

#define VMWGFX_CHIP_SVGAII 0

drivers/gpu/drm/vmwgfx/vmwgfx_fb.c

+4 −4
Original line number Diff line number Diff line
@@ -26,14 +26,14 @@ 
 *

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



#include <linux/export.h>

#include <linux/pci.h>



#include <drm/drm_fourcc.h>

#include <drm/ttm/ttm_placement.h>



#include <drm/drmP.h>

#include "vmwgfx_drv.h"

#include "vmwgfx_kms.h"



#include <drm/ttm/ttm_placement.h>



#define VMW_DIRTY_DELAY (HZ / 30)



struct vmw_fb_par {

drivers/gpu/drm/vmwgfx/vmwgfx_fence.c

+2 −1
Original line number Diff line number Diff line
@@ -25,7 +25,8 @@ 
 *

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



#include <drm/drmP.h>

#include <linux/sched/signal.h>



#include "vmwgfx_drv.h"



#define VMW_FENCE_WRAP (1 << 31)

drivers/gpu/drm/vmwgfx/vmwgfx_fifo.c

+4 −2
Original line number Diff line number Diff line
@@ -25,10 +25,12 @@ 
 *

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



#include "vmwgfx_drv.h"

#include <drm/drmP.h>

#include <linux/sched/signal.h>



#include <drm/ttm/ttm_placement.h>



#include "vmwgfx_drv.h"



struct vmw_temp_set_context {

	SVGA3dCmdHeader header;

	SVGA3dCmdDXTempSetContext body;

CRA Git | Maintained and supported by SUSTech CRA and CCSE