diff options
Diffstat (limited to 'drivers/gpu/nvgpu/common/fb')
-rw-r--r-- | drivers/gpu/nvgpu/common/fb/fb_gm20b.c | 3 | ||||
-rw-r--r-- | drivers/gpu/nvgpu/common/fb/fb_gp106.c | 7 | ||||
-rw-r--r-- | drivers/gpu/nvgpu/common/fb/fb_gp10b.c | 4 | ||||
-rw-r--r-- | drivers/gpu/nvgpu/common/fb/fb_gv100.c | 3 | ||||
-rw-r--r-- | drivers/gpu/nvgpu/common/fb/fb_gv11b.c | 2 |
5 files changed, 8 insertions, 11 deletions
diff --git a/drivers/gpu/nvgpu/common/fb/fb_gm20b.c b/drivers/gpu/nvgpu/common/fb/fb_gm20b.c index 00d0fba4..9a13ecca 100644 --- a/drivers/gpu/nvgpu/common/fb/fb_gm20b.c +++ b/drivers/gpu/nvgpu/common/fb/fb_gm20b.c | |||
@@ -26,8 +26,7 @@ | |||
26 | 26 | ||
27 | #include <nvgpu/sizes.h> | 27 | #include <nvgpu/sizes.h> |
28 | #include <nvgpu/utils.h> | 28 | #include <nvgpu/utils.h> |
29 | 29 | #include <nvgpu/gk20a.h> | |
30 | #include "gk20a/gk20a.h" | ||
31 | 30 | ||
32 | #include "fb_gm20b.h" | 31 | #include "fb_gm20b.h" |
33 | 32 | ||
diff --git a/drivers/gpu/nvgpu/common/fb/fb_gp106.c b/drivers/gpu/nvgpu/common/fb/fb_gp106.c index 6dacceb5..27fce8a7 100644 --- a/drivers/gpu/nvgpu/common/fb/fb_gp106.c +++ b/drivers/gpu/nvgpu/common/fb/fb_gp106.c | |||
@@ -20,14 +20,13 @@ | |||
20 | * DEALINGS IN THE SOFTWARE. | 20 | * DEALINGS IN THE SOFTWARE. |
21 | */ | 21 | */ |
22 | 22 | ||
23 | #include "gk20a/gk20a.h" | 23 | #include <nvgpu/io.h> |
24 | #include <nvgpu/timers.h> | ||
25 | #include <nvgpu/gk20a.h> | ||
24 | 26 | ||
25 | #include "fb_gp10b.h" | 27 | #include "fb_gp10b.h" |
26 | #include "fb_gp106.h" | 28 | #include "fb_gp106.h" |
27 | 29 | ||
28 | #include <nvgpu/io.h> | ||
29 | #include <nvgpu/timers.h> | ||
30 | |||
31 | #include <nvgpu/hw/gp106/hw_fb_gp106.h> | 30 | #include <nvgpu/hw/gp106/hw_fb_gp106.h> |
32 | 31 | ||
33 | #define HW_SCRUB_TIMEOUT_DEFAULT 100 /* usec */ | 32 | #define HW_SCRUB_TIMEOUT_DEFAULT 100 /* usec */ |
diff --git a/drivers/gpu/nvgpu/common/fb/fb_gp10b.c b/drivers/gpu/nvgpu/common/fb/fb_gp10b.c index 45fc8373..ac5fbd9d 100644 --- a/drivers/gpu/nvgpu/common/fb/fb_gp10b.c +++ b/drivers/gpu/nvgpu/common/fb/fb_gp10b.c | |||
@@ -1,7 +1,7 @@ | |||
1 | /* | 1 | /* |
2 | * GP10B FB | 2 | * GP10B FB |
3 | * | 3 | * |
4 | * Copyright (c) 2014-2017, NVIDIA CORPORATION. All rights reserved. | 4 | * Copyright (c) 2014-2018, NVIDIA CORPORATION. All rights reserved. |
5 | * | 5 | * |
6 | * Permission is hereby granted, free of charge, to any person obtaining a | 6 | * Permission is hereby granted, free of charge, to any person obtaining a |
7 | * copy of this software and associated documentation files (the "Software"), | 7 | * copy of this software and associated documentation files (the "Software"), |
@@ -23,8 +23,8 @@ | |||
23 | */ | 23 | */ |
24 | 24 | ||
25 | #include <nvgpu/sizes.h> | 25 | #include <nvgpu/sizes.h> |
26 | #include <nvgpu/gk20a.h> | ||
26 | 27 | ||
27 | #include "gk20a/gk20a.h" | ||
28 | #include "fb_gp10b.h" | 28 | #include "fb_gp10b.h" |
29 | 29 | ||
30 | unsigned int gp10b_fb_compression_page_size(struct gk20a *g) | 30 | unsigned int gp10b_fb_compression_page_size(struct gk20a *g) |
diff --git a/drivers/gpu/nvgpu/common/fb/fb_gv100.c b/drivers/gpu/nvgpu/common/fb/fb_gv100.c index 4cae5312..967af51b 100644 --- a/drivers/gpu/nvgpu/common/fb/fb_gv100.c +++ b/drivers/gpu/nvgpu/common/fb/fb_gv100.c | |||
@@ -38,8 +38,7 @@ | |||
38 | #include <nvgpu/io.h> | 38 | #include <nvgpu/io.h> |
39 | #include <nvgpu/utils.h> | 39 | #include <nvgpu/utils.h> |
40 | #include <nvgpu/timers.h> | 40 | #include <nvgpu/timers.h> |
41 | 41 | #include <nvgpu/gk20a.h> | |
42 | #include "gk20a/gk20a.h" | ||
43 | 42 | ||
44 | #include "fb_gv100.h" | 43 | #include "fb_gv100.h" |
45 | 44 | ||
diff --git a/drivers/gpu/nvgpu/common/fb/fb_gv11b.c b/drivers/gpu/nvgpu/common/fb/fb_gv11b.c index b3d8cdb9..a03c7da7 100644 --- a/drivers/gpu/nvgpu/common/fb/fb_gv11b.c +++ b/drivers/gpu/nvgpu/common/fb/fb_gv11b.c | |||
@@ -33,9 +33,9 @@ | |||
33 | #include <nvgpu/io.h> | 33 | #include <nvgpu/io.h> |
34 | #include <nvgpu/utils.h> | 34 | #include <nvgpu/utils.h> |
35 | #include <nvgpu/timers.h> | 35 | #include <nvgpu/timers.h> |
36 | #include <nvgpu/gk20a.h> | ||
36 | #include <nvgpu/channel.h> | 37 | #include <nvgpu/channel.h> |
37 | 38 | ||
38 | #include "gk20a/gk20a.h" | ||
39 | #include "gk20a/mm_gk20a.h" | 39 | #include "gk20a/mm_gk20a.h" |
40 | 40 | ||
41 | #include "gv11b/fifo_gv11b.h" | 41 | #include "gv11b/fifo_gv11b.h" |