The use of drmP.h is discouraged and removal of it from drm_modeset_helper.h caused kirin to fail to build.
This patch introduce the necessary fixes to prepare for the drmP.h removal from drm_modeset_helper.h. List of include files sorted alphabetically. Build tested on arm x86 allmodconfig using the following hack to the Kconfig file: | - depends on DRM && OF && ARM64 | + depends on DRM && OF && (ARM64 || (X86_64 && COMPILE_TEST)) Build failed on 32bit ARM - so the X86_64 hack was required. The COMPILE_TEST hack is not submitted as the preferred fix is something where we have coverage on 32bit ARM too. Signed-off-by: Sam Ravnborg <s...@ravnborg.org> Cc: Xinliang Liu <z.liuxinli...@hisilicon.com> Cc: Rongrong Zou <zourongr...@gmail.com> Cc: Xinwei Kong <kong.kongxin...@hisilicon.com> Cc: Chen Feng <puck.c...@hisilicon.com> Cc: David Airlie <airl...@linux.ie> Cc: Daniel Vetter <dan...@ffwll.ch> --- drivers/gpu/drm/hisilicon/kirin/dw_drm_dsi.c | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/drivers/gpu/drm/hisilicon/kirin/dw_drm_dsi.c b/drivers/gpu/drm/hisilicon/kirin/dw_drm_dsi.c index b4c7af3ab6ae..7ffebdd843a2 100644 --- a/drivers/gpu/drm/hisilicon/kirin/dw_drm_dsi.c +++ b/drivers/gpu/drm/hisilicon/kirin/dw_drm_dsi.c @@ -16,13 +16,18 @@ */ #include <linux/clk.h> +#include <linux/delay.h> #include <linux/component.h> +#include <linux/module.h> +#include <linux/platform_device.h> -#include <drm/drm_of.h> +#include <drm/drm_atomic_helper.h> #include <drm/drm_crtc_helper.h> -#include <drm/drm_mipi_dsi.h> +#include <drm/drm_device.h> #include <drm/drm_encoder_slave.h> -#include <drm/drm_atomic_helper.h> +#include <drm/drm_mipi_dsi.h> +#include <drm/drm_print.h> +#include <drm/drm_of.h> #include "dw_dsi_reg.h" -- 2.12.0
