aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/gpu/drm/nouveau/dispnv04/dac.c
diff options
context:
space:
mode:
authorBen Skeggs <bskeggs@redhat.com>2020-02-17 14:58:02 +1000
committerBen Skeggs <bskeggs@redhat.com>2020-04-07 14:37:50 +1000
commited3d1489d2717a13f3b47b296bb2faa7ce4168da (patch)
treeba6236e37fa207cc5432773063a3a7dff3041547 /drivers/gpu/drm/nouveau/dispnv04/dac.c
parentdrm/nouveau/nvif: access PTIMER through usermode class, if available (diff)
downloadlinux-dev-ed3d1489d2717a13f3b47b296bb2faa7ce4168da.tar.xz
linux-dev-ed3d1489d2717a13f3b47b296bb2faa7ce4168da.zip
drm/nouveau/nvif: protect waits against GPU falling off the bus
Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
Diffstat (limited to 'drivers/gpu/drm/nouveau/dispnv04/dac.c')
-rw-r--r--drivers/gpu/drm/nouveau/dispnv04/dac.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/gpu/drm/nouveau/dispnv04/dac.c b/drivers/gpu/drm/nouveau/dispnv04/dac.c
index e8eef88a8382..ffdd447d8706 100644
--- a/drivers/gpu/drm/nouveau/dispnv04/dac.c
+++ b/drivers/gpu/drm/nouveau/dispnv04/dac.c
@@ -35,7 +35,8 @@
#include <subdev/bios/gpio.h>
#include <subdev/gpio.h>
-#include <subdev/timer.h>
+
+#include <nvif/timer.h>
int nv04_dac_output_offset(struct drm_encoder *encoder)
{