diff options
author | Ben Skeggs <bskeggs@redhat.com> | 2020-02-17 14:58:02 +1000 |
---|---|---|
committer | Ben Skeggs <bskeggs@redhat.com> | 2020-04-07 14:37:50 +1000 |
commit | ed3d1489d2717a13f3b47b296bb2faa7ce4168da (patch) | |
tree | ba6236e37fa207cc5432773063a3a7dff3041547 /drivers/gpu/drm/nouveau/dispnv04 | |
parent | 58e92b5ee8743ebb77b824cce3330521f049bbac (diff) |
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')
-rw-r--r-- | drivers/gpu/drm/nouveau/dispnv04/dac.c | 3 | ||||
-rw-r--r-- | drivers/gpu/drm/nouveau/dispnv04/hw.c | 1 |
2 files changed, 3 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) { diff --git a/drivers/gpu/drm/nouveau/dispnv04/hw.c b/drivers/gpu/drm/nouveau/dispnv04/hw.c index 3fdfafa8b0ad..b674d68ef28a 100644 --- a/drivers/gpu/drm/nouveau/dispnv04/hw.c +++ b/drivers/gpu/drm/nouveau/dispnv04/hw.c @@ -26,6 +26,7 @@ #include "hw.h" #include <subdev/bios/pll.h> +#include <nvif/timer.h> #define CHIPSET_NFORCE 0x01a0 #define CHIPSET_NFORCE2 0x01f0 |