drm/i915: drop all drmP.h includes

Needs just a few additional includes here and there.

Cc: Sam Ravnborg <sam@ravnborg.org>
Cc: Daniel Vetter <daniel@ffwll.ch>
Cc: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Acked-by: Daniel Vetter <daniel.vetter@ffwll.ch>
Acked-by: Sam Ravnborg <sam@ravnborg.org>
Signed-off-by: Jani Nikula <jani.nikula@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20190108082709.3748-1-jani.nikula@intel.com
This commit is contained in:
Jani Nikula 2019-01-08 10:27:09 +02:00
parent f2bb09b632
commit 2f80d7bd8d
51 changed files with 3 additions and 51 deletions

View File

@ -24,7 +24,6 @@
#define _INTEL_DVO_H #define _INTEL_DVO_H
#include <linux/i2c.h> #include <linux/i2c.h>
#include <drm/drmP.h>
#include <drm/drm_crtc.h> #include <drm/drm_crtc.h>
#include "intel_drv.h" #include "intel_drv.h"

View File

@ -41,7 +41,6 @@
#include <linux/vt.h> #include <linux/vt.h>
#include <acpi/video.h> #include <acpi/video.h>
#include <drm/drmP.h>
#include <drm/drm_crtc_helper.h> #include <drm/drm_crtc_helper.h>
#include <drm/drm_atomic_helper.h> #include <drm/drm_atomic_helper.h>
#include <drm/i915_drm.h> #include <drm/i915_drm.h>

View File

@ -46,7 +46,6 @@
#include <linux/reservation.h> #include <linux/reservation.h>
#include <linux/shmem_fs.h> #include <linux/shmem_fs.h>
#include <drm/drmP.h>
#include <drm/intel-gtt.h> #include <drm/intel-gtt.h>
#include <drm/drm_legacy.h> /* for struct drm_dma_handle */ #include <drm/drm_legacy.h> /* for struct drm_dma_handle */
#include <drm/drm_gem.h> #include <drm/drm_gem.h>
@ -54,6 +53,7 @@
#include <drm/drm_cache.h> #include <drm/drm_cache.h>
#include <drm/drm_util.h> #include <drm/drm_util.h>
#include <drm/drm_dsc.h> #include <drm/drm_dsc.h>
#include <drm/drm_connector.h>
#include "i915_fixed.h" #include "i915_fixed.h"
#include "i915_params.h" #include "i915_params.h"

View File

@ -25,7 +25,6 @@
* *
*/ */
#include <drm/drmP.h>
#include <drm/drm_vma_manager.h> #include <drm/drm_vma_manager.h>
#include <drm/i915_drm.h> #include <drm/i915_drm.h>
#include "i915_drv.h" #include "i915_drv.h"

View File

@ -86,7 +86,6 @@
*/ */
#include <linux/log2.h> #include <linux/log2.h>
#include <drm/drmP.h>
#include <drm/i915_drm.h> #include <drm/i915_drm.h>
#include "i915_drv.h" #include "i915_drv.h"
#include "i915_trace.h" #include "i915_trace.h"

View File

@ -27,7 +27,6 @@
#include <linux/dma-buf.h> #include <linux/dma-buf.h>
#include <linux/reservation.h> #include <linux/reservation.h>
#include <drm/drmP.h>
#include "i915_drv.h" #include "i915_drv.h"

View File

@ -26,7 +26,6 @@
* *
*/ */
#include <drm/drmP.h>
#include <drm/i915_drm.h> #include <drm/i915_drm.h>
#include "i915_drv.h" #include "i915_drv.h"

View File

@ -31,7 +31,6 @@
#include <linux/sync_file.h> #include <linux/sync_file.h>
#include <linux/uaccess.h> #include <linux/uaccess.h>
#include <drm/drmP.h>
#include <drm/drm_syncobj.h> #include <drm/drm_syncobj.h>
#include <drm/i915_drm.h> #include <drm/i915_drm.h>

View File

@ -21,7 +21,6 @@
* IN THE SOFTWARE. * IN THE SOFTWARE.
*/ */
#include <drm/drmP.h>
#include <drm/i915_drm.h> #include <drm/i915_drm.h>
#include "i915_drv.h" #include "i915_drv.h"

View File

@ -33,7 +33,6 @@
#include <asm/set_memory.h> #include <asm/set_memory.h>
#include <drm/drmP.h>
#include <drm/i915_drm.h> #include <drm/i915_drm.h>
#include "i915_drv.h" #include "i915_drv.h"

View File

@ -22,7 +22,6 @@
* *
*/ */
#include <drm/drmP.h>
#include <drm/i915_drm.h> #include <drm/i915_drm.h>
#include "i915_drv.h" #include "i915_drv.h"

View File

@ -29,7 +29,8 @@
#include <drm/drm_vma_manager.h> #include <drm/drm_vma_manager.h>
#include <drm/drm_gem.h> #include <drm/drm_gem.h>
#include <drm/drmP.h> #include <drm/drm_file.h>
#include <drm/drm_device.h>
#include <drm/i915_drm.h> #include <drm/i915_drm.h>

View File

@ -30,7 +30,6 @@
#include <linux/pci.h> #include <linux/pci.h>
#include <linux/dma-buf.h> #include <linux/dma-buf.h>
#include <linux/vmalloc.h> #include <linux/vmalloc.h>
#include <drm/drmP.h>
#include <drm/i915_drm.h> #include <drm/i915_drm.h>
#include "i915_drv.h" #include "i915_drv.h"

View File

@ -26,7 +26,6 @@
* *
*/ */
#include <drm/drmP.h>
#include <drm/i915_drm.h> #include <drm/i915_drm.h>
#include "i915_drv.h" #include "i915_drv.h"

View File

@ -27,7 +27,6 @@
#include <linux/string.h> #include <linux/string.h>
#include <linux/bitops.h> #include <linux/bitops.h>
#include <drm/drmP.h>
#include <drm/i915_drm.h> #include <drm/i915_drm.h>
#include "i915_drv.h" #include "i915_drv.h"

View File

@ -22,7 +22,6 @@
* *
*/ */
#include <drm/drmP.h>
#include <drm/i915_drm.h> #include <drm/i915_drm.h>
#include "i915_drv.h" #include "i915_drv.h"
#include "i915_trace.h" #include "i915_trace.h"

View File

@ -28,7 +28,6 @@
*/ */
#include <linux/compat.h> #include <linux/compat.h>
#include <drm/drmP.h>
#include <drm/i915_drm.h> #include <drm/i915_drm.h>
#include "i915_drv.h" #include "i915_drv.h"

View File

@ -31,7 +31,6 @@
#include <linux/sysrq.h> #include <linux/sysrq.h>
#include <linux/slab.h> #include <linux/slab.h>
#include <linux/circ_buf.h> #include <linux/circ_buf.h>
#include <drm/drmP.h>
#include <drm/i915_drm.h> #include <drm/i915_drm.h>
#include "i915_drv.h" #include "i915_drv.h"
#include "i915_trace.h" #include "i915_trace.h"

View File

@ -24,7 +24,6 @@
* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. * SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
*/ */
#include <drm/drmP.h>
#include <drm/i915_drm.h> #include <drm/i915_drm.h>
#include "intel_drv.h" #include "intel_drv.h"
#include "i915_reg.h" #include "i915_reg.h"

View File

@ -6,7 +6,6 @@
#include <linux/types.h> #include <linux/types.h>
#include <linux/tracepoint.h> #include <linux/tracepoint.h>
#include <drm/drmP.h>
#include "i915_drv.h" #include "i915_drv.h"
#include "intel_drv.h" #include "intel_drv.h"
#include "intel_ringbuffer.h" #include "intel_ringbuffer.h"

View File

@ -6,7 +6,6 @@
*/ */
#include <linux/pci.h> #include <linux/pci.h>
#include <linux/acpi.h> #include <linux/acpi.h>
#include <drm/drmP.h>
#include "i915_drv.h" #include "i915_drv.h"
#define INTEL_DSM_REVISION_ID 1 /* For Calpella anyway... */ #define INTEL_DSM_REVISION_ID 1 /* For Calpella anyway... */

View File

@ -29,7 +29,6 @@
* See intel_atomic_plane.c for the plane-specific atomic functionality. * See intel_atomic_plane.c for the plane-specific atomic functionality.
*/ */
#include <drm/drmP.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_plane_helper.h>

View File

@ -31,7 +31,6 @@
* prepare/check/commit/cleanup steps. * prepare/check/commit/cleanup steps.
*/ */
#include <drm/drmP.h>
#include <drm/drm_atomic_helper.h> #include <drm/drm_atomic_helper.h>
#include <drm/drm_plane_helper.h> #include <drm/drm_plane_helper.h>
#include "intel_drv.h" #include "intel_drv.h"

View File

@ -27,7 +27,6 @@
#include <drm/intel_lpe_audio.h> #include <drm/intel_lpe_audio.h>
#include "intel_drv.h" #include "intel_drv.h"
#include <drm/drmP.h>
#include <drm/drm_edid.h> #include <drm/drm_edid.h>
#include "i915_drv.h" #include "i915_drv.h"

View File

@ -26,7 +26,6 @@
*/ */
#include <drm/drm_dp_helper.h> #include <drm/drm_dp_helper.h>
#include <drm/drmP.h>
#include <drm/i915_drm.h> #include <drm/i915_drm.h>
#include "i915_drv.h" #include "i915_drv.h"

View File

@ -27,7 +27,6 @@
#include <linux/i2c.h> #include <linux/i2c.h>
#include <drm/drm_atomic_helper.h> #include <drm/drm_atomic_helper.h>
#include <drm/drm_edid.h> #include <drm/drm_edid.h>
#include <drm/drmP.h>
#include "intel_drv.h" #include "intel_drv.h"
#include "i915_drv.h" #include "i915_drv.h"

View File

@ -27,7 +27,6 @@
#include <linux/dmi.h> #include <linux/dmi.h>
#include <linux/i2c.h> #include <linux/i2c.h>
#include <linux/slab.h> #include <linux/slab.h>
#include <drm/drmP.h>
#include <drm/drm_atomic_helper.h> #include <drm/drm_atomic_helper.h>
#include <drm/drm_crtc.h> #include <drm/drm_crtc.h>
#include <drm/drm_crtc_helper.h> #include <drm/drm_crtc_helper.h>

View File

@ -31,7 +31,6 @@
#include <linux/slab.h> #include <linux/slab.h>
#include <linux/vgaarb.h> #include <linux/vgaarb.h>
#include <drm/drm_edid.h> #include <drm/drm_edid.h>
#include <drm/drmP.h>
#include "intel_drv.h" #include "intel_drv.h"
#include "intel_frontbuffer.h" #include "intel_frontbuffer.h"
#include <drm/i915_drm.h> #include <drm/i915_drm.h>

View File

@ -32,7 +32,6 @@
#include <linux/notifier.h> #include <linux/notifier.h>
#include <linux/reboot.h> #include <linux/reboot.h>
#include <asm/byteorder.h> #include <asm/byteorder.h>
#include <drm/drmP.h>
#include <drm/drm_atomic_helper.h> #include <drm/drm_atomic_helper.h>
#include <drm/drm_crtc.h> #include <drm/drm_crtc.h>
#include <drm/drm_crtc_helper.h> #include <drm/drm_crtc_helper.h>

View File

@ -23,7 +23,6 @@
* *
*/ */
#include <drm/drmP.h>
#include "i915_drv.h" #include "i915_drv.h"
#include "intel_drv.h" #include "intel_drv.h"
#include <drm/drm_atomic_helper.h> #include <drm/drm_atomic_helper.h>

View File

@ -24,7 +24,6 @@
#ifndef _INTEL_DSI_H #ifndef _INTEL_DSI_H
#define _INTEL_DSI_H #define _INTEL_DSI_H
#include <drm/drmP.h>
#include <drm/drm_crtc.h> #include <drm/drm_crtc.h>
#include <drm/drm_mipi_dsi.h> #include <drm/drm_mipi_dsi.h>
#include "intel_drv.h" #include "intel_drv.h"

View File

@ -24,7 +24,6 @@
* *
*/ */
#include <drm/drmP.h>
#include <drm/drm_crtc.h> #include <drm/drm_crtc.h>
#include <drm/drm_edid.h> #include <drm/drm_edid.h>
#include <drm/i915_drm.h> #include <drm/i915_drm.h>

View File

@ -26,7 +26,6 @@
*/ */
#include <linux/i2c.h> #include <linux/i2c.h>
#include <linux/slab.h> #include <linux/slab.h>
#include <drm/drmP.h>
#include <drm/drm_atomic_helper.h> #include <drm/drm_atomic_helper.h>
#include <drm/drm_crtc.h> #include <drm/drm_crtc.h>
#include "intel_drv.h" #include "intel_drv.h"

View File

@ -37,7 +37,6 @@
#include <linux/init.h> #include <linux/init.h>
#include <linux/vga_switcheroo.h> #include <linux/vga_switcheroo.h>
#include <drm/drmP.h>
#include <drm/drm_crtc.h> #include <drm/drm_crtc.h>
#include <drm/drm_fb_helper.h> #include <drm/drm_fb_helper.h>
#include "intel_drv.h" #include "intel_drv.h"

View File

@ -60,7 +60,6 @@
* functions is deprecated and should be avoided. * functions is deprecated and should be avoided.
*/ */
#include <drm/drmP.h>
#include "intel_drv.h" #include "intel_drv.h"
#include "intel_frontbuffer.h" #include "intel_frontbuffer.h"

View File

@ -6,7 +6,6 @@
* Sean Paul <seanpaul@chromium.org> * Sean Paul <seanpaul@chromium.org>
*/ */
#include <drm/drmP.h>
#include <drm/drm_hdcp.h> #include <drm/drm_hdcp.h>
#include <linux/i2c.h> #include <linux/i2c.h>
#include <linux/random.h> #include <linux/random.h>

View File

@ -30,7 +30,6 @@
#include <linux/slab.h> #include <linux/slab.h>
#include <linux/delay.h> #include <linux/delay.h>
#include <linux/hdmi.h> #include <linux/hdmi.h>
#include <drm/drmP.h>
#include <drm/drm_atomic_helper.h> #include <drm/drm_atomic_helper.h>
#include <drm/drm_crtc.h> #include <drm/drm_crtc.h>
#include <drm/drm_edid.h> #include <drm/drm_edid.h>

View File

@ -23,7 +23,6 @@
#include <linux/kernel.h> #include <linux/kernel.h>
#include <drm/drmP.h>
#include <drm/i915_drm.h> #include <drm/i915_drm.h>
#include "i915_drv.h" #include "i915_drv.h"

View File

@ -29,7 +29,6 @@
#include <linux/i2c.h> #include <linux/i2c.h>
#include <linux/i2c-algo-bit.h> #include <linux/i2c-algo-bit.h>
#include <linux/export.h> #include <linux/export.h>
#include <drm/drmP.h>
#include <drm/drm_hdcp.h> #include <drm/drm_hdcp.h>
#include "intel_drv.h" #include "intel_drv.h"
#include <drm/i915_drm.h> #include <drm/i915_drm.h>

View File

@ -133,7 +133,6 @@
*/ */
#include <linux/interrupt.h> #include <linux/interrupt.h>
#include <drm/drmP.h>
#include <drm/i915_drm.h> #include <drm/i915_drm.h>
#include "i915_drv.h" #include "i915_drv.h"
#include "i915_gem_render_state.h" #include "i915_gem_render_state.h"

View File

@ -32,7 +32,6 @@
#include <linux/i2c.h> #include <linux/i2c.h>
#include <linux/slab.h> #include <linux/slab.h>
#include <linux/vga_switcheroo.h> #include <linux/vga_switcheroo.h>
#include <drm/drmP.h>
#include <drm/drm_atomic_helper.h> #include <drm/drm_atomic_helper.h>
#include <drm/drm_crtc.h> #include <drm/drm_crtc.h>
#include <drm/drm_edid.h> #include <drm/drm_edid.h>

View File

@ -49,7 +49,6 @@
* context handling keep the MOCS in step. * context handling keep the MOCS in step.
*/ */
#include <drm/drmP.h>
#include "i915_drv.h" #include "i915_drv.h"
int intel_rcs_context_init_mocs(struct i915_request *rq); int intel_rcs_context_init_mocs(struct i915_request *rq);

View File

@ -30,7 +30,6 @@
#include <linux/firmware.h> #include <linux/firmware.h>
#include <acpi/video.h> #include <acpi/video.h>
#include <drm/drmP.h>
#include <drm/i915_drm.h> #include <drm/i915_drm.h>
#include "intel_opregion.h" #include "intel_opregion.h"

View File

@ -25,7 +25,6 @@
* *
* Derived from Xorg ddx, xf86-video-intel, src/i830_video.c * Derived from Xorg ddx, xf86-video-intel, src/i830_video.c
*/ */
#include <drm/drmP.h>
#include <drm/i915_drm.h> #include <drm/i915_drm.h>
#include "i915_drv.h" #include "i915_drv.h"
#include "i915_reg.h" #include "i915_reg.h"

View File

@ -51,7 +51,6 @@
* must be correctly synchronized/cancelled when shutting down the pipe." * must be correctly synchronized/cancelled when shutting down the pipe."
*/ */
#include <drm/drmP.h>
#include "intel_drv.h" #include "intel_drv.h"
#include "i915_drv.h" #include "i915_drv.h"

View File

@ -29,7 +29,6 @@
#include <linux/log2.h> #include <linux/log2.h>
#include <drm/drmP.h>
#include <drm/i915_drm.h> #include <drm/i915_drm.h>
#include "i915_drv.h" #include "i915_drv.h"

View File

@ -29,7 +29,6 @@
#include <linux/slab.h> #include <linux/slab.h>
#include <linux/delay.h> #include <linux/delay.h>
#include <linux/export.h> #include <linux/export.h>
#include <drm/drmP.h>
#include <drm/drm_atomic_helper.h> #include <drm/drm_atomic_helper.h>
#include <drm/drm_crtc.h> #include <drm/drm_crtc.h>
#include <drm/drm_edid.h> #include <drm/drm_edid.h>

View File

@ -29,7 +29,6 @@
* registers; newer ones are much simpler and we can use the new DRM plane * registers; newer ones are much simpler and we can use the new DRM plane
* support. * support.
*/ */
#include <drm/drmP.h>
#include <drm/drm_atomic_helper.h> #include <drm/drm_atomic_helper.h>
#include <drm/drm_crtc.h> #include <drm/drm_crtc.h>
#include <drm/drm_fourcc.h> #include <drm/drm_fourcc.h>

View File

@ -30,7 +30,6 @@
* Integrated TV-out support for the 915GM and 945GM. * Integrated TV-out support for the 915GM and 945GM.
*/ */
#include <drm/drmP.h>
#include <drm/drm_atomic_helper.h> #include <drm/drm_atomic_helper.h>
#include <drm/drm_crtc.h> #include <drm/drm_crtc.h>
#include <drm/drm_edid.h> #include <drm/drm_edid.h>

View File

@ -6,7 +6,6 @@
* Manasi Navare <manasi.d.navare@intel.com> * Manasi Navare <manasi.d.navare@intel.com>
*/ */
#include <drm/drmP.h>
#include <drm/i915_drm.h> #include <drm/i915_drm.h>
#include "i915_drv.h" #include "i915_drv.h"
#include "intel_drv.h" #include "intel_drv.h"

View File

@ -23,7 +23,6 @@
* Author: Jani Nikula <jani.nikula@intel.com> * Author: Jani Nikula <jani.nikula@intel.com>
*/ */
#include <drm/drmP.h>
#include <drm/drm_atomic_helper.h> #include <drm/drm_atomic_helper.h>
#include <drm/drm_crtc.h> #include <drm/drm_crtc.h>
#include <drm/drm_edid.h> #include <drm/drm_edid.h>