diff options
Diffstat (limited to 'drivers/gpu')
6 files changed, 26 insertions, 9 deletions
diff --git a/drivers/gpu/drm/arm/display/komeda/komeda_crtc.c b/drivers/gpu/drm/arm/display/komeda/komeda_crtc.c index 5bb5a55f6b31..3ca5718aa0c2 100644 --- a/drivers/gpu/drm/arm/display/komeda/komeda_crtc.c +++ b/drivers/gpu/drm/arm/display/komeda/komeda_crtc.c | |||
@@ -5,12 +5,16 @@ | |||
5 | * | 5 | * |
6 | */ | 6 | */ |
7 | #include <linux/clk.h> | 7 | #include <linux/clk.h> |
8 | #include <linux/pm_runtime.h> | ||
8 | #include <linux/spinlock.h> | 9 | #include <linux/spinlock.h> |
10 | |||
9 | #include <drm/drm_atomic.h> | 11 | #include <drm/drm_atomic.h> |
10 | #include <drm/drm_atomic_helper.h> | 12 | #include <drm/drm_atomic_helper.h> |
11 | #include <drm/drm_plane_helper.h> | ||
12 | #include <drm/drm_crtc_helper.h> | 13 | #include <drm/drm_crtc_helper.h> |
13 | #include <linux/pm_runtime.h> | 14 | #include <drm/drm_plane_helper.h> |
15 | #include <drm/drm_print.h> | ||
16 | #include <drm/drm_vblank.h> | ||
17 | |||
14 | #include "komeda_dev.h" | 18 | #include "komeda_dev.h" |
15 | #include "komeda_kms.h" | 19 | #include "komeda_kms.h" |
16 | 20 | ||
diff --git a/drivers/gpu/drm/arm/display/komeda/komeda_dev.c b/drivers/gpu/drm/arm/display/komeda/komeda_dev.c index 0fe6954fbbf4..70e9bb7fa30c 100644 --- a/drivers/gpu/drm/arm/display/komeda/komeda_dev.c +++ b/drivers/gpu/drm/arm/display/komeda/komeda_dev.c | |||
@@ -4,9 +4,13 @@ | |||
4 | * Author: James.Qian.Wang <james.qian.wang@arm.com> | 4 | * Author: James.Qian.Wang <james.qian.wang@arm.com> |
5 | * | 5 | * |
6 | */ | 6 | */ |
7 | #include <linux/platform_device.h> | 7 | #include <linux/io.h> |
8 | #include <linux/of_device.h> | 8 | #include <linux/of_device.h> |
9 | #include <linux/of_graph.h> | 9 | #include <linux/of_graph.h> |
10 | #include <linux/platform_device.h> | ||
11 | |||
12 | #include <drm/drm_print.h> | ||
13 | |||
10 | #include "komeda_dev.h" | 14 | #include "komeda_dev.h" |
11 | 15 | ||
12 | static int komeda_parse_pipe_dt(struct komeda_dev *mdev, struct device_node *np) | 16 | static int komeda_parse_pipe_dt(struct komeda_dev *mdev, struct device_node *np) |
diff --git a/drivers/gpu/drm/arm/display/komeda/komeda_framebuffer.c b/drivers/gpu/drm/arm/display/komeda/komeda_framebuffer.c index 23ee74d42239..9cc9935024f7 100644 --- a/drivers/gpu/drm/arm/display/komeda/komeda_framebuffer.c +++ b/drivers/gpu/drm/arm/display/komeda/komeda_framebuffer.c | |||
@@ -4,10 +4,12 @@ | |||
4 | * Author: James.Qian.Wang <james.qian.wang@arm.com> | 4 | * Author: James.Qian.Wang <james.qian.wang@arm.com> |
5 | * | 5 | * |
6 | */ | 6 | */ |
7 | #include <drm/drm_gem.h> | 7 | #include <drm/drm_device.h> |
8 | #include <drm/drm_gem_framebuffer_helper.h> | ||
9 | #include <drm/drm_fb_cma_helper.h> | 8 | #include <drm/drm_fb_cma_helper.h> |
9 | #include <drm/drm_gem.h> | ||
10 | #include <drm/drm_gem_cma_helper.h> | 10 | #include <drm/drm_gem_cma_helper.h> |
11 | #include <drm/drm_gem_framebuffer_helper.h> | ||
12 | |||
11 | #include "komeda_framebuffer.h" | 13 | #include "komeda_framebuffer.h" |
12 | #include "komeda_dev.h" | 14 | #include "komeda_dev.h" |
13 | 15 | ||
diff --git a/drivers/gpu/drm/arm/display/komeda/komeda_kms.c b/drivers/gpu/drm/arm/display/komeda/komeda_kms.c index 3fc096d3883e..47a58ab20434 100644 --- a/drivers/gpu/drm/arm/display/komeda/komeda_kms.c +++ b/drivers/gpu/drm/arm/display/komeda/komeda_kms.c | |||
@@ -5,15 +5,19 @@ | |||
5 | * | 5 | * |
6 | */ | 6 | */ |
7 | #include <linux/component.h> | 7 | #include <linux/component.h> |
8 | #include <linux/interrupt.h> | ||
9 | |||
8 | #include <drm/drm_atomic.h> | 10 | #include <drm/drm_atomic.h> |
9 | #include <drm/drm_atomic_helper.h> | 11 | #include <drm/drm_atomic_helper.h> |
10 | #include <drm/drm_gem_framebuffer_helper.h> | 12 | #include <drm/drm_drv.h> |
11 | #include <drm/drm_gem_cma_helper.h> | ||
12 | #include <drm/drm_fb_helper.h> | 13 | #include <drm/drm_fb_helper.h> |
13 | #include <linux/interrupt.h> | 14 | #include <drm/drm_gem_cma_helper.h> |
15 | #include <drm/drm_gem_framebuffer_helper.h> | ||
16 | #include <drm/drm_vblank.h> | ||
17 | |||
14 | #include "komeda_dev.h" | 18 | #include "komeda_dev.h" |
15 | #include "komeda_kms.h" | ||
16 | #include "komeda_framebuffer.h" | 19 | #include "komeda_framebuffer.h" |
20 | #include "komeda_kms.h" | ||
17 | 21 | ||
18 | DEFINE_DRM_GEM_CMA_FOPS(komeda_cma_fops); | 22 | DEFINE_DRM_GEM_CMA_FOPS(komeda_cma_fops); |
19 | 23 | ||
diff --git a/drivers/gpu/drm/arm/display/komeda/komeda_kms.h b/drivers/gpu/drm/arm/display/komeda/komeda_kms.h index f13666004a42..874e9c9f0749 100644 --- a/drivers/gpu/drm/arm/display/komeda/komeda_kms.h +++ b/drivers/gpu/drm/arm/display/komeda/komeda_kms.h | |||
@@ -10,6 +10,7 @@ | |||
10 | #include <drm/drm_atomic.h> | 10 | #include <drm/drm_atomic.h> |
11 | #include <drm/drm_atomic_helper.h> | 11 | #include <drm/drm_atomic_helper.h> |
12 | #include <drm/drm_crtc_helper.h> | 12 | #include <drm/drm_crtc_helper.h> |
13 | #include <drm/drm_device.h> | ||
13 | #include <drm/drm_writeback.h> | 14 | #include <drm/drm_writeback.h> |
14 | 15 | ||
15 | /** struct komeda_plane - komeda instance of drm_plane */ | 16 | /** struct komeda_plane - komeda instance of drm_plane */ |
diff --git a/drivers/gpu/drm/arm/display/komeda/komeda_pipeline.c b/drivers/gpu/drm/arm/display/komeda/komeda_pipeline.c index edb1cd7795f9..f1908e9ef128 100644 --- a/drivers/gpu/drm/arm/display/komeda/komeda_pipeline.c +++ b/drivers/gpu/drm/arm/display/komeda/komeda_pipeline.c | |||
@@ -4,6 +4,8 @@ | |||
4 | * Author: James.Qian.Wang <james.qian.wang@arm.com> | 4 | * Author: James.Qian.Wang <james.qian.wang@arm.com> |
5 | * | 5 | * |
6 | */ | 6 | */ |
7 | #include <drm/drm_print.h> | ||
8 | |||
7 | #include "komeda_dev.h" | 9 | #include "komeda_dev.h" |
8 | #include "komeda_pipeline.h" | 10 | #include "komeda_pipeline.h" |
9 | 11 | ||