aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/gpu/drm/vmwgfx
diff options
context:
space:
mode:
authorDavid Howells <dhowells@redhat.com>2012-10-02 13:01:07 -0400
committerDavid Howells <dhowells@redhat.com>2012-10-02 13:01:07 -0400
commit760285e7e7ab282c25b5e90816f7c47000557f4f (patch)
treeb288dddd8ad2fdc51fa8b2022ea8db8603dd749c /drivers/gpu/drm/vmwgfx
parent4126d5d61f8466be3f76c1bc4e16d46eb2c9641b (diff)
UAPI: (Scripted) Convert #include "..." to #include <path/...> in drivers/gpu/
Convert #include "..." to #include <path/...> in drivers/gpu/. Signed-off-by: David Howells <dhowells@redhat.com> Acked-by: Dave Airlie <airlied@redhat.com> Acked-by: Arnd Bergmann <arnd@arndb.de> Acked-by: Thomas Gleixner <tglx@linutronix.de> Acked-by: Paul E. McKenney <paulmck@linux.vnet.ibm.com> Acked-by: Dave Jones <davej@redhat.com>
Diffstat (limited to 'drivers/gpu/drm/vmwgfx')
-rw-r--r--drivers/gpu/drm/vmwgfx/vmwgfx_buffer.c6
-rw-r--r--drivers/gpu/drm/vmwgfx/vmwgfx_dmabuf.c4
-rw-r--r--drivers/gpu/drm/vmwgfx/vmwgfx_drv.c10
-rw-r--r--drivers/gpu/drm/vmwgfx/vmwgfx_drv.h18
-rw-r--r--drivers/gpu/drm/vmwgfx/vmwgfx_execbuf.c4
-rw-r--r--drivers/gpu/drm/vmwgfx/vmwgfx_fb.c4
-rw-r--r--drivers/gpu/drm/vmwgfx/vmwgfx_fence.c2
-rw-r--r--drivers/gpu/drm/vmwgfx/vmwgfx_fifo.c4
-rw-r--r--drivers/gpu/drm/vmwgfx/vmwgfx_gmr.c4
-rw-r--r--drivers/gpu/drm/vmwgfx/vmwgfx_gmrid_manager.c6
-rw-r--r--drivers/gpu/drm/vmwgfx/vmwgfx_ioctl.c2
-rw-r--r--drivers/gpu/drm/vmwgfx/vmwgfx_irq.c2
-rw-r--r--drivers/gpu/drm/vmwgfx/vmwgfx_kms.h4
-rw-r--r--drivers/gpu/drm/vmwgfx/vmwgfx_overlay.c4
-rw-r--r--drivers/gpu/drm/vmwgfx/vmwgfx_resource.c8
-rw-r--r--drivers/gpu/drm/vmwgfx/vmwgfx_ttm_glue.c2
16 files changed, 42 insertions, 42 deletions
diff --git a/drivers/gpu/drm/vmwgfx/vmwgfx_buffer.c b/drivers/gpu/drm/vmwgfx/vmwgfx_buffer.c
index 1e2c0fb7f786..9826fbc88154 100644
--- a/drivers/gpu/drm/vmwgfx/vmwgfx_buffer.c
+++ b/drivers/gpu/drm/vmwgfx/vmwgfx_buffer.c
@@ -26,9 +26,9 @@
26 **************************************************************************/ 26 **************************************************************************/
27 27
28#include "vmwgfx_drv.h" 28#include "vmwgfx_drv.h"
29#include "ttm/ttm_bo_driver.h" 29#include <drm/ttm/ttm_bo_driver.h>
30#include "ttm/ttm_placement.h" 30#include <drm/ttm/ttm_placement.h>
31#include "ttm/ttm_page_alloc.h" 31#include <drm/ttm/ttm_page_alloc.h>
32 32
33static uint32_t vram_placement_flags = TTM_PL_FLAG_VRAM | 33static uint32_t vram_placement_flags = TTM_PL_FLAG_VRAM |
34 TTM_PL_FLAG_CACHED; 34 TTM_PL_FLAG_CACHED;
diff --git a/drivers/gpu/drm/vmwgfx/vmwgfx_dmabuf.c b/drivers/gpu/drm/vmwgfx/vmwgfx_dmabuf.c
index 3fa884db08ab..3ce68a2e312d 100644
--- a/drivers/gpu/drm/vmwgfx/vmwgfx_dmabuf.c
+++ b/drivers/gpu/drm/vmwgfx/vmwgfx_dmabuf.c
@@ -25,9 +25,9 @@
25 * 25 *
26 **************************************************************************/ 26 **************************************************************************/
27 27
28#include "ttm/ttm_placement.h" 28#include <drm/ttm/ttm_placement.h>
29 29
30#include "drmP.h" 30#include <drm/drmP.h>
31#include "vmwgfx_drv.h" 31#include "vmwgfx_drv.h"
32 32
33 33
diff --git a/drivers/gpu/drm/vmwgfx/vmwgfx_drv.c b/drivers/gpu/drm/vmwgfx/vmwgfx_drv.c
index ba2c35dbf10e..c84d9ba66f3b 100644
--- a/drivers/gpu/drm/vmwgfx/vmwgfx_drv.c
+++ b/drivers/gpu/drm/vmwgfx/vmwgfx_drv.c
@@ -26,12 +26,12 @@
26 **************************************************************************/ 26 **************************************************************************/
27#include <linux/module.h> 27#include <linux/module.h>
28 28
29#include "drmP.h" 29#include <drm/drmP.h>
30#include "vmwgfx_drv.h" 30#include "vmwgfx_drv.h"
31#include "ttm/ttm_placement.h" 31#include <drm/ttm/ttm_placement.h>
32#include "ttm/ttm_bo_driver.h" 32#include <drm/ttm/ttm_bo_driver.h>
33#include "ttm/ttm_object.h" 33#include <drm/ttm/ttm_object.h>
34#include "ttm/ttm_module.h" 34#include <drm/ttm/ttm_module.h>
35 35
36#define VMWGFX_DRIVER_NAME "vmwgfx" 36#define VMWGFX_DRIVER_NAME "vmwgfx"
37#define VMWGFX_DRIVER_DESC "Linux drm driver for VMware graphics devices" 37#define VMWGFX_DRIVER_DESC "Linux drm driver for VMware graphics devices"
diff --git a/drivers/gpu/drm/vmwgfx/vmwgfx_drv.h b/drivers/gpu/drm/vmwgfx/vmwgfx_drv.h
index 29c984ff7f23..88a179e26de9 100644
--- a/drivers/gpu/drm/vmwgfx/vmwgfx_drv.h
+++ b/drivers/gpu/drm/vmwgfx/vmwgfx_drv.h
@@ -29,15 +29,15 @@
29#define _VMWGFX_DRV_H_ 29#define _VMWGFX_DRV_H_
30 30
31#include "vmwgfx_reg.h" 31#include "vmwgfx_reg.h"
32#include "drmP.h" 32#include <drm/drmP.h>
33#include "vmwgfx_drm.h" 33#include <drm/vmwgfx_drm.h>
34#include "drm_hashtab.h" 34#include <drm/drm_hashtab.h>
35#include "linux/suspend.h" 35#include <linux/suspend.h>
36#include "ttm/ttm_bo_driver.h" 36#include <drm/ttm/ttm_bo_driver.h>
37#include "ttm/ttm_object.h" 37#include <drm/ttm/ttm_object.h>
38#include "ttm/ttm_lock.h" 38#include <drm/ttm/ttm_lock.h>
39#include "ttm/ttm_execbuf_util.h" 39#include <drm/ttm/ttm_execbuf_util.h>
40#include "ttm/ttm_module.h" 40#include <drm/ttm/ttm_module.h>
41#include "vmwgfx_fence.h" 41#include "vmwgfx_fence.h"
42 42
43#define VMWGFX_DRIVER_DATE "20120209" 43#define VMWGFX_DRIVER_DATE "20120209"
diff --git a/drivers/gpu/drm/vmwgfx/vmwgfx_execbuf.c b/drivers/gpu/drm/vmwgfx/vmwgfx_execbuf.c
index 4acced44a623..30654b4cc972 100644
--- a/drivers/gpu/drm/vmwgfx/vmwgfx_execbuf.c
+++ b/drivers/gpu/drm/vmwgfx/vmwgfx_execbuf.c
@@ -27,8 +27,8 @@
27 27
28#include "vmwgfx_drv.h" 28#include "vmwgfx_drv.h"
29#include "vmwgfx_reg.h" 29#include "vmwgfx_reg.h"
30#include "ttm/ttm_bo_api.h" 30#include <drm/ttm/ttm_bo_api.h>
31#include "ttm/ttm_placement.h" 31#include <drm/ttm/ttm_placement.h>
32 32
33static int vmw_cmd_invalid(struct vmw_private *dev_priv, 33static int vmw_cmd_invalid(struct vmw_private *dev_priv,
34 struct vmw_sw_context *sw_context, 34 struct vmw_sw_context *sw_context,
diff --git a/drivers/gpu/drm/vmwgfx/vmwgfx_fb.c b/drivers/gpu/drm/vmwgfx/vmwgfx_fb.c
index 3c447bf317cb..568dc0ef1035 100644
--- a/drivers/gpu/drm/vmwgfx/vmwgfx_fb.c
+++ b/drivers/gpu/drm/vmwgfx/vmwgfx_fb.c
@@ -28,10 +28,10 @@
28 28
29#include <linux/export.h> 29#include <linux/export.h>
30 30
31#include "drmP.h" 31#include <drm/drmP.h>
32#include "vmwgfx_drv.h" 32#include "vmwgfx_drv.h"
33 33
34#include "ttm/ttm_placement.h" 34#include <drm/ttm/ttm_placement.h>
35 35
36#define VMW_DIRTY_DELAY (HZ / 30) 36#define VMW_DIRTY_DELAY (HZ / 30)
37 37
diff --git a/drivers/gpu/drm/vmwgfx/vmwgfx_fence.c b/drivers/gpu/drm/vmwgfx/vmwgfx_fence.c
index 7e0743358dff..bc187fafd58c 100644
--- a/drivers/gpu/drm/vmwgfx/vmwgfx_fence.c
+++ b/drivers/gpu/drm/vmwgfx/vmwgfx_fence.c
@@ -25,7 +25,7 @@
25 * 25 *
26 **************************************************************************/ 26 **************************************************************************/
27 27
28#include "drmP.h" 28#include <drm/drmP.h>
29#include "vmwgfx_drv.h" 29#include "vmwgfx_drv.h"
30 30
31#define VMW_FENCE_WRAP (1 << 31) 31#define VMW_FENCE_WRAP (1 << 31)
diff --git a/drivers/gpu/drm/vmwgfx/vmwgfx_fifo.c b/drivers/gpu/drm/vmwgfx/vmwgfx_fifo.c
index a0c2f12b1e1b..3eb148667d63 100644
--- a/drivers/gpu/drm/vmwgfx/vmwgfx_fifo.c
+++ b/drivers/gpu/drm/vmwgfx/vmwgfx_fifo.c
@@ -26,8 +26,8 @@
26 **************************************************************************/ 26 **************************************************************************/
27 27
28#include "vmwgfx_drv.h" 28#include "vmwgfx_drv.h"
29#include "drmP.h" 29#include <drm/drmP.h>
30#include "ttm/ttm_placement.h" 30#include <drm/ttm/ttm_placement.h>
31 31
32bool vmw_fifo_have_3d(struct vmw_private *dev_priv) 32bool vmw_fifo_have_3d(struct vmw_private *dev_priv)
33{ 33{
diff --git a/drivers/gpu/drm/vmwgfx/vmwgfx_gmr.c b/drivers/gpu/drm/vmwgfx/vmwgfx_gmr.c
index 21ee78226560..3751730764a5 100644
--- a/drivers/gpu/drm/vmwgfx/vmwgfx_gmr.c
+++ b/drivers/gpu/drm/vmwgfx/vmwgfx_gmr.c
@@ -26,8 +26,8 @@
26 **************************************************************************/ 26 **************************************************************************/
27 27
28#include "vmwgfx_drv.h" 28#include "vmwgfx_drv.h"
29#include "drmP.h" 29#include <drm/drmP.h>
30#include "ttm/ttm_bo_driver.h" 30#include <drm/ttm/ttm_bo_driver.h>
31 31
32#define VMW_PPN_SIZE sizeof(unsigned long) 32#define VMW_PPN_SIZE sizeof(unsigned long)
33 33
diff --git a/drivers/gpu/drm/vmwgfx/vmwgfx_gmrid_manager.c b/drivers/gpu/drm/vmwgfx/vmwgfx_gmrid_manager.c
index 5f717152cff5..c5c054ae9056 100644
--- a/drivers/gpu/drm/vmwgfx/vmwgfx_gmrid_manager.c
+++ b/drivers/gpu/drm/vmwgfx/vmwgfx_gmrid_manager.c
@@ -29,9 +29,9 @@
29 */ 29 */
30 30
31#include "vmwgfx_drv.h" 31#include "vmwgfx_drv.h"
32#include "ttm/ttm_module.h" 32#include <drm/ttm/ttm_module.h>
33#include "ttm/ttm_bo_driver.h" 33#include <drm/ttm/ttm_bo_driver.h>
34#include "ttm/ttm_placement.h" 34#include <drm/ttm/ttm_placement.h>
35#include <linux/idr.h> 35#include <linux/idr.h>
36#include <linux/spinlock.h> 36#include <linux/spinlock.h>
37#include <linux/kernel.h> 37#include <linux/kernel.h>
diff --git a/drivers/gpu/drm/vmwgfx/vmwgfx_ioctl.c b/drivers/gpu/drm/vmwgfx/vmwgfx_ioctl.c
index 66917c6c3813..b07ca2e4d04b 100644
--- a/drivers/gpu/drm/vmwgfx/vmwgfx_ioctl.c
+++ b/drivers/gpu/drm/vmwgfx/vmwgfx_ioctl.c
@@ -26,7 +26,7 @@
26 **************************************************************************/ 26 **************************************************************************/
27 27
28#include "vmwgfx_drv.h" 28#include "vmwgfx_drv.h"
29#include "vmwgfx_drm.h" 29#include <drm/vmwgfx_drm.h>
30#include "vmwgfx_kms.h" 30#include "vmwgfx_kms.h"
31 31
32int vmw_getparam_ioctl(struct drm_device *dev, void *data, 32int vmw_getparam_ioctl(struct drm_device *dev, void *data,
diff --git a/drivers/gpu/drm/vmwgfx/vmwgfx_irq.c b/drivers/gpu/drm/vmwgfx/vmwgfx_irq.c
index cabc95f7517e..4640adbcaf91 100644
--- a/drivers/gpu/drm/vmwgfx/vmwgfx_irq.c
+++ b/drivers/gpu/drm/vmwgfx/vmwgfx_irq.c
@@ -25,7 +25,7 @@
25 * 25 *
26 **************************************************************************/ 26 **************************************************************************/
27 27
28#include "drmP.h" 28#include <drm/drmP.h>
29#include "vmwgfx_drv.h" 29#include "vmwgfx_drv.h"
30 30
31#define VMW_FENCE_WRAP (1 << 24) 31#define VMW_FENCE_WRAP (1 << 24)
diff --git a/drivers/gpu/drm/vmwgfx/vmwgfx_kms.h b/drivers/gpu/drm/vmwgfx/vmwgfx_kms.h
index 8184bc5b1730..6fa89c9d6214 100644
--- a/drivers/gpu/drm/vmwgfx/vmwgfx_kms.h
+++ b/drivers/gpu/drm/vmwgfx/vmwgfx_kms.h
@@ -28,8 +28,8 @@
28#ifndef VMWGFX_KMS_H_ 28#ifndef VMWGFX_KMS_H_
29#define VMWGFX_KMS_H_ 29#define VMWGFX_KMS_H_
30 30
31#include "drmP.h" 31#include <drm/drmP.h>
32#include "drm_crtc_helper.h" 32#include <drm/drm_crtc_helper.h>
33#include "vmwgfx_drv.h" 33#include "vmwgfx_drv.h"
34 34
35#define VMWGFX_NUM_DISPLAY_UNITS 8 35#define VMWGFX_NUM_DISPLAY_UNITS 8
diff --git a/drivers/gpu/drm/vmwgfx/vmwgfx_overlay.c b/drivers/gpu/drm/vmwgfx/vmwgfx_overlay.c
index 14399eec9c3c..cb55b7b66377 100644
--- a/drivers/gpu/drm/vmwgfx/vmwgfx_overlay.c
+++ b/drivers/gpu/drm/vmwgfx/vmwgfx_overlay.c
@@ -26,10 +26,10 @@
26 **************************************************************************/ 26 **************************************************************************/
27 27
28 28
29#include "drmP.h" 29#include <drm/drmP.h>
30#include "vmwgfx_drv.h" 30#include "vmwgfx_drv.h"
31 31
32#include "ttm/ttm_placement.h" 32#include <drm/ttm/ttm_placement.h>
33 33
34#include "svga_overlay.h" 34#include "svga_overlay.h"
35#include "svga_escape.h" 35#include "svga_escape.h"
diff --git a/drivers/gpu/drm/vmwgfx/vmwgfx_resource.c b/drivers/gpu/drm/vmwgfx/vmwgfx_resource.c
index 2c6ffe0e2c07..da3c6b5b98a1 100644
--- a/drivers/gpu/drm/vmwgfx/vmwgfx_resource.c
+++ b/drivers/gpu/drm/vmwgfx/vmwgfx_resource.c
@@ -26,10 +26,10 @@
26 **************************************************************************/ 26 **************************************************************************/
27 27
28#include "vmwgfx_drv.h" 28#include "vmwgfx_drv.h"
29#include "vmwgfx_drm.h" 29#include <drm/vmwgfx_drm.h>
30#include "ttm/ttm_object.h" 30#include <drm/ttm/ttm_object.h>
31#include "ttm/ttm_placement.h" 31#include <drm/ttm/ttm_placement.h>
32#include "drmP.h" 32#include <drm/drmP.h>
33 33
34struct vmw_user_context { 34struct vmw_user_context {
35 struct ttm_base_object base; 35 struct ttm_base_object base;
diff --git a/drivers/gpu/drm/vmwgfx/vmwgfx_ttm_glue.c b/drivers/gpu/drm/vmwgfx/vmwgfx_ttm_glue.c
index d3c11f5184f3..98d6bfb3a997 100644
--- a/drivers/gpu/drm/vmwgfx/vmwgfx_ttm_glue.c
+++ b/drivers/gpu/drm/vmwgfx/vmwgfx_ttm_glue.c
@@ -25,7 +25,7 @@
25 * 25 *
26 **************************************************************************/ 26 **************************************************************************/
27 27
28#include "drmP.h" 28#include <drm/drmP.h>
29#include "vmwgfx_drv.h" 29#include "vmwgfx_drv.h"
30 30
31int vmw_mmap(struct file *filp, struct vm_area_struct *vma) 31int vmw_mmap(struct file *filp, struct vm_area_struct *vma)