drm/komeda: fix build with drm_modeset_helper.h update
Subsystems (4)
PATCH 1/1 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.
--- drivers/gpu/drm/arm/display/komeda/komeda_crtc.c | 8 ++++++-- drivers/gpu/drm/arm/display/komeda/komeda_dev.c | 6 +++++- drivers/gpu/drm/arm/display/komeda/komeda_framebuffer.c | 6 ++++-- drivers/gpu/drm/arm/display/komeda/komeda_kms.c | 12 ++++++++---- drivers/gpu/drm/arm/display/komeda/komeda_kms.h | 1 + drivers/gpu/drm/arm/display/komeda/komeda_pipeline.c | 2 ++ 6 files changed, 26 insertions(+), 9 deletions(-)
drivers/gpu/drm/arm/display/komeda/komeda_crtc.c +6 -2
@@ -5,12 +5,16 @@* */ #include <linux/clk.h> +#include <linux/pm_runtime.h> #include <linux/spinlock.h> +#include <drm/drm_atomic.h> #include <drm/drm_atomic_helper.h> -#include <drm/drm_plane_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_kms.h"
drivers/gpu/drm/arm/display/komeda/komeda_dev.c +5 -1
@@ -4,9 +4,13 @@* Author: James.Qian.Wang <[email protected]> * */ -#include <linux/platform_device.h> +#include <linux/io.h> #include <linux/of_device.h> #include <linux/of_graph.h> +#include <linux/platform_device.h> + +#include <drm/drm_print.h> +#include "komeda_dev.h" static int komeda_parse_pipe_dt (struct komeda_dev *mdev,struct device_node *np)
drivers/gpu/drm/arm/display/komeda/komeda_framebuffer.c +4 -2
@@ -4,10 +4,12 @@* Author: James.Qian.Wang <[email protected]> * */ -#include <drm/drm_gem.h> -#include <drm/drm_gem_framebuffer_helper.h> +#include <drm/drm_device.h> #include <drm/drm_fb_cma_helper.h> +#include <drm/drm_gem.h> #include <drm/drm_gem_cma_helper.h> +#include <drm/drm_gem_framebuffer_helper.h> +#include "komeda_framebuffer.h" #include "komeda_dev.h"
drivers/gpu/drm/arm/display/komeda/komeda_kms.c +8 -4
@@ -5,15 +5,19 @@* */ #include <linux/component.h> +#include <linux/interrupt.h> +#include <drm/drm_atomic.h> #include <drm/drm_atomic_helper.h> -#include <drm/drm_gem_framebuffer_helper.h> -#include <drm/drm_gem_cma_helper.h> +#include <drm/drm_drv.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_kms.h" #include "komeda_framebuffer.h" +#include "komeda_kms.h" DEFINE_DRM_GEM_CMA_FOPS (komeda_cma_fops);
drivers/gpu/drm/arm/display/komeda/komeda_kms.h +1 -0
@@ -10,6 +10,7 @@#include <drm/drm_atomic.h> #include <drm/drm_atomic_helper.h> #include <drm/drm_crtc_helper.h> +#include <drm/drm_device.h> #include <drm/drm_writeback.h> /** struct komeda_plane - komeda instance of drm_plane */
drivers/gpu/drm/arm/display/komeda/komeda_pipeline.c +2 -0
@@ -4,6 +4,8 @@* Author: James.Qian.Wang <[email protected]> * */ +#include <drm/drm_print.h> +#include "komeda_dev.h" #include "komeda_pipeline.h"
Signature · 6 lines
2.12.0 _______________________________________________ dri-devel mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/dri-devel
Hi Sam,
Quoted 20 lines · On Fri, 8 Feb 2019 23:13:24 +0100 Sam Ravnborg <[email protected]> wrote:
With
drmP.hremoved fromdrm_modeset_helper.hthe build of komeda filed as reported by linux-nextAdd 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 Sam Ravnborg <[email protected]>Cc Stephen Rothwell <[email protected]>Cc James Wang <[email protected]>Cc Liviu Dudau <[email protected]>Cc Brian Starkey <[email protected]>Cc David Airlie <[email protected]>Cc Daniel Vetter <[email protected]>
Quoted 8 lines
--- drivers/gpu/drm/arm/display/komeda/komeda_crtc.c | 8 ++++++-- drivers/gpu/drm/arm/display/komeda/komeda_dev.c | 6 +++++- drivers/gpu/drm/arm/display/komeda/komeda_framebuffer.c | 6 ++++-- drivers/gpu/drm/arm/display/komeda/komeda_kms.c | 12 ++++++++---- drivers/gpu/drm/arm/display/komeda/komeda_kms.h | 1 + drivers/gpu/drm/arm/display/komeda/komeda_pipeline.c | 2 ++ 6 files changed, 26 insertions(+), 9 deletions(-)
Applied to linux-next as a merge fix patch for the merge of the drm-misc tree today.
Signature · 2 lines
Cheers, Stephen Rothwell
_______________________________________________
dri-devel mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/dri-devel
Maxime Ripard
AppliedQuoted 11 lines · Sam Ravnborg
With
drmP.hremoved fromdrm_modeset_helper.hthe build of komeda filed as reported by linux-nextAdd 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.
Quoted 8 lines
Signed-off-by Sam Ravnborg <[email protected]>Cc Stephen Rothwell <[email protected]>Cc James Wang <[email protected]>Cc Liviu Dudau <[email protected]>Cc Brian Starkey <[email protected]>Cc David Airlie <[email protected]>Cc Daniel Vetter <[email protected]>
I've applied it to drm-misc-next (after a drm-next backmerge), thanks! Maxime
Signature · 3 lines
Maxime Ripard, Bootlin Embedded Linux and Kernel engineering https://bootlin.com
_______________________________________________
dri-devel mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/dri-devel