summaryrefslogtreecommitdiff
path: root/drivers/gpu/drm/nouveau/nvkm/engine/disp
diff options
context:
space:
mode:
authorBen Skeggs <bskeggs@redhat.com>2015-08-20 04:54:06 (GMT)
committerBen Skeggs <bskeggs@redhat.com>2015-08-28 02:40:07 (GMT)
commit9ace404b1098221021b01c2ba0eeea0c257fa4a5 (patch)
tree7aae574960fc5d5838502cc98d79dc904d5c3b84 /drivers/gpu/drm/nouveau/nvkm/engine/disp
parent6d0d40e7a577bbc7497ee7fbfeb2315d46a872a6 (diff)
downloadlinux-9ace404b1098221021b01c2ba0eeea0c257fa4a5.tar.xz
drm/nouveau/device: include core/device.h automatically for subdevs/engines
Pretty much every subdev/engine is going to need access to nvkm_device shortly to touch registers and/or output messages. The odd placement of the includes is necessary to work around some inter-dependencies that currently exist. This will be fixed later. Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
Diffstat (limited to 'drivers/gpu/drm/nouveau/nvkm/engine/disp')
-rw-r--r--drivers/gpu/drm/nouveau/nvkm/engine/disp/nv04.c1
-rw-r--r--drivers/gpu/drm/nouveau/nvkm/engine/disp/nv50.c1
-rw-r--r--drivers/gpu/drm/nouveau/nvkm/engine/disp/sorg94.c1
-rw-r--r--drivers/gpu/drm/nouveau/nvkm/engine/disp/vga.c2
4 files changed, 0 insertions, 5 deletions
diff --git a/drivers/gpu/drm/nouveau/nvkm/engine/disp/nv04.c b/drivers/gpu/drm/nouveau/nvkm/engine/disp/nv04.c
index ff09b26..b8f9e5c 100644
--- a/drivers/gpu/drm/nouveau/nvkm/engine/disp/nv04.c
+++ b/drivers/gpu/drm/nouveau/nvkm/engine/disp/nv04.c
@@ -24,7 +24,6 @@
#include "priv.h"
#include <core/client.h>
-#include <core/device.h>
#include <nvif/class.h>
#include <nvif/unpack.h>
diff --git a/drivers/gpu/drm/nouveau/nvkm/engine/disp/nv50.c b/drivers/gpu/drm/nouveau/nvkm/engine/disp/nv50.c
index 8ba808d..25fcabc 100644
--- a/drivers/gpu/drm/nouveau/nvkm/engine/disp/nv50.c
+++ b/drivers/gpu/drm/nouveau/nvkm/engine/disp/nv50.c
@@ -26,7 +26,6 @@
#include "outpdp.h"
#include <core/client.h>
-#include <core/device.h>
#include <core/engctx.h>
#include <core/enum.h>
#include <core/handle.h>
diff --git a/drivers/gpu/drm/nouveau/nvkm/engine/disp/sorg94.c b/drivers/gpu/drm/nouveau/nvkm/engine/disp/sorg94.c
index 2244362..0b4ecb8 100644
--- a/drivers/gpu/drm/nouveau/nvkm/engine/disp/sorg94.c
+++ b/drivers/gpu/drm/nouveau/nvkm/engine/disp/sorg94.c
@@ -24,7 +24,6 @@
#include "nv50.h"
#include "outpdp.h"
-#include <core/device.h>
#include <subdev/timer.h>
static inline u32
diff --git a/drivers/gpu/drm/nouveau/nvkm/engine/disp/vga.c b/drivers/gpu/drm/nouveau/nvkm/engine/disp/vga.c
index c4622c7..c91d73b 100644
--- a/drivers/gpu/drm/nouveau/nvkm/engine/disp/vga.c
+++ b/drivers/gpu/drm/nouveau/nvkm/engine/disp/vga.c
@@ -23,8 +23,6 @@
*/
#include <subdev/vga.h>
-#include <core/device.h>
-
u8
nv_rdport(void *obj, int head, u16 port)
{