Commit 6649a95d authored by Sam Ravnborg's avatar Sam Ravnborg Committed by Maxime Ripard

drm/komeda: fix build with drm_modeset_helper.h update

With drmP.h removed from drm_modeset_helper.h the build of
komeda filed as reported by linux-next

Add missing include files to fix build.
For the files touched group include files and sort them.

The fix was tested on a tree with drm-misc-next merged.
And the patch was also tested to work without drm-misc-next merged.

Build tested on arm + x86.
Signed-off-by: default avatarSam Ravnborg <sam@ravnborg.org>
Reported-by: Stephen Rothwell <sfr@canb.auug.org.au> [linux-next]
Cc: Stephen Rothwell <sfr@canb.auug.org.au>
Cc: James Wang <james.qian.wang@arm.com>
Cc: Liviu Dudau <liviu.dudau@arm.com>
Cc: Brian Starkey <brian.starkey@arm.com>
Cc: David Airlie <airlied@linux.ie>
Cc: Daniel Vetter <daniel@ffwll.ch>
Signed-off-by: default avatarMaxime Ripard <maxime.ripard@bootlin.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20190208221324.27002-1-sam@ravnborg.org
parent d588100b
...@@ -5,12 +5,16 @@ ...@@ -5,12 +5,16 @@
* *
*/ */
#include <linux/clk.h> #include <linux/clk.h>
#include <linux/pm_runtime.h>
#include <linux/spinlock.h> #include <linux/spinlock.h>
#include <drm/drm_atomic.h> #include <drm/drm_atomic.h>
#include <drm/drm_atomic_helper.h> #include <drm/drm_atomic_helper.h>
#include <drm/drm_plane_helper.h>
#include <drm/drm_crtc_helper.h> #include <drm/drm_crtc_helper.h>
#include <linux/pm_runtime.h> #include <drm/drm_plane_helper.h>
#include <drm/drm_print.h>
#include <drm/drm_vblank.h>
#include "komeda_dev.h" #include "komeda_dev.h"
#include "komeda_kms.h" #include "komeda_kms.h"
......
...@@ -4,9 +4,13 @@ ...@@ -4,9 +4,13 @@
* Author: James.Qian.Wang <james.qian.wang@arm.com> * Author: James.Qian.Wang <james.qian.wang@arm.com>
* *
*/ */
#include <linux/platform_device.h> #include <linux/io.h>
#include <linux/of_device.h> #include <linux/of_device.h>
#include <linux/of_graph.h> #include <linux/of_graph.h>
#include <linux/platform_device.h>
#include <drm/drm_print.h>
#include "komeda_dev.h" #include "komeda_dev.h"
static int komeda_parse_pipe_dt(struct komeda_dev *mdev, struct device_node *np) static int komeda_parse_pipe_dt(struct komeda_dev *mdev, struct device_node *np)
......
...@@ -4,10 +4,12 @@ ...@@ -4,10 +4,12 @@
* Author: James.Qian.Wang <james.qian.wang@arm.com> * Author: James.Qian.Wang <james.qian.wang@arm.com>
* *
*/ */
#include <drm/drm_gem.h> #include <drm/drm_device.h>
#include <drm/drm_gem_framebuffer_helper.h>
#include <drm/drm_fb_cma_helper.h> #include <drm/drm_fb_cma_helper.h>
#include <drm/drm_gem.h>
#include <drm/drm_gem_cma_helper.h> #include <drm/drm_gem_cma_helper.h>
#include <drm/drm_gem_framebuffer_helper.h>
#include "komeda_framebuffer.h" #include "komeda_framebuffer.h"
#include "komeda_dev.h" #include "komeda_dev.h"
......
...@@ -5,15 +5,19 @@ ...@@ -5,15 +5,19 @@
* *
*/ */
#include <linux/component.h> #include <linux/component.h>
#include <linux/interrupt.h>
#include <drm/drm_atomic.h> #include <drm/drm_atomic.h>
#include <drm/drm_atomic_helper.h> #include <drm/drm_atomic_helper.h>
#include <drm/drm_gem_framebuffer_helper.h> #include <drm/drm_drv.h>
#include <drm/drm_gem_cma_helper.h>
#include <drm/drm_fb_helper.h> #include <drm/drm_fb_helper.h>
#include <linux/interrupt.h> #include <drm/drm_gem_cma_helper.h>
#include <drm/drm_gem_framebuffer_helper.h>
#include <drm/drm_vblank.h>
#include "komeda_dev.h" #include "komeda_dev.h"
#include "komeda_kms.h"
#include "komeda_framebuffer.h" #include "komeda_framebuffer.h"
#include "komeda_kms.h"
DEFINE_DRM_GEM_CMA_FOPS(komeda_cma_fops); DEFINE_DRM_GEM_CMA_FOPS(komeda_cma_fops);
......
...@@ -10,6 +10,7 @@ ...@@ -10,6 +10,7 @@
#include <drm/drm_atomic.h> #include <drm/drm_atomic.h>
#include <drm/drm_atomic_helper.h> #include <drm/drm_atomic_helper.h>
#include <drm/drm_crtc_helper.h> #include <drm/drm_crtc_helper.h>
#include <drm/drm_device.h>
#include <drm/drm_writeback.h> #include <drm/drm_writeback.h>
/** struct komeda_plane - komeda instance of drm_plane */ /** struct komeda_plane - komeda instance of drm_plane */
......
...@@ -4,6 +4,8 @@ ...@@ -4,6 +4,8 @@
* Author: James.Qian.Wang <james.qian.wang@arm.com> * Author: James.Qian.Wang <james.qian.wang@arm.com>
* *
*/ */
#include <drm/drm_print.h>
#include "komeda_dev.h" #include "komeda_dev.h"
#include "komeda_pipeline.h" #include "komeda_pipeline.h"
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment