Commit d0e93599 authored by Sam Ravnborg's avatar Sam Ravnborg Committed by Daniel Vetter
Browse files

drm/i915: prepare for drmP.h removal from drm_modeset_helper.h 



The use of drmP.h is discouraged and removal of it from
drm_modeset_helper.h caused i915 to fail to build.

This patch introduce the necessary fixes to prepare for the
drmP.h removal from drm_modeset_helper.h.

In the files touched the lists of include files was grouped
and sorted.

Build tested on x86 and arm allmodconfig / allyesconfig.

Signed-off-by: default avatarSam Ravnborg <sam@ravnborg.org>
Cc: Jani Nikula <jani.nikula@linux.intel.com>
Cc: Joonas Lahtinen <joonas.lahtinen@linux.intel.com>
Cc: Rodrigo Vivi <rodrigo.vivi@intel.com>
Cc: David Airlie <airlied@linux.ie>
Cc: Daniel Vetter <daniel@ffwll.ch>
Cc: intel-gfx@lists.freedesktop.org
Acked-by: default avatarJani Nikula <jani.nikula@intel.com>
Signed-off-by: default avatarDaniel Vetter <daniel.vetter@ffwll.ch>
Link: https://patchwork.freedesktop.org/patch/msgid/20190126122527.11647-3-sam@ravnborg.org
parent 96bae043

drivers/gpu/drm/i915/i915_drv.c

+3 −1
Original line number Diff line number Diff line
@@ -41,8 +41,10 @@ 
#include <linux/vt.h>

#include <acpi/video.h>



#include <drm/drm_probe_helper.h>

#include <drm/drm_atomic_helper.h>

#include <drm/drm_ioctl.h>

#include <drm/drm_irq.h>

#include <drm/drm_probe_helper.h>

#include <drm/i915_drm.h>



#include "i915_drv.h"

drivers/gpu/drm/i915/intel_atomic.c

+2 −0
Original line number Diff line number Diff line
@@ -31,7 +31,9 @@ 


#include <drm/drm_atomic.h>

#include <drm/drm_atomic_helper.h>

#include <drm/drm_fourcc.h>

#include <drm/drm_plane_helper.h>



#include "intel_drv.h"



/**

drivers/gpu/drm/i915/intel_atomic_plane.c

+2 −0
Original line number Diff line number Diff line
@@ -32,7 +32,9 @@ 
 */



#include <drm/drm_atomic_helper.h>

#include <drm/drm_fourcc.h>

#include <drm/drm_plane_helper.h>



#include "intel_drv.h"



struct intel_plane *intel_plane_alloc(void)

drivers/gpu/drm/i915/intel_display.c

+16 −13
Original line number Diff line number Diff line
@@ -24,29 +24,32 @@ 
 *	Eric Anholt <eric@anholt.net>

 */



#include <linux/module.h>

#include <linux/input.h>

#include <linux/i2c.h>

#include <linux/input.h>

#include <linux/intel-iommu.h>

#include <linux/kernel.h>

#include <linux/module.h>

#include <linux/reservation.h>

#include <linux/slab.h>

#include <linux/vgaarb.h>

#include <drm/drm_edid.h>

#include "intel_drv.h"

#include "intel_frontbuffer.h"

#include <drm/i915_drm.h>

#include "i915_drv.h"

#include "i915_gem_clflush.h"

#include "intel_dsi.h"

#include "i915_trace.h"



#include <drm/drm_atomic.h>

#include <drm/drm_atomic_helper.h>

#include <drm/drm_atomic_uapi.h>

#include <drm/drm_dp_helper.h>

#include <drm/drm_edid.h>

#include <drm/drm_fourcc.h>

#include <drm/drm_plane_helper.h>

#include <drm/drm_probe_helper.h>

#include <drm/drm_rect.h>

#include <drm/drm_atomic_uapi.h>

#include <linux/intel-iommu.h>

#include <linux/reservation.h>

#include <drm/i915_drm.h>



#include "i915_drv.h"

#include "i915_gem_clflush.h"

#include "i915_trace.h"

#include "intel_drv.h"

#include "intel_dsi.h"

#include "intel_frontbuffer.h"



/* Primary plane formats for gen <= 3 */

static const uint32_t i8xx_primary_formats[] = {

drivers/gpu/drm/i915/intel_pm.c

+5 −2
Original line number Diff line number Diff line
@@ -26,13 +26,16 @@ 
 */



#include <linux/cpufreq.h>

#include <linux/module.h>

#include <linux/pm_runtime.h>



#include <drm/drm_atomic_helper.h>

#include <drm/drm_fourcc.h>

#include <drm/drm_plane_helper.h>



#include "i915_drv.h"

#include "intel_drv.h"

#include "../../../platform/x86/intel_ips.h"

#include <linux/module.h>

#include <drm/drm_atomic_helper.h>



/**

 * DOC: RC6

CRA Git | Maintained and supported by SUSTech CRA and CCSE